jruby · Jun 23, 2017 · Jun 23, 2017 · Jun 23, 2017 · Jun 23, 2017
diff --git a/spec/mspec/lib/mspec/commands/mspec-ci.rb b/spec/mspec/lib/mspec/commands/mspec-ci.rb
@@ -22,7 +22,6 @@ def options(argv=ARGV)
     options.chdir
     options.prefix
     options.configure { |f| load f }
-    options.name
     options.pretend
     options.interrupt
 

diff --git a/spec/mspec/lib/mspec/commands/mspec-run.rb b/spec/mspec/lib/mspec/commands/mspec-run.rb
@@ -32,7 +32,6 @@ def options(argv=ARGV)
     options.chdir
     options.prefix
     options.configure { |f| load f }
-    options.name
     options.randomize
     options.repeat
     options.pretend

diff --git a/spec/mspec/lib/mspec/commands/mspec-tag.rb b/spec/mspec/lib/mspec/commands/mspec-tag.rb
@@ -30,7 +30,6 @@ def options(argv=ARGV)
 
     options.doc "\n How to modify the execution"
     options.configure { |f| load f }
-    options.name
     options.pretend
     options.unguarded
     options.interrupt

diff --git a/spec/mspec/lib/mspec/commands/mspec.rb b/spec/mspec/lib/mspec/commands/mspec.rb
@@ -114,6 +114,7 @@ def multi_exec(argv)
 
     puts children.map { |child| child.gets }.uniq
     formatter.start
+    last_files = {}
 
     until @files.empty?
       IO.select(children)[0].each { |io|
@@ -127,22 +128,33 @@ def multi_exec(argv)
           while chunk = (io.read_nonblock(4096) rescue nil)
             reply += chunk
           end
-          raise reply
+          reply.chomp!('.')
+          msg = "A child mspec-run process printed unexpected output on STDOUT"
+          if last_file = last_files[io]
+            msg += " while running #{last_file}"
+          end
+          abort "\n#{msg}: #{reply.inspect}"
+        end
+
+        unless @files.empty?
+          file = @files.shift
+          last_files[io] = file
+          io.puts file
         end
-        io.puts @files.shift unless @files.empty?
       }
     end
 
-    ok = true
+    success = true
     children.each { |child|
       child.puts "QUIT"
-      Process.wait(child.pid)
-      ok &&= $?.success?
+      pid, status = Process.wait2(child.pid)
+      success &&= status.success?
+      child.close
     }
 
     formatter.aggregate_results(output_files)
     formatter.finish
-    ok
+    success
   end
 
   def run
@@ -152,7 +164,7 @@ def run
     argv.concat config[:flags]
     argv.concat config[:loadpath]
     argv.concat config[:requires]
-    argv << "#{MSPEC_HOME}/bin/mspec-#{ config[:command] || "run" }"
+    argv << "#{MSPEC_HOME}/bin/mspec-#{config[:command] || 'run'}"
     argv.concat config[:options]
 
     if config[:multi]

diff --git a/spec/mspec/lib/mspec/guards.rb b/spec/mspec/lib/mspec/guards.rb
@@ -1,4 +1,3 @@
-require 'mspec/utils/ruby_name'
 require 'mspec/guards/block_device'
 require 'mspec/guards/bug'
 require 'mspec/guards/conflict'

diff --git a/spec/mspec/lib/mspec/guards/block_device.rb b/spec/mspec/lib/mspec/guards/block_device.rb
@@ -11,8 +11,6 @@ def match?
   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
diff --git a/spec/mspec/lib/mspec/guards/bug.rb b/spec/mspec/lib/mspec/guards/bug.rb
@@ -23,8 +23,6 @@ def match?
   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
diff --git a/spec/mspec/lib/mspec/guards/conflict.rb b/spec/mspec/lib/mspec/guards/conflict.rb
@@ -8,12 +8,10 @@ def match?
   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
diff --git a/spec/mspec/lib/mspec/guards/endian.rb b/spec/mspec/lib/mspec/guards/endian.rb
@@ -16,12 +16,10 @@ def match?
   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
diff --git a/spec/mspec/lib/mspec/guards/feature.rb b/spec/mspec/lib/mspec/guards/feature.rb
@@ -10,34 +10,32 @@ def match?
   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
diff --git a/spec/mspec/lib/mspec/guards/guard.rb b/spec/mspec/lib/mspec/guards/guard.rb
@@ -1,6 +1,5 @@
 require 'mspec/runner/mspec'
 require 'mspec/runner/actions/tally'
-require 'mspec/utils/ruby_name'
 
 class SpecGuard
   def self.report

diff --git a/spec/mspec/lib/mspec/guards/platform.rb b/spec/mspec/lib/mspec/guards/platform.rb
@@ -5,9 +5,9 @@ def self.implementation?(*args)
     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 @@ def match?
   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
diff --git a/spec/mspec/lib/mspec/guards/quarantine.rb b/spec/mspec/lib/mspec/guards/quarantine.rb
@@ -6,8 +6,6 @@ def match?
   end
 end
 
-class Object
-  def quarantine!(&block)
-    QuarantineGuard.new.run_unless(:quarantine!, &block)
-  end
+def quarantine!(&block)
+  QuarantineGuard.new.run_unless(:quarantine!, &block)
 end
diff --git a/spec/mspec/lib/mspec/guards/superuser.rb b/spec/mspec/lib/mspec/guards/superuser.rb
@@ -6,12 +6,10 @@ def match?
   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
diff --git a/spec/mspec/lib/mspec/guards/support.rb b/spec/mspec/lib/mspec/guards/support.rb
@@ -9,8 +9,6 @@ def match?
   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
diff --git a/spec/mspec/lib/mspec/guards/version.rb b/spec/mspec/lib/mspec/guards/version.rb
@@ -32,8 +32,6 @@ def match?
   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
diff --git a/spec/mspec/lib/mspec/helpers/argf.rb b/spec/mspec/lib/mspec/helpers/argf.rb
@@ -1,37 +1,35 @@
-class Object
-  # Convenience helper for specs using ARGF.
-  # Set @argf to an instance of ARGF.class with the given +argv+.
-  # That instance must be used instead of ARGF as ARGF is global
-  # and it is not always possible to reset its state correctly.
-  #
-  # The helper yields to the block and then close
-  # the files open by the instance. Example:
-  #
-  #   describe "That" do
-  #     it "does something" do
-  #       argf ['a', 'b'] do
-  #         # do something
-  #       end
-  #     end
-  #   end
-  def argf(argv)
-    if argv.empty? or argv.length > 2
-      raise "Only 1 or 2 filenames are allowed for the argf helper so files can be properly closed: #{argv.inspect}"
-    end
-    @argf ||= nil
-    raise "Cannot nest calls to the argf helper" if @argf
+# Convenience helper for specs using ARGF.
+# Set @argf to an instance of ARGF.class with the given +argv+.
+# That instance must be used instead of ARGF as ARGF is global
+# and it is not always possible to reset its state correctly.
+#
+# The helper yields to the block and then close
+# the files open by the instance. Example:
+#
+#   describe "That" do
+#     it "does something" do
+#       argf ['a', 'b'] do
+#         # do something
+#       end
+#     end
+#   end
+def argf(argv)
+  if argv.empty? or argv.length > 2
+    raise "Only 1 or 2 filenames are allowed for the argf helper so files can be properly closed: #{argv.inspect}"
+  end
+  @argf ||= nil
+  raise "Cannot nest calls to the argf helper" if @argf
 
-    @argf = ARGF.class.new(*argv)
-    @__mspec_saved_argf_file__ = @argf.file
-    begin
-      yield
-    ensure
-      file1 = @__mspec_saved_argf_file__
-      file2 = @argf.file # Either the first file or the second
-      file1.close if !file1.closed? and file1 != STDIN
-      file2.close if !file2.closed? and file2 != STDIN
-      @argf = nil
-      @__mspec_saved_argf_file__ = nil
-    end
+  @argf = ARGF.class.new(*argv)
+  @__mspec_saved_argf_file__ = @argf.file
+  begin
+    yield
+  ensure
+    file1 = @__mspec_saved_argf_file__
+    file2 = @argf.file # Either the first file or the second
+    file1.close if !file1.closed? and file1 != STDIN
+    file2.close if !file2.closed? and file2 != STDIN
+    @argf = nil
+    @__mspec_saved_argf_file__ = nil
   end
 end