jruby · Jun 29, 2017 · Jun 29, 2017 · Jun 29, 2017 · Jun 29, 2017
diff --git a/spec/mspec/lib/mspec/commands/mspec.rb b/spec/mspec/lib/mspec/commands/mspec.rb
@@ -98,7 +98,7 @@ def multi_exec(argv)
     end
 
     output_files = []
-    processes = [cores, @files.size].min
+    processes = cores(@files.size)
     children = processes.times.map { |i|
       name = tmp "mspec-multi-#{i}"
       output_files << name
@@ -109,7 +109,7 @@ def multi_exec(argv)
       }
       command = argv + ["-fy", "-o", name]
       $stderr.puts "$ #{command.join(' ')}" if $MSPEC_DEBUG
-      IO.popen([env, *command], "rb+")
+      IO.popen([env, *command, close_others: false], "rb+")
     }
 
     puts children.map { |child| child.gets }.uniq
@@ -147,7 +147,7 @@ def multi_exec(argv)
     success = true
     children.each { |child|
       child.puts "QUIT"
-      pid, status = Process.wait2(child.pid)
+      _pid, status = Process.wait2(child.pid)
       success &&= status.success?
       child.close
     }
@@ -171,7 +171,7 @@ def run
       exit multi_exec(argv)
     else
       $stderr.puts "$ #{argv.join(' ')}"
-      exec(*argv)
+      exec(*argv, close_others: false)
     end
   end
 end
diff --git a/spec/mspec/lib/mspec/helpers/ruby_exe.rb b/spec/mspec/lib/mspec/helpers/ruby_exe.rb
@@ -38,6 +38,14 @@
 # If +nil+ is passed for the first argument, the command line
 # will be built only from the options hash.
 #
+# If no arguments are passed to ruby_exe, it returns an Array
+# containing the interpreter executable and the flags:
+#
+#    spawn(*ruby_exe, "-e", "puts :hello")
+#
+# This avoids spawning an extra shell, and ensure the pid returned by spawn
+# corresponds to the ruby process and not the shell.
+#
 # The RUBY_EXE constant is setup by mspec automatically
 # and is used by ruby_exe and ruby_cmd. The mspec runner script
 # will set ENV['RUBY_EXE'] to the name of the executable used
@@ -121,11 +129,15 @@ def resolve_ruby_exe
   raise Exception, "Unable to find a suitable ruby executable."
 end
 
-def ruby_exe(code, opts = {})
+def ruby_exe(code = :not_given, opts = {})
   if opts[:dir]
     raise "ruby_exe(..., dir: dir) is no longer supported, use Dir.chdir"
   end
 
+  if code == :not_given
+    return RUBY_EXE.split(' ')
+  end
+
   env = opts[:env] || {}
   saved_env = {}
   env.each do |key, value|

diff --git a/spec/mspec/lib/mspec/matchers/base.rb b/spec/mspec/lib/mspec/matchers/base.rb
@@ -1,3 +1,15 @@
+module MSpecMatchers
+end
+
+class MSpecEnv
+  include MSpecMatchers
+end
+
+# Expactations are sometimes used in a module body
+class Module
+  include MSpecMatchers
+end
+
 class SpecPositiveOperatorMatcher
   def initialize(actual)
     @actual = actual

diff --git a/spec/mspec/lib/mspec/matchers/be_an_instance_of.rb b/spec/mspec/lib/mspec/matchers/be_an_instance_of.rb
@@ -19,8 +19,8 @@ def negative_failure_message
   end
 end
 
-class Object
-  def be_an_instance_of(expected)
+module MSpecMatchers
+  private def be_an_instance_of(expected)
     BeAnInstanceOfMatcher.new(expected)
   end
 end
diff --git a/spec/mspec/lib/mspec/matchers/be_ancestor_of.rb b/spec/mspec/lib/mspec/matchers/be_ancestor_of.rb
@@ -17,8 +17,8 @@ def negative_failure_message
   end
 end
 
-class Object
-  def be_ancestor_of(expected)
+module MSpecMatchers
+  private def be_ancestor_of(expected)
     BeAncestorOfMatcher.new(expected)
   end
 end
diff --git a/spec/mspec/lib/mspec/matchers/be_close.rb b/spec/mspec/lib/mspec/matchers/be_close.rb
@@ -20,8 +20,8 @@ def negative_failure_message
   end
 end
 
-class Object
-  def be_close(expected, tolerance)
+module MSpecMatchers
+  private def be_close(expected, tolerance)
     BeCloseMatcher.new(expected, tolerance)
   end
 end
diff --git a/spec/mspec/lib/mspec/matchers/be_computed_by.rb b/spec/mspec/lib/mspec/matchers/be_computed_by.rb
@@ -30,8 +30,8 @@ def failure_message
   end
 end
 
-class Object
-  def be_computed_by(sym, *args)
+module MSpecMatchers
+  private def be_computed_by(sym, *args)
     BeComputedByMatcher.new(sym, *args)
   end
 end
diff --git a/spec/mspec/lib/mspec/matchers/be_empty.rb b/spec/mspec/lib/mspec/matchers/be_empty.rb
@@ -13,8 +13,8 @@ def negative_failure_message
   end
 end
 
-class Object
-  def be_empty
+module MSpecMatchers
+  private def be_empty
     BeEmptyMatcher.new
   end
 end
diff --git a/spec/mspec/lib/mspec/matchers/be_false.rb b/spec/mspec/lib/mspec/matchers/be_false.rb
@@ -13,8 +13,8 @@ def negative_failure_message
   end
 end
 
-class Object
-  def be_false
+module MSpecMatchers
+  private def be_false
     BeFalseMatcher.new
   end
 end
diff --git a/spec/mspec/lib/mspec/matchers/be_kind_of.rb b/spec/mspec/lib/mspec/matchers/be_kind_of.rb
@@ -17,8 +17,8 @@ def negative_failure_message
   end
 end
 
-class Object
-  def be_kind_of(expected)
+module MSpecMatchers
+  private def be_kind_of(expected)
     BeKindOfMatcher.new(expected)
   end
 end
diff --git a/spec/mspec/lib/mspec/matchers/be_nan.rb b/spec/mspec/lib/mspec/matchers/be_nan.rb
@@ -13,8 +13,8 @@ def negative_failure_message
   end
 end
 
-class Object
-  def be_nan
+module MSpecMatchers
+  private def be_nan
     BeNaNMatcher.new
   end
 end
diff --git a/spec/mspec/lib/mspec/matchers/be_nil.rb b/spec/mspec/lib/mspec/matchers/be_nil.rb
@@ -13,8 +13,8 @@ def negative_failure_message
   end
 end
 
-class Object
-  def be_nil
+module MSpecMatchers
+  private def be_nil
     BeNilMatcher.new
   end
 end
diff --git a/spec/mspec/lib/mspec/matchers/be_true.rb b/spec/mspec/lib/mspec/matchers/be_true.rb
@@ -13,8 +13,8 @@ def negative_failure_message
   end
 end
 
-class Object
-  def be_true
+module MSpecMatchers
+  private def be_true
     BeTrueMatcher.new
   end
 end
diff --git a/spec/mspec/lib/mspec/matchers/be_true_or_false.rb b/spec/mspec/lib/mspec/matchers/be_true_or_false.rb
@@ -13,8 +13,8 @@ def negative_failure_message
   end
 end
 
-class Object
-  def be_true_or_false
+module MSpecMatchers
+  private def be_true_or_false
     BeTrueOrFalseMatcher.new
   end
 end
diff --git a/spec/mspec/lib/mspec/matchers/block_caller.rb b/spec/mspec/lib/mspec/matchers/block_caller.rb
@@ -28,8 +28,8 @@ def negative_failure_message
   end
 end
 
-class Object
-  def block_caller(timeout = 0.1)
+module MSpecMatchers
+  private def block_caller(timeout = 0.1)
     BlockingMatcher.new
   end
 end
diff --git a/spec/mspec/lib/mspec/matchers/complain.rb b/spec/mspec/lib/mspec/matchers/complain.rb
@@ -49,8 +49,8 @@ def negative_failure_message
   end
 end
 
-class Object
-  def complain(complaint=nil)
+module MSpecMatchers
+  private def complain(complaint=nil)
     ComplainMatcher.new(complaint)
   end
 end
diff --git a/spec/mspec/lib/mspec/matchers/eql.rb b/spec/mspec/lib/mspec/matchers/eql.rb
@@ -19,8 +19,8 @@ def negative_failure_message
   end
 end
 
-class Object
-  def eql(expected)
+module MSpecMatchers
+  private def eql(expected)
     EqlMatcher.new(expected)
   end
 end
diff --git a/spec/mspec/lib/mspec/matchers/equal.rb b/spec/mspec/lib/mspec/matchers/equal.rb
@@ -19,8 +19,8 @@ def negative_failure_message
   end
 end
 
-class Object
-  def equal(expected)
+module MSpecMatchers
+  private def equal(expected)
     EqualMatcher.new(expected)
   end
 end
diff --git a/spec/mspec/lib/mspec/matchers/equal_element.rb b/spec/mspec/lib/mspec/matchers/equal_element.rb
@@ -71,8 +71,8 @@ def content_for_failure_message
   end
 end
 
-class Object
-  def equal_element(*args)
+module MSpecMatchers
+  private def equal_element(*args)
     EqualElementMatcher.new(*args)
   end
 end
diff --git a/spec/mspec/lib/mspec/matchers/have_class_variable.rb b/spec/mspec/lib/mspec/matchers/have_class_variable.rb
@@ -5,8 +5,8 @@ class HaveClassVariableMatcher < VariableMatcher
   self.description      = 'class variable'
 end
 
-class Object
-  def have_class_variable(variable)
+module MSpecMatchers
+  private def have_class_variable(variable)
     HaveClassVariableMatcher.new(variable)
   end
 end
diff --git a/spec/mspec/lib/mspec/matchers/have_constant.rb b/spec/mspec/lib/mspec/matchers/have_constant.rb
@@ -5,8 +5,8 @@ class HaveConstantMatcher < VariableMatcher
   self.description      = 'constant'
 end
 
-class Object
-  def have_constant(variable)
+module MSpecMatchers
+  private def have_constant(variable)
     HaveConstantMatcher.new(variable)
   end
 end
diff --git a/spec/mspec/lib/mspec/matchers/have_instance_method.rb b/spec/mspec/lib/mspec/matchers/have_instance_method.rb
@@ -17,8 +17,8 @@ def negative_failure_message
   end
 end
 
-class Object
-  def have_instance_method(method, include_super=true)
+module MSpecMatchers
+  private def have_instance_method(method, include_super=true)
     HaveInstanceMethodMatcher.new method, include_super
   end
 end
diff --git a/spec/mspec/lib/mspec/matchers/have_instance_variable.rb b/spec/mspec/lib/mspec/matchers/have_instance_variable.rb
@@ -5,8 +5,8 @@ class HaveInstanceVariableMatcher < VariableMatcher
   self.description      = 'instance variable'
 end
 
-class Object
-  def have_instance_variable(variable)
+module MSpecMatchers
+  private def have_instance_variable(variable)
     HaveInstanceVariableMatcher.new(variable)
   end
 end
diff --git a/spec/mspec/lib/mspec/matchers/have_method.rb b/spec/mspec/lib/mspec/matchers/have_method.rb
@@ -17,8 +17,8 @@ def negative_failure_message
   end
 end
 
-class Object
-  def have_method(method, include_super=true)
+module MSpecMatchers
+  private def have_method(method, include_super=true)
     HaveMethodMatcher.new method, include_super
   end
 end
diff --git a/spec/mspec/lib/mspec/matchers/have_private_instance_method.rb b/spec/mspec/lib/mspec/matchers/have_private_instance_method.rb
@@ -17,8 +17,8 @@ def negative_failure_message
   end
 end
 
-class Object
-  def have_private_instance_method(method, include_super=true)
+module MSpecMatchers
+  private def have_private_instance_method(method, include_super=true)
     HavePrivateInstanceMethodMatcher.new method, include_super
   end
 end
diff --git a/spec/mspec/lib/mspec/matchers/have_private_method.rb b/spec/mspec/lib/mspec/matchers/have_private_method.rb
@@ -17,8 +17,8 @@ def negative_failure_message
   end
 end
 
-class Object
-  def have_private_method(method, include_super=true)
+module MSpecMatchers
+  private def have_private_method(method, include_super=true)
     HavePrivateMethodMatcher.new method, include_super
   end
 end
diff --git a/spec/mspec/lib/mspec/matchers/have_protected_instance_method.rb b/spec/mspec/lib/mspec/matchers/have_protected_instance_method.rb
@@ -17,8 +17,8 @@ def negative_failure_message
   end
 end
 
-class Object
-  def have_protected_instance_method(method, include_super=true)
+module MSpecMatchers
+  private def have_protected_instance_method(method, include_super=true)
     HaveProtectedInstanceMethodMatcher.new method, include_super
   end
 end
diff --git a/spec/mspec/lib/mspec/matchers/have_public_instance_method.rb b/spec/mspec/lib/mspec/matchers/have_public_instance_method.rb
@@ -17,8 +17,8 @@ def negative_failure_message
   end
 end
 
-class Object
-  def have_public_instance_method(method, include_super=true)
+module MSpecMatchers
+  private def have_public_instance_method(method, include_super=true)
     HavePublicInstanceMethodMatcher.new method, include_super
   end
 end
diff --git a/spec/mspec/lib/mspec/matchers/have_singleton_method.rb b/spec/mspec/lib/mspec/matchers/have_singleton_method.rb
@@ -17,8 +17,8 @@ def negative_failure_message
   end
 end
 
-class Object
-  def have_singleton_method(method, include_super=true)
+module MSpecMatchers
+  private def have_singleton_method(method, include_super=true)
     HaveSingletonMethodMatcher.new method, include_super
   end
 end
diff --git a/spec/mspec/lib/mspec/matchers/include.rb b/spec/mspec/lib/mspec/matchers/include.rb
@@ -24,9 +24,8 @@ def negative_failure_message
 end
 
 # Cannot override #include at the toplevel in MRI
-module MSpec
-  def include(*expected)
+module MSpecMatchers
+  private def include(*expected)
     IncludeMatcher.new(*expected)
   end
-  module_function :include
 end
diff --git a/spec/mspec/lib/mspec/matchers/infinity.rb b/spec/mspec/lib/mspec/matchers/infinity.rb
@@ -17,12 +17,12 @@ def negative_failure_message
   end
 end
 
-class Object
-  def be_positive_infinity
+module MSpecMatchers
+  private def be_positive_infinity
     InfinityMatcher.new(1)
   end
 
-  def be_negative_infinity
+  private def be_negative_infinity
     InfinityMatcher.new(-1)
   end
 end