mspec 1.5.20 → 1.6.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: dea78f04d5f7dd8d900b3a9de1462448b14a71db
+  data.tar.gz: a978b407496a528fbaf345bdf3188c52be68a8ad
+SHA512:
+  metadata.gz: 1fd3e10ba43ac914f0191b93cd687c8d5bd299194f7a0b6c95d4dff4f52542a38e362c67ba5d13d74ec9a4c0842bbcff58d69be995404c7da79f0396166f66d3
+  data.tar.gz: 457f6c7dda4d73809de319c0c13a3d0047801f5f8e9927a7a681612cc290f27979e3d218ebb0166de34fe70caf013b2dc68fb69d97b559837d22da772d443da9

data/.travis.yml

@@ -7,14 +7,12 @@ rvm:
   - 1.8.7
   - 1.9.3
   - 2.0.0
+  - 2.1.0
   - ruby-head
-  - rbx-18mode
-  - rbx-19mode
-  - jruby-18mode
-  - jruby-19mode
+  - rbx-2
+  - jruby-head
 allow_failures:
-  - rvm: jruby-18mode
-  - rvm: jruby-19mode
+  - rvm: jruby-head
 notifications:
   recipients:
     - brixen@gmail.com

data/README

@@ -34,7 +34,7 @@ specs in a manner compatible with multiple Ruby implementations.
 
 2. Bundler
 
-A Gemfile is provides. Use Bundler to install gem dependencies. To install
+A Gemfile is provided. Use Bundler to install gem dependencies. To install
 Bundler, run the following:
 
   $ gem install bundler

data/lib/mspec/commands/mspec.rb

@@ -161,7 +161,9 @@ class MSpecMain < MSpecScript
       multi_exec argv
     else
       if config[:use_valgrind]
-        more = ["--db-attach=#{config[:use_gdb] ? 'yes' : 'no'}", config[:target]] + argv
+        more = ["--child-silent-after-fork=yes",
+                "--db-attach=#{config[:use_gdb] ? 'yes' : 'no'}",
+                config[:target]] + argv
         exec "valgrind", *more
       elsif config[:use_gdb]
         more = ["--args", config[:target]] + argv

data/lib/mspec/guards/guard.rb

@@ -135,6 +135,8 @@ class SpecGuard
         RUBY_NAME =~ /^maglev/
       when :topaz
         RUBY_NAME =~ /^topaz/
+      when :opal
+        RUBY_NAME =~ /^opal/
       else
         false
       end

data/lib/mspec/guards/version.rb

@@ -7,8 +7,8 @@ class VersionGuard < SpecGuard
     when String
       @version = SpecVersion.new version
     when Range
-      a = SpecVersion.new version.first
-      b = SpecVersion.new version.last
+      a = SpecVersion.new version.begin
+      b = SpecVersion.new version.end
       @version = version.exclude_end? ? a...b : a..b
     end
     self.parameters = [version]
@@ -30,9 +30,11 @@ end
 class Object
   def ruby_version_is(*args)
     g = VersionGuard.new(*args)
-    g.name = :ruby_version_is
-    yield if g.yield?
-  ensure
-    g.unregister
+    begin
+      g.name = :ruby_version_is
+      yield if g.yield?
+    ensure
+      g.unregister
+    end
   end
 end

data/lib/mspec/helpers/datetime.rb

@@ -25,4 +25,27 @@ class Object
     DateTime.new value[:year], value[:month], value[:day], value[:hour],
       value[:minute], value[:second], value[:offset], value[:sg]
   end
+
+  def with_timezone(name, offset = nil, daylight_saving_zone = "")
+    zone = name.dup
+
+    if offset
+      # TZ convention is backwards
+      offset = -offset
+
+      zone += offset.to_s
+      zone += ":00:00"
+    end
+    zone += daylight_saving_zone
+
+    old = ENV["TZ"]
+    ENV["TZ"] = zone
+
+    begin
+      yield
+    ensure
+      ENV["TZ"] = old
+    end
+  end
+
 end

data/lib/mspec/helpers/fs.rb

@@ -38,13 +38,13 @@ class Object
       end
 
       # File.symlink? needs to be checked first as
-      # File.exists? returns false for dangling symlinks
+      # File.exist? returns false for dangling symlinks
       if File.symlink? path
         File.unlink path
       elsif File.directory? path
         Dir.entries(path).each { |x| rm_r "#{path}/#{x}" unless x =~ /^\.\.?$/ }
         Dir.rmdir path
-      elsif File.exists? path
+      elsif File.exist? path
         File.delete path
       end
     end

data/lib/mspec/helpers/io.rb

@@ -10,7 +10,11 @@ class IOStub < String
   end
 
   def puts(*str)
-    write(str.collect { |s| s.to_s.chomp }.concat([nil]).join("\n"))
+    if str.empty?
+      write "\n"
+    else
+      write(str.collect { |s| s.to_s.chomp }.concat([nil]).join("\n"))
+    end
   end
 
   def printf(format, *args)

data/lib/mspec/helpers/ruby_exe.rb

@@ -109,7 +109,7 @@ class Object
       # It has been reported that File.executable is not reliable
       # on Windows platforms (see commit 56bc555c). So, we check the
       # platform.
-      if File.exists?(exe) and (PlatformGuard.windows? or File.executable?(exe))
+      if File.exist?(exe) and (PlatformGuard.windows? or File.executable?(exe))
         return [File.expand_path(exe), *rest].join(" ")
       end
     end
@@ -142,7 +142,7 @@ class Object
   def ruby_cmd(code, opts = {})
     body = code
 
-    if code and not File.exists?(code)
+    if code and not File.exist?(code)
       if opts[:escape]
         code = "'#{code}'"
       else

data/lib/mspec/helpers/tmp.rb

@@ -32,7 +32,7 @@ end
 
 class Object
   def tmp(name, uniquify=true)
-    Dir.mkdir SPEC_TEMP_DIR unless File.exists? SPEC_TEMP_DIR
+    Dir.mkdir SPEC_TEMP_DIR unless File.exist? SPEC_TEMP_DIR
 
     if uniquify and !name.empty?
       slash = name.rindex "/"

data/lib/mspec/helpers.rb

@@ -10,7 +10,6 @@ require 'mspec/helpers/flunk'
 require 'mspec/helpers/fs'
 require 'mspec/helpers/hash'
 require 'mspec/helpers/io'
-require 'mspec/helpers/language_version'
 require 'mspec/helpers/mock_to_path'
 require 'mspec/helpers/numeric'
 require 'mspec/helpers/pack'

data/lib/mspec/matchers/raise_exception.rb

@@ -0,0 +1,51 @@
+class RaiseExceptionMatcher
+  def initialize(exception, message, &block)
+    @exception = exception
+    @message = message
+    @block = block
+  end
+
+  def matches?(proc)
+    @result = proc.call
+    return false
+  rescue Object => @actual
+    return false unless @actual.instance_of? @exception
+    if @message then
+      case @message
+      when String then
+        return false if @message != @actual.message
+      when Regexp then
+        return false if @message !~ @actual.message
+      end
+    end
+
+    @block[@actual] if @block
+
+    return true
+  end
+
+  def failure_message
+    message = ["Expected #{@exception}#{%[ (#{@message})] if @message}"]
+
+    if @actual then
+      message << "but got #{@actual.class}#{%[ (#{@actual.message})] if @actual.message}"
+    else
+      message << "but no exception was raised (#@result was returned)"
+    end
+
+    message
+  end
+
+  def negative_failure_message
+    message = ["Expected to not get #{@exception}#{%[ (#{@message})] if @message}", ""]
+    message[1] = "but got #{@actual.class}#{%[ (#{@actual.message})] if @actual.message}" unless @actual.class == @exception
+    message
+  end
+end
+
+class Object
+  def raise_exception(exception=Exception, message=nil, &block)
+    RaiseExceptionMatcher.new(exception, message, &block)
+  end
+end
+

data/lib/mspec/matchers.rb

@@ -31,6 +31,7 @@ require 'mspec/matchers/include'
 require 'mspec/matchers/infinity'
 require 'mspec/matchers/match_yaml'
 require 'mspec/matchers/raise_error'
+require 'mspec/matchers/raise_exception'
 require 'mspec/matchers/output'
 require 'mspec/matchers/output_to_fd'
 require 'mspec/matchers/respond_to'

data/lib/mspec/runner/evaluate.rb

@@ -0,0 +1,54 @@
+class SpecEvaluate
+  def self.desc=(desc)
+    @desc = desc
+  end
+
+  def self.desc
+    @desc ||= "evaluates "
+  end
+
+  def initialize(ruby, desc)
+    @ruby = ruby
+    @desc = desc || self.class.desc
+  end
+
+  # Formats the Ruby source code for reabable output in the -fs formatter
+  # option. If the source contains no newline characters, wraps the source in
+  # single quotes to set if off from the rest of the description string. If
+  # the source does contain newline characters, sets the indent level to four
+  # characters.
+  def format(ruby, newline=true)
+    if /\n/ =~ ruby
+      lines = ruby.rstrip.each_line.to_a
+      if /( *)/ =~ lines.first
+        if $1.size > 4
+          dedent = $1.size - 4
+          ruby = lines.map { |l| l[dedent..-1] }.join
+        else
+          indent = " " * (4 - $1.size)
+          ruby = lines.map { |l| "#{indent}#{l}" }.join
+        end
+      end
+      "\n#{ruby}"
+    else
+      "'#{ruby}'"
+    end
+  end
+
+  def define(&block)
+    ruby = @ruby
+    desc = @desc
+    evaluator = self
+
+    specify "#{desc} #{format ruby}" do
+      evaluator.instance_eval(ruby)
+      evaluator.instance_eval(&block)
+    end
+  end
+end
+
+class Object
+  def evaluate(str, desc=nil, &block)
+    SpecEvaluate.new(str, desc).define(&block)
+  end
+end

data/lib/mspec/runner/mspec.rb

@@ -354,6 +354,6 @@ module MSpec
   # Removes the tag file associated with a spec file.
   def self.delete_tags
     file = tags_file
-    File.delete file if File.exists? file
+    File.delete file if File.exist? file
   end
 end

data/lib/mspec/runner.rb

@@ -1,6 +1,7 @@
 require 'mspec/mocks'
 require 'mspec/runner/mspec'
 require 'mspec/runner/context'
+require 'mspec/runner/evaluate'
 require 'mspec/runner/example'
 require 'mspec/runner/exception'
 require 'mspec/runner/object'

data/lib/mspec/utils/options.rb

@@ -309,6 +309,7 @@ class MSpecOptions
     doc "       a, *, spin               SpinnerFormatter"
     doc "       t, method                MethodFormatter"
     doc "       y, yaml                  YamlFormatter"
+    doc "       p, profile               ProfileFormatter"
     doc "       j, junit                 JUnitFormatter\n"
 
     on("-o", "--output", "FILE",

data/lib/mspec/version.rb

@@ -1,5 +1,5 @@
 require 'mspec/utils/version'
 
 module MSpec
-  VERSION = SpecVersion.new "1.5.20"
+  VERSION = SpecVersion.new "1.6.0"
 end

data/spec/helpers/fs_spec.rb

@@ -12,8 +12,8 @@ describe Object, "#cp" do
   end
 
   after :each do
-    File.delete @source if File.exists? @source
-    File.delete @copy if File.exists? @copy
+    File.delete @source if File.exist? @source
+    File.delete @copy if File.exist? @copy
   end
 
   it "copies a file" do
@@ -30,17 +30,17 @@ describe Object, "#touch" do
   end
 
   after :each do
-    File.delete @name if File.exists? @name
+    File.delete @name if File.exist? @name
   end
 
   it "creates a file" do
     touch @name
-    File.exists?(@name).should be_true
+    File.exist?(@name).should be_true
   end
 
   it "accepts an optional mode argument" do
     touch @name, "wb"
-    File.exists?(@name).should be_true
+    File.exist?(@name).should be_true
   end
 
   it "overwrites an existing file" do
@@ -68,7 +68,7 @@ describe Object, "#touch" do
 
   it "creates all the directories in the path to the file" do
     touch @name
-    File.exists?(@name).should be_true
+    File.exist?(@name).should be_true
   end
 end
 
@@ -113,10 +113,10 @@ describe Object, "#rm_r" do
   end
 
   after :each do
-    File.delete @link if File.exists? @link or File.symlink? @link
-    File.delete @socket if File.exists? @socket
-    File.delete @subfile if File.exists? @subfile
-    File.delete @topfile if File.exists? @topfile
+    File.delete @link if File.exist? @link or File.symlink? @link
+    File.delete @socket if File.exist? @socket
+    File.delete @subfile if File.exist? @subfile
+    File.delete @topfile if File.exist? @topfile
 
     Dir.rmdir @subdir2 if File.directory? @subdir2
     Dir.rmdir @subdir1 if File.directory? @subdir1
@@ -129,20 +129,20 @@ describe Object, "#rm_r" do
 
   it "removes a single file" do
     rm_r @subfile
-    File.exists?(@subfile).should be_false
+    File.exist?(@subfile).should be_false
   end
 
   it "removes multiple files" do
     rm_r @topfile, @subfile
-    File.exists?(@topfile).should be_false
-    File.exists?(@subfile).should be_false
+    File.exist?(@topfile).should be_false
+    File.exist?(@subfile).should be_false
   end
 
   platform_is_not :windows do
     it "removes a symlink to a file" do
       File.symlink @topfile, @link
       rm_r @link
-      File.exists?(@link).should be_false
+      File.exist?(@link).should be_false
     end
 
     it "removes a symlink to a directory" do
@@ -151,7 +151,7 @@ describe Object, "#rm_r" do
       lambda do
         File.lstat(@link)
       end.should raise_error(Errno::ENOENT)
-      File.exists?(@subdir1).should be_true
+      File.exist?(@subdir1).should be_true
     end
 
     it "removes a dangling symlink" do
@@ -166,7 +166,7 @@ describe Object, "#rm_r" do
       require 'socket'
       UNIXServer.new(@socket).close
       rm_r @socket
-      File.exists?(@socket).should be_false
+      File.exist?(@socket).should be_false
     end
   end
 

data/spec/helpers/io_spec.rb

@@ -34,6 +34,11 @@ describe IOStub do
     @out.should == "hello\n1\n2\n3\n"
   end
 
+  it "provides a puts method that appends separator if argument not given" do
+    @out.puts
+    @out.should == "\n"
+  end
+
   it "provides a printf method" do
     @out.printf "%-10s, %03d, %2.1f", "test", 42, 4.2
     @out.should == "test      , 042, 4.2"

data/spec/helpers/ruby_exe_spec.rb

@@ -108,7 +108,7 @@ describe "#resolve_ruby_exe" do
   it "returns the value returned by #ruby_exe_options if it exists and is executable" do
     PlatformGuard.stub!(:windows?).and_return(false)
     @script.should_receive(:ruby_exe_options).and_return(@name)
-    File.should_receive(:exists?).with(@name).and_return(true)
+    File.should_receive(:exist?).with(@name).and_return(true)
     File.should_receive(:executable?).with(@name).and_return(true)
     File.should_receive(:expand_path).with(@name).and_return(@name)
     @script.resolve_ruby_exe.should == @name
@@ -117,7 +117,7 @@ describe "#resolve_ruby_exe" do
   it "returns the value returned by #ruby_exe_options if it exists on Windows platforms" do
     PlatformGuard.stub!(:windows?).and_return(true)
     @script.should_receive(:ruby_exe_options).and_return(@name)
-    File.should_receive(:exists?).with(@name).and_return(true)
+    File.should_receive(:exist?).with(@name).and_return(true)
     File.should_not_receive(:executable?)
     File.should_receive(:expand_path).with(@name).and_return(@name)
     @script.resolve_ruby_exe.should == @name
@@ -126,14 +126,14 @@ describe "#resolve_ruby_exe" do
   it "expands the path portion of the result of #ruby_exe_options" do
     PlatformGuard.stub!(:windows?).and_return(false)
     @script.should_receive(:ruby_exe_options).and_return("#{@name} -Xfoo")
-    File.should_receive(:exists?).with(@name).and_return(true)
+    File.should_receive(:exist?).with(@name).and_return(true)
     File.should_receive(:executable?).with(@name).and_return(true)
     File.should_receive(:expand_path).with(@name).and_return("/usr/bin/#{@name}")
     @script.resolve_ruby_exe.should == "/usr/bin/#{@name} -Xfoo"
   end
 
   it "returns nil if no exe is found" do
-    File.should_receive(:exists?).at_least(:once).and_return(false)
+    File.should_receive(:exist?).at_least(:once).and_return(false)
     @script.resolve_ruby_exe.should be_nil
   end
 end
@@ -162,23 +162,23 @@ describe Object, "#ruby_cmd" do
   end
 
   it "returns a command that runs the given file if it is a file that exists" do
-    File.should_receive(:exists?).with(@file).and_return(true)
+    File.should_receive(:exist?).with(@file).and_return(true)
     @script.ruby_cmd(@file).should == "ruby_spec_exe -w -Q some/ruby/file.rb"
   end
 
   it "includes the given options and arguments with a file" do
-    File.should_receive(:exists?).with(@file).and_return(true)
+    File.should_receive(:exist?).with(@file).and_return(true)
     @script.ruby_cmd(@file, :options => "-w -Cdir", :args => "< file.txt").should ==
       "ruby_spec_exe -w -Q -w -Cdir some/ruby/file.rb < file.txt"
   end
 
   it "returns a command that runs code using -e" do
-    File.should_receive(:exists?).with(@code).and_return(false)
+    File.should_receive(:exist?).with(@code).and_return(false)
     @script.ruby_cmd(@code).should == %(ruby_spec_exe -w -Q -e "some \\"real\\" 'ruby' code")
   end
 
   it "includes the given options and arguments with -e" do
-    File.should_receive(:exists?).with(@code).and_return(false)
+    File.should_receive(:exist?).with(@code).and_return(false)
     @script.ruby_cmd(@code, :options => "-W0 -Cdir", :args => "< file.txt").should ==
       %(ruby_spec_exe -w -Q -W0 -Cdir -e "some \\"real\\" 'ruby' code" < file.txt)
   end

data/spec/matchers/equal_spec.rb

@@ -14,7 +14,6 @@ describe EqualMatcher do
 
   it "does not match when actual is not a equal? to expected" do
     EqualMatcher.new(1).matches?(1.0).should == false
-    EqualMatcher.new(1.5).matches?(1.5).should == false
     EqualMatcher.new("blue").matches?("blue").should == false
     EqualMatcher.new(Hash).matches?(Object).should == false
   end

data/spec/matchers/raise_exception_spec.rb

@@ -0,0 +1,82 @@
+require 'spec_helper'
+require 'mspec/expectations/expectations'
+require 'mspec/matchers'
+
+class ExpectedException < Exception; end
+class UnexpectedException < Exception; end
+
+describe RaiseExceptionMatcher do
+  it "matches when the proc raises the expected exception" do
+    proc = Proc.new { raise ExpectedException }
+    RaiseErrorMatcher.new(ExpectedException, nil).matches?(proc).should == true
+  end
+
+  it "executes it's optional block if matched" do
+    run = false
+    proc = Proc.new { raise ExpectedException }
+    matcher = RaiseErrorMatcher.new(ExpectedException, nil) { |error|
+      run = true
+      error.class.should == ExpectedException
+    }
+
+    matcher.matches?(proc).should == true
+    run.should == true
+  end
+
+  it "matches when the proc raises the expected exception with the expected message" do
+    proc = Proc.new { raise ExpectedException, "message" }
+    RaiseErrorMatcher.new(ExpectedException, "message").matches?(proc).should == true
+  end
+
+  it "does not match when the proc does not raise the expected exception" do
+    proc = Proc.new { raise UnexpectedException }
+    RaiseErrorMatcher.new(ExpectedException, nil).matches?(proc).should == false
+  end
+
+  it "does not match when the proc raises the expected exception with an unexpected message" do
+    proc = Proc.new { raise ExpectedException, "unexpected" }
+    RaiseErrorMatcher.new(ExpectedException, "expected").matches?(proc).should == false
+  end
+
+  it "does not match when the proc does not raise an exception" do
+    proc = Proc.new {}
+    RaiseErrorMatcher.new(ExpectedException, "expected").matches?(proc).should == false
+  end
+
+  it "does not match when the raised exception is not an instance of the expected exception" do
+    proc = Proc.new { raise Exception }
+    RaiseErrorMatcher.new(ExpectedException, nil).matches?(proc).should == false
+  end
+
+  it "provides a useful failure message" do
+    proc = Proc.new { raise UnexpectedException, "unexpected" }
+    matcher = RaiseErrorMatcher.new(ExpectedException, "expected")
+    matcher.matches?(proc)
+    matcher.failure_message.should ==
+      ["Expected ExpectedException (expected)", "but got UnexpectedException (unexpected)"]
+  end
+
+  it "provides a useful failure message when no exception is raised" do
+    proc = Proc.new { 120 }
+    matcher = RaiseErrorMatcher.new(ExpectedException, "expected")
+    matcher.matches?(proc)
+    matcher.failure_message.should ==
+      ["Expected ExpectedException (expected)", "but no exception was raised (120 was returned)"]
+  end
+
+  it "provides a useful negative failure message" do
+    proc = Proc.new { raise ExpectedException, "expected" }
+    matcher = RaiseErrorMatcher.new(ExpectedException, "expected")
+    matcher.matches?(proc)
+    matcher.negative_failure_message.should ==
+      ["Expected to not get ExpectedException (expected)", ""]
+  end
+
+  it "provides a useful negative failure message for strict subclasses of the matched exception class" do
+    proc = Proc.new { raise UnexpectedException, "unexpected" }
+    matcher = RaiseErrorMatcher.new(Exception, nil)
+    matcher.matches?(proc)
+    matcher.negative_failure_message.should ==
+      ["Expected to not get Exception", "but got UnexpectedException (unexpected)"]
+  end
+end

data/spec/runner/mspec_spec.rb

@@ -535,7 +535,7 @@ describe MSpec, ".delete_tags" do
 
   it "deletes the tag file" do
     MSpec.delete_tags
-    File.exists?(@tags).should be_false
+    File.exist?(@tags).should be_false
   end
 end
 

metadata

@@ -1,51 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: mspec
 version: !ruby/object:Gem::Version
-  version: 1.5.20
-  prerelease: 
+  version: 1.6.0
 platform: ruby
 authors:
 - Brian Shirai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-20 00:00:00.000000000 Z
+date: 2014-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
-description: ! 'MSpec is a specialized framework for RubySpec.
-
-'
+description: |
+  MSpec is a specialized framework for RubySpec.
 email:
 - bshirai@engineyard.com
 executables:
@@ -59,8 +53,8 @@ extra_rdoc_files:
 - README
 - LICENSE
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README
@@ -117,7 +111,6 @@ files:
 - lib/mspec/helpers/fs.rb
 - lib/mspec/helpers/hash.rb
 - lib/mspec/helpers/io.rb
-- lib/mspec/helpers/language_version.rb
 - lib/mspec/helpers/mock_to_path.rb
 - lib/mspec/helpers/numeric.rb
 - lib/mspec/helpers/pack.rb
@@ -163,6 +156,7 @@ files:
 - lib/mspec/matchers/output.rb
 - lib/mspec/matchers/output_to_fd.rb
 - lib/mspec/matchers/raise_error.rb
+- lib/mspec/matchers/raise_exception.rb
 - lib/mspec/matchers/respond_to.rb
 - lib/mspec/matchers/signed_zero.rb
 - lib/mspec/matchers/stringsymboladapter.rb
@@ -181,6 +175,7 @@ files:
 - lib/mspec/runner/actions/tally.rb
 - lib/mspec/runner/actions/timer.rb
 - lib/mspec/runner/context.rb
+- lib/mspec/runner/evaluate.rb
 - lib/mspec/runner/example.rb
 - lib/mspec/runner/exception.rb
 - lib/mspec/runner/filters.rb
@@ -256,7 +251,6 @@ files:
 - spec/helpers/fs_spec.rb
 - spec/helpers/hash_spec.rb
 - spec/helpers/io_spec.rb
-- spec/helpers/language_version_spec.rb
 - spec/helpers/mock_to_path_spec.rb
 - spec/helpers/numeric_spec.rb
 - spec/helpers/ruby_exe_spec.rb
@@ -298,6 +292,7 @@ files:
 - spec/matchers/output_spec.rb
 - spec/matchers/output_to_fd_spec.rb
 - spec/matchers/raise_error_spec.rb
+- spec/matchers/raise_exception_spec.rb
 - spec/matchers/respond_to_spec.rb
 - spec/matchers/signed_zero_spec.rb
 - spec/matchers/stringsymboladapter_spec.rb
@@ -341,32 +336,31 @@ files:
 - spec/utils/version_spec.rb
 homepage: http://rubyspec.org
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --title
+- "--title"
 - MSpec Gem
-- --main
+- "--main"
 - README
-- --line-numbers
+- "--line-numbers"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: http://rubyforge.org/projects/mspec
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: MSpec is a specialized framework that is syntax-compatible with RSpec for
   basic things like describe, it blocks and before, after actions.  MSpec contains
   additional features that assist in writing the RubySpecs used by multiple Ruby implementations.
@@ -417,7 +411,6 @@ test_files:
 - spec/helpers/fs_spec.rb
 - spec/helpers/hash_spec.rb
 - spec/helpers/io_spec.rb
-- spec/helpers/language_version_spec.rb
 - spec/helpers/mock_to_path_spec.rb
 - spec/helpers/numeric_spec.rb
 - spec/helpers/ruby_exe_spec.rb
@@ -459,6 +452,7 @@ test_files:
 - spec/matchers/output_spec.rb
 - spec/matchers/output_to_fd_spec.rb
 - spec/matchers/raise_error_spec.rb
+- spec/matchers/raise_exception_spec.rb
 - spec/matchers/respond_to_spec.rb
 - spec/matchers/signed_zero_spec.rb
 - spec/matchers/stringsymboladapter_spec.rb

data/lib/mspec/helpers/language_version.rb

@@ -1,30 +0,0 @@
-require 'mspec/guards/guard'
-
-class Object
-  # Helper for syntax-sensitive specs. The specs should be placed in a file in
-  # the +versions+ subdirectory. For example, suppose language/method_spec.rb
-  # contains specs whose syntax depends on the Ruby version. In the
-  # language/method_spec.rb use the helper as follows:
-  #
-  #   language_version __FILE__, "method"
-  #
-  # Then add a file "language/versions/method_1.8.rb" for the specs that are
-  # syntax-compatible with Ruby 1.8.x.
-  #
-  # The most version-specific file will be loaded. If the version is 1.8.6,
-  # "method_1.8.6.rb" will be loaded if it exists, otherwise "method_1.8.rb"
-  # will be loaded if it exists.
-  def language_version(dir, name)
-    path = File.dirname(File.expand_path(dir))
-
-    [SpecGuard.ruby_version(:tiny), SpecGuard.ruby_version].each do |version|
-      file = File.join path, "versions", "#{name}_#{version}.rb"
-      if File.exists? file
-        require file
-        break
-      end
-    end
-
-    nil
-  end
-end

data/spec/helpers/language_version_spec.rb

@@ -1,40 +0,0 @@
-require 'spec_helper'
-require 'mspec/guards'
-require 'mspec/helpers'
-
-describe Object, "#language_version" do
-  before :all do
-    @ruby_version = Object.const_get :RUBY_VERSION
-
-    Object.const_set :RUBY_VERSION, "8.2.3"
-
-    dir = "#{File.expand_path('../', __FILE__)}/versions"
-    @method82  = "#{dir}/method_8.2.rb"
-    @method823 = "#{dir}/method_8.2.3.rb"
-  end
-
-  after :all do
-    Object.const_set :RUBY_VERSION, @ruby_version
-  end
-
-  it "loads the most version-specific file if it exists" do
-    File.should_receive(:exists?).with(@method823).and_return(true)
-    should_receive(:require).with(@method823)
-    language_version __FILE__, "method"
-  end
-
-  it "loads a less version-specific file if it exists" do
-    File.should_receive(:exists?).with(@method823).and_return(false)
-    File.should_receive(:exists?).with(@method82).and_return(true)
-    should_receive(:require).with(@method82)
-    language_version __FILE__, "method"
-  end
-
-  it "does not load the file if it does not exist" do
-    File.should_receive(:exists?).with(@method82).and_return(false)
-    File.should_receive(:exists?).with(@method823).and_return(false)
-    should_not_receive(:require).with(@method82)
-    should_not_receive(:require).with(@method823)
-    language_version __FILE__, "method"
-  end
-end