rspec 1.2.0 → 1.2.1

data/lib/spec/runner/heckle_runner.rb

@@ -1,5 +1,6 @@
 if Spec::Ruby.version.to_f < 1.9
   begin
+    require 'rubygems' unless ENV['NO_RUBYGEMS']
     require 'heckle'
   rescue LoadError ; raise "You must gem install heckle to use --heckle" ; end
 

data/lib/spec/runner/option_parser.rb

@@ -78,6 +78,7 @@ module Spec
         :options_file => ["-O", "--options PATH", "Read options from a file"],
         :generate_options => ["-G", "--generate-options PATH", "Generate an options file for --options"],
         :runner => ["-U", "--runner RUNNER", "Use a custom Runner."],
+        :debug => ["-u", "--debugger", "Enable ruby-debugging."],
         :drb => ["-X", "--drb", "Run examples via DRb. (For example against script/spec_server)"],
         :version => ["-v", "--version", "Show version"],
         :help => ["-h", "--help", "You're looking at it"]
@@ -110,6 +111,7 @@ module Spec
         on(*OPTIONS[:options_file])     {|options_file|}
         on(*OPTIONS[:generate_options]) {|options_file|}
         on(*OPTIONS[:runner])           {|runner|  @options.user_input_for_runner = runner}
+        on(*OPTIONS[:debug])            {@options.debug = true}
         on(*OPTIONS[:drb])              {}
         on(*OPTIONS[:version])          {parse_version}
         on("--autospec")                {@options.autospec = true}
@@ -135,7 +137,8 @@ module Spec
         @options
       end
       
-      protected
+    protected
+
       def invoke_requires(requires)
         requires.split(",").each do |file|
           require file

data/lib/spec/runner/options.rb

@@ -34,6 +34,7 @@ module Spec
         :dry_run,
         :profile,
         :heckle_runner,
+        :debug,
         :line_number,
         :loadby,
         :reporter,
@@ -57,6 +58,7 @@ module Spec
         @colour = false
         @profile = false
         @dry_run = false
+        @debug = false
         @reporter = Reporter.new(self)
         @context_lines = 3
         @diff_format  = :unified
@@ -67,6 +69,8 @@ module Spec
         @examples_should_be_run = nil
         @user_input_for_runner = nil
         @after_suite_parts = []
+        @files_loaded = false
+        @out_used = nil
       end
 
       def add_example_group(example_group)
@@ -77,7 +81,13 @@ module Spec
         @example_groups.delete(example_group)
       end
 
+      def require_ruby_debug
+        require 'rubygems' unless ENV['NO_RUBYGEMS']
+        require 'ruby-debug'
+      end
+
       def run_examples
+        require_ruby_debug if debug
         return true unless examples_should_be_run?
         success = true
         begin
@@ -142,6 +152,7 @@ module Spec
         if @colour && RUBY_PLATFORM =~ /mswin|mingw/ ;\
           begin ;\
             replace_output = @output_stream.equal?($stdout) ;\
+            require 'rubygems' unless ENV['NO_RUBYGEMS'] ;\
             require 'Win32/Console/ANSI' ;\
             @output_stream = $stdout if replace_output ;\
           rescue LoadError ;\

data/lib/spec/runner/spec_parser.rb

@@ -33,25 +33,21 @@ module Spec
     protected
 
       def consider_example_group_for_best_match(example_group, file, line_number)
-        parsed_backtrace = parse_backtrace(example_group.backtrace)
-        parsed_backtrace.each do |example_file, example_line|
-          if is_best_match?(file, line_number, example_file, example_line)
-            best_match.clear
-            best_match[:example_group] = example_group
-            best_match[:line] = example_line
-          end
+        example_group_file, example_group_line = parse_location(example_group.location)
+        if is_best_match?(file, line_number, example_group_file, example_group_line)
+          best_match.clear
+          best_match[:example_group] = example_group
+          best_match[:line] = example_group_line
         end
       end
 
       def consider_example_for_best_match(example, example_group, file, line_number)
-        parsed_backtrace = parse_backtrace(example.backtrace)
-        parsed_backtrace.each do |example_file, example_line|
-          if is_best_match?(file, line_number, example_file, example_line)
-            best_match.clear
-            best_match[:example_group] = example_group
-            best_match[:example] = example
-            best_match[:line] = example_line
-          end
+        example_file, example_line = parse_location(example.location)
+        if is_best_match?(file, line_number, example_file, example_line)
+          best_match.clear
+          best_match[:example_group] = example_group
+          best_match[:example] = example
+          best_match[:line] = example_line
         end
       end
 
@@ -60,13 +56,10 @@ module Spec
         example_line <= line_number &&
         example_line > best_match[:line].to_i
       end
-
-      def parse_backtrace(backtrace)
-        Array(backtrace).collect do |trace_line|
-          trace_line =~ /(.*)\:(\d*)(\:|$)/
-          file, number = $1, $2
-          [file, Integer(number)]
-        end
+      
+      def parse_location(location)
+        location =~ /(.*)\:(\d*)(\:|$)/
+        return $1, Integer($2)
       end
     end
   end

data/lib/spec/version.rb

@@ -1,13 +1,11 @@
-module Spec
-  module VERSION
+module Spec # :nodoc:
+  module VERSION # :nodoc:
     unless defined? MAJOR
       MAJOR  = 1
       MINOR  = 2
-      TINY   = 0
-      MINESCULE = nil
+      TINY   = 1
       
-
-      STRING = [MAJOR, MINOR, TINY, MINESCULE].compact.join('.')
+      STRING = [MAJOR, MINOR, TINY].compact.join('.')
 
       SUMMARY = "rspec #{STRING}"
     end

data/spec/autotest/autotest_helper.rb

@@ -1,4 +1,9 @@
-require 'autotest'
+begin
+  require 'autotest'
+rescue LoadError
+  require 'rubygems' unless ENV['NO_RUBYGEMS']
+  require 'autotest'
+end
 dir = File.dirname(__FILE__)
 require File.expand_path("#{dir}/../spec_helper")
 require File.expand_path("#{dir}/../../lib/autotest/rspec")

data/spec/spec/dsl/main_spec.rb

@@ -12,7 +12,7 @@ module Spec
           it "should delegate to Spec::Example::ExampleGroupFactory.create_example_group" do
             block = lambda {|a,b|}
             Spec::Example::ExampleGroupFactory.should_receive(:create_example_group).with(
-              "The ExampleGroup", hash_including(:spec_path), &block
+              "The ExampleGroup", hash_including(:location), &block
             )
             @main.__send__ method, "The ExampleGroup", &block
           end
@@ -24,7 +24,7 @@ module Spec
           it "should create a shared ExampleGroup" do
             block = lambda {|a,b|}
             Spec::Example::ExampleGroupFactory.should_receive(:create_shared_example_group).with(
-              "shared group", hash_including(:spec_path), &block
+              "shared group", hash_including(:location), &block
             )
             @main.__send__ method, "shared group", &block
           end
@@ -65,7 +65,7 @@ module Spec
         it "registers a shared ExampleGroup" do
           block = lambda {|a,b|}
           Spec::Example::ExampleGroupFactory.should_receive(:create_shared_example_group).with(
-            group_name, hash_including(:spec_path), &block
+            group_name, hash_including(:location), &block
           )
           @main.share_as group_name, &block
         end

data/spec/spec/example/example_group_factory_spec.rb

@@ -92,52 +92,46 @@ module Spec
           end
         end
 
-        it "should create a type indicated by :spec_path" do
+        it "should create a type indicated by :location" do
           Spec::Example::ExampleGroupFactory.register(:something_other_than_default, parent_example_group)
           custom_example_group = Spec::Example::ExampleGroupFactory.create_example_group(
-            "example_group", :spec_path => "./spec/something_other_than_default/some_spec.rb"
+            "example_group", :location => "./spec/something_other_than_default/some_spec.rb"
           ) {}
           custom_example_group.superclass.should == parent_example_group
         end
 
-        it "should create a type indicated by :spec_path (with spec_path generated by caller on windows)" do
+        it "should create a type indicated by :location (with location generated by caller on windows)" do
           Spec::Example::ExampleGroupFactory.register(:something_other_than_default, parent_example_group)
           custom_example_group = Spec::Example::ExampleGroupFactory.create_example_group(
             "example_group",
-            :spec_path => "./spec\\something_other_than_default\\some_spec.rb"
+            :location => "./spec\\something_other_than_default\\some_spec.rb"
           ) {}
           custom_example_group.superclass.should == parent_example_group
         end
 
-        it "should create a type indicated by spec_path for a path-like key" do
+        it "should create a type indicated by location for a path-like key" do
           Spec::Example::ExampleGroupFactory.register('path/to/custom/', parent_example_group)
           custom_example_group = Spec::Example::ExampleGroupFactory.create_example_group(
-            "example_group", :spec_path => "./spec/path/to/custom/some_spec.rb"
+            "example_group", :location => "./spec/path/to/custom/some_spec.rb"
           ) {}
           custom_example_group.superclass.should == parent_example_group
         end
 
-        it "should use the longest key that matches when creating a type indicated by spec_path" do
+        it "should use the longest key that matches when creating a type indicated by location" do
           longer = Class.new parent_example_group
           Spec::Example::ExampleGroupFactory.register(:longer, longer)
           long = Class.new parent_example_group
           Spec::Example::ExampleGroupFactory.register(:long, long)
           custom_example_group = Spec::Example::ExampleGroupFactory.create_example_group(
-            "example_group", :spec_path => "./spec/longer/some_spec.rb"
+            "example_group", :location => "./spec/longer/some_spec.rb"
           ) {}
           custom_example_group.superclass.should == longer
         end
 
-        it "sets the spec_path from the caller" do
-          options = {}
-          shared_example_group = Spec::Example::ExampleGroupFactory.create_example_group("foo", options) {}
-          options[:spec_path].should =~ /#{__FILE__}:#{__LINE__ - 1}/
-        end
-
         describe "with :shared => true" do
           def shared_example_group
             @shared_example_group ||= Spec::Example::ExampleGroupFactory.create_example_group(
-              "name", :spec_path => '/blah/spec/models/blah.rb', :type => :controller, :shared => true
+              "name", :location => '/blah/spec/models/blah.rb', :type => :controller, :shared => true
             ) {}
           end
 
@@ -147,10 +141,10 @@ module Spec
           end
         end
 
-        it "should favor the :type over the :spec_path" do
+        it "should favor the :type over the :location" do
           Spec::Example::ExampleGroupFactory.register(:something_other_than_default, parent_example_group)
           custom_example_group = Spec::Example::ExampleGroupFactory.create_example_group(
-            "name", :spec_path => '/blah/spec/models/blah.rb', :type => :something_other_than_default
+            "name", :location => '/blah/spec/models/blah.rb', :type => :something_other_than_default
           ) {}
           custom_example_group.superclass.should == parent_example_group
         end
@@ -179,12 +173,6 @@ module Spec
           shared_example_group.should be_an_instance_of(Spec::Example::SharedExampleGroup)
           SharedExampleGroup.should include(shared_example_group)
         end
-
-        it "sets the spec_path from the caller" do
-          options = {}
-          shared_example_group = Spec::Example::ExampleGroupFactory.create_shared_example_group("foo", options) {}
-          options[:spec_path].should =~ /#{__FILE__}:#{__LINE__ - 1}/
-        end
       end
 
     end

data/spec/spec/example/example_group_methods_spec.rb

@@ -44,7 +44,7 @@ module Spec
               end
               
               it "records the spec path" do
-                @child_example_group.spec_path.should =~ /#{__FILE__}:#{__LINE__ - 15}/
+                @child_example_group.location.should =~ /#{__FILE__}:#{__LINE__ - 15}/
               end
             end
 
@@ -74,24 +74,49 @@ module Spec
               }.should change { @example_group.examples.length }.by(1)
             end
             
-            describe "creates an ExampleDescription" do
-              before(:all) do
-                @example_group = Class.new(ExampleGroupDouble).describe("bar")
-                @example_description = @example_group.__send__(method, "foo", {:this => :that}, "the backtrace") {}
-              end
-              
-              specify "with a description" do
-                @example_description.description.should == "foo"
-              end
+            describe "with no location supplied" do
+              describe "creates an ExampleProxy" do
+                before(:all) do
+                  @example_group = Class.new(ExampleGroupDouble).describe("bar")
+                  @example_proxy = @example_group.__send__(method, "foo", {:this => :that}) {}
+                end
+
+                specify "with a description" do
+                  @example_proxy.description.should == "foo"
+                end
 
-              specify "with options" do
-                @example_description.options.should == {:this => :that}
+                specify "with options" do
+                  @example_proxy.options.should == {:this => :that}
+                end
+
+                specify "with a default backtrace" do
+                  @example_proxy.backtrace.should =~ /#{__FILE__}:#{__LINE__ - 12}/
+                end
+
+                specify "with a default location" do
+                  @example_proxy.location.should =~ /#{__FILE__}:#{__LINE__ - 16}/
+                end
               end
-              
-              specify "with a backtrace" do
-                @example_description.backtrace.should == "the backtrace"
+            end
+            
+            describe "with a location supplied" do
+              describe "creates an ExampleProxy" do
+                before(:all) do
+                  @example_group = Class.new(ExampleGroupDouble).describe("bar")
+                  @example_proxy = @example_group.__send__(method, "foo", {:this => :that}, "the location") {}
+                end
+
+                specify "with the supplied location as #backtrace" do
+                  @example_proxy.backtrace.should == "the location"
+                end
+
+                specify "with the supplied location as #location" do
+                  @example_proxy.location.should == "the location"
+                end
               end
             end
+          
+            
           end
         end
         
@@ -334,15 +359,15 @@ module Spec
 
           describe "#set_description(Hash representing options)" do
             before(:each) do
-              example_group.set_description(:a => "b", :spec_path => "blah")
+              example_group.set_description(:a => "b", :location => "blah")
             end
 
-            it ".spec_path should expand the passed in :spec_path option passed into the constructor" do
-              example_group.spec_path.should == File.expand_path("blah")
+            it ".location should expand the passed in :location option passed into the constructor" do
+              example_group.location.should == File.expand_path("blah")
             end
 
             it ".options should return all the options passed in" do
-              example_group.options.should == {:a => "b", :spec_path => "blah"}
+              example_group.options.should == {:a => "b", :location => "blah"}
             end
 
           end
@@ -665,4 +690,4 @@ module Spec
       end
     end
   end
-end
+end

data/spec/spec/example/example_group_proxy_spec.rb

@@ -0,0 +1,63 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+module Spec
+  module Example
+    describe ExampleGroupProxy do
+      before(:each) do
+        @group = stub("example group").as_null_object
+      end
+      
+      attr_reader :group
+      def proxy
+        @proxy ||= ExampleGroupProxy.new(@group)
+      end
+      
+      describe "#description" do
+        it "provides the example group's description" do
+          group.stub!(:description => "the description")
+          proxy.description.should == "the description"
+        end
+      end
+
+      describe "#nested_descriptions" do
+        it "provides the example group's nested_descriptions" do
+          group.stub!(:nested_descriptions => ["the description"])
+          proxy.nested_descriptions.should == ["the description"]
+        end
+      end
+
+      describe "#filtered_description" do
+        it "builds the description from the group's nested_descriptions" do
+          group.stub!(:nested_descriptions => ["ignore","the","description"])
+          proxy.filtered_description(/ignore/).should == "the description"
+        end
+        it "filters out description parts that match the supplied regexp" do
+          group.stub!(:nested_descriptions => ["ignore this one","the","description"])
+          proxy.filtered_description(/ignore/).should == "the description"
+        end
+      end
+      
+      describe "#examples" do
+        it "provides a collection of example group proxies" do
+          group.stub!(:example_proxies => ["array","of","proxies"])
+          proxy.examples.should == ["array","of","proxies"]
+        end
+      end
+      
+      describe "#backtrace (deprecated - use #location)" do
+        it "provides the location of the declaration of this group" do
+          group.stub!(:backtrace => "path/to/location:37")
+          proxy.backtrace.should == "path/to/location:37"
+        end
+      end
+      
+      describe "#location" do
+        it "provides the location of the declaration of this group" do
+          group.stub!(:location => "path/to/location:37")
+          proxy.location.should  == "path/to/location:37"
+        end
+      end
+      
+    end
+  end
+end

data/spec/spec/example/example_group_spec.rb

@@ -108,6 +108,21 @@ module Spec
           reporter.should_not_receive(:add_example_group)
           example_group.run(options)
         end
+
+        it "should report the start of an example run" do
+          reporter.should_receive(:example_started) do |example|
+            example.should equal(example_group.examples[0])
+          end
+          example_group.run(options)
+        end
+
+        it "should report the end of an example run" do
+          reporter.should_receive(:example_finished) do |example, execution_error|
+            example.should equal(example_group.examples[0])
+            execution_error.should be_nil
+          end
+          example_group.run(options)
+        end
       
         describe "when before_each fails" do
           before(:each) do