mspec 1.5.17 → 1.5.18

data/lib/mspec/utils/script.rb

@@ -86,7 +86,7 @@ class MSpecScript
   # first two numbers in RUBY_VERSION. For example, on MRI 1.8.6,
   # the file name would be 'ruby.1.8.mspec'.
   def load_default
-    return if load 'default.mspec'
+    load 'default.mspec'
 
     if Object.const_defined?(:RUBY_ENGINE)
       engine = RUBY_ENGINE
@@ -141,6 +141,7 @@ class MSpecScript
   def signals
     if config[:abort]
       Signal.trap "INT" do
+        MSpec.actions :abort
         puts "\nProcess aborted!"
         exit! 1
       end

data/lib/mspec/version.rb

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

data/mspec.gemspec

@@ -0,0 +1,40 @@
+# -*- encoding: utf-8 -*-
+$:.unshift File.expand_path('../lib', __FILE__)
+require 'mspec/version'
+
+Gem::Specification.new do |gem|
+  gem.name          = "mspec"
+  gem.version       = MSpec::VERSION.to_s
+  gem.authors       = ["Brian Shirai"]
+  gem.email         = ["bshirai@engineyard.com"]
+  gem.homepage      = "http://rubyspec.org"
+
+  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) unless File.extname(f) == ".bat" }.compact
+  gem.files         = `git ls-files`.split("\n")
+  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.require_paths = ["lib"]
+  gem.description   = <<-EOD
+MSpec is a specialized framework for RubySpec.
+                      EOD
+  gem.summary       = <<-EOS
+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. Also,
+MSpec attempts to use the simplest Ruby language features
+so that beginning Ruby implementations can run it.
+                      EOS
+  gem.has_rdoc                  = true
+  gem.extra_rdoc_files          = %w[ README LICENSE ]
+  gem.rubygems_version  = %q{1.3.5}
+  gem.rubyforge_project         = 'http://rubyforge.org/projects/mspec'
+
+  gem.rdoc_options  << '--title' << 'MSpec Gem' <<
+                    '--main' << 'README' <<
+                    '--line-numbers'
+
+  gem.add_development_dependency "rake",   "~> 10.0"
+  gem.add_development_dependency "rspec",  "~> 2.8"
+end

data/spec/commands/mkspec_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 require 'mspec/commands/mkspec'
 
 
@@ -194,8 +194,9 @@ describe MkSpec, "#write_spec" do
   end
 
   it "checks if specs exist for the method if the spec file exists" do
+    name = Regexp.escape(@script.ruby)
     @script.should_receive(:`).with(
-        %r"#{@script.ruby} #{MSPEC_HOME}/bin/mspec-run --dry-run -fs -e 'Object#inspect' spec/core/tcejbo/inspect_spec.rb")
+        %r"#{name} #{MSPEC_HOME}/bin/mspec-run --dry-run -fs -e 'Object#inspect' spec/core/tcejbo/inspect_spec.rb")
     @script.write_spec("spec/core/tcejbo/inspect_spec.rb", "Object#inspect", true)
   end
 
@@ -335,7 +336,7 @@ end
 
 describe MkSpec, ".main" do
   before :each do
-    @script = mock("MkSpec", :null_object => true)
+    @script = mock("MkSpec").as_null_object
     MkSpec.stub!(:new).and_return(@script)
   end
 

data/spec/commands/mspec_ci_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 require 'mspec/runner/mspec'
 require 'mspec/runner/filters/tag'
 require 'mspec/commands/mspec-ci'
@@ -88,11 +88,6 @@ describe MSpecCI, "#options" do
     @script.options
   end
 
-  it "enables the debug option" do
-    @options.should_receive(:debug)
-    @script.options @argv
-  end
-
   it "calls #custom_options" do
     @script.should_receive(:custom_options).with(@options)
     @script.options

data/spec/commands/mspec_run_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 require 'mspec/runner/mspec'
 require 'mspec/commands/mspec-run'
 
@@ -118,11 +118,6 @@ describe MSpecRun, "#options" do
     @script.options @argv
   end
 
-  it "enables the debug option" do
-    @options.should_receive(:debug)
-    @script.options @argv
-  end
-
   it "exits if there are no files to process" do
     @options.should_receive(:parse).and_return([])
     @script.should_receive(:exit)

data/spec/commands/mspec_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 require 'yaml'
 require 'mspec/commands/mspec'
 
@@ -108,9 +108,9 @@ describe MSpecMain, "#report" do
   before :each do
     @stdout, $stdout = $stdout, IOStub.new
 
-    @timer = mock("timer", :null_object => true)
+    @timer = mock("timer").as_null_object
     @timer.stub!(:format).and_return("Finished in 42 seconds")
-    @file = mock("file", :null_object => true)
+    @file = mock("file").as_null_object
 
     File.stub!(:delete)
     YAML.stub!(:load)
@@ -244,6 +244,14 @@ describe MSpecMain, "#run" do
     @script.run
   end
 
+  it "adds config[:launch] to the exec options" do
+    @script.should_receive(:exec).with("ruby",
+        "-Xlaunch.option", "-v", %r"#{MSPEC_HOME}/bin/mspec-run$")
+    @config[:launch] << "-Xlaunch.option"
+    @script.options []
+    @script.run
+  end
+
   it "calls #multi_exec if the command is 'ci' and the multi option is passed" do
     @script.should_receive(:multi_exec).and_return do |arg|
       arg.length.should == 3
@@ -293,11 +301,11 @@ describe "The -A, --valgrind option" do
     @script.options
   end
 
-  it "sets flags to --valgrind" do
+  it "sets :use_valgrind config option to true" do
     ["-A", "--valgrind"].each do |opt|
-      @config[:flags] = []
+      @config[:use_valgrind] = false
       @script.options [opt]
-      @config[:flags].should include("--valgrind")
+      @config[:use_valgrind].should be_true
     end
   end
 end

data/spec/commands/mspec_tag_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 require 'mspec/runner/mspec'
 require 'mspec/commands/mspec-tag'
 require 'mspec/runner/actions/tag'
@@ -98,11 +98,6 @@ describe MSpecTag, "#options" do
     @script.options @argv
   end
 
-  it "enables the debug option" do
-    @options.should_receive(:debug)
-    @script.options @argv
-  end
-
   it "calls #custom_options" do
     @script.should_receive(:custom_options).with(@options)
     @script.options @argv
@@ -264,7 +259,7 @@ describe MSpecTag, "#run" do
   before :each do
     MSpec.stub!(:process)
 
-    options = mock("MSpecOptions", :null_object => true)
+    options = mock("MSpecOptions").as_null_object
     options.stub!(:parse).and_return(["one", "two"])
     MSpecOptions.stub!(:new).and_return(options)
 
@@ -318,36 +313,42 @@ describe MSpecTag, "#register" do
     @tl.stub!(:register)
   end
 
-  it "creates a TagAction if config[:tagger] is :add" do
-    TagAction.should_receive(:new).with(:add, :fail, "fake", nil, [], []).and_return(@t)
-    @script.register
+  it "raises an ArgumentError if no recognized action is given" do
+    @config[:tagger] = :totally_whack
+    lambda { @script.register }.should raise_error(ArgumentError)
   end
 
-  it "creates a TagAction if config[:tagger] is :del" do
-    @config[:tagger] = :del
-    @config[:outcome] = :pass
-    TagAction.should_receive(:new).with(:del, :pass, "fake", nil, [], []).and_return(@t)
-    @script.register
-  end
+  describe "when config[:tagger] is the default (:add)" do
+    before :each do
+      @config[:formatter] = false
+    end
 
-  it "calls #register on the TagAction instance" do
-    TagAction.should_receive(:new).and_return(@t)
-    @t.should_receive(:register)
-    @script.register
-  end
+    it "creates a TagAction" do
+      TagAction.should_receive(:new).and_return(@t)
+      @script.register
+    end
 
-  it "raises an ArgumentError if no recognized action is given" do
-    @config[:tagger] = :totally_whack
-    lambda { @script.register }.should raise_error(ArgumentError)
+    it "creates a TagAction if config[:tagger] is :del" do
+      @config[:tagger] = :del
+      @config[:outcome] = :pass
+      TagAction.should_receive(:new).with(:del, :pass, "fake", nil, [], []).and_return(@t)
+      @script.register
+    end
+
+    it "calls #register on the TagAction instance" do
+      TagAction.should_receive(:new).and_return(@t)
+      @t.should_receive(:register)
+      @script.register
+    end
   end
 
   describe "when config[:tagger] is :list" do
     before :each do
+      TagListAction.should_receive(:new).with(@config[:ltags]).and_return(@tl)
       @config[:tagger] = :list
     end
 
     it "creates a TagListAction" do
-      TagListAction.should_receive(:new).with(@config[:ltags]).and_return(@tl)
       @tl.should_receive(:register)
       @script.register
     end
@@ -365,11 +366,11 @@ describe MSpecTag, "#register" do
 
   describe "when config[:tagger] is :list_all" do
     before :each do
+      TagListAction.should_receive(:new).with(nil).and_return(@tl)
       @config[:tagger] = :list_all
     end
 
     it "creates a TagListAction" do
-      TagListAction.should_receive(:new).with(nil).and_return(@tl)
       @tl.should_receive(:register)
       @script.register
     end
@@ -387,12 +388,12 @@ describe MSpecTag, "#register" do
 
   describe "when config[:tagger] is :purge" do
     before :each do
+      TagPurgeAction.should_receive(:new).and_return(@tl)
       MSpec.stub!(:register_mode)
       @config[:tagger] = :purge
     end
 
     it "creates a TagPurgeAction" do
-      TagPurgeAction.should_receive(:new).and_return(@tl)
       @tl.should_receive(:register)
       @script.register
     end

data/spec/expectations/expectations_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 require 'mspec/expectations/expectations'
 
 describe SpecExpectationNotMetError do

data/spec/expectations/should_spec.rb

@@ -1,10 +1,10 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 require 'rbconfig'
 
-describe MSpec do
+describe "MSpec" do
   before :all do
-    path = Config::CONFIG['bindir']
-    exe  = Config::CONFIG['ruby_install_name']
+    path = RbConfig::CONFIG['bindir']
+    exe  = RbConfig::CONFIG['ruby_install_name']
     file = File.dirname(__FILE__) + '/should.rb'
     @out = `#{path}/#{exe} #{file}`
   end

data/spec/guards/background_spec.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-require 'mspec/guards/background'
+require 'spec_helper'
+require 'mspec/guards'
 
 describe Object, "#process_is_foreground" do
   before :each do

data/spec/guards/block_device_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+require 'mspec/guards'
+
+describe Object, "#with_block_device" do
+  before :each do
+    ScratchPad.clear
+
+    @guard = BlockDeviceGuard.new
+    BlockDeviceGuard.stub!(:new).and_return(@guard)
+  end
+
+  platform_is_not :freebsd, :windows do
+    it "yields if block device is available" do
+      @guard.should_receive(:`).and_return("block devices")
+      with_block_device { ScratchPad.record :yield }
+      ScratchPad.recorded.should == :yield
+    end
+
+    it "does not yield if block device is not available" do
+      @guard.should_receive(:`).and_return(nil)
+      with_block_device { ScratchPad.record :yield }
+      ScratchPad.recorded.should_not == :yield
+    end
+  end
+
+  platform_is :freebsd, :windows do
+    it "does not yield, since platform does not support block devices" do
+      @guard.should_not_receive(:`)
+      with_block_device { ScratchPad.record :yield }
+      ScratchPad.recorded.should_not == :yield
+    end
+  end
+
+  it "sets the name of the guard to :with_block_device" do
+    with_block_device { }
+    @guard.name.should == :with_block_device
+  end
+
+  it "calls #unregister even when an exception is raised in the guard block" do
+    @guard.should_receive(:match?).and_return(true)
+    @guard.should_receive(:unregister)
+    lambda do
+      with_block_device { raise Exception }
+    end.should raise_error(Exception)
+  end
+end

data/spec/guards/bug_spec.rb

@@ -1,6 +1,5 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-require 'mspec/utils/ruby_name'
-require 'mspec/guards/bug'
+require 'spec_helper'
+require 'mspec/guards'
 
 describe BugGuard, "#match? when #implementation? is 'ruby'" do
   before :all do

data/spec/guards/compliance_spec.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-require 'mspec/guards/compliance'
+require 'spec_helper'
+require 'mspec/guards'
 
 describe Object, "#compliant_on" do
   before :all do

data/spec/guards/conflict_spec.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-require 'mspec/guards/conflict'
+require 'spec_helper'
+require 'mspec/guards'
 
 describe Object, "#conflicts_with" do
   before :each do

data/spec/guards/endian_spec.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-require 'mspec/guards/endian'
+require 'spec_helper'
+require 'mspec/guards'
 
 describe Object, "#big_endian" do
   before :each do

data/spec/guards/extensions_spec.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-require 'mspec/guards/extensions'
+require 'spec_helper'
+require 'mspec/guards'
 
 describe Object, "#extended_on" do
   before :all do

data/spec/guards/feature_spec.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-require 'mspec/guards/feature'
+require 'spec_helper'
+require 'mspec/guards'
 
 describe FeatureGuard, ".enabled?" do
   it "returns true if the feature is enabled" do

data/spec/guards/guard_spec.rb

@@ -1,10 +1,24 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-require 'mspec/utils/ruby_name'
-require 'mspec/guards/guard'
+require 'spec_helper'
+require 'mspec/guards'
 require 'rbconfig'
 
+describe SpecGuard, "#ruby_version_override=" do
+  after :each do
+    SpecGuard.ruby_version_override = nil
+  end
+
+  it "returns nil by default" do
+    SpecGuard.ruby_version_override.should be_nil
+  end
+
+  it "returns the value set by #ruby_version_override=" do
+    SpecGuard.ruby_version_override = "8.3.2"
+    SpecGuard.ruby_version_override.should == "8.3.2"
+  end
+end
+
 describe SpecGuard, ".ruby_version" do
-  before :all do
+  before :each do
     @ruby_version = Object.const_get :RUBY_VERSION
     @ruby_patchlevel = Object.const_get :RUBY_PATCHLEVEL
 
@@ -12,7 +26,7 @@ describe SpecGuard, ".ruby_version" do
     Object.const_set :RUBY_PATCHLEVEL, 71
   end
 
-  after :all do
+  after :each do
     Object.const_set :RUBY_VERSION, @ruby_version
     Object.const_set :RUBY_PATCHLEVEL, @ruby_patchlevel
   end
@@ -45,6 +59,45 @@ describe SpecGuard, ".ruby_version" do
   it "returns major for :major" do
     SpecGuard.ruby_version(:major).should == "8"
   end
+
+  describe "with ruby_version_override set" do
+    before :each do
+      SpecGuard.ruby_version_override = "8.3.2"
+    end
+
+    after :each do
+      SpecGuard.ruby_version_override = nil
+    end
+
+    it "returns the version and patchlevel for :full" do
+      SpecGuard.ruby_version(:full).should == "8.3.2.71"
+    end
+
+    it "returns 0 for negative RUBY_PATCHLEVEL values" do
+      Object.const_set :RUBY_PATCHLEVEL, -1
+      SpecGuard.ruby_version(:full).should == "8.3.2.0"
+    end
+
+    it "returns major.minor.tiny for :tiny" do
+      SpecGuard.ruby_version(:tiny).should == "8.3.2"
+    end
+
+    it "returns major.minor.tiny for :teeny" do
+      SpecGuard.ruby_version(:tiny).should == "8.3.2"
+    end
+
+    it "returns major.minor for :minor" do
+      SpecGuard.ruby_version(:minor).should == "8.3"
+    end
+
+    it "defaults to :minor" do
+      SpecGuard.ruby_version.should == "8.3"
+    end
+
+    it "returns major for :major" do
+      SpecGuard.ruby_version(:major).should == "8"
+    end
+  end
 end
 
 describe SpecGuard, "#yield?" do
@@ -158,6 +211,11 @@ describe SpecGuard, "#implementation?" do
     @guard.implementation?(:maglev).should == true
   end
 
+  it "returns true if passed :topaz and RUBY_NAME == 'topaz'" do
+    Object.const_set :RUBY_NAME, 'topaz'
+    @guard.implementation?(:topaz).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
@@ -237,12 +295,12 @@ describe SpecGuard, "#platform?" do
     @guard.platform?(:windows).should == true
   end
 
-  it "returns false when arg is not :windows and Config::CONFIG['host_os'] contains 'mswin'" do
+  it "returns false when arg is not :windows and RbConfig::CONFIG['host_os'] contains 'mswin'" do
     Object.const_set :RUBY_PLATFORM, 'i386-mswin32'
     @guard.platform?(:linux).should == false
   end
 
-  it "returns false when arg is not :windows and Config::CONFIG['host_os'] contains 'mingw'" do
+  it "returns false when arg is not :windows and RbConfig::CONFIG['host_os'] contains 'mingw'" do
     Object.const_set :RUBY_PLATFORM, 'i386-mingw32'
     @guard.platform?(:linux).should == false
   end
@@ -273,12 +331,12 @@ describe SpecGuard, "#platform? on JRuby" do
   end
 
   it "returns true when arg is :windows and RUBY_PLATFORM contains 'java' and os?(:windows) is true" do
-    Config::CONFIG.stub!(:[]).and_return('mswin32')
+    RbConfig::CONFIG.stub!(:[]).and_return('mswin32')
     @guard.platform?(:windows).should == true
   end
 
   it "returns true when RUBY_PLATFORM contains 'java' and os?(argument) is true" do
-    Config::CONFIG.stub!(:[]).and_return('amiga')
+    RbConfig::CONFIG.stub!(:[]).and_return('amiga')
     @guard.platform?(:amiga).should == true
   end
 end
@@ -300,42 +358,42 @@ end
 describe SpecGuard, "#os?" do
   before :each do
     @guard = SpecGuard.new
-    Config::CONFIG.stub!(:[]).and_return('unreal')
+    RbConfig::CONFIG.stub!(:[]).and_return('unreal')
   end
 
-  it "returns true if argument matches Config::CONFIG['host_os']" do
+  it "returns true if argument matches RbConfig::CONFIG['host_os']" do
     @guard.os?(:unreal).should == true
   end
 
-  it "returns true if any argument matches Config::CONFIG['host_os']" do
+  it "returns true if any argument matches RbConfig::CONFIG['host_os']" do
     @guard.os?(:bsd, :unreal, :amiga).should == true
   end
 
-  it "returns false if no argument matches Config::CONFIG['host_os']" do
+  it "returns false if no argument matches RbConfig::CONFIG['host_os']" do
     @guard.os?(:bsd, :netbsd, :amiga, :msdos).should == false
   end
 
-  it "returns false if argument does not match Config::CONFIG['host_os']" do
+  it "returns false if argument does not match RbConfig::CONFIG['host_os']" do
     @guard.os?(:amiga).should == false
   end
 
-  it "returns true when arg is :windows and Config::CONFIG['host_os'] contains 'mswin'" do
-    Config::CONFIG.stub!(:[]).and_return('i386-mswin32')
+  it "returns true when arg is :windows and RbConfig::CONFIG['host_os'] contains 'mswin'" do
+    RbConfig::CONFIG.stub!(:[]).and_return('i386-mswin32')
     @guard.os?(:windows).should == true
   end
 
-  it "returns true when arg is :windows and Config::CONFIG['host_os'] contains 'mingw'" do
-    Config::CONFIG.stub!(:[]).and_return('i386-mingw32')
+  it "returns true when arg is :windows and RbConfig::CONFIG['host_os'] contains 'mingw'" do
+    RbConfig::CONFIG.stub!(:[]).and_return('i386-mingw32')
     @guard.os?(:windows).should == true
   end
 
-  it "returns false when arg is not :windows and Config::CONFIG['host_os'] contains 'mswin'" do
-    Config::CONFIG.stub!(:[]).and_return('i386-mingw32')
+  it "returns false when arg is not :windows and RbConfig::CONFIG['host_os'] contains 'mswin'" do
+    RbConfig::CONFIG.stub!(:[]).and_return('i386-mingw32')
     @guard.os?(:linux).should == false
   end
 
-  it "returns false when arg is not :windows and Config::CONFIG['host_os'] contains 'mingw'" do
-    Config::CONFIG.stub!(:[]).and_return('i386-mingw32')
+  it "returns false when arg is not :windows and RbConfig::CONFIG['host_os'] contains 'mingw'" do
+    RbConfig::CONFIG.stub!(:[]).and_return('i386-mingw32')
     @guard.os?(:linux).should == false
   end
 end