rspec-core 2.6.3 → 2.6.4

data/.travis.yml

@@ -1,7 +1,9 @@
-script: "rake"
+script: "bundle exec rake"
 rvm:
   - 1.8.6
   - 1.8.7
   - 1.9.1
   - 1.9.2
   - ree
+  - rbx
+  - jruby

data/{features/Changelog.md → Changelog.md}

@@ -1,3 +1,13 @@
+### 2.6.4 / 2011-06-06
+
+[full changelog](http://github.com/rspec/rspec-core/compare/v2.6.3...v2.6.4)
+
+* Bug fixes
+  * Support exclusion filters in DRb. (Yann Lugrin)
+  * Fix --example escaping when run over DRb. (Elliot Winkler)
+  * Use standard ANSI codes for color formatting so colors work in a wider set
+    of color schemes.
+
 ### 2.6.3 / 2011-05-24
 
 [full changelog](http://github.com/rspec/rspec-core/compare/v2.6.2...v2.6.3)

data/Rakefile

@@ -79,7 +79,9 @@ end
 desc "Push docs/cukes to relishapp using the relish-client-gem"
 task :relish, :version do |t, args|
   raise "rake relish[VERSION]" unless args[:version]
+  sh "cp Changelog.md features/"
   sh "relish push rspec/rspec-core:#{args[:version]}"
+  sh "rm features/Changelog.md"
 end
 
 Rake::RDocTask.new do |rdoc|

data/lib/rspec/core.rb

@@ -1,3 +1,4 @@
+require 'rspec/core/dsl'
 require 'rspec/core/extensions'
 require 'rspec/core/load_path'
 require 'rspec/core/deprecation'
@@ -39,14 +40,17 @@ module RSpec
     end
   end
 
+  # Used internally to determine what to do when a SIGINT is received
   def self.wants_to_quit
     world.wants_to_quit
   end
 
+  # Used internally to determine what to do when a SIGINT is received
   def self.wants_to_quit=(maybe)
     world.wants_to_quit=(maybe)
   end
 
+  # Internal container for global non-configuration data
   def self.world
     @world ||= RSpec::Core::World.new
   end
@@ -58,6 +62,7 @@ module RSpec
     configuration.reset
   end
 
+  # Returns the global configuration object
   def self.configuration
     @configuration ||= RSpec::Core::Configuration.new
   end
@@ -74,6 +79,7 @@ module RSpec
     yield configuration if block_given?
   end
 
+  # Used internally to clear remaining groups when fail_fast is set
   def self.clear_remaining_example_groups
     world.example_groups.clear
   end

data/lib/rspec/core/configuration_options.rb

@@ -12,15 +12,15 @@ module RSpec
         keys = options.keys
         keys.unshift(:requires) if keys.delete(:requires)
         keys.unshift(:libs)     if keys.delete(:libs)
-        
+
         formatters = options[:formatters] if keys.delete(:formatters)
-        
+
         config.exclusion_filter.merge! options[:exclusion_filter] if keys.delete(:exclusion_filter)
-        
+
         keys.each do |key|
           config.send("#{key}=", options[key]) if config.respond_to?("#{key}=")
         end
-        
+
         formatters.each {|pair| config.add_formatter(*pair) } if formatters
       end
 
@@ -33,12 +33,23 @@ module RSpec
         argv << "--fail-fast"    if options[:fail_fast]
         argv << "--line_number"  << options[:line_number]             if options[:line_number]
         argv << "--options"      << options[:custom_options_file]     if options[:custom_options_file]
-        argv << "--example"      << options[:full_description].source if options[:full_description]
+        if options[:full_description]
+          # The argument to --example is regexp-escaped before being stuffed
+          # into a regexp when received for the first time (see OptionParser).
+          # Hence, merely grabbing the source of this regexp will retain the
+          # backslashes, so we must remove them.
+          argv << "--example" << options[:full_description].source.delete('\\')
+        end
         if options[:filter]
           options[:filter].each_pair do |k, v|
             argv << "--tag" << k.to_s
           end
         end
+        if options[:exclusion_filter]
+          options[:exclusion_filter].each_pair do |k, v|
+            argv << "--tag" << "~#{k.to_s}"
+          end
+        end
         if options[:formatters]
           options[:formatters].each do |pair|
             argv << "--format" << pair[0]

data/lib/rspec/core/{extensions/object.rb → dsl.rb}

@@ -1,6 +1,6 @@
 module RSpec
   module Core
-    module ObjectExtensions
+    module DSL
       def describe(*args, &example_group_block)
         RSpec::Core::ExampleGroup.describe(*args, &example_group_block).register
       end
@@ -8,6 +8,4 @@ module RSpec
   end
 end
 
-class Object
-  include RSpec::Core::ObjectExtensions
-end
+include RSpec::Core::DSL

data/lib/rspec/core/expecting/with_rspec.rb

@@ -3,9 +3,7 @@ require 'rspec/expectations'
 module RSpec
   module Core
     module ExpectationFrameworkAdapter
-
       include RSpec::Matchers
-
     end
   end
 end

data/lib/rspec/core/extensions.rb

@@ -1,4 +1,3 @@
-require 'rspec/core/extensions/object'
 require 'rspec/core/extensions/kernel'
 require 'rspec/core/extensions/instance_eval_with_args'
 require 'rspec/core/extensions/module_eval_with_args'

data/lib/rspec/core/formatters/base_formatter.rb

@@ -12,6 +12,13 @@ module RSpec
         attr_reader :example_count, :pending_count, :failure_count
         attr_reader :failed_examples, :pending_examples
 
+        def self.relative_path(line)
+          line = line.sub(File.expand_path("."), ".")
+          line = line.sub(/\A([^:]+:\d+)$/, '\\1')
+          return nil if line == '-e:1'
+          line
+        end
+
         def initialize(output)
           @output = output || StringIO.new
           @example_count = @pending_count = @failure_count = 0
@@ -113,10 +120,7 @@ module RSpec
 
         def backtrace_line(line)
           return nil if configuration.cleaned_from_backtrace?(line)
-          line = line.sub(File.expand_path("."), ".")
-          line = line.sub(/\A([^:]+:\d+)$/, '\\1')
-          return nil if line == '-e:1'
-          line
+          self.class.relative_path(line)
         end
 
         def read_failed_line(exception, example)

data/lib/rspec/core/formatters/base_text_formatter.rb

@@ -39,6 +39,18 @@ module RSpec
           dump_profile if profile_examples? && failure_count == 0
           output.puts "\nFinished in #{format_seconds(duration)} seconds\n"
           output.puts colorise_summary(summary_line(example_count, failure_count, pending_count))
+          dump_commands_to_rerun_failed_examples
+        end
+
+        def dump_commands_to_rerun_failed_examples
+          return if failed_examples.empty?
+          output.puts
+          output.puts("Failed examples:")
+          output.puts
+
+          failed_examples.each do |example|
+            output.puts(red("rspec #{BaseFormatter::relative_path(example.location)}") + " " + cyan("# #{example.full_description}"))
+          end
         end
 
         def dump_profile
@@ -46,7 +58,7 @@ module RSpec
           output.puts "\nTop #{sorted_examples.size} slowest examples:\n"
           sorted_examples.each do |example|
             output.puts "  #{example.full_description}"
-            output.puts grey("    #{red(format_seconds(example.execution_result[:run_time]))} #{red("seconds")} #{format_caller(example.location)}")
+            output.puts cyan("    #{red(format_seconds(example.execution_result[:run_time]))} #{red("seconds")} #{format_caller(example.location)}")
           end
         end
 
@@ -63,8 +75,8 @@ module RSpec
             output.puts "Pending:"
             pending_examples.each do |pending_example|
               output.puts yellow("  #{pending_example.full_description}")
-              output.puts grey("    # #{pending_example.execution_result[:pending_message]}")
-              output.puts grey("    # #{format_caller(pending_example.location)}")
+              output.puts cyan("    # #{pending_example.execution_result[:pending_message]}")
+              output.puts cyan("    # #{format_caller(pending_example.location)}")
             end
           end
         end
@@ -83,20 +95,12 @@ module RSpec
           color(text, "\e[1m")
         end
 
-        def white(text)
-          color(text, "\e[37m")
-        end
-
-        def green(text)
-          color(text, "\e[32m")
-        end
-
         def red(text)
           color(text, "\e[31m")
         end
 
-        def magenta(text)
-          color(text, "\e[35m")
+        def green(text)
+          color(text, "\e[32m")
         end
 
         def yellow(text)
@@ -107,8 +111,16 @@ module RSpec
           color(text, "\e[34m")
         end
 
-        def grey(text)
-          color(text, "\e[90m")
+        def magenta(text)
+          color(text, "\e[35m")
+        end
+
+        def cyan(text)
+          color(text, "\e[36m")
+        end
+
+        def white(text)
+          color(text, "\e[37m")
         end
 
         def short_padding
@@ -131,7 +143,7 @@ module RSpec
 
         def dump_backtrace(example)
           format_backtrace(example.execution_result[:exception].backtrace, example).each do |backtrace_info|
-            output.puts grey("#{long_padding}# #{backtrace_info}")
+            output.puts cyan("#{long_padding}# #{backtrace_info}")
           end
         end
 

data/lib/rspec/core/hooks.rb

@@ -8,7 +8,7 @@ module RSpec
 
         def initialize(options, &block)
           @options = options
-          raise "no block given for #{self.class::TYPE} hook" unless block
+          raise "no block given for #{display_name}" unless block
           @block = block
         end
 
@@ -23,10 +23,13 @@ module RSpec
         def call
           @block.call
         end
+
+        def display_name
+          self.class.name.split('::').last.gsub('Hook','').downcase << " hook"
+        end
       end
 
       class BeforeHook < Hook
-        TYPE = 'before'
         def run_in(example_group_instance)
           if example_group_instance
             example_group_instance.instance_eval(&self)
@@ -37,7 +40,6 @@ module RSpec
       end
 
       class AfterHook < Hook
-        TYPE = 'after'
         def run_in(example_group_instance)
           if example_group_instance
             example_group_instance.instance_eval_with_rescue(&self)
@@ -48,7 +50,6 @@ module RSpec
       end
 
       class AroundHook < Hook
-        TYPE = 'around'
         def call(wrapped_example)
           @block.call(wrapped_example)
         end

data/lib/rspec/core/metadata_hash_builder.rb

@@ -87,7 +87,7 @@ a string such as "#method_name" to remove this warning.
 
 NOTICE
           end
-        end
       end
+    end
   end
 end

data/lib/rspec/core/version.rb

@@ -1,7 +1,7 @@
 module RSpec # :nodoc:
   module Core # :nodoc:
     module Version # :nodoc:
-      STRING = '2.6.3'
+      STRING = '2.6.4'
     end
   end
 end

data/spec/rspec/core/configuration_options_spec.rb

@@ -14,7 +14,7 @@ describe RSpec::Core::ConfigurationOptions do
     config_options_object(*args).options
   end
 
-  it "warns when HOME env var is not set" do
+  it "warns when HOME env var is not set", :unless => (RUBY_PLATFORM == 'java') do
     begin
       orig_home = ENV.delete("HOME")
       coo = RSpec::Core::ConfigurationOptions.new([])
@@ -41,7 +41,7 @@ describe RSpec::Core::ConfigurationOptions do
       config.should_receive(:add_formatter).ordered
       opts.configure(config)
     end
-    
+
     it "merges the :exclusion_filter option with the default exclusion_filter" do
       opts = config_options_object(*%w[--tag ~slow])
       config = RSpec::Core::Configuration.new
@@ -223,17 +223,38 @@ describe RSpec::Core::ConfigurationOptions do
       config_options_object(*%w[--options custom.opts]).drb_argv.should include("--options", "custom.opts")
     end
 
+    context "with --example" do
+      it "includes --example" do
+        config_options_object(*%w[--example foo]).drb_argv.should include("--example", "foo")
+      end
+      
+      it "unescapes characters which were escaped upon storing --example originally" do
+        config_options_object("--example", "foo\\ bar").drb_argv.should include("--example", "foo bar")
+      end
+    end
+
     context "with tags" do
-      it "includes the tags" do
+      it "includes the inclusion tags" do
         coo = config_options_object("--tag", "tag")
         coo.drb_argv.should eq(["--tag", "tag"])
       end
 
-      it "leaves tags intact" do
+      it "leaves inclusion tags intact" do
         coo = config_options_object("--tag", "tag")
         coo.drb_argv
         coo.options[:filter].should eq( {:tag=>true} )
       end
+
+      it "includes the exclusion tags" do
+        coo = config_options_object("--tag", "~tag")
+        coo.drb_argv.should eq(["--tag", "~tag"])
+      end
+
+      it "leaves exclusion tags intact" do
+        coo = config_options_object("--tag", "~tag")
+        coo.drb_argv
+        coo.options[:exclusion_filter].should eq( {:tag=>true} )
+      end
     end
 
     context "with formatters" do

data/spec/rspec/core/formatters/base_text_formatter_spec.rb

@@ -1,89 +1,112 @@
 require 'spec_helper'
 require 'rspec/core/formatters/base_text_formatter'
 
-module RSpec::Core::Formatters
+describe RSpec::Core::Formatters::BaseTextFormatter do
+  let(:output) { StringIO.new }
+  let(:formatter) { RSpec::Core::Formatters::BaseTextFormatter.new(output) }
 
-  describe BaseTextFormatter do
-    let(:output) { StringIO.new }
-    let(:formatter) { RSpec::Core::Formatters::BaseTextFormatter.new(output) }
+  describe "#summary_line" do
+    it "with 0s outputs pluralized (excluding pending)" do
+      formatter.summary_line(0,0,0).should eq("0 examples, 0 failures")
+    end
 
-    describe "#summary_line" do
-      context "with 0s" do
-        it "outputs pluralized (excluding pending)" do
-          formatter.summary_line(0,0,0).should eq("0 examples, 0 failures")
-        end
-      end
+    it "with 1s outputs singular (including pending)" do
+      formatter.summary_line(1,1,1).should eq("1 example, 1 failure, 1 pending")
+    end
 
-      context "with 1s" do
-        it "outputs singular (including pending)" do
-          formatter.summary_line(1,1,1).should eq("1 example, 1 failure, 1 pending")
-        end
-      end
+    it "with 2s outputs pluralized (including pending)" do
+      formatter.summary_line(2,2,2).should eq("2 examples, 2 failures, 2 pending")
+    end
+  end
 
-      context "with 2s" do
-        it "outputs pluralized (including pending)" do
-          formatter.summary_line(2,2,2).should eq("2 examples, 2 failures, 2 pending")
-        end
+  describe "#dump_commands_to_rerun_failed_examples" do
+    it "includes command to re-run each failed example" do
+      group = RSpec::Core::ExampleGroup.describe("example group") do
+        it("fails") { fail }
       end
+      line = __LINE__ - 2
+      group.run(formatter)
+      formatter.dump_commands_to_rerun_failed_examples
+      output.string.should include("rspec #{RSpec::Core::Formatters::BaseFormatter::relative_path("#{__FILE__}:#{line}")} # example group fails")
     end
+  end
 
-    describe "#dump_failures" do
-      let(:group) { RSpec::Core::ExampleGroup.describe("group name") }
+  describe "#dump_failures" do
+    let(:group) { RSpec::Core::ExampleGroup.describe("group name") }
 
-      before { RSpec.configuration.stub(:color_enabled?) { false } }
+    before { RSpec.configuration.stub(:color_enabled?) { false } }
 
-      def run_all_and_dump_failures
-        group.run(formatter)
-        formatter.dump_failures
-      end
+    def run_all_and_dump_failures
+      group.run(formatter)
+      formatter.dump_failures
+    end
 
-      it "preserves formatting" do
-        group.example("example name") { "this".should eq("that") }
+    it "preserves formatting" do
+      group.example("example name") { "this".should eq("that") }
 
-        run_all_and_dump_failures
+      run_all_and_dump_failures
+
+      output.string.should =~ /group name example name/m
+      output.string.should =~ /(\s+)expected \"that\"\n\1     got \"this\"/m
+    end
 
-        output.string.should =~ /group name example name/m
-        output.string.should =~ /(\s+)expected \"that\"\n\1     got \"this\"/m
+    context "with an exception without a message" do
+      it "does not throw NoMethodError" do
+        exception_without_message = Exception.new()
+        exception_without_message.stub(:message) { nil }
+        group.example("example name") { raise exception_without_message }
+        expect { run_all_and_dump_failures }.not_to raise_error(NoMethodError)
       end
+    end
 
-      context "with an exception without a message" do
-        it "does not throw NoMethodError" do
-          exception_without_message = Exception.new()
-          exception_without_message.stub(:message) { nil }
-          group.example("example name") { raise exception_without_message }
-          expect { run_all_and_dump_failures }.not_to raise_error(NoMethodError)
-        end
+    context "with an exception class other than RSpec" do
+      it "does not show the error class" do
+        group.example("example name") { raise NameError.new('foo') }
+        run_all_and_dump_failures
+        output.string.should =~ /NameError/m
       end
+    end
 
-      context "with an exception class other than RSpec" do
-        it "does not show the error class" do
-          group.example("example name") { raise NameError.new('foo') }
-          run_all_and_dump_failures
-          output.string.should =~ /NameError/m
-        end
+    context "with a failed expectation (rspec-expectations)" do
+      it "does not show the error class" do
+        group.example("example name") { "this".should eq("that") }
+        run_all_and_dump_failures
+        output.string.should_not =~ /RSpec/m
       end
+    end
 
-      context "with a failed expectation (rspec-expectations)" do
-        it "does not show the error class" do
-          group.example("example name") { "this".should eq("that") }
-          run_all_and_dump_failures
-          output.string.should_not =~ /RSpec/m
-        end
+    context "with a failed message expectation (rspec-mocks)" do
+      it "does not show the error class" do
+        group.example("example name") { "this".should_receive("that") }
+        run_all_and_dump_failures
+        output.string.should_not =~ /RSpec/m
       end
+    end
 
-      context "with a failed message expectation (rspec-mocks)" do
-        it "does not show the error class" do
-          group.example("example name") { "this".should_receive("that") }
-          run_all_and_dump_failures
-          output.string.should_not =~ /RSpec/m
+    context 'for #share_examples_for' do
+      it 'outputs the name and location' do
+
+        share_examples_for 'foo bar' do
+          it("example name") { "this".should eq("that") }
         end
+
+        line = __LINE__.next
+        group.it_should_behave_like('foo bar')
+
+        run_all_and_dump_failures
+
+        output.string.should include(
+          'Shared Example Group: "foo bar" called from ' +
+            "./spec/rspec/core/formatters/base_text_formatter_spec.rb:#{line}"
+        )
       end
 
-      context 'for #share_examples_for' do
+      context 'that contains nested example groups' do
         it 'outputs the name and location' do
-
           share_examples_for 'foo bar' do
-            it("example name") { "this".should eq("that") }
+            describe 'nested group' do
+              it("example name") { "this".should eq("that") }
+            end
           end
 
           line = __LINE__.next
@@ -96,98 +119,78 @@ module RSpec::Core::Formatters
               "./spec/rspec/core/formatters/base_text_formatter_spec.rb:#{line}"
           )
         end
+      end
+    end
 
-        context 'that contains nested example groups' do
-          it 'outputs the name and location' do
-            share_examples_for 'foo bar' do
-              describe 'nested group' do
-                it("example name") { "this".should eq("that") }
-              end
-            end
+    context 'for #share_as' do
+      it 'outputs the name and location' do
 
-            line = __LINE__.next
-            group.it_should_behave_like('foo bar')
+        share_as :FooBar do
+          it("example name") { "this".should eq("that") }
+        end
 
-            run_all_and_dump_failures
+        line = __LINE__.next
+        group.send(:include, FooBar)
 
-            output.string.should include(
-              'Shared Example Group: "foo bar" called from ' +
-                "./spec/rspec/core/formatters/base_text_formatter_spec.rb:#{line}"
-            )
-          end
-        end
+        run_all_and_dump_failures
+
+        output.string.should include(
+          'Shared Example Group: "FooBar" called from ' +
+            "./spec/rspec/core/formatters/base_text_formatter_spec.rb:#{line}"
+        )
       end
 
-      context 'for #share_as' do
+      context 'that contains nested example groups' do
         it 'outputs the name and location' do
 
-          share_as :FooBar do
-            it("example name") { "this".should eq("that") }
+          share_as :NestedFoo do
+            describe 'nested group' do
+              describe 'hell' do
+                it("example name") { "this".should eq("that") }
+              end
+            end
           end
 
           line = __LINE__.next
-          group.send(:include, FooBar)
+          group.send(:include, NestedFoo)
 
           run_all_and_dump_failures
 
           output.string.should include(
-            'Shared Example Group: "FooBar" called from ' +
+            'Shared Example Group: "NestedFoo" called from ' +
               "./spec/rspec/core/formatters/base_text_formatter_spec.rb:#{line}"
           )
         end
-
-        context 'that contains nested example groups' do
-          it 'outputs the name and location' do
-
-            share_as :NestedFoo do
-              describe 'nested group' do
-                describe 'hell' do
-                  it("example name") { "this".should eq("that") }
-                end
-              end
-            end
-
-            line = __LINE__.next
-            group.send(:include, NestedFoo)
-
-            run_all_and_dump_failures
-
-            output.string.should include(
-              'Shared Example Group: "NestedFoo" called from ' +
-                "./spec/rspec/core/formatters/base_text_formatter_spec.rb:#{line}"
-            )
-          end
-        end
       end
     end
+  end
 
-    describe "#dump_profile" do
-      before do
-        formatter.stub(:examples) do
-          group = RSpec::Core::ExampleGroup.describe("group") do
-            example("example")
-          end
-          group.run(double('reporter').as_null_object)
-          group.examples
+  describe "#dump_profile" do
+    before do
+      formatter.stub(:examples) do
+        group = RSpec::Core::ExampleGroup.describe("group") do
+          example("example")
         end
+        group.run(double('reporter').as_null_object)
+        group.examples
       end
+    end
 
-      it "names the example" do
-        formatter.dump_profile
-        output.string.should =~ /group example/m
-      end
+    it "names the example" do
+      formatter.dump_profile
+      output.string.should =~ /group example/m
+    end
 
-      it "prints the time" do
-        formatter.dump_profile
-        output.string.should =~ /0(\.\d+)? seconds/
-      end
+    it "prints the time" do
+      formatter.dump_profile
+      output.string.should =~ /0(\.\d+)? seconds/
+    end
 
-      it "prints the path" do
-        formatter.dump_profile
-        filename = __FILE__.split(File::SEPARATOR).last
+    it "prints the path" do
+      formatter.dump_profile
+      filename = __FILE__.split(File::SEPARATOR).last
 
-        output.string.should =~ /#{filename}\:#{__LINE__ - 21}/
-      end
+      output.string.should =~ /#{filename}\:#{__LINE__ - 21}/
     end
   end
 end

data/spec/rspec/core/formatters/html_formatted-1.8.7-jruby.html

@@ -312,18 +312,14 @@ a {
       <span class="failed_spec_name">fails</span>
       <div class="failure" id="failure_1">
         <div class="message"><pre>RSpec::Core::PendingExampleFixedError</pre></div>
-        <div class="backtrace"><pre>./spec/rspec/core/resources/formatter_specs.rb:18
-./spec/rspec/core/formatters/html_formatter_spec.rb:24
-./spec/rspec/core/formatters/html_formatter_spec.rb:46
-./spec/rspec/core/formatters/html_formatter_spec.rb:46:in `open'
-./spec/rspec/core/formatters/html_formatter_spec.rb:46
-./spec/rspec/core/formatters/html_formatter_spec.rb:45:in `chdir'
-./spec/rspec/core/formatters/html_formatter_spec.rb:45</pre></div>
-    <pre class="ruby"><code><span class="linenum">24</span>          <span class="keyword">rescue</span> <span class="constant">Exception</span>
-<span class="linenum">25</span>          <span class="keyword">end</span>
-<span class="offending"><span class="linenum">26</span>          <span class="keyword">raise</span> <span class="constant">RSpec</span><span class="punct">::</span><span class="constant">Core</span><span class="punct">::</span><span class="constant">PendingExampleFixedError</span><span class="punct">.</span><span class="ident">new</span> <span class="keyword">if</span> <span class="ident">result</span></span>
-<span class="linenum">27</span>        <span class="keyword">end</span>
-<span class="linenum">28</span>        <span class="keyword">raise</span> <span class="constant">PendingDeclaredInExample</span><span class="punct">.</span><span class="ident">new</span><span class="punct">(</span><span class="ident">message</span><span class="punct">)</span></code></pre>
+        <div class="backtrace"><pre>./spec/rspec/core/resources/formatter_specs.rb:18:in `(root)'
+org/jruby/RubyKernel.java:2021:in `instance_eval'
+org/jruby/RubyArray.java:2336:in `collect'</pre></div>
+    <pre class="ruby"><code><span class="linenum">29</span>            <span class="ident">teardown_mocks_for_rspec</span>
+<span class="linenum">30</span>          <span class="keyword">end</span>
+<span class="offending"><span class="linenum">31</span>          <span class="keyword">raise</span> <span class="constant">RSpec</span><span class="punct">::</span><span class="constant">Core</span><span class="punct">::</span><span class="constant">PendingExampleFixedError</span><span class="punct">.</span><span class="ident">new</span> <span class="keyword">if</span> <span class="ident">result</span></span>
+<span class="linenum">32</span>        <span class="keyword">end</span>
+<span class="linenum">33</span>        <span class="keyword">raise</span> <span class="constant">PendingDeclaredInExample</span><span class="punct">.</span><span class="ident">new</span><span class="punct">(</span><span class="ident">message</span><span class="punct">)</span></code></pre>
       </div>
     </dd>
   </dl>
@@ -350,13 +346,9 @@ expected 2
 
 (compared using ==)
 </pre></div>
-        <div class="backtrace"><pre>./spec/rspec/core/resources/formatter_specs.rb:33
-./spec/rspec/core/formatters/html_formatter_spec.rb:24
-./spec/rspec/core/formatters/html_formatter_spec.rb:46
-./spec/rspec/core/formatters/html_formatter_spec.rb:46:in `open'
-./spec/rspec/core/formatters/html_formatter_spec.rb:46
-./spec/rspec/core/formatters/html_formatter_spec.rb:45:in `chdir'
-./spec/rspec/core/formatters/html_formatter_spec.rb:45</pre></div>
+        <div class="backtrace"><pre>./spec/rspec/core/resources/formatter_specs.rb:33:in `(root)'
+org/jruby/RubyKernel.java:2021:in `instance_eval'
+org/jruby/RubyArray.java:2336:in `collect'</pre></div>
     <pre class="ruby"><code><span class="linenum">27</span>        <span class="keyword">end</span>
 <span class="linenum">28</span>
 <span class="offending"><span class="linenum">29</span>        <span class="keyword">raise</span><span class="punct">(</span><span class="constant">RSpec</span><span class="punct">::</span><span class="constant">Expectations</span><span class="punct">::</span><span class="constant">ExpectationNotMetError</span><span class="punct">.</span><span class="ident">new</span><span class="punct">(</span><span class="ident">message</span><span class="punct">))</span></span>
@@ -375,7 +367,11 @@ expected 2
       <span class="failed_spec_name">fails with a backtrace that has no file</span>
       <div class="failure" id="failure_3">
         <div class="message"><pre>foo</pre></div>
-        <div class="backtrace"><pre>(erb):1</pre></div>
+        <div class="backtrace"><pre>(erb):1:in `result'
+org/jruby/RubyKernel.java:1088:in `eval'
+./spec/rspec/core/resources/formatter_specs.rb:41:in `(root)'
+org/jruby/RubyKernel.java:2021:in `instance_eval'
+org/jruby/RubyArray.java:2336:in `collect'</pre></div>
     <pre class="ruby"><code><span class="linenum">-1</span><span class="comment"># Couldn't get snippet for (erb)</span></code></pre>
       </div>
     </dd>

data/spec/rspec/core/formatters/text_mate_formatted-1.8.7-jruby.html

@@ -312,18 +312,14 @@ a {
       <span class="failed_spec_name">fails</span>
       <div class="failure" id="failure_1">
         <div class="message"><pre>RSpec::Core::PendingExampleFixedError</pre></div>
-        <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/repos/rspec-core/spec/rspec/core/resources/formatter_specs.rb&line=18">./spec/rspec/core/resources/formatter_specs.rb:18</a> 
-<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/repos/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=24">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:24</a> 
-<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/repos/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=47">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:47</a> 
-<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/repos/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=47">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:47</a> :in `open'
-<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/repos/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=47">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:47</a> 
-<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/repos/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=46">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:46</a> :in `chdir'
-<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/repos/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=46">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:46</a> </pre></div>
-    <pre class="ruby"><code><span class="linenum">24</span>          <span class="keyword">rescue</span> <span class="constant">Exception</span>
-<span class="linenum">25</span>          <span class="keyword">end</span>
-<span class="offending"><span class="linenum">26</span>          <span class="keyword">raise</span> <span class="constant">RSpec</span><span class="punct">::</span><span class="constant">Core</span><span class="punct">::</span><span class="constant">PendingExampleFixedError</span><span class="punct">.</span><span class="ident">new</span> <span class="keyword">if</span> <span class="ident">result</span></span>
-<span class="linenum">27</span>        <span class="keyword">end</span>
-<span class="linenum">28</span>        <span class="keyword">raise</span> <span class="constant">PendingDeclaredInExample</span><span class="punct">.</span><span class="ident">new</span><span class="punct">(</span><span class="ident">message</span><span class="punct">)</span></code></pre>
+        <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/repos/rspec-core/spec/rspec/core/resources/formatter_specs.rb&line=18">./spec/rspec/core/resources/formatter_specs.rb:18</a> :in `(root)'
+org/jruby/RubyKernel.java:2021:in `instance_eval'
+org/jruby/RubyArray.java:2336:in `collect'</pre></div>
+    <pre class="ruby"><code><span class="linenum">29</span>            <span class="ident">teardown_mocks_for_rspec</span>
+<span class="linenum">30</span>          <span class="keyword">end</span>
+<span class="offending"><span class="linenum">31</span>          <span class="keyword">raise</span> <span class="constant">RSpec</span><span class="punct">::</span><span class="constant">Core</span><span class="punct">::</span><span class="constant">PendingExampleFixedError</span><span class="punct">.</span><span class="ident">new</span> <span class="keyword">if</span> <span class="ident">result</span></span>
+<span class="linenum">32</span>        <span class="keyword">end</span>
+<span class="linenum">33</span>        <span class="keyword">raise</span> <span class="constant">PendingDeclaredInExample</span><span class="punct">.</span><span class="ident">new</span><span class="punct">(</span><span class="ident">message</span><span class="punct">)</span></code></pre>
       </div>
     </dd>
   </dl>
@@ -350,13 +346,9 @@ expected 2
 
 (compared using ==)
 </pre></div>
-        <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/repos/rspec-core/spec/rspec/core/resources/formatter_specs.rb&line=33">./spec/rspec/core/resources/formatter_specs.rb:33</a> 
-<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/repos/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=24">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:24</a> 
-<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/repos/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=47">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:47</a> 
-<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/repos/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=47">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:47</a> :in `open'
-<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/repos/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=47">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:47</a> 
-<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/repos/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=46">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:46</a> :in `chdir'
-<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/repos/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=46">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:46</a> </pre></div>
+        <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/repos/rspec-core/spec/rspec/core/resources/formatter_specs.rb&line=33">./spec/rspec/core/resources/formatter_specs.rb:33</a> :in `(root)'
+org/jruby/RubyKernel.java:2021:in `instance_eval'
+org/jruby/RubyArray.java:2336:in `collect'</pre></div>
     <pre class="ruby"><code><span class="linenum">27</span>        <span class="keyword">end</span>
 <span class="linenum">28</span>
 <span class="offending"><span class="linenum">29</span>        <span class="keyword">raise</span><span class="punct">(</span><span class="constant">RSpec</span><span class="punct">::</span><span class="constant">Expectations</span><span class="punct">::</span><span class="constant">ExpectationNotMetError</span><span class="punct">.</span><span class="ident">new</span><span class="punct">(</span><span class="ident">message</span><span class="punct">))</span></span>
@@ -375,7 +367,11 @@ expected 2
       <span class="failed_spec_name">fails with a backtrace that has no file</span>
       <div class="failure" id="failure_3">
         <div class="message"><pre>foo</pre></div>
-        <div class="backtrace"><pre>(erb):1</pre></div>
+        <div class="backtrace"><pre>(erb):1:in `result'
+org/jruby/RubyKernel.java:1088:in `eval'
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/repos/rspec-core/spec/rspec/core/resources/formatter_specs.rb&line=41">./spec/rspec/core/resources/formatter_specs.rb:41</a> :in `(root)'
+org/jruby/RubyKernel.java:2021:in `instance_eval'
+org/jruby/RubyArray.java:2336:in `collect'</pre></div>
     <pre class="ruby"><code><span class="linenum">-1</span><span class="comment"># Couldn't get snippet for (erb)</span></code></pre>
       </div>
     </dd>

data/spec/spec_helper.rb

@@ -19,7 +19,6 @@ def sandboxed(&block)
     RSpec.instance_variable_set(:@configuration, new_config)
     RSpec.instance_variable_set(:@world, new_world)
     object = Object.new
-    object.extend(RSpec::Core::ObjectExtensions)
     object.extend(RSpec::Core::SharedExampleGroup)
 
     (class << RSpec::Core::ExampleGroup; self; end).class_eval do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-core
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 2
   - 6
-  - 3
-  version: 2.6.3
+  - 4
+  version: 2.6.4
 platform: ruby
 authors: 
 - Chad Humphries
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-24 00:00:00 -05:00
+date: 2011-06-06 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -34,6 +34,7 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
+- Changelog.md
 - Gemfile
 - Guardfile
 - License.txt
@@ -44,7 +45,6 @@ files:
 - cucumber.yml
 - features/.nav
 - features/Autotest.md
-- features/Changelog.md
 - features/README.md
 - features/Upgrade.md
 - features/command_line/README.md
@@ -103,6 +103,7 @@ files:
 - lib/rspec/core/configuration_options.rb
 - lib/rspec/core/deprecation.rb
 - lib/rspec/core/drb_command_line.rb
+- lib/rspec/core/dsl.rb
 - lib/rspec/core/errors.rb
 - lib/rspec/core/example.rb
 - lib/rspec/core/example_group.rb
@@ -112,7 +113,6 @@ files:
 - lib/rspec/core/extensions/instance_eval_with_args.rb
 - lib/rspec/core/extensions/kernel.rb
 - lib/rspec/core/extensions/module_eval_with_args.rb
-- lib/rspec/core/extensions/object.rb
 - lib/rspec/core/formatters/base_formatter.rb
 - lib/rspec/core/formatters/base_text_formatter.rb
 - lib/rspec/core/formatters/documentation_formatter.rb
@@ -241,10 +241,9 @@ rubyforge_project: rspec
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: rspec-core-2.6.3
+summary: rspec-core-2.6.4
 test_files: 
 - features/Autotest.md
-- features/Changelog.md
 - features/README.md
 - features/Upgrade.md
 - features/command_line/README.md