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 mspec/upstream_patch.diff @@ -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 @@ -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 @@ -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 @@ -1 +1 @@ -d47b8987fd1f9114b36a4bc45bf683fe121f0397 \ No newline at end of file +e8129536bba5624579112283197a5138134be28b \ No newline at end of file mspec/upstream 0afe8e184ceb236de8457c66bdc47f415ad8391c eloy.de.enige@gmail.com eloy.de.enige@gmail.com http://github.com/alloy/mr-experimental/commit/86b63d1b311320b7a56c83a1d9e94239f5dbc9cd 86b63d1b311320b7a56c83a1d9e94239f5dbc9cd 2009-07-01T16:54:10-07:00 2009-07-01T16:48:55-07:00 Updated MSpec to e8129536bba5624579112283197a5138134be28b git-svn-id: http://svn.macosforge.org/repository/ruby/MacRuby/branches/experimental@1964 23306eb0-4c56-4727-a40e-e92c0eb68959 7049bdd5fc851d34fcb9efb8e3c0d5e93a8c9c8d Eloy Duran eloy.de.enige@gmail.com