[前][次][番号順一覧][スレッド一覧]

ruby-changes:46977

From: eregon <ko1@a...>
Date: Thu, 15 Jun 2017 21:48:33 +0900 (JST)
Subject: [ruby-changes:46977] eregon:r59092 (trunk): Update to ruby/mspec@d900a49

eregon	2017-06-15 21:48:26 +0900 (Thu, 15 Jun 2017)

  New Revision: 59092

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=59092

  Log:
    Update to ruby/mspec@d900a49

  Removed files:
    trunk/spec/mspec/lib/mspec/utils/ruby_name.rb
  Modified files:
    trunk/spec/mspec/lib/mspec/commands/mspec-ci.rb
    trunk/spec/mspec/lib/mspec/commands/mspec-run.rb
    trunk/spec/mspec/lib/mspec/commands/mspec-tag.rb
    trunk/spec/mspec/lib/mspec/guards/block_device.rb
    trunk/spec/mspec/lib/mspec/guards/bug.rb
    trunk/spec/mspec/lib/mspec/guards/conflict.rb
    trunk/spec/mspec/lib/mspec/guards/endian.rb
    trunk/spec/mspec/lib/mspec/guards/feature.rb
    trunk/spec/mspec/lib/mspec/guards/guard.rb
    trunk/spec/mspec/lib/mspec/guards/platform.rb
    trunk/spec/mspec/lib/mspec/guards/quarantine.rb
    trunk/spec/mspec/lib/mspec/guards/superuser.rb
    trunk/spec/mspec/lib/mspec/guards/support.rb
    trunk/spec/mspec/lib/mspec/guards/version.rb
    trunk/spec/mspec/lib/mspec/guards.rb
    trunk/spec/mspec/lib/mspec/helpers/argf.rb
    trunk/spec/mspec/lib/mspec/helpers/argv.rb
    trunk/spec/mspec/lib/mspec/helpers/datetime.rb
    trunk/spec/mspec/lib/mspec/helpers/fixture.rb
    trunk/spec/mspec/lib/mspec/helpers/flunk.rb
    trunk/spec/mspec/lib/mspec/helpers/fs.rb
    trunk/spec/mspec/lib/mspec/helpers/io.rb
    trunk/spec/mspec/lib/mspec/helpers/mock_to_path.rb
    trunk/spec/mspec/lib/mspec/helpers/numeric.rb
    trunk/spec/mspec/lib/mspec/helpers/ruby_exe.rb
    trunk/spec/mspec/lib/mspec/helpers/tmp.rb
    trunk/spec/mspec/lib/mspec/helpers/warning.rb
    trunk/spec/mspec/lib/mspec/runner/formatters/html.rb
    trunk/spec/mspec/lib/mspec/runner/formatters/junit.rb
    trunk/spec/mspec/lib/mspec/utils/options.rb
    trunk/spec/mspec/spec/commands/mspec_ci_spec.rb
    trunk/spec/mspec/spec/commands/mspec_run_spec.rb
    trunk/spec/mspec/spec/commands/mspec_tag_spec.rb
    trunk/spec/mspec/spec/guards/bug_spec.rb
    trunk/spec/mspec/spec/guards/platform_spec.rb
    trunk/spec/mspec/spec/guards/support_spec.rb
    trunk/spec/mspec/spec/helpers/ruby_exe_spec.rb
    trunk/spec/mspec/spec/runner/formatters/html_spec.rb
    trunk/spec/mspec/spec/utils/options_spec.rb
    trunk/spec/mspec/tool/sync/sync-rubyspec.rb
Index: spec/mspec/lib/mspec/utils/ruby_name.rb
===================================================================
--- spec/mspec/lib/mspec/utils/ruby_name.rb	(revision 59091)
+++ spec/mspec/lib/mspec/utils/ruby_name.rb	(nonexistent)
@@ -1,8 +0,0 @@ https://github.com/ruby/ruby/blob/trunk/spec/mspec/lib/mspec/utils/ruby_name.rb#L0
-unless Object.const_defined?(:RUBY_NAME) and RUBY_NAME
-  if Object.const_defined?(:RUBY_ENGINE) and RUBY_ENGINE
-    RUBY_NAME = RUBY_ENGINE
-  else
-    require 'rbconfig'
-    RUBY_NAME = RbConfig::CONFIG["RUBY_INSTALL_NAME"] || RbConfig::CONFIG["ruby_install_name"]
-  end
-end

Property changes on: spec/mspec/lib/mspec/utils/ruby_name.rb
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-LF
\ No newline at end of property
Index: spec/mspec/spec/helpers/ruby_exe_spec.rb
===================================================================
--- spec/mspec/spec/helpers/ruby_exe_spec.rb	(revision 59091)
+++ spec/mspec/spec/helpers/ruby_exe_spec.rb	(revision 59092)
@@ -4,6 +4,10 @@ require 'mspec/helpers' https://github.com/ruby/ruby/blob/trunk/spec/mspec/spec/helpers/ruby_exe_spec.rb#L4
 require 'rbconfig'
 
 class RubyExeSpecs
+  public :ruby_exe_options
+  public :resolve_ruby_exe
+  public :ruby_cmd
+  public :ruby_exe
 end
 
 describe "#ruby_exe_options" do
@@ -11,14 +15,14 @@ describe "#ruby_exe_options" do https://github.com/ruby/ruby/blob/trunk/spec/mspec/spec/helpers/ruby_exe_spec.rb#L15
     @verbose = $VERBOSE
     $VERBOSE = nil
 
-    @ruby_name = Object.const_get :RUBY_NAME
+    @ruby_engine = Object.const_get :RUBY_ENGINE
     @ruby_exe_env = ENV['RUBY_EXE']
 
     @script = RubyExeSpecs.new
   end
 
   after :all do
-    Object.const_set :RUBY_NAME, @ruby_name
+    Object.const_set :RUBY_ENGINE, @ruby_engine
     ENV['RUBY_EXE'] = @ruby_exe_env
     $VERBOSE = @verbose
   end
@@ -32,33 +36,33 @@ describe "#ruby_exe_options" do https://github.com/ruby/ruby/blob/trunk/spec/mspec/spec/helpers/ruby_exe_spec.rb#L36
     @script.ruby_exe_options(:env).should == "kowabunga"
   end
 
-  it "returns 'bin/jruby' when passed :engine and RUBY_NAME is 'jruby'" do
-    Object.const_set :RUBY_NAME, 'jruby'
+  it "returns 'bin/jruby' when passed :engine and RUBY_ENGINE is 'jruby'" do
+    Object.const_set :RUBY_ENGINE, 'jruby'
     @script.ruby_exe_options(:engine).should == 'bin/jruby'
   end
 
-  it "returns 'bin/rbx' when passed :engine, RUBY_NAME is 'rbx'" do
-    Object.const_set :RUBY_NAME, 'rbx'
+  it "returns 'bin/rbx' when passed :engine, RUBY_ENGINE is 'rbx'" do
+    Object.const_set :RUBY_ENGINE, 'rbx'
     @script.ruby_exe_options(:engine).should == 'bin/rbx'
   end
 
-  it "returns 'ir' when passed :engine and RUBY_NAME is 'ironruby'" do
-    Object.const_set :RUBY_NAME, 'ironruby'
+  it "returns 'ir' when passed :engine and RUBY_ENGINE is 'ironruby'" do
+    Object.const_set :RUBY_ENGINE, 'ironruby'
     @script.ruby_exe_options(:engine).should == 'ir'
   end
 
-  it "returns 'maglev-ruby' when passed :engine and RUBY_NAME is 'maglev'" do
-    Object.const_set :RUBY_NAME, 'maglev'
+  it "returns 'maglev-ruby' when passed :engine and RUBY_ENGINE is 'maglev'" do
+    Object.const_set :RUBY_ENGINE, 'maglev'
     @script.ruby_exe_options(:engine).should == 'maglev-ruby'
   end
 
-  it "returns 'topaz' when passed :engine and RUBY_NAME is 'topaz'" do
-    Object.const_set :RUBY_NAME, 'topaz'
+  it "returns 'topaz' when passed :engine and RUBY_ENGINE is 'topaz'" do
+    Object.const_set :RUBY_ENGINE, 'topaz'
     @script.ruby_exe_options(:engine).should == 'topaz'
   end
 
-  it "returns RUBY_NAME + $(EXEEXT) when passed :name" do
-    bin = RUBY_NAME + (RbConfig::CONFIG['EXEEXT'] || RbConfig::CONFIG['exeext'] || '')
+  it "returns RUBY_ENGINE + $(EXEEXT) when passed :name" do
+    bin = RUBY_ENGINE + (RbConfig::CONFIG['EXEEXT'] || RbConfig::CONFIG['exeext'] || '')
     name = File.join ".", bin
     @script.ruby_exe_options(:name).should == name
   end
Index: spec/mspec/spec/guards/platform_spec.rb
===================================================================
--- spec/mspec/spec/guards/platform_spec.rb	(revision 59091)
+++ spec/mspec/spec/guards/platform_spec.rb	(revision 59092)
@@ -120,56 +120,56 @@ describe PlatformGuard, ".implementation https://github.com/ruby/ruby/blob/trunk/spec/mspec/spec/guards/platform_spec.rb#L120
   end
 
   before :each do
-    @ruby_name = Object.const_get :RUBY_NAME
+    @ruby_engine = Object.const_get :RUBY_ENGINE
   end
 
   after :each do
-    Object.const_set :RUBY_NAME, @ruby_name
+    Object.const_set :RUBY_ENGINE, @ruby_engine
   end
 
-  it "returns true if passed :ruby and RUBY_NAME == 'ruby'" do
-    Object.const_set :RUBY_NAME, 'ruby'
+  it "returns true if passed :ruby and RUBY_ENGINE == 'ruby'" do
+    Object.const_set :RUBY_ENGINE, 'ruby'
     PlatformGuard.implementation?(:ruby).should == true
   end
 
-  it "returns true if passed :rubinius and RUBY_NAME == 'rbx'" do
-    Object.const_set :RUBY_NAME, 'rbx'
+  it "returns true if passed :rubinius and RUBY_ENGINE == 'rbx'" do
+    Object.const_set :RUBY_ENGINE, 'rbx'
     PlatformGuard.implementation?(:rubinius).should == true
   end
 
-  it "returns true if passed :jruby and RUBY_NAME == 'jruby'" do
-    Object.const_set :RUBY_NAME, 'jruby'
+  it "returns true if passed :jruby and RUBY_ENGINE == 'jruby'" do
+    Object.const_set :RUBY_ENGINE, 'jruby'
     PlatformGuard.implementation?(:jruby).should == true
   end
 
-  it "returns true if passed :ironruby and RUBY_NAME == 'ironruby'" do
-    Object.const_set :RUBY_NAME, 'ironruby'
+  it "returns true if passed :ironruby and RUBY_ENGINE == 'ironruby'" do
+    Object.const_set :RUBY_ENGINE, 'ironruby'
     PlatformGuard.implementation?(:ironruby).should == true
   end
 
-  it "returns true if passed :maglev and RUBY_NAME == 'maglev'" do
-    Object.const_set :RUBY_NAME, 'maglev'
+  it "returns true if passed :maglev and RUBY_ENGINE == 'maglev'" do
+    Object.const_set :RUBY_ENGINE, 'maglev'
     PlatformGuard.implementation?(:maglev).should == true
   end
 
-  it "returns true if passed :topaz and RUBY_NAME == 'topaz'" do
-    Object.const_set :RUBY_NAME, 'topaz'
+  it "returns true if passed :topaz and RUBY_ENGINE == 'topaz'" do
+    Object.const_set :RUBY_ENGINE, 'topaz'
     PlatformGuard.implementation?(:topaz).should == true
   end
 
-  it "returns true if passed :ruby and RUBY_NAME matches /^ruby/" do
-    Object.const_set :RUBY_NAME, 'ruby'
+  it "returns true if passed :ruby and RUBY_ENGINE matches /^ruby/" do
+    Object.const_set :RUBY_ENGINE, 'ruby'
     PlatformGuard.implementation?(:ruby).should == true
 
-    Object.const_set :RUBY_NAME, 'ruby1.8'
+    Object.const_set :RUBY_ENGINE, 'ruby1.8'
     PlatformGuard.implementation?(:ruby).should == true
 
-    Object.const_set :RUBY_NAME, 'ruby1.9'
+    Object.const_set :RUBY_ENGINE, 'ruby1.9'
     PlatformGuard.implementation?(:ruby).should == true
   end
 
   it "raises an error when passed an unrecognized name" do
-    Object.const_set :RUBY_NAME, 'ruby'
+    Object.const_set :RUBY_ENGINE, 'ruby'
     lambda {
       PlatformGuard.implementation?(:python)
     }.should raise_error(/unknown implementation/)
Index: spec/mspec/lib/mspec/guards/platform.rb
===================================================================
--- spec/mspec/lib/mspec/guards/platform.rb	(revision 59091)
+++ spec/mspec/lib/mspec/guards/platform.rb	(revision 59092)
@@ -5,9 +5,9 @@ class PlatformGuard < SpecGuard https://github.com/ruby/ruby/blob/trunk/spec/mspec/lib/mspec/guards/platform.rb#L5
     args.any? do |name|
       case name
       when :rubinius
-        RUBY_NAME.start_with?('rbx')
+        RUBY_ENGINE.start_with?('rbx')
       when :ruby, :jruby, :truffleruby, :ironruby, :macruby, :maglev, :topaz, :opal
-        RUBY_NAME.start_with?(name.to_s)
+        RUBY_ENGINE.start_with?(name.to_s)
       else
         raise "unknown implementation #{name}"
       end
@@ -67,12 +67,10 @@ class PlatformGuard < SpecGuard https://github.com/ruby/ruby/blob/trunk/spec/mspec/lib/mspec/guards/platform.rb#L67
   end
 end
 
-class Object
-  def platform_is(*args, &block)
-    PlatformGuard.new(*args).run_if(:platform_is, &block)
-  end
+def platform_is(*args, &block)
+  PlatformGuard.new(*args).run_if(:platform_is, &block)
+end
 
-  def platform_is_not(*args, &block)
-    PlatformGuard.new(*args).run_unless(:platform_is_not, &block)
-  end
+def platform_is_not(*args, &block)
+  PlatformGuard.new(*args).run_unless(:platform_is_not, &block)
 end
Index: spec/mspec/lib/mspec/guards/version.rb
===================================================================
--- spec/mspec/lib/mspec/guards/version.rb	(revision 59091)
+++ spec/mspec/lib/mspec/guards/version.rb	(revision 59092)
@@ -32,8 +32,6 @@ class VersionGuard < SpecGuard https://github.com/ruby/ruby/blob/trunk/spec/mspec/lib/mspec/guards/version.rb#L32
   end
 end
 
-class Object
-  def ruby_version_is(*args, &block)
-    VersionGuard.new(*args).run_if(:ruby_version_is, &block)
-  end
+def ruby_version_is(*args, &block)
+  VersionGuard.new(*args).run_if(:ruby_version_is, &block)
 end
Index: spec/mspec/lib/mspec/guards/quarantine.rb
===================================================================
--- spec/mspec/lib/mspec/guards/quarantine.rb	(revision 59091)
+++ spec/mspec/lib/mspec/guards/quarantine.rb	(revision 59092)
@@ -6,8 +6,6 @@ class QuarantineGuard < SpecGuard https://github.com/ruby/ruby/blob/trunk/spec/mspec/lib/mspec/guards/quarantine.rb#L6
   end
 end
 
-class Object
-  def quarantine!(&block)
-    QuarantineGuard.new.run_unless(:quarantine!, &block)
-  end
+def quarantine!(&block)
+  QuarantineGuard.new.run_unless(:quarantine!, &block)
 end
Index: spec/mspec/lib/mspec/guards/block_device.rb
===================================================================
--- spec/mspec/lib/mspec/guards/block_device.rb	(revision 59091)
+++ spec/mspec/lib/mspec/guards/block_device.rb	(revision 59092)
@@ -11,8 +11,6 @@ class BlockDeviceGuard < SpecGuard https://github.com/ruby/ruby/blob/trunk/spec/mspec/lib/mspec/guards/block_device.rb#L11
   end
 end
 
-class Object
-  def with_block_device(&block)
-    BlockDeviceGuard.new.run_if(:with_block_device, &block)
-  end
+def with_block_device(&block)
+  BlockDeviceGuard.new.run_if(:with_block_device, &block)
 end
Index: spec/mspec/lib/mspec/guards/feature.rb
===================================================================
--- spec/mspec/lib/mspec/guards/feature.rb	(revision 59091)
+++ spec/mspec/lib/mspec/guards/feature.rb	(revision 59092)
@@ -10,34 +10,32 @@ class FeatureGuard < SpecGuard https://github.com/ruby/ruby/blob/trunk/spec/mspec/lib/mspec/guards/feature.rb#L10
   end
 end
 
-class Object
-  # Provides better documentation in the specs by
-  # naming sets of features that work together as
-  # a whole. Examples include :encoding, :fiber,
-  # :continuation, :fork.
-  #
-  # Usage example:
-  #
-  #   with_feature :encoding do
-  #     # specs for a method that provides aspects
-  #     # of the encoding feature
-  #   end
-  #
-  # Multiple features must all be enabled for the
-  # guard to run:
-  #
-  #   with_feature :one, :two do
-  #     # these specs will run if features :one AND
-  #     # :two are enabled.
-  #   end
-  #
-  # The implementation must explicitly enable a feature
-  # by adding code like the following to the .mspec
-  # configuration file:
-  #
-  #   MSpec.enable_feature :encoding
-  #
-  def with_feature(*features, &block)
-    FeatureGuard.new(*features).run_if(:with_feature, &block)
-  end
+# Provides better documentation in the specs by
+# naming sets of features that work together as
+# a whole. Examples include :encoding, :fiber,
+# :continuation, :fork.
+#
+# Usage example:
+#
+#   with_feature :encoding do
+#     # specs for a method that provides aspects
+#     # of the encoding feature
+#   end
+#
+# Multiple features must all be enabled for the
+# guard to run:
+#
+#   with_feature :one, :two do
+#     # these specs will run if features :one AND
+#     # :two are enabled.
+#   end
+#
+# The implementation must explicitly enable a feature
+# by adding code like the following to the .mspec
+# configuration file:
+#
+#   MSpec.enable_feature :encoding
+#
+def with_feature(*features, &block)
+  FeatureGuard.new(*features).run_if(:with_feature, &block)
 end
Index: spec/mspec/lib/mspec/guards/support.rb
===================================================================
--- spec/mspec/lib/mspec/guards/support.rb	(revision 59091)
+++ spec/mspec/lib/mspec/guards/support.rb	(revision 59092)
@@ -9,8 +9,6 @@ class SupportedGuard < SpecGuard https://github.com/ruby/ruby/blob/trunk/spec/mspec/lib/mspec/guards/support.rb#L9
   end
 end
 
-class Object
-  def not_supported_on(*args, &block)
-    SupportedGuard.new(*args).run_unless(:not_supported_on, &block)
-  end
+def not_supported_on(*args, &block)
+  SupportedGuard.new(*args).run_unless(:not_supported_on, &block)
 end
Index: spec/mspec/lib/mspec/guards/bug.rb
===================================================================
--- spec/mspec/lib/mspec/guards/bug.rb	(revision 59091)
+++ spec/mspec/lib/mspec/guards/bug.rb	(revision 59092)
@@ -23,8 +23,6 @@ class BugGuard < VersionGuard https://github.com/ruby/ruby/blob/trunk/spec/mspec/lib/mspec/guards/bug.rb#L23
   end
 end
 
-class Object
-  def ruby_bug(bug, version, &block)
-    BugGuard.new(bug, version).run_unless(:ruby_bug, &block)
-  end
+def ruby_bug(bug, version, &block)
+  BugGuard.new(bug, version).run_unless(:ruby_bug, &block)
 end
Index: spec/mspec/lib/mspec/guards/superuser.rb
===================================================================
--- spec/mspec/lib/mspec/guards/superuser.rb	(revision 59091)
+++ spec/mspec/lib/mspec/guards/superuser.rb	(revision 59092)
@@ -6,12 +6,10 @@ class SuperUserGuard < SpecGuard https://github.com/ruby/ruby/blob/trunk/spec/mspec/lib/mspec/guards/superuser.rb#L6
   end
 end
 
-class Object
-  def as_superuser(&block)
-    SuperUserGuard.new.run_if(:as_superuser, &block)
-  end
+def as_superuser(&block)
+  SuperUserGuard.new.run_if(:as_superuser, &block)
+end
 
-  def as_user(&block)
-    SuperUserGuard.new.run_unless(:as_user, &block)
-  end
+def as_user(&block)
+  SuperUserGuard.new.run_unless(:as_user, &block)
 end
Index: spec/mspec/lib/mspec/guards/endian.rb
===================================================================
--- spec/mspec/lib/mspec/guards/endian.rb	(revision 59091)
+++ spec/mspec/lib/mspec/guards/endian.rb	(revision 59092)
@@ -16,12 +16,10 @@ class BigEndianGuard < EndianGuard https://github.com/ruby/ruby/blob/trunk/spec/mspec/lib/mspec/guards/endian.rb#L16
   end
 end
 
-class Object
-  def big_endian(&block)
-    BigEndianGuard.new.run_if(:big_endian, &block)
-  end
+def big_endian(&block)
+  BigEndianGuard.new.run_if(:big_endian, &block)
+end
 
-  def little_endian(&block)
-    BigEndianGuard.new.run_unless(:little_endian, &block)
-  end
+def little_endian(&block)
+  BigEndianGuard.new.run_unless(:little_endian, &block)
 end
Index: spec/mspec/lib/mspec/guards/conflict.rb
===================================================================
--- spec/mspec/lib/mspec/guards/conflict.rb	(revision 59091)
+++ spec/mspec/lib/mspec/guards/conflict.rb	(revision 59092)
@@ -8,12 +8,10 @@ class ConflictsGuard < SpecGuard https://github.com/ruby/ruby/blob/trunk/spec/mspec/lib/mspec/guards/conflict.rb#L8
   end
 end
 
-class Object
-  # In some cases, libraries will modify another Ruby method's
-  # behavior. The specs for the method's behavior will then fail
-  # if that library is loaded. This guard will not run if any of
-  # the specified constants exist in Object.constants.
-  def conflicts_with(*modules, &block)
-    ConflictsGuard.new(*modules).run_unless(:conflicts_with, &block)
-  end
+# In some cases, libraries will modify another Ruby method's
+# behavior. The specs for the method's behavior will then fail
+# if that library is loaded. This guard will not run if any of
+# the specified constants exist in Object.constants.
+def conflicts_with(*modules, &block)
+  ConflictsGuard.new(*modules).run_unless(:conflicts_with, &block)
 end
Index: spec/mspec/lib/mspec/guards/guard.rb
===================================================================
--- spec/mspec/lib/mspec/guards/guard.rb	(revision 59091)
+++ spec/mspec/lib/mspec/guards/guard.rb	(revision 59092)
@@ -1,6 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/spec/mspec/lib/mspec/guards/guard.rb#L1
 require 'mspec/runner/mspec'
 require 'mspec/runner/actions/tally'
-require 'mspec/utils/ruby_name'
 
 class SpecGuard
   def self.report
Index: spec/mspec/lib/mspec/guards.rb
===================================================================
--- spec/mspec/lib/mspec/guards.rb	(revision 59091)
+++ spec/mspec/lib/mspec/guards.rb	(revision 59092)
@@ -1,4 +1,3 @@ https://github.com/ruby/ruby/blob/trunk/spec/mspec/lib/mspec/guards.rb#L1
-require 'mspec/utils/ruby_name'
 require 'mspec/guards/block_device'
 require 'mspec/guards/bug'
 require 'mspec/guards/conflict'
Index: spec/mspec/lib/mspec/runner/formatters/html.rb
===================================================================
--- spec/mspec/lib/mspec/runner/formatters/html.rb	(revision 59091)
+++ spec/mspec/lib/mspec/runner/formatters/html.rb	(revision 59092)
@@ -15,7 +15,7 @@ class HtmlFormatter < DottedFormatter https://github.com/ruby/ruby/blob/trunk/spec/mspec/lib/mspec/runner/formatters/html.rb#L15
     "http://www.w3.org/TR/html4/strict.dtd">
 <html>
 <head>
-<title>Spec Output For #{RUBY_NAME} (#{RUBY_VERSION})</title>
+<title>Spec Output For #{RUBY_ENGINE} (#{RUBY_VERSION})</title>
 <style type="text/css">
 ul {
   list-style: none;
Index: spec/mspec/lib/mspec/runner/formatters/junit.rb
===================================================================
--- spec/mspec/lib/mspec/runner/formatters/junit.rb	(revision 59091)
+++ spec/mspec/lib/mspec/runner/formatters/junit.rb	(revision 59092)
@@ -1,5 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/spec/mspec/lib/mspec/runner/formatters/junit.rb#L1
 require 'mspec/expectations/expectations'
-require 'mspec/utils/ruby_name'
 require 'mspec/runner/formatters/yaml'
 
 class JUnitFormatter < YamlFormatter
@@ -39,7 +38,7 @@ class JUnitFormatter < YamlFormatter https://github.com/ruby/ruby/blob/trunk/spec/mspec/lib/mspec/runner/formatters/junit.rb#L38
           errors="#{errors}"
           failures="#{failures}"
           time="#{time}"
-          name="Spec Output For #{::RUBY_NAME} (#{::RUBY_VERSION})">
+          name="Spec Output For #{::RUBY_ENGINE} (#{::RUBY_VERSION})">
     XML
     @tests.each do |h|
       description = encode_for_xml h[:test].description
Index: spec/mspec/lib/mspec/utils/options.rb
===================================================================
--- spec/mspec/lib/mspec/utils/options.rb	(revision 59091)
+++ spec/mspec/lib/mspec/utils/options.rb	(revision 59092)
@@ -200,13 +200,6 @@ class MSpecOptions https://github.com/ruby/ruby/blob/trunk/spec/mspec/lib/mspec/utils/options.rb#L200
        "Load FILE containing configuration options", &block)
   end
 
-  def name
-    on("-n", "--name", "RUBY_NAME",
-       "Set the value of RUBY_NAME (used to determine the implementation)") do |n|
-      Object.const_set :RUBY_NAME, n
-    end
-  end
-
   def targets
     on("-t", "--target", "TARGET",
        "Implementation to run the specs, where TARGET is:") do |t|
@@ -469,7 +462,6 @@ class MSpecOptions https://github.com/ruby/ruby/blob/trunk/spec/mspec/lib/mspec/utils/options.rb#L462
     # Generated with:
     # puts File.read(__FILE__).scan(/def (\w+).*\n\s*on\(/)
     configure {}
-    name
     targets
     formatters
     filters
Index: spec/mspec/lib/mspec/commands/mspec-ci.rb
===================================================================
--- spec/mspec/lib/mspec/commands/mspec-ci.rb	(revision 59091)
+++ spec/mspec/lib/mspec/commands/mspec-ci.rb	(revision 59092)
@@ -22,7 (... truncated)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]