mspec 1.5.9 → 1.5.10

data/lib/mspec/matchers/method.rb

@@ -1,10 +1,11 @@
-require 'mspec/utils/version'
+require 'mspec/matchers/stringsymboladapter'
 
 class MethodMatcher
+  include StringSymbolAdapter
+
   def initialize(method, include_super=true)
     @include_super = include_super
-    version = SpecVersion.new(RUBY_VERSION) <=> "1.9"
-    @method = version < 0 ? method.to_s : method
+    @method = convert_name method
   end
 
   def matches?(mod)

data/lib/mspec/matchers/stringsymboladapter.rb

@@ -0,0 +1,8 @@
+require 'mspec/utils/version'
+
+module StringSymbolAdapter
+  def convert_name(name)
+    version = SpecVersion.new(RUBY_VERSION) <=> "1.9"
+    version < 0 ? name.to_s : name
+  end
+end

data/lib/mspec/runner/actions/tally.rb

@@ -1,8 +1,8 @@
 class Tally
-  attr_accessor :files, :examples, :expectations, :failures, :errors
+  attr_accessor :files, :examples, :expectations, :failures, :errors, :guards
 
   def initialize
-    @files = @examples = @expectations = @failures = @errors = 0
+    @files = @examples = @expectations = @failures = @errors = @guards = 0
   end
 
   def files!(add=1)
@@ -25,6 +25,10 @@ class Tally
     @errors += add
   end
 
+  def guards!(add=1)
+    @guards += add
+  end
+
   def file
     pluralize files, "file"
   end
@@ -45,8 +49,14 @@ class Tally
     pluralize errors, "error"
   end
 
+  def guard
+    pluralize guards, "guard"
+  end
+
   def format
-    [ file, example, expectation, failure, error ].join(", ")
+    results = [ file, example, expectation, failure, error ]
+    results << guard if [:report, :report_on, :verify].any? { |m| MSpec.mode? m }
+    results.join(", ")
   end
 
   alias_method :to_s, :format

data/lib/mspec/runner/context.rb

@@ -79,18 +79,23 @@ class ContextState
 
   # Records before(:each) and before(:all) blocks.
   def before(what, &block)
+    return if MSpec.guarded?
     block ? @before[what].push(block) : @before[what]
   end
 
   # Records after(:each) and after(:all) blocks.
   def after(what, &block)
+    return if MSpec.guarded?
     block ? @after[what].unshift(block) : @after[what]
   end
 
   # Creates an ExampleState instance for the block and stores it
   # in a list of examples to evaluate unless the example is filtered.
   def it(desc, &block)
-    @examples << ExampleState.new(self, desc, block)
+    example = ExampleState.new(self, desc, block)
+    MSpec.actions :add, example
+    return if MSpec.guarded?
+    @examples << example
   end
 
   # Evaluates the block and resets the toplevel +ContextState+ to #parent.
@@ -108,6 +113,8 @@ class ContextState
   # Injects the before/after blocks and examples from the shared
   # describe block into this +ContextState+ instance.
   def it_should_behave_like(desc)
+    return if MSpec.guarded?
+
     unless state = MSpec.retrieve_shared(desc)
       raise Exception, "Unable to find shared 'describe' for #{desc}"
     end

data/lib/mspec/runner/mspec.rb

@@ -20,6 +20,7 @@ module MSpec
   @current = nil
   @modes   = []
   @shared  = {}
+  @guarded = []
   @exception    = nil
   @randomize    = nil
   @expectation  = nil
@@ -74,6 +75,20 @@ module MSpec
     end
   end
 
+  # Guards can be nested, so a stack is necessary to know when we have
+  # exited the toplevel guard.
+  def self.guard
+    @guarded << true
+  end
+
+  def self.unguard
+    @guarded.pop
+  end
+
+  def self.guarded?
+    not @guarded.empty?
+  end
+
   # Sets the toplevel ContextState to +state+.
   def self.register_current(state)
     store :current, state
@@ -161,6 +176,7 @@ module MSpec
   #   :load         before a spec file is loaded
   #   :enter        before a describe block is run
   #   :before       before a single spec is run
+  #   :add          while a describe block is adding examples to run later
   #   :expectation  before a 'should', 'should_receive', etc.
   #   :example      after an example block is run, passed the block
   #   :exception    after an exception is rescued

data/lib/mspec/utils/options.rb

@@ -360,6 +360,9 @@ class MSpecOptions
     on("--unguarded", "Turn off all guards") do
       MSpec.register_mode :unguarded
     end
+    on("--no-ruby_bug", "Turn off the ruby_bug guard") do
+      MSpec.register_mode :no_ruby_bug
+    end
   end
 
   def randomize
@@ -401,13 +404,17 @@ class MSpecOptions
   end
 
   def verify
-    on("-Y", "--verify",
-       "Verify that guarded specs pass and fail as expected") do
-      MSpec.register_mode :verify
+    on("--report-on", "GUARD", "Report specs guarded by GUARD") do |g|
+      MSpec.register_mode :report_on
+      SpecGuard.guards << g.to_sym
     end
     on("-O", "--report", "Report guarded specs") do
       MSpec.register_mode :report
     end
+    on("-Y", "--verify",
+       "Verify that guarded specs pass and fail as expected") do
+      MSpec.register_mode :verify
+    end
   end
 
   def action_filters

data/lib/mspec/version.rb

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

data/spec/guards/background_spec.rb

@@ -5,6 +5,9 @@ describe Object, "#process_is_foreground" do
   before :each do
     MSpec.clear_modes
     ScratchPad.clear
+
+    @guard = BackgroundGuard.new
+    BackgroundGuard.stub!(:new).and_return(@guard)
   end
 
   it "yields if MSpec.mode?(:background) is false" do
@@ -18,4 +21,16 @@ describe Object, "#process_is_foreground" do
     process_is_foreground { ScratchPad.record :yield }
     ScratchPad.recorded.should_not == :yield
   end
+
+  it "sets the name of the guard to :process_is_foreground" do
+    process_is_foreground { ScratchPad.record :yield }
+    @guard.name.should == :process_is_foreground
+  end
+
+  it "calls #unregister even when an exception is raised in the guard block" do
+    @guard.should_receive(:unregister)
+    lambda do
+      process_is_foreground { raise Exception }
+    end.should raise_error(Exception)
+  end
 end

data/spec/guards/bug_spec.rb

@@ -46,6 +46,12 @@ describe BugGuard, "#match? when #implementation? is 'ruby'" do
     BugGuard.new("#1", "1.8").match?.should == true
     BugGuard.new("#1", "1.8.6").match?.should == true
   end
+
+  it "returns false when MSpec.mode?(:no_ruby_bug) is true" do
+    MSpec.should_receive(:mode?).with(:no_ruby_bug).twice.and_return(:true)
+    BugGuard.new("#1", "1.8.5").match?.should == false
+    BugGuard.new("#1", "1.8").match?.should == false
+  end
 end
 
 describe BugGuard, "#match? when #implementation? is not 'ruby'" do
@@ -87,6 +93,13 @@ describe BugGuard, "#match? when #implementation? is not 'ruby'" do
     BugGuard.new("#1", "1.8.7").match?.should == false
     BugGuard.new("#1", "1.8.6.115").match?.should == false
   end
+
+  it "returns false when MSpec.mode?(:no_ruby_bug) is true" do
+    MSpec.should_receive(:mode?).with(:no_ruby_bug).any_number_of_times.and_return(:true)
+    BugGuard.new("#1", "1.8.6").match?.should == false
+    BugGuard.new("#1", "1.8.6.114").match?.should == false
+    BugGuard.new("#1", "1.8.6.115").match?.should == false
+  end
 end
 
 describe Object, "#ruby_bug" do
@@ -98,25 +111,30 @@ describe Object, "#ruby_bug" do
 
   it "yields when #match? returns false" do
     @guard.stub!(:match?).and_return(false)
-    ruby_bug { ScratchPad.record :yield }
+    ruby_bug("#1234", "1.8.6") { ScratchPad.record :yield }
     ScratchPad.recorded.should == :yield
   end
 
   it "does not yield when #match? returns true" do
     @guard.stub!(:match?).and_return(true)
-    ruby_bug { ScratchPad.record :yield }
+    ruby_bug("#1234", "1.8.6") { ScratchPad.record :yield }
     ScratchPad.recorded.should_not == :yield
   end
 
-  it "accepts an optional String identifying the bug tracker number" do
-    @guard.stub!(:match?).and_return(false)
-    ruby_bug("#1234") { ScratchPad.record :yield }
-    ScratchPad.recorded.should == :yield
+  it "requires a bug tracker number and a version number" do
+    lambda { ruby_bug { }          }.should raise_error(ArgumentError)
+    lambda { ruby_bug("#1234") { } }.should raise_error(ArgumentError)
   end
 
-  it "accepts an optional String identifying the version number" do
-    @guard.stub!(:match?).and_return(false)
-    ruby_bug("#1234", "1.8.6") { ScratchPad.record :yield }
-    ScratchPad.recorded.should == :yield
+  it "sets the name of the guard to :ruby_bug" do
+    ruby_bug("#1234", "1.8.6") { }
+    @guard.name.should == :ruby_bug
+  end
+
+  it "calls #unregister even when an exception is raised in the guard block" do
+    @guard.should_receive(:unregister)
+    lambda do
+      ruby_bug("", "") { raise Exception }
+    end.should raise_error(Exception)
   end
 end

data/spec/guards/compliance_spec.rb

@@ -21,6 +21,14 @@ describe Object, "#compliant_on" do
     ScratchPad.clear
   end
 
+  it "raises an Exception when passed :ruby" do
+    Object.const_set :RUBY_NAME, "jruby"
+    lambda {
+      compliant_on(:ruby) { ScratchPad.record :yield }
+    }.should raise_error(Exception)
+    ScratchPad.recorded.should_not == :yield
+  end
+
   it "does not yield when #standard? and #implementation? return false" do
     Object.const_set :RUBY_NAME, "jruby"
     compliant_on(:rubinius, :ironruby) { ScratchPad.record :yield }
@@ -46,6 +54,25 @@ describe Object, "#compliant_on" do
   end
 end
 
+describe Object, "#compliant_on" do
+  before :each do
+    @guard = CompliantOnGuard.new :any
+    CompliantOnGuard.stub!(:new).and_return(@guard)
+  end
+
+  it "sets the name of the guard to :compliant_on" do
+    compliant_on(:rubinius) { }
+    @guard.name.should == :compliant_on
+  end
+
+  it "calls #unregister even when an exception is raised in the guard block" do
+    @guard.should_receive(:unregister)
+    lambda do
+      compliant_on(:rubinius) { raise Exception }
+    end.should raise_error(Exception)
+  end
+end
+
 describe Object, "#not_compliant_on" do
   before :all do
     @verbose = $VERBOSE
@@ -66,6 +93,14 @@ describe Object, "#not_compliant_on" do
     ScratchPad.clear
   end
 
+  it "raises an Exception when passed :ruby" do
+    Object.const_set :RUBY_NAME, "jruby"
+    lambda {
+      not_compliant_on(:ruby) { ScratchPad.record :yield }
+    }.should raise_error(Exception)
+    ScratchPad.recorded.should_not == :yield
+  end
+
   it "yields when #standard? returns true" do
     Object.const_set :RUBY_NAME, "ruby"
     not_compliant_on(:rubinius) { ScratchPad.record :yield }
@@ -84,3 +119,22 @@ describe Object, "#not_compliant_on" do
     ScratchPad.recorded.should == :yield
   end
 end
+
+describe Object, "#not_compliant_on" do
+  before :each do
+    @guard = NotCompliantOnGuard.new :any
+    NotCompliantOnGuard.stub!(:new).and_return(@guard)
+  end
+
+  it "sets the name of the guard to :not_compliant_on" do
+    not_compliant_on(:rubinius) { }
+    @guard.name.should == :not_compliant_on
+  end
+
+  it "calls #unregister even when an exception is raised in the guard block" do
+    @guard.should_receive(:unregister)
+    lambda do
+      not_compliant_on(:rubinius) { raise Exception }
+    end.should raise_error(Exception)
+  end
+end

data/spec/guards/conflict_spec.rb

@@ -18,3 +18,22 @@ describe Object, "#conflicts_with" do
     ScratchPad.recorded.should == :yield
   end
 end
+
+describe Object, "#conflicts_with" do
+  before :each do
+    @guard = ConflictsGuard.new
+    ConflictsGuard.stub!(:new).and_return(@guard)
+  end
+
+  it "sets the name of the guard to :conflicts_with" do
+    conflicts_with(:AClass, :BClass) { }
+    @guard.name.should == :conflicts_with
+  end
+
+  it "calls #unregister even when an exception is raised in the guard block" do
+    @guard.should_receive(:unregister)
+    lambda do
+      conflicts_with(:AClass, :BClass) { raise Exception }
+    end.should raise_error(Exception)
+  end
+end

data/spec/guards/endian_spec.rb

@@ -19,6 +19,19 @@ describe Object, "#big_endian" do
     big_endian { ScratchPad.record :yield }
     ScratchPad.recorded.should_not == :yield
   end
+
+  it "sets the name of the guard to :big_endian" do
+    big_endian { }
+    @guard.name.should == :big_endian
+  end
+
+  it "calls #unregister even when an exception is raised in the guard block" do
+    @guard.stub!(:pattern).and_return([1])
+    @guard.should_receive(:unregister)
+    lambda do
+      big_endian { raise Exception }
+    end.should raise_error(Exception)
+  end
 end
 
 describe Object, "#little_endian" do
@@ -39,4 +52,17 @@ describe Object, "#little_endian" do
     little_endian { ScratchPad.record :yield }
     ScratchPad.recorded.should_not == :yield
   end
+
+  it "sets the name of the guard to :little_endian" do
+    little_endian { }
+    @guard.name.should == :little_endian
+  end
+
+  it "calls #unregister even when an exception is raised in the guard block" do
+    @guard.stub!(:pattern).and_return([0])
+    @guard.should_receive(:unregister)
+    lambda do
+      little_endian { raise Exception }
+    end.should raise_error(Exception)
+  end
 end

data/spec/guards/extensions_spec.rb

@@ -47,3 +47,23 @@ describe Object, "#extended_on" do
     ScratchPad.recorded.should == :yield
   end
 end
+
+describe Object, "#extended_on" do
+  before :each do
+    @guard = ExtensionsGuard.new
+    ExtensionsGuard.stub!(:new).and_return(@guard)
+  end
+
+  it "sets the name of the guard to :extended_on" do
+    extended_on(:rubinius) { }
+    @guard.name.should == :extended_on
+  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
+      extended_on(:rubinius) { raise Exception }
+    end.should raise_error(Exception)
+  end
+end

data/spec/guards/guard_spec.rb

@@ -3,42 +3,6 @@ require 'mspec/utils/ruby_name'
 require 'mspec/guards/guard'
 require 'rbconfig'
 
-describe SpecGuard, ".register" do
-  before :each do
-    @tally = mock("tally")
-    @tally.stub!(:register)
-    TallyAction.stub!(:new).and_return(@tally)
-    SpecGuard.instance_variable_set(:@registered, nil)
-  end
-
-  it "creates a new TallyAction if one does not exist" do
-    TallyAction.should_receive(:new).and_return(@tally)
-    @tally.should_receive(:register)
-    SpecGuard.register
-    SpecGuard.register
-  end
-
-  it "registers itself with MSpec :finish actions" do
-    MSpec.should_receive(:register).with(:finish, SpecGuard)
-    SpecGuard.register
-  end
-end
-
-describe SpecGuard, ".unregister" do
-  before :each do
-    @tally = mock("tally")
-    @tally.stub!(:register)
-    TallyAction.stub!(:new).and_return(@tally)
-    SpecGuard.instance_variable_set(:@registered, nil)
-  end
-
-  it "unregisters its tally action" do
-    @tally.should_receive(:unregister)
-    SpecGuard.register
-    SpecGuard.unregister
-  end
-end
-
 describe SpecGuard, ".ruby_version" do
   before :all do
     @ruby_version = Object.const_get :RUBY_VERSION
@@ -116,6 +80,12 @@ describe SpecGuard, "#yield?" do
     @guard = SpecGuard.new
   end
 
+  after :each do
+    MSpec.unregister :add, @guard
+    MSpec.clear_modes
+    SpecGuard.clear_guards
+  end
+
   it "returns true if MSpec.mode?(:unguarded) is true" do
     MSpec.register_mode :unguarded
     @guard.yield?.should == true
@@ -141,6 +111,14 @@ describe SpecGuard, "#yield?" do
     @guard.yield?(true).should == true
   end
 
+  it "returns true if MSpec.mode?(:report_on) is true and SpecGuards.guards contains the named guard" do
+    MSpec.register_mode :report_on
+    SpecGuard.guards << :guard_name
+    @guard.yield?.should == false
+    @guard.name = :guard_name
+    @guard.yield?.should == true
+  end
+
   it "returns #match? if neither report nor verify mode are true" do
     @guard.stub!(:match?).and_return(false)
     @guard.yield?.should == false
@@ -430,30 +408,69 @@ end
 
 describe SpecGuard, "#unregister" do
   before :each do
-    @tally = mock("tally")
-    @tally.stub!(:register)
-    TallyAction.stub!(:new).and_return(@tally)
     MSpec.stub!(:unregister)
     @guard = SpecGuard.new
-
-    SpecGuard.instance_variable_set(:@registered, nil)
-    SpecGuard.register
   end
 
-  it "unregisters from MSpec :exclude actions" do
-    MSpec.should_receive(:unregister).with(:exclude, @guard)
-    @tally.should_receive(:unregister)
+  it "unregisters from MSpec :add actions" do
+    MSpec.should_receive(:unregister).with(:add, @guard)
     @guard.unregister
   end
+end
 
-  it "unregisters from MSpec :after actions" do
-    MSpec.should_receive(:unregister).with(:after, @guard)
-    @tally.should_receive(:unregister)
-    @guard.unregister
+describe SpecGuard, "#record" do
+  after :each do
+    SpecGuard.clear
   end
 
-  it "invokes the class's unregister method" do
-    SpecGuard.should_receive(:unregister)
-    @guard.unregister
+  it "saves the name of the guarded spec under the name of the guard" do
+    guard = SpecGuard.new "a", "1.8"..."1.9"
+    guard.name = :named_guard
+    guard.record "SomeClass#action returns true"
+    SpecGuard.report.should == {
+      'named_guard a, 1.8...1.9' => ["SomeClass#action returns true"]
+    }
+  end
+end
+
+describe SpecGuard, ".guards" do
+  it "returns an Array" do
+    SpecGuard.guards.should be_kind_of(Array)
+  end
+end
+
+describe SpecGuard, ".clear_guards" do
+  it "resets the array to empty" do
+    SpecGuard.guards << :guard
+    SpecGuard.guards.should == [:guard]
+    SpecGuard.clear_guards
+    SpecGuard.guards.should == []
+  end
+end
+
+describe SpecGuard, ".finish" do
+  before :each do
+    $stdout = @out = IOStub.new
+  end
+
+  after :each do
+    $stdout = STDOUT
+    SpecGuard.clear
+  end
+
+  it "prints the descriptions of the guarded specs" do
+    guard = SpecGuard.new "a", "1.8"..."1.9"
+    guard.name = :named_guard
+    guard.record "SomeClass#action returns true"
+    guard.record "SomeClass#reverse returns false"
+    SpecGuard.finish
+    $stdout.should == %[
+
+2 specs omitted by guard: named_guard a, 1.8...1.9:
+
+SomeClass#action returns true
+SomeClass#reverse returns false
+
+]
   end
 end