jruby · Sep 14, 2017 · Sep 14, 2017 · Sep 14, 2017 · Sep 14, 2017
diff --git a/spec/mspec/.travis.yml b/spec/mspec/.travis.yml
@@ -2,8 +2,14 @@ sudo: false
 language: ruby
 script:
   - bundle exec rspec
-rvm:
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
-  - ruby-head
+matrix:
+  include:
+  - rvm: 2.2.7
+  - rvm: 2.3.4
+  - rvm: 2.4.1
+  - rvm: ruby-head
+  - jdk: oraclejdk8
+    install:
+      - curl -L https://github.com/graalvm/truffleruby/releases/download/vm-enterprise-0.27/truffleruby-testing-0.27.tar.gz | tar xz
+      - source truffleruby/setup_env
+      - bundle install
diff --git a/spec/mspec/Gemfile b/spec/mspec/Gemfile
@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in mspec.gemspec
-gemspec
+gem "rake", "~> 10.0"
+gem "rspec", "~> 2.14.1"
diff --git a/spec/mspec/Gemfile.lock b/spec/mspec/Gemfile.lock
@@ -1,8 +1,3 @@
-PATH
-  remote: .
-  specs:
-    mspec (1.8.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -22,9 +17,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  mspec!
   rake (~> 10.0)
   rspec (~> 2.14.1)
 
 BUNDLED WITH
-   1.10.2
+   1.14.5
diff --git a/spec/mspec/README.md b/spec/mspec/README.md
@@ -33,6 +33,9 @@ specs in a manner compatible with multiple Ruby implementations.
      configuration facility with a default project file and user-specific
      overrides.
 
+## Requirements
+
+MSpec requires Ruby 2.2 or more recent.
 
 ## Bundler
 

diff --git a/spec/mspec/lib/mspec/matchers/raise_error.rb b/spec/mspec/lib/mspec/matchers/raise_error.rb
@@ -5,16 +5,18 @@ def initialize(exception, message, &block)
     @exception = exception
     @message = message
     @block = block
+    @actual = nil
   end
 
   def matches?(proc)
     @result = proc.call
     return false
-  rescue Exception => @actual
-    if matching_exception?(@actual)
+  rescue Exception => actual
+    @actual = actual
+    if matching_exception?(actual)
       return true
     else
-      raise @actual
+      raise actual
     end
   end
 
@@ -54,7 +56,7 @@ def format_exception(exception)
   def failure_message
     message = ["Expected #{format_expected_exception}"]
 
-    if @actual then
+    if @actual
       message << "but got #{format_exception(@actual)}"
     else
       message << "but no exception was raised (#{@result.pretty_inspect.chomp} was returned)"

diff --git a/spec/mspec/lib/mspec/mocks/mock.rb b/spec/mspec/lib/mspec/mocks/mock.rb
@@ -1,4 +1,5 @@
 require 'mspec/expectations/expectations'
+require 'mspec/helpers/warning'
 
 module Mock
   def self.reset
@@ -57,10 +58,12 @@ def self.install_method(obj, sym, type=nil)
       meta.__send__ :alias_method, key.first, sym
     end
 
-    meta.class_eval {
-      define_method(sym) do |*args, &block|
-        Mock.verify_call self, sym, *args, &block
-      end
+    suppress_warning {
+      meta.class_eval {
+        define_method(sym) do |*args, &block|
+          Mock.verify_call self, sym, *args, &block
+        end
+      }
     }
 
     proxy = MockProxy.new type
@@ -179,7 +182,9 @@ def self.cleanup
       meta = obj.singleton_class
 
       if mock_respond_to? obj, replaced, true
-        meta.__send__ :alias_method, sym, replaced
+        suppress_warning do
+          meta.__send__ :alias_method, sym, replaced
+        end
         meta.__send__ :remove_method, replaced
       else
         meta.__send__ :remove_method, sym

diff --git a/spec/mspec/lib/mspec/runner/formatters/multi.rb b/spec/mspec/lib/mspec/runner/formatters/multi.rb
@@ -1,5 +1,4 @@
 require 'mspec/runner/formatters/spinner'
-require 'yaml'
 
 class MultiFormatter < SpinnerFormatter
   def initialize(out=nil)
@@ -10,6 +9,8 @@ def initialize(out=nil)
   end
 
   def aggregate_results(files)
+    require 'yaml'
+
     @timer.finish
     @exceptions = []
 

diff --git a/spec/mspec/lib/mspec/runner/mspec.rb b/spec/mspec/lib/mspec/runner/mspec.rb
@@ -2,6 +2,9 @@
 require 'mspec/runner/exception'
 require 'mspec/runner/tag'
 
+module MSpec
+end
+
 class MSpecEnv
   include MSpec
 end
@@ -399,4 +402,7 @@ def self.delete_tags
     file = tags_file
     File.delete file if File.exist? file
   end
+
+  # Initialize @env
+  setup_env
 end
diff --git a/spec/mspec/lib/mspec/utils/script.rb b/spec/mspec/lib/mspec/utils/script.rb
@@ -38,6 +38,10 @@ def self.get(key)
   end
 
   def initialize
+    if RUBY_VERSION < '2.2'
+      abort "MSpec needs Ruby 2.2 or more recent"
+    end
+
     config[:formatter] = nil
     config[:includes]  = []
     config[:excludes]  = []
@@ -188,7 +192,8 @@ def entries(partial)
       if File.file?(expanded) && expanded.end_with?('.rb')
         return [expanded]
       elsif File.directory?(expanded)
-        return Dir["#{expanded}/**/*_spec.rb"].sort
+        specs = Dir["#{expanded}/**/*_spec.rb"].sort
+        return specs unless specs.empty?
       end
     end
 

diff --git a/spec/mspec/lib/mspec/utils/warnings.rb b/spec/mspec/lib/mspec/utils/warnings.rb
@@ -4,6 +4,7 @@
   ruby_version_is "2.4"..."2.5" do
     # Kernel#warn does not delegate to Warning.warn in 2.4
     module Kernel
+      remove_method :warn
       def warn(*messages)
         return if $VERBOSE == nil or messages.empty?
         msg = messages.join("\n")
@@ -16,6 +17,24 @@ def warn(*messages)
 
   def Warning.warn(message)
     case message
+    # $VERBOSE = true warnings
+    when /possibly useless use of (<|<=|==|>=|>|\+|-) in void context/
+    when /assigned but unused variable/
+    when /method redefined/
+    when /previous definition of/
+    when /instance variable @.+ not initialized/
+    when /statement not reached/
+    when /shadowing outer local variable/
+    when /setting Encoding.default_(in|ex)ternal/
+    when /unknown (un)?pack directive/
+    when /(un)?trust(ed\?)? is deprecated/
+    when /\.exists\? is a deprecated name/
+    when /Float .+ out of range/
+    when /passing a block to String#(bytes|chars|codepoints|lines) is deprecated/
+    when /core\/string\/modulo_spec\.rb:\d+: warning: too many arguments for format string/
+    when /regexp\/shared\/new_ascii(_8bit)?\.rb:\d+: warning: Unknown escape .+ is ignored/
+
+    # $VERBOSE = false warnings
     when /constant ::(Fixnum|Bignum) is deprecated/
     when /\/(argf|io|stringio)\/.+(ARGF|IO)#(lines|chars|bytes|codepoints) is deprecated/
     when /Thread\.exclusive is deprecated.+\n.+thread\/exclusive_spec\.rb/

diff --git a/spec/mspec/mspec.gemspec b/spec/mspec/mspec.gemspec
diff --git a/spec/mspec/spec/commands/mkspec_spec.rb b/spec/mspec/spec/commands/mkspec_spec.rb
@@ -38,7 +38,7 @@
     @options.stub(:on)
     @options.should_receive(:on).with("-b", "--base", "DIR",
       an_instance_of(String))
-    @script.options
+    @script.options []
   end
 
   it "sets the base directory relative to which the spec directories are created" do
@@ -62,7 +62,7 @@
     @options.stub(:on)
     @options.should_receive(:on).with("-r", "--require", "LIBRARY",
       an_instance_of(String))
-    @script.options
+    @script.options []
   end
 
   it "adds CONSTANT to the list of constants" do
@@ -86,7 +86,7 @@
     @options.stub(:on)
     @options.should_receive(:on).with("-V", "--version-guard", "VERSION",
       an_instance_of(String))
-    @script.options
+    @script.options []
   end
 
   it "sets the version for the ruby_version_is guards to VERSION" do
@@ -119,7 +119,7 @@
     @options.should_receive(:raise).with(MSpecOptions::ParseError, an_instance_of(String))
     @options.stub(:puts)
     @options.stub(:exit)
-    @script.options "--iunknown"
+    @script.options ["--iunknown"]
   end
 end
 

diff --git a/spec/mspec/spec/commands/mspec_ci_spec.rb b/spec/mspec/spec/commands/mspec_ci_spec.rb
@@ -15,17 +15,17 @@
 
   it "enables the chdir option" do
     @options.should_receive(:chdir)
-    @script.options
+    @script.options []
   end
 
   it "enables the prefix option" do
     @options.should_receive(:prefix)
-    @script.options
+    @script.options []
   end
 
   it "enables the config option" do
     @options.should_receive(:configure)
-    @script.options
+    @script.options []
   end
 
   it "provides a custom action (block) to the config option" do
@@ -35,52 +35,52 @@
 
   it "enables the dry run option" do
     @options.should_receive(:pretend)
-    @script.options
+    @script.options []
   end
 
   it "enables the unguarded option" do
     @options.should_receive(:unguarded)
-    @script.options
+    @script.options []
   end
 
   it "enables the interrupt single specs option" do
     @options.should_receive(:interrupt)
-    @script.options
+    @script.options []
   end
 
   it "enables the formatter options" do
     @options.should_receive(:formatters)
-    @script.options
+    @script.options []
   end
 
   it "enables the verbose option" do
     @options.should_receive(:verbose)
-    @script.options
+    @script.options []
   end
 
   it "enables the action options" do
     @options.should_receive(:actions)
-    @script.options
+    @script.options []
   end
 
   it "enables the action filter options" do
     @options.should_receive(:action_filters)
-    @script.options
+    @script.options []
   end
 
   it "enables the version option" do
     @options.should_receive(:version)
-    @script.options
+    @script.options []
   end
 
   it "enables the help option" do
     @options.should_receive(:help)
-    @script.options
+    @script.options []
   end
 
   it "calls #custom_options" do
     @script.should_receive(:custom_options).with(@options)
-    @script.options
+    @script.options []
   end
 end
 
@@ -99,7 +99,7 @@
     @script.stub(:exit)
     @script.stub(:config).and_return(@config)
     @script.stub(:files).and_return(["one", "two"])
-    @script.options
+    @script.options []
   end
 
   it "registers the tags patterns" do

diff --git a/spec/mspec/spec/guards/guard_spec.rb b/spec/mspec/spec/guards/guard_spec.rb
@@ -4,12 +4,7 @@
 
 describe SpecGuard, ".ruby_version" do
   before :each do
-    @ruby_version = Object.const_get :RUBY_VERSION
-    Object.const_set :RUBY_VERSION, "8.2.3"
-  end
-
-  after :each do
-    Object.const_set :RUBY_VERSION, @ruby_version
+    stub_const "RUBY_VERSION", "8.2.3"
   end
 
   it "returns the full version for :full" do