rspec 1.2.6 → 1.2.7

data/lib/spec/mocks/proxy.rb

@@ -56,9 +56,9 @@ module Spec
         @expectations.last
       end
 
-      def add_stub(expected_from, sym, opts={})
+      def add_stub(expected_from, sym, opts={}, &implementation)
         __add sym
-        @stubs.unshift MessageExpectation.new(@error_generator, @expectation_ordering, expected_from, sym, nil, :any, opts)
+        @stubs.unshift MessageExpectation.new(@error_generator, @expectation_ordering, expected_from, sym, nil, :any, opts, &implementation)
         @stubs.first
       end
       

data/lib/spec/rake/spectask.rb

@@ -118,6 +118,9 @@ module Spec
       # Use verbose output. If this is set to true, the task will print
       # the executed spec command to stdout. Defaults to false.
       attr_accessor :verbose
+      
+      # Explicitly define the path to the ruby binary, or its proxy (e.g. multiruby)
+      attr_accessor :ruby_cmd
 
       # Defines a new task, using the name +name+.
       def initialize(name=:spec)
@@ -152,7 +155,7 @@ module Spec
               # ruby [ruby_opts] -Ilib -S rcov [rcov_opts] bin/spec -- examples [spec_opts]
               # or
               # ruby [ruby_opts] -Ilib bin/spec examples [spec_opts]
-              cmd_parts = [RUBY]
+              cmd_parts = [ruby_cmd || RUBY]
               cmd_parts += ruby_opts
               cmd_parts << %[-I"#{lib_path}"]
               cmd_parts << "-S rcov" if rcov
@@ -192,8 +195,11 @@ module Spec
       end
 
       def rcov_option_list # :nodoc:
-        return "" unless rcov
-        ENV['RCOV_OPTS'] || rcov_opts.join(" ") || ""
+        if rcov
+          ENV['RCOV_OPTS'] || rcov_opts.join(" ") || ""
+        else
+          ""
+        end
       end
 
       def spec_option_list # :nodoc:

data/lib/spec/runner.rb

@@ -6,7 +6,7 @@ require 'spec/runner/command_line'
 require 'spec/runner/drb_command_line'
 require 'spec/runner/backtrace_tweaker'
 require 'spec/runner/reporter'
-require 'spec/runner/spec_parser'
+require 'spec/runner/line_number_query'
 require 'spec/runner/class_and_arguments_parser'
 require 'spec/runner/extensions/kernel'
 

data/lib/spec/runner/{spec_parser.rb → line_number_query.rb}

@@ -1,7 +1,7 @@
 module Spec
   module Runner
     # Parses a spec file and finds the nearest example for a given line number.
-    class SpecParser
+    class LineNumberQuery
       attr_reader :best_match
 
       def initialize(run_options)
@@ -12,14 +12,7 @@ module Spec
       def spec_name_for(file, line_number)
         best_match.clear
         file = File.expand_path(file)
-        @run_options.example_groups.each do |example_group|
-          next unless example_group.location
-          consider_example_group_for_best_match(example_group, file, line_number)
-
-          example_group.examples.each do |example|
-            consider_example_for_best_match(example, example_group, file, line_number)
-          end
-        end
+        determine_best_match(file, line_number)
         if best_match[:example_group]
           if best_match[:example]
             "#{best_match[:example_group].description} #{best_match[:example].description}"
@@ -31,7 +24,25 @@ module Spec
         end
       end
 
+      def example_line_for(file, line_number)
+        determine_best_match(file, line_number)
+        best_match[:line]
+      end
+    
     protected
+    
+      def determine_best_match(file, line_number)
+        best_match.clear
+        file = File.expand_path(file)
+        @run_options.example_groups.each do |example_group|
+          next unless example_group.location
+          consider_example_group_for_best_match(example_group, file, line_number)
+
+          example_group.examples.each do |example|
+            consider_example_for_best_match(example, example_group, file, line_number)
+          end
+        end
+      end
 
       def consider_example_group_for_best_match(example_group, file, line_number)
         example_group_file, example_group_line = parse_location(example_group.location)

data/lib/spec/runner/options.rb

@@ -74,10 +74,18 @@ module Spec
         @files_loaded = false
         @out_used = nil
       end
-
+      
       def add_example_group(example_group)
         @example_groups << example_group
       end
+      
+      def line_number_requested?
+        !!line_number
+      end
+      
+      def example_line
+        Spec::Runner::LineNumberQuery.new(self).example_line_for(files.first, line_number)
+      end
 
       def remove_example_group(example_group)
         @example_groups.delete(example_group)
@@ -340,7 +348,7 @@ module Spec
               error_stream.puts "You must specify one file, not a directory when providing a line number"
               exit(1) if stderr?
             else
-              example = SpecParser.new(self).spec_name_for(files[0], line_number)
+              example = LineNumberQuery.new(self).spec_name_for(files[0], line_number)
               @examples = [example]
             end
           else

data/lib/spec/version.rb

@@ -3,9 +3,10 @@ module Spec # :nodoc:
     unless defined? MAJOR
       MAJOR  = 1
       MINOR  = 2
-      TINY   = 6
+      TINY   = 7
+      PRE    = nil
       
-      STRING = [MAJOR, MINOR, TINY].compact.join('.')
+      STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
 
       SUMMARY = "rspec #{STRING}"
     end

data/spec/autotest/failed_results_re_spec.rb

@@ -8,6 +8,13 @@ describe "failed_results_re" do
     $2.should == "reason\n/path.rb:37:"
   end
 
+  it "should match a failure when matcher outputs multiple lines" do
+    re = Autotest::Rspec.new.failed_results_re
+    re =~ "1)\n'other example' FAILED\n\nreason line 1\nreason line 2\n\n(additional info)\n/path.rb:37:\n\n"
+    $1.should == "other example"
+    $2.should == "reason line 1\nreason line 2\n\n(additional info)\n/path.rb:37:"
+  end
+
   it "should match an Error" do
     re = Autotest::Rspec.new.failed_results_re
     re =~ "1)\nRuntimeError in 'this example'\nreason\n/path.rb:37:\n\n"

data/spec/spec/example/example_group_methods_spec.rb

@@ -670,6 +670,67 @@ module Spec
             example_group.__send__ :run_after_all, true, {}, nil
           end
         end
+        
+        describe "#examples_to_run" do
+          it "runs only the example identified by a line number" do
+            example_group = Class.new(ExampleGroupDouble).describe("this") do
+              it { 3.should == 3 }
+              it "has another example which raises" do
+                raise "this shouldn't have run"
+              end
+            end
+            options.examples << :ignore
+            options.line_number = __LINE__ - 6
+            options.files << __FILE__
+            example_group.run(options).should be_true
+          end
+
+          it "runs the example identified by a line number even if it's not the example line number" do
+            example_group = Class.new(ExampleGroupDouble).describe("this") do
+
+              it { raise "foo" }
+
+            end
+            options.examples << :ignore
+            options.line_number = __LINE__ - 3
+            options.files << __FILE__
+            example_group.run(options).should be_false
+          end
+
+          it "runs all the examples in the group " do
+            first_example_ran  = false
+            second_example_ran = false
+            example_group = Class.new(ExampleGroupDouble).describe("this") do
+
+              it { first_example_ran  = true }
+              it { second_example_ran = true }
+
+            end
+            options.line_number = __LINE__ - 6
+            options.files << __FILE__
+            options.examples << :ignore
+            example_group.run(options)
+            first_example_ran.should be_true
+            second_example_ran.should be_true
+          end
+
+          it "doesn't run any examples in another group" do
+            example_ran  = false
+            example_group_1 = Class.new(ExampleGroupDouble).describe("this") do
+              it "ignore" do
+                example_ran = true
+              end
+            end
+            example_group_2 = Class.new(ExampleGroupDouble).describe("that") do
+            end
+            options.examples << :ignore
+            options.line_number = __LINE__ - 3
+            options.files << __FILE__
+            example_group_1.run(options)
+            example_group_2.run(options)
+            example_ran.should be_false
+          end
+        end
 
       end
     end

data/spec/spec/example/example_matcher_spec.rb

@@ -75,5 +75,12 @@ module Spec
         matcher.matches?(["no match1", "no match2"]).should == false
       end
     end
+    
+    describe ExampleMatcher, "called with nil example" do
+      it "does not puke" do
+        matcher = ExampleMatcher.new("Foo::Bar", nil)
+        matcher.matches?(["anything"]).should == false
+      end
+    end
   end
 end

data/spec/spec/example/example_methods_spec.rb

@@ -27,7 +27,7 @@ module Spec
       end
       
       describe "with an included module that is reopened" do
-        it "should have repoened methods" do
+        it "should have reopened methods" do
           method(:module_that_is_reopened_method).should_not be_nil
         end
       end
@@ -56,11 +56,26 @@ module Spec
             @example_group.run(@options).should be_true
           end
         end
+		
+        context "in an ExampleGroup using 'self' as an explicit subject" do
+          it "delegates matcher to the ExampleGroup" do
+            @example_group.describe(::Thing)
+            @example_group.subject { self }
+            @example_group.example { should == self }
+            @example_group.example { should eql(self) }
+            @example_group.example do
+              self.instance_eval("def method_ok?; true end")
+              should be_method_ok
+            end
+            @example_group.run(@options).should be_true
+          end
+        end
       end
 
       describe "#should_not" do
         before(:each) do
           @example_group = Class.new(ExampleGroupDouble)
+          @options = ::Spec::Runner::Options.new(StringIO.new, StringIO.new)
         end
 
         context "in an ExampleGroup with an implicit subject" do
@@ -68,7 +83,7 @@ module Spec
             @example_group.describe(::Thing)
             @example_group.example { should_not == ::Thing.new(:other) }
             @example_group.example { should_not eql(::Thing.new(:other)) }
-            @example_group.run(::Spec::Runner::Options.new(StringIO.new, StringIO.new)).should be_true
+            @example_group.run(@options).should be_true
           end
         end
         
@@ -78,7 +93,21 @@ module Spec
             @example_group.subject { ::Thing.new(:other) }
             @example_group.example { should_not == ::Thing.new(:default) }
             @example_group.example { should_not eql(::Thing.new(:default)) }
-            @example_group.run(::Spec::Runner::Options.new(StringIO.new, StringIO.new)).should be_true
+            @example_group.run(@options).should be_true
+          end
+        end
+		
+        context "in an ExampleGroup using 'self' as an explicit subject" do
+          it "delegates matcher to the ExampleGroup" do
+            @example_group.describe(::Thing)
+            @example_group.subject { self }
+            @example_group.example { should_not == ::Thing.new(:default) }
+            @example_group.example { should_not eql(::Thing.new(:default)) }
+            @example_group.example do
+              self.instance_eval("def method_ok?; false end")
+              should_not be_method_ok
+            end
+            @example_group.run(@options).should be_true
           end
         end
       end
@@ -109,12 +138,11 @@ module Spec
         Spec::Matchers.stub!(:generated_description).and_return('this message')
         example.description.should == "this message"
       end
-      it "raises if there is no supplied or generated description" do
+      it "warns if there is no supplied or generated description" do
         example = ExampleGroupDouble.new ExampleProxy.new(nil, {}, "this backtrace") do; end
         Spec::Matchers.stub!(:generated_description).and_return(nil)
-        lambda do
-          example.description
-        end.should raise_error(/No description supplied for example declared on this backtrace/)
+        Spec.should_receive(:warn).with("No description supplied for example declared on this backtrace")
+        example.description
       end
     end
     

data/spec/spec/expectations/fail_with_spec.rb

@@ -64,7 +64,24 @@ describe Spec::Expectations, "#fail_with with diff" do
       Spec::Expectations.fail_with "the message", lambda {}, lambda {}
     }.should fail_with("the message")
   end
-  
+
+  after(:each) do
+    Spec::Expectations.differ = @old_differ
+  end
+end
+
+describe Spec::Expectations, "#fail_with with a nil message" do
+  before(:each) do
+    @old_differ = Spec::Expectations.differ
+    Spec::Expectations.differ = nil
+  end
+
+  it "should handle just a message" do
+    lambda {
+      Spec::Expectations.fail_with nil
+    }.should raise_error(ArgumentError, /Failure message is nil\. Does your matcher define the appropriate failure_message_for_\* method to return a string\?/)
+  end
+
   after(:each) do
     Spec::Expectations.differ = @old_differ
   end

data/spec/spec/matchers/match_spec.rb

@@ -5,11 +5,21 @@ describe "should match(expected)" do
     "string".should match(/tri/)
   end
 
+  it "should pass when target (String) matches expected (String)" do
+    "string".should match("tri")
+  end
+
   it "should fail when target (String) does not match expected (Regexp)" do
     lambda {
       "string".should match(/rings/)
     }.should fail
   end
+
+  it "should fail when target (String) does not match expected (String)" do
+    lambda {
+      "string".should match("rings")
+    }.should fail
+  end
   
   it "should provide message, expected and actual on failure" do
     matcher = match(/rings/)
@@ -23,12 +33,22 @@ describe "should_not match(expected)" do
     "string".should_not match(/rings/)
   end
 
+  it "should pass when target (String) matches does not match (String)" do
+    "string".should_not match("rings")
+  end
+
   it "should fail when target (String) matches expected (Regexp)" do
     lambda {
       "string".should_not match(/tri/)
     }.should fail
   end
 
+  it "should fail when target (String) matches expected (String)" do
+    lambda {
+      "string".should_not match("tri")
+    }.should fail
+  end
+
   it "should provide message, expected and actual on failure" do
     matcher = match(/tri/)
     matcher.matches?("string")

data/spec/spec/matchers/matcher_spec.rb

@@ -13,7 +13,6 @@ module Spec
         end
         
         it "provides a default description" do
-          @matcher.matches?(0)
           @matcher.description.should == "be a multiple of 3"
         end
 
@@ -29,29 +28,17 @@ module Spec
       end
       
       it "is not diffable by default" do
-        matcher = Spec::Matchers::Matcher.new(:name) do
-          match {|actual|}
-        end
-        matcher.matches?(0)
+        matcher = Spec::Matchers::Matcher.new(:name) {}
         matcher.should_not be_diffable
       end
       
       it "is diffable when told to be" do
-        matcher = Spec::Matchers::Matcher.new(:name) do
-          match {|actual|}
-          diffable
-        end
-        matcher.matches?(0)
+        matcher = Spec::Matchers::Matcher.new(:name) { diffable }
         matcher.should be_diffable
       end
       
       it "provides expected" do
-        matcher = Spec::Matchers::Matcher.new(:name, 'expected string') do
-          match {|actual|}
-        end
-        
-        matcher.matches?('actual string')
-        
+        matcher = Spec::Matchers::Matcher.new(:name, 'expected string') {}
         matcher.expected.should == ['expected string']
       end
       
@@ -92,7 +79,6 @@ module Spec
         end
 
         it "overrides the description" do
-          @matcher.matches?(true)
           @matcher.description.should == "be the boolean true"
         end
 
@@ -181,20 +167,33 @@ module Spec
         end
       end
       
-      context "with helper methods" do
-        it "does something" do
-          matcher = Spec::Matchers::Matcher.new(:be_similar_to, [1,2,3]) do |sample|
-            match do |actual|
-              similar?(sample, actual)
-            end
+      it "supports helper methods" do
+        matcher = Spec::Matchers::Matcher.new(:be_similar_to, [1,2,3]) do |sample|
+          match do |actual|
+            similar?(sample, actual)
+          end
 
-            def similar?(a, b)
-              a.sort == b.sort
-            end
+          def similar?(a, b)
+            a.sort == b.sort
           end
-          
-          matcher.matches?([2,3,1]).should be_true
         end
+        
+        matcher.matches?([2,3,1]).should be_true
+      end
+      
+      it "supports fluent interface" do
+        matcher = Spec::Matchers::Matcher.new(:first_word) do
+          def second_word
+            self
+          end
+        end
+        
+        matcher.second_word.should == matcher
+      end
+      
+      it "treats method missing normally for undeclared methods" do
+        matcher = Spec::Matchers::Matcher.new(:ignore) { }
+        expect { matcher.non_existent_method }.to raise_error(NoMethodError)
       end
 
     end