rspec-core 2.0.0.rc → 2.0.0

data/lib/rspec/core/example.rb

@@ -16,7 +16,7 @@ module RSpec
         @example_group_class, @options, @example_block = example_group_class, options, example_block
         @metadata  = @example_group_class.metadata.for_example(desc, options)
         @exception = nil
-        @pending_declared_in_example = @in_block = false
+        @pending_declared_in_example = false
       end
 
       def example_group
@@ -28,10 +28,6 @@ module RSpec
         example_group
       end
 
-      def in_block?
-        @in_block
-      end
-
       def pending?
         !!pending
       end
@@ -48,12 +44,10 @@ module RSpec
               with_around_hooks do
                 begin
                   run_before_each
-                  @in_block = true
                   @example_group_instance.instance_eval(&@example_block)
                 rescue Exception => e
                   set_exception(e)
                 ensure
-                  @in_block = false
                   run_after_each
                 end
               end

data/lib/rspec/core/example_group.rb

@@ -159,12 +159,14 @@ module RSpec
       end
 
       def self.store_before_all_ivars(example_group_instance)
+        return if example_group_instance.instance_variables.empty?
         example_group_instance.instance_variables.each { |ivar| 
           before_all_ivars[ivar] = example_group_instance.instance_variable_get(ivar)
         }
       end
 
       def self.assign_before_all_ivars(ivars, example_group_instance)
+        return if ivars.empty?
         ivars.each { |ivar, val| example_group_instance.instance_variable_set(ivar, val) }
       end
 
@@ -196,7 +198,20 @@ module RSpec
       def self.eval_after_alls(example_group_instance)
         return if descendant_filtered_examples.empty?
         assign_before_all_ivars(before_all_ivars, example_group_instance)
-        run_hook!(:after, :all, example_group_instance)
+
+        begin
+          run_hook!(:after, :all, example_group_instance)
+        rescue => e
+          # TODO: come up with a better solution for this.
+          RSpec.configuration.reporter.message <<-EOS
+
+An error occurred in an after(:all) hook.
+  #{e.class}: #{e.message}
+  occurred at #{e.backtrace.first}
+
+        EOS
+        end
+
         world.run_hook_filtered(:after, :all, self, example_group_instance) if top_level?
       end
 
@@ -209,7 +224,6 @@ module RSpec
           RSpec.clear_remaining_example_groups if top_level?
           return
         end
-        @reporter = reporter
         example_group_instance = new
         reporter.example_group_started(self)
 
@@ -289,6 +303,7 @@ module RSpec
         begin
           instance_eval(&hook)
         rescue Exception => e
+          raise unless example
           example.set_exception(e)
         end
       end

data/lib/rspec/core/hooks.rb

@@ -5,7 +5,7 @@ module RSpec
       class Hook
         attr_reader :options
 
-        def initialize(options, block)
+        def initialize(options, &block)
           @options = options
           @block = block
         end
@@ -85,16 +85,19 @@ module RSpec
         }
       end
 
-      def before(scope=:each, options={}, &block)
-        hooks[:before][scope] << BeforeHook.new(options, block)
+      def before(*args, &block)
+        scope, options = scope_and_options_from(*args)
+        hooks[:before][scope] << BeforeHook.new(options, &block)
       end
 
-      def after(scope=:each, options={}, &block)
-        hooks[:after][scope] << AfterHook.new(options, block)
+      def after(*args, &block)
+        scope, options = scope_and_options_from(*args)
+        hooks[:after][scope] << AfterHook.new(options, &block)
       end
 
-      def around(scope=:each, options={}, &block)
-        hooks[:around][scope] << AroundHook.new(options, block)
+      def around(*args, &block)
+        scope, options = scope_and_options_from(*args)
+        hooks[:around][scope] << AroundHook.new(options, &block)
       end
 
       # Runs all of the blocks stored with the hook in the context of the
@@ -116,6 +119,16 @@ module RSpec
       def find_hook(hook, scope, example_group_class)
         hooks[hook][scope].find_hooks_for(example_group_class)
       end
+
+    private
+
+      def scope_and_options_from(scope=:each, options={})
+        if Hash === scope
+          options = scope
+          scope = :each
+        end
+        return scope, options
+      end
     end
   end
 end

data/lib/rspec/core/option_parser.rb

@@ -52,7 +52,7 @@ module RSpec::Core
         end
 
         parser.on('-o', '--out FILE', 'output to a file instead of STDOUT') do |o|
-          options[:output_stream] = o
+          options[:output_stream] = File.open(o,'w')
         end
 
         parser.on_tail('-h', '--help', "You're looking at it.") do
@@ -95,6 +95,10 @@ module RSpec::Core
         parser.on('--drb-port [PORT]', 'Port to connect to on the DRb server') do |o|
           options[:drb_port] = o.to_i
         end
+
+        parser.on('--autotest') do |o|
+          options[:autotest] = true
+        end
       end
     end
   end

data/lib/rspec/core/rake_task.rb

@@ -73,6 +73,12 @@ module RSpec
       #   nil
       attr_accessor :ruby_opts
 
+      # Path to rspec
+      #
+      # default:
+      #   'rspec'
+      attr_accessor :rspec_path
+
       # Command line options to pass to rspec.
       #
       # default:
@@ -93,8 +99,9 @@ module RSpec
 
         yield self if block_given?
 
-        @rcov_path ||= 'rcov'
-        @pattern ||= './spec/**/*_spec.rb'
+        @rcov_path  ||= 'rcov'
+        @rspec_path ||= 'rspec'
+        @pattern    ||= './spec/**/*_spec.rb'
 
         desc("Run RSpec code examples") unless ::Rake.application.last_comment
 
@@ -117,7 +124,11 @@ module RSpec
     private
 
       def files_to_run # :nodoc:
-        FileList[ pattern ].map { |f| %["#{f}"] }
+        if ENV['SPEC']
+          FileList[ ENV['SPEC'] ]
+        else
+          FileList[ pattern ].map { |f| %["#{f}"] }
+        end
       end
 
       def spec_command
@@ -127,8 +138,15 @@ module RSpec
                             cmd_parts << "-S"
                             cmd_parts << "bundle exec" if bundler?
                             cmd_parts << runner
-                            cmd_parts << runner_options 
+                            if rcov
+                              cmd_parts << ["-Ispec", rcov_opts]
+                            else
+                              cmd_parts << rspec_opts
+                            end
                             cmd_parts << files_to_run
+                            if rcov && rspec_opts
+                              cmd_parts << ["--",  rspec_opts]
+                            end
                             cmd_parts.flatten.compact.reject(&blank).join(" ")
                           end
       end
@@ -136,11 +154,7 @@ module RSpec
     private
 
       def runner
-        rcov ? rcov_path : 'rspec'
-      end
-
-      def runner_options
-        rcov ? [rcov_opts] : [rspec_opts]
+        rcov ? rcov_path : rspec_path
       end
 
       def bundler?

data/lib/rspec/core/version.rb

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

data/spec/autotest/failed_results_re_spec.rb

@@ -5,17 +5,16 @@ describe "failed_results_re for autotest" do
   let(:formatter) { RSpec::Core::Formatters::BaseTextFormatter.new(output) }
   let(:example_output) do
     group = RSpec::Core::ExampleGroup.describe("group name")
-    example = group.example("example name") { "this".should eq("that") }
+    group.example("example name") { "this".should eq("that") }
     group.run(formatter)
     RSpec.configuration.stub(:color_enabled?) { false }
     formatter.dump_failures
     output.string
   end
-  
-  it "should match a failure" do
+
+  it "matches a failure" do
     re = Autotest::Rspec2.new.failed_results_re
-    re =~ example_output
-    $1.should == "group name example name\n     Failure/Error: example = group.example(\"example name\") { \"this\".should eq(\"that\") }"
-    $2.should == __FILE__.sub(File.expand_path('.'),'.')
+    example_output.should =~ re
+    example_output[re, 2].should == __FILE__.sub(File.expand_path('.'),'.')
   end
 end

data/spec/autotest/rspec_spec.rb

@@ -66,39 +66,32 @@ describe Autotest::Rspec2 do
   end
 
   describe "consolidating failures" do
-    before do
-      @spec_file = "spec/autotest/some_spec.rb"
-      rspec_autotest.instance_variable_set("@files", {@spec_file => Time.now})
-      rspec_autotest.stub!(:find_files_to_test).and_return true
-    end
+    let(:subject_file) { "lib/autotest/some.rb" }
+    let(:spec_file)    { "spec/autotest/some_spec.rb" }
 
     it "returns no failures if no failures were given in the output" do
       rspec_autotest.consolidate_failures([[]]).should == {}
     end
 
     it "returns a hash with the spec filename => spec name for each failure or error" do
-      rspec_autotest.stub!(:test_files_for).and_return "spec/autotest/some_spec.rb"
-      failures = [
-        [
-          "false should be false",
-          "#{@spec_file}"
-        ]
-      ]
+      failures = [ [ "false should be false", spec_file ] ]
       rspec_autotest.consolidate_failures(failures).should == {
-        @spec_file => ["false should be false"]
+        spec_file => ["false should be false"]
       }
     end
 
-    it "does not include the subject file" do
-      subject_file = "lib/autotest/some.rb"
-      rspec_autotest.stub!(:test_files_for).and_return "spec/autotest/some_spec.rb"
-      failures = [
-        [
-          "false should be false",
-          "expected: true,\n     got: false (using ==)\n#{subject_file}:143:\n#{@spec_file}:203:"
-        ]
-      ]
-      rspec_autotest.consolidate_failures(failures).keys.should_not include(subject_file)
+    context "when subject file appears before the spec file in the backtrace" do
+      let(:failures) do
+        [ [ "false should be false", "#{subject_file}:143:\n#{spec_file}:203:" ] ]
+      end
+
+      it "excludes the subject file" do
+        rspec_autotest.consolidate_failures(failures).keys.should_not include(subject_file)
+      end
+
+      it "includes the spec file" do
+        rspec_autotest.consolidate_failures(failures).keys.should include(spec_file)
+      end
     end
   end
 
@@ -116,16 +109,14 @@ describe Autotest::Rspec2 do
     context "using bundler" do
       it "returns 'bundle exec'" do
         File.stub(:exists?).with("./Gemfile") { true }
-        rspec_autotest.ruby.should eq("bundle exec")
+        rspec_autotest.make_test_cmd({'a' => 'b'}).should =~ /bundle exec .*ruby/
       end
     end
 
     context "not using bundler" do
       it "returns the ruby command generated by Autotest" do
-        autotest = Autotest.new
-        autotest_ruby_command = autotest.ruby
         File.stub(:exists?).with("./Gemfile") { false }
-        rspec_autotest.ruby.should eq(autotest_ruby_command)
+        rspec_autotest.make_test_cmd({'a' => 'b'}).should_not =~ /bundle exec/
       end
     end
   end

data/spec/rspec/core/command_line_spec.rb

@@ -39,20 +39,29 @@ module RSpec::Core
         RSpec::Core::Configuration.new
       end
 
+      let(:err) { ::StringIO.new }
       let(:out) { ::StringIO.new }
 
       before do
         config.stub(:run_hook)
       end
 
+      it "configures streams before command line options" do
+        # this is necessary to ensure that color works correctly on windows
+        config.should_receive(:error_stream=).ordered
+        config.should_receive(:output_stream=).ordered
+        config.should_receive(:color_enabled=).ordered
+        command_line.run(err, out) rescue nil
+      end
+
       it "runs before suite hooks" do
         config.should_receive(:run_hook).with(:before, :suite)
-        command_line.run(out, out)
+        command_line.run(err, out)
       end
 
       it "runs after suite hooks" do
         config.should_receive(:run_hook).with(:after, :suite)
-        command_line.run(out, out)
+        command_line.run(err, out)
       end
 
       it "runs after suite hooks even after an error" do
@@ -66,10 +75,11 @@ module RSpec::Core
           end
         end
         expect do
-          command_line.run(out, out)
+          command_line.run(err, out)
         end.to raise_error
         after_suite_called.should be_true
       end
+
     end
 
     describe "#run with custom output" do

data/spec/rspec/core/configuration_spec.rb

@@ -204,9 +204,41 @@ module RSpec::Core
 
     describe "#color_enabled=" do
       context "given true" do
+        context "with non-tty output and no autotest" do
+          it "does not set color_enabled" do
+            config.output_stream = StringIO.new
+            config.output_stream.stub(:tty?) { false }
+            config.autotest = false
+            config.color_enabled = true
+            config.color_enabled.should be_false
+          end
+        end
+
+        context "with tty output" do
+          it "does not set color_enabled" do
+            config.output_stream = StringIO.new
+            config.output_stream.stub(:tty?) { true }
+            config.autotest = false
+            config.color_enabled = true
+            config.color_enabled.should be_true
+          end
+        end
+
+        context "with autotest output" do
+          it "does not set color_enabled" do
+            config.output_stream = StringIO.new
+            config.output_stream.stub(:tty?) { false }
+            config.autotest = true
+            config.color_enabled = true
+            config.color_enabled.should be_true
+          end
+        end
+
         context "on windows" do
           before do
             @original_host  = RbConfig::CONFIG['host_os']
+            @original_stdout = $stdout
+            @original_stderr = $stderr
             RbConfig::CONFIG['host_os'] = 'mswin'
             config.stub(:require)
             config.stub(:warn)
@@ -214,6 +246,8 @@ module RSpec::Core
 
           after do
             RbConfig::CONFIG['host_os'] = @original_host
+            $stdout = @original_stdout
+            $stderr = @original_stderr
           end
 
           context "with win32console available" do
@@ -223,14 +257,48 @@ module RSpec::Core
               config.color_enabled = true
             end
 
-            it "leaves output stream intact" do
-              config.output_stream = $stdout
-              config.stub(:require) do |what|
-                config.output_stream = 'foo' if what =~ /Win32/
+            context "with $stdout/err assigned to config.output/error_stream" do
+              it "reassigns new $stdout to output_stream" do
+                config.output_stream = $stdout
+                substitute_stdout = StringIO.new
+                config.stub(:require) do |what|
+                  $stdout = substitute_stdout if what =~ /Win32/
+                end
+                config.color_enabled = true
+                config.output_stream.should eq(substitute_stdout)
+              end
+
+              it "reassigns new $stderr to error_stream" do
+                config.error_stream = $stderr
+                substitute_stderr = StringIO.new
+                config.stub(:require) do |what|
+                  $stderr = substitute_stderr if what =~ /Win32/
+                end
+                config.color_enabled = true
+                config.error_stream.should eq(substitute_stderr)
               end
-              config.color_enabled = true
-              config.output_stream.should eq($stdout)
             end
+
+            context "without $stdout/err assigned to config.output/error_stream" do
+              it "leaves output stream intact" do
+                config.output_stream = output_stream = StringIO.new
+                config.stub(:require) do |what|
+                  $stdout = StringIO.new if what =~ /Win32/
+                end
+                config.color_enabled = true
+                config.output_stream.should eq(output_stream)
+              end
+
+              it "leaves error stream intact" do
+                config.error_stream = error_stream = StringIO.new
+                config.stub(:require) do |what|
+                  $stderr = StringIO.new if what =~ /Win32/
+                end
+                config.color_enabled = true
+                config.error_stream.should eq(error_stream)
+              end
+            end
+
           end
 
           context "with win32console NOT available" do