rspec-core 2.6.2.rc → 2.6.3.beta1

data/Gemfile

@@ -10,9 +10,8 @@ source "http://rubygems.org"
   end
 end
 
-
 ### dev dependencies
-gem "rake", "0.8.7"
+gem "rake", "~> 0.8"
 gem "cucumber", "~> 0.10.2"
 gem "aruba", "~> 0.3.6"
 gem "rcov", "0.9.9", :platforms => :mri

data/features/Changelog.md

@@ -1,4 +1,13 @@
-### 2.6.2 / 2011-05-20
+### dev
+
+[full changelog](http://github.com/rspec/rspec-core/compare/v2.6.2...master)
+
+* Bug fixes
+  * Explicitly convert exit code to integer, avoiding TypeError when return
+    value of run is IO object proxied by DRb::DRbObject (Julian Scheid)
+
+
+### 2.6.2 / 2011-05-21
 
 [full changelog](http://github.com/rspec/rspec-core/compare/v2.6.1...v2.6.2)
 

data/gem-info.txt

@@ -0,0 +1,12 @@
+build | read  | status
+1.3.7 | 1.3.7 | ok
+1.3.7 | 1.6.2 | ok
+1.3.7 | 1.7.2 | ok
+1.3.7 | 1.8.3 | ok
+
+1.8.3 | 1.8.3 | ok
+1.8.3 | 1.7.2 | ok
+1.8.3 | 1.6.2 | ok
+1.8.3 | 1.3.7 | ok
+
+1.7.2

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)}") + " " + grey("# #{example.full_description}"))
+          end
         end
 
         def dump_profile

data/lib/rspec/core/option_parser.rb

@@ -40,8 +40,7 @@ module RSpec::Core
           options[:debug] = true
         end
 
-        parser.on('-e', '--example PATTERN', "Run examples whose full descriptions match this pattern",
-                "(PATTERN is compiled into a Ruby regular expression)") do |o|
+        parser.on('-e', '--example STRING', "Run examples whose full nested names include STRING") do |o|
           options[:full_description] = Regexp.compile(Regexp.escape(o))
         end
 

data/lib/rspec/core/runner.rb

@@ -8,7 +8,7 @@ module RSpec
       def self.autorun
         return if autorun_disabled? || installed_at_exit? || running_in_drb?
         @installed_at_exit = true
-        at_exit { exit(run(ARGV, $stderr, $stdout)) }
+        at_exit { exit(run(ARGV, $stderr, $stdout).to_i) }
       end
       AT_EXIT_HOOK_BACKTRACE_LINE = "#{__FILE__}:#{__LINE__ - 2}:in `autorun'"
 

data/lib/rspec/core/version.rb

@@ -1,7 +1,7 @@
 module RSpec # :nodoc:
   module Core # :nodoc:
     module Version # :nodoc:
-      STRING = '2.6.2.rc'
+      STRING = '2.6.3.beta1'
     end
   end
 end

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

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-core
 version: !ruby/object:Gem::Version 
-  hash: 7712002
+  hash: 62196377
   prerelease: 6
   segments: 
   - 2
   - 6
-  - 2
-  - rc
-  version: 2.6.2.rc
+  - 3
+  - beta
+  - 1
+  version: 2.6.3.beta1
 platform: ruby
 authors: 
 - Chad Humphries
@@ -17,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-20 00:00:00 -04:00
+date: 2011-05-22 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -93,6 +94,7 @@ files:
 - features/subject/implicit_receiver.feature
 - features/subject/implicit_subject.feature
 - features/support/env.rb
+- gem-info.txt
 - lib/autotest/discover.rb
 - lib/autotest/rspec2.rb
 - lib/rspec/autorun.rb
@@ -244,7 +246,7 @@ rubyforge_project: rspec
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: rspec-core-2.6.2.rc
+summary: rspec-core-2.6.3.beta1
 test_files: 
 - features/Autotest.md
 - features/Changelog.md