mspec/lib/mspec/guards/user.rb mspec/lib/mspec/helpers/infinity.rb mspec/lib/mspec/helpers/nan.rb mspec/spec/guards/user_spec.rb mspec/spec/helpers/infinity_spec.rb mspec/spec/helpers/nan_spec.rb @@ -13,4 +13,5 @@ require 'mspec/guards/runner' require 'mspec/guards/support' require 'mspec/guards/superuser' require 'mspec/guards/tty' +require 'mspec/guards/user' require 'mspec/guards/version' mspec/lib/mspec/guards.rb @@ -123,6 +123,8 @@ class SpecGuard RUBY_NAME =~ /^ironruby/ when :macruby RUBY_NAME =~ /^macruby/ + when :maglev + RUBY_NAME =~ /^maglev/ else false end mspec/lib/mspec/guards/guard.rb @@ -7,9 +7,11 @@ require 'mspec/helpers/environment' require 'mspec/helpers/fixture' require 'mspec/helpers/flunk' require 'mspec/helpers/hash' +require 'mspec/helpers/infinity' require 'mspec/helpers/io' require 'mspec/helpers/language_version' require 'mspec/helpers/metaclass' +require 'mspec/helpers/nan' require 'mspec/helpers/ruby_exe' require 'mspec/helpers/scratch' require 'mspec/helpers/tmp' mspec/lib/mspec/helpers.rb @@ -76,6 +76,8 @@ class Object "bin/rbx" when 'jruby' "bin/jruby" + when 'maglev' + "maglev-ruby" when 'ironruby' "ir" end mspec/lib/mspec/helpers/ruby_exe.rb @@ -37,11 +37,7 @@ class RaiseErrorMatcher end def negative_failure_message - if @exception == Exception - ["Expect to get no exception, but got #{@actual.class} (#{@actual.message})",""] - else - ["Expected to not get #{@exception}#{%[ (#{@message})] if @message}", ""] - end + ["Expected to not get #{@exception}#{%[ (#{@message})] if @message}", ""] end end mspec/lib/mspec/matchers/raise_error.rb @@ -1,6 +1,10 @@ require 'mspec/expectations/expectations' require 'mspec/helpers/metaclass' +class Object + alias_method :__mspec_object_id__, :object_id +end + module Mock def self.reset @mocks = @stubs = @objects = nil @@ -19,7 +23,7 @@ module Mock end def self.replaced_name(obj, sym) - :"__mspec_#{obj.__id__}_#{sym}__" + :"__mspec_#{obj.__mspec_object_id__}_#{sym}__" end def self.replaced_key(obj, sym) @@ -166,7 +170,7 @@ module Mock sym = key.last meta = obj.metaclass - if meta.instance_methods.map { |x| x.to_sym }.include?(replaced) + if mock_respond_to? obj, replaced meta.__send__ :alias_method, sym, replaced meta.__send__ :remove_method, replaced else mspec/lib/mspec/mocks/mock.rb @@ -221,6 +221,8 @@ class MSpecOptions config[:target] = 'jruby' when 'i','ironruby' config[:target] = 'ir' + when 'm','maglev' + config[:target] = 'maglev-ruby' else config[:target] = t end @@ -233,6 +235,7 @@ class MSpecOptions doc " X or rbx invokes rbx in PATH" doc " j or jruby invokes jruby in PATH" doc " i or ironruby invokes ir in PATH" + doc " m or maglev invokes maglev-ruby in PATH" doc " full path to EXE invokes EXE directly\n" on("-T", "--target-opt", "OPT", mspec/lib/mspec/utils/options.rb @@ -180,6 +180,11 @@ describe SpecGuard, "#implementation?" do @guard.implementation?(:ironruby).should == true end + it "returns true if passed :maglev and RUBY_NAME == 'maglev'" do + Object.const_set :RUBY_NAME, 'maglev' + @guard.implementation?(:maglev).should == true + end + it "returns true if passed :ruby and RUBY_NAME matches /^ruby/" do Object.const_set :RUBY_NAME, 'ruby' @guard.implementation?(:ruby).should == true @@ -238,7 +243,7 @@ describe SpecGuard, "#platform?" do end it "returns false when no arg matches RUBY_PLATFORM" do - @guard.platform?(:ruby, :jruby, :rubinius).should == false + @guard.platform?(:ruby, :jruby, :rubinius, :maglev).should == false end it "returns true when arg matches RUBY_PLATFORM" do @@ -246,7 +251,7 @@ describe SpecGuard, "#platform?" do end it "returns true when any arg matches RUBY_PLATFORM" do - @guard.platform?(:ruby, :jruby, :solarce, :rubinius).should == true + @guard.platform?(:ruby, :jruby, :solarce, :rubinius, :maglev).should == true end it "returns true when arg is :windows and RUBY_PLATFORM contains 'mswin'" do mspec/spec/guards/guard_spec.rb @@ -46,6 +46,11 @@ describe "#ruby_exe_options" do @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' + @script.ruby_exe_options(:engine).should == 'maglev-ruby' + end + it "returns RUBY_NAME + $(EXEEXT) when passed :name" do bin = RUBY_NAME + (Config::CONFIG['EXEEXT'] || Config::CONFIG['exeext'] || '') name = File.join ".", bin mspec/spec/helpers/ruby_exe_spec.rb @@ -22,7 +22,7 @@ end describe Mock, ".replaced_name" do it "returns the name for a method that is being replaced by a mock method" do m = mock('a fake id') - m.stub!(:__id__).and_return(42) + m.stub!(:__mspec_object_id__).and_return(42) Mock.replaced_name(m, :method_call).should == :__mspec_42_method_call__ end end @@ -30,7 +30,7 @@ end describe Mock, ".replaced_key" do it "returns a key used internally by Mock" do m = mock('a fake id') - m.stub!(:__id__).and_return(42) + m.stub!(:__mspec_object_id__).and_return(42) Mock.replaced_key(m, :method_call).should == [:__mspec_42_method_call__, :method_call] end end mspec/spec/mocks/mock_spec.rb @@ -587,6 +587,15 @@ describe "The -t, --target TARGET option" do end end + it "sets the target to 'maglev' with TARGET 'm' or 'maglev'" do + ["-t", "--target"].each do |opt| + ["m", "maglev"].each do |t| + @options.parse [opt, t] + @config[:target].should == "maglev-ruby" + end + end + end + it "sets the target to TARGET" do ["-t", "--target"].each do |opt| @options.parse [opt, "whateva"] mspec/spec/utils/options_spec.rb 6eae43533ab0e994de789b01f2e689f7ef51e88b Brian Ford bford@engineyard.com http://github.com/evanphx/rubinius/commit/046e04f2008c4de85c9f7d57be5f40d11db072a4 046e04f2008c4de85c9f7d57be5f40d11db072a4 2009-07-08T15:43:59-07:00 2009-07-08T15:43:59-07:00 Updated MSpec source to fe6cb0ab. dc2fcc724788cd74f442e209beade16e7ea3967e Brian Ford bford@engineyard.com