rspec-core 2.1.0 → 2.2.0

data/lib/rspec/core/extensions/kernel.rb

@@ -1,5 +1,25 @@
 module Kernel
-  def debugger(*args)
-    RSpec.configuration.error_stream.puts "debugger statement ignored, use -d or --debug option to enable debugging\n#{caller(0)[1]}"
-  end unless respond_to?(:debugger)
+
+  private
+
+  def method_missing(m, *a)
+    if m.to_s == 'debugger'
+      begin
+        require 'ruby-debug'
+        debugger
+      rescue LoadError => e
+        warn <<-EOM
+#{'*'*50}
+The debugger statement on the following line was ignored:
+
+  #{caller(0).detect {|l| l !~ /method_missing/}}
+ 
+To use the debugger statement, you must install ruby-debug.
+#{'*'*50}
+EOM
+      end
+    else
+      super
+    end
+  end
 end

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

@@ -15,32 +15,9 @@ module RSpec
           output.puts
           output.puts "Failures:"
           failed_examples.each_with_index do |example, index|
-            output.puts if index > 0
-            exception = example.execution_result[:exception_encountered]
-            short_padding = '  '
-            padding = '     '
-            if exception.is_a?(RSpec::Core::PendingExampleFixedError)
-              output.puts "#{short_padding}#{index.next}) #{example.full_description} FIXED"
-              output.puts "#{padding}Expected pending '#{example.metadata[:execution_result][:pending_message]}' to fail. No Error was raised."
-            else
-              output.puts "#{short_padding}#{index.next}) #{example.full_description}"
-              output.puts "#{padding}#{red("Failure/Error:")} #{red(read_failed_line(exception, example).strip)}"
-              exception.message.split("\n").each do |line|
-                output.puts "#{padding}#{red(line)}"
-              end
-
-              example.example_group.ancestors.push(example.example_group).each do |group|
-                if group.metadata[:shared_group_name]
-                  output.puts "#{padding}Shared Example Group: \"#{group.metadata[:shared_group_name]}\" called from " +
-                              "#{backtrace_line(group.metadata[:example_group][:location])}"
-                  break
-                end
-              end
-            end
-
-            format_backtrace(exception.backtrace, example).each do |backtrace_info|
-              output.puts grey("#{padding}# #{backtrace_info}")
-            end
+            output.puts
+            dump_pending_example_fixed(example, index) || dump_failure(example, index)
+            dump_backtrace(example)
           end
         end
 
@@ -69,7 +46,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.metadata[:location])}")
+            output.puts grey("    #{red(format_seconds(example.execution_result[:run_time]))} #{red("seconds")} #{format_caller(example.location)}")
           end
         end
 
@@ -86,8 +63,8 @@ module RSpec
             output.puts "Pending:"
             pending_examples.each do |pending_example|
               output.puts yellow("  #{pending_example.full_description}")
-              output.puts grey("    # #{pending_example.metadata[:execution_result][:pending_message]}")
-              output.puts grey("    # #{format_caller(pending_example.metadata[:location])}")
+              output.puts grey("    # #{pending_example.execution_result[:pending_message]}")
+              output.puts grey("    # #{format_caller(pending_example.location)}")
             end
           end
         end
@@ -134,6 +111,14 @@ module RSpec
           color(text, "\e[90m")
         end
 
+        def short_padding
+          '  '
+        end
+
+        def long_padding
+          '     '
+        end
+
       private
 
         def pluralize(count, string)
@@ -144,8 +129,36 @@ module RSpec
           backtrace_line(caller_info.to_s.split(':in `block').first)
         end
 
-      end
+        def dump_backtrace(example)
+          format_backtrace(example.execution_result[:exception].backtrace, example).each do |backtrace_info|
+            output.puts grey("#{long_padding}# #{backtrace_info}")
+          end
+        end
+
+        def dump_pending_example_fixed(example, index)
+          if RSpec::Core::PendingExampleFixedError === example.execution_result[:exception]
+            output.puts "#{short_padding}#{index.next}) #{example.full_description} FIXED"
+            output.puts blue("#{long_padding}Expected pending '#{example.metadata[:execution_result][:pending_message]}' to fail. No Error was raised.")
+            true
+          end
+        end
+
+        def dump_failure(example, index)
+          exception = example.execution_result[:exception]
+          output.puts "#{short_padding}#{index.next}) #{example.full_description}"
+          output.puts "#{long_padding}#{red("Failure/Error:")} #{red(read_failed_line(exception, example).strip)}"
+          exception.message.split("\n").each { |line| output.puts "#{long_padding}#{red(line)}" }
 
+          example.example_group.ancestors.push(example.example_group).each do |group|
+            if group.metadata[:shared_group_name]
+              output.puts "#{long_padding}Shared Example Group: \"#{group.metadata[:shared_group_name]}\" called from " +
+                "#{backtrace_line(group.metadata[:example_group][:location])}"
+              break
+            end
+          end
+        end
+
+      end
     end
   end
 end

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

@@ -36,7 +36,7 @@ module RSpec
 
         def example_failed(example)
           super(example)
-          output.puts failure_output(example, example.execution_result[:exception_encountered])
+          output.puts failure_output(example, example.execution_result[:exception])
         end
 
         def failure_output(example, exception)

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

@@ -7,13 +7,6 @@ module RSpec
       class HtmlFormatter < BaseTextFormatter
         include ERB::Util # for the #h method
 
-        def method_missing(m, *a, &b)
-          # no-op
-        end
-
-        def message(message)
-        end
-
         def initialize(output)
           super(output)
           @example_group_number = 0
@@ -21,6 +14,15 @@ module RSpec
           @header_red = nil
         end
 
+        private
+        def method_missing(m, *a, &b)
+          # no-op
+        end
+
+        public
+        def message(message)
+        end
+
         # The number of the currently running example_group
         def example_group_number
           @example_group_number
@@ -71,7 +73,7 @@ module RSpec
 
         def example_failed(example)
           counter = 0
-          exception = example.metadata[:execution_result][:exception_encountered]
+          exception = example.metadata[:execution_result][:exception]
           extra = extra_failure_content(exception)
           failure_style = 'failed'
           failure_style = RSpec::Core::PendingExampleFixedError === exception ? 'pending_fixed' : 'failed'

data/lib/rspec/core/hooks.rb

@@ -57,7 +57,7 @@ module RSpec
 
       class BeforeHooks < HookCollection
         def run_all(example_group_instance)
-          each {|h| h.run_in(example_group_instance) }
+          each {|h| h.run_in(example_group_instance) } unless empty?
         end
 
         def run_all!(example_group_instance)
@@ -67,7 +67,7 @@ module RSpec
 
       class AfterHooks < HookCollection
         def run_all(example_group_instance)
-          reverse.each {|h| h.run_in(example_group_instance) }
+          reverse.each {|h| h.run_in(example_group_instance) } unless empty?
         end
 
         def run_all!(example_group_instance)

data/lib/rspec/core/metadata.rb

@@ -2,14 +2,46 @@ module RSpec
   module Core
     class Metadata < Hash
 
+      module LocationKeys
+        def [](key)
+          return super if has_key?(key)
+          case key
+          when :location
+            store(:location, location)
+          when :file_path, :line_number
+            file_path, line_number = file_and_line_number
+            store(:file_path, file_path)
+            store(:line_number, line_number)
+            self[key]
+          else
+            super
+          end
+        end
+
+        def location
+          "#{self[:file_path]}:#{self[:line_number]}"
+        end
+
+        def file_and_line_number
+          first_caller_from_outside_rspec =~ /(.+?):(\d+)(|:\d+)/
+          return [$1, $2.to_i]
+        end
+
+        def first_caller_from_outside_rspec
+          self[:caller].detect {|l| l !~ /\/lib\/rspec\/core/}
+        end
+      end
+
       def initialize(superclass_metadata=nil)
         @superclass_metadata = superclass_metadata
         if @superclass_metadata
           update(@superclass_metadata)
           example_group = {:example_group => @superclass_metadata[:example_group]}
+        else
+          example_group = {}
         end
 
-        store(:example_group, example_group || {})
+        store(:example_group, example_group.extend(LocationKeys))
         yield self if block_given?
       end
 
@@ -27,13 +59,11 @@ module RSpec
         user_metadata = args.last.is_a?(Hash) ? args.pop : {}
         ensure_valid_keys(user_metadata)
 
-        self[:example_group][:describes] = described_class_from(*args)
-        self[:example_group][:description] = description_from(*args)
-        self[:example_group][:full_description] = full_description_from(*args)
-
-        self[:example_group][:block] = user_metadata.delete(:example_group_block)
-        self[:example_group][:file_path], self[:example_group][:line_number] = file_and_line_number_from(user_metadata.delete(:caller) || caller)
-        self[:example_group][:location] = location_from(self[:example_group])
+        self[:example_group].store(:caller, user_metadata.delete(:caller) || caller)
+        self[:example_group].store(:describes, described_class_from(*args))
+        self[:example_group].store(:description, description_from(*args))
+        self[:example_group].store(:full_description, full_description_from(*args))
+        self[:example_group].store(:block, user_metadata.delete(:example_group_block))
 
         update(user_metadata)
       end
@@ -60,17 +90,16 @@ EOM
         end
       end
 
-      def for_example(description, options)
-        dup.configure_for_example(description,options)
+      def for_example(description, user_metadata)
+        dup.extend(LocationKeys).configure_for_example(description, user_metadata)
       end
 
-      def configure_for_example(description, options)
+      def configure_for_example(description, user_metadata)
         store(:description, description.to_s)
         store(:full_description, "#{self[:example_group][:full_description]} #{self[:description]}")
         store(:execution_result, {})
-        self[:file_path], self[:line_number] = file_and_line_number_from(options.delete(:caller) || caller)
-        self[:location] = location_from(self)
-        update(options)
+        store(:caller, user_metadata.delete(:caller) || caller)
+        update(user_metadata)
       end
 
       def apply?(predicate, filters)
@@ -88,8 +117,7 @@ EOM
         end
       end
 
-      def apply_condition(key, value, metadata=nil)
-        metadata ||= self
+      def apply_condition(key, value, metadata=self)
         case value
         when Hash
           value.all? { |k, v| apply_condition(k, v, metadata[key]) }
@@ -150,26 +178,10 @@ EOM
       end
 
       def described_class_from(*args)
-        if args.first.is_a?(String) || args.first.is_a?(Symbol)
-          superclass_metadata[:example_group][:describes]
-        else
-          args.first
+        superclass_metadata[:example_group][:describes] || begin
+          args.first unless args.first.is_a?(String) || args.first.is_a?(Symbol)
         end
       end
-
-      def file_and_line_number_from(list)
-        entry = first_caller_from_outside_rspec_from_caller(list)
-        entry =~ /(.+?):(\d+)(|:\d+)/
-        return [$1, $2.to_i]
-      end
-
-      def first_caller_from_outside_rspec_from_caller(list)
-        list.detect {|l| l !~ /\/lib\/rspec\/core/}
-      end
-
-      def location_from(metadata)
-        "#{metadata[:file_path]}:#{metadata[:line_number]}"
-      end
     end
   end
 end

data/lib/rspec/core/option_parser.rb

@@ -96,8 +96,8 @@ module RSpec::Core
           options[:drb_port] = o.to_i
         end
 
-        parser.on('--autotest') do |o|
-          options[:autotest] = true
+        parser.on('--tty') do |o|
+          options[:tty] = true
         end
 
         parser.on('--fail-fast', 'Use the fail_fast option to tell RSpec to abort the run on first failure.') do |o|

data/lib/rspec/core/rake_task.rb

@@ -161,7 +161,7 @@ module RSpec
                             cmd_parts << "bundle exec" if gemfile? unless skip_bundler
                             cmd_parts << runner
                             if rcov
-                              cmd_parts << ["-Ispec", "-Ilib", rcov_opts]
+                              cmd_parts << ["-Ispec:lib", rcov_opts]
                             else
                               cmd_parts << rspec_opts
                             end

data/lib/rspec/core/ruby_project.rb

@@ -27,9 +27,9 @@ module RSpec
         ascend_until {|path| File.exists?(File.join(path, dir))}
       end
 
-      def ascend_until(&block) # :nodoc:
+      def ascend_until # :nodoc:
         Pathname(File.expand_path('.')).ascend do |path|
-          return path if block.call(path)
+          return path if yield(path)
         end
       end
 

data/lib/rspec/core/runner.rb

@@ -23,8 +23,8 @@ module RSpec
       end
 
       def self.running_in_drb?
-        (DRb.current_server rescue false) &&
-        !!((DRb.current_server.uri) =~ /druby\:\/\/127.0.0.1\:/)
+        (DRb.current_server rescue false) && 
+         DRb.current_server.uri =~ /druby\:\/\/127.0.0.1\:/
       end
 
       def self.trap_interrupt

data/lib/rspec/core/subject.rb

@@ -88,9 +88,10 @@ module RSpec
         # onto the subject in an expression.
         #   
         #   describe Person do
-        #     let(:person) do
-        #       person = Person.new
-        #       person.phone_numbers << "555-1212"
+        #     subject do
+        #       Person.new.tap do |person|
+        #         person.phone_numbers << "555-1212"
+        #       end
         #     end
         #
         #     its("phone_numbers.first") { should == "555-1212" }

data/lib/rspec/core/version.rb

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

data/rspec-core.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.files            = `git ls-files`.split("\n")
   s.test_files       = `git ls-files -- {spec,features}/*`.split("\n")
   s.executables      = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.extra_rdoc_files = [ "README.markdown" ]
+  s.extra_rdoc_files = [ "README.md" ]
   s.rdoc_options     = ["--charset=UTF-8"]
   s.require_path     = "lib"
 

data/spec/rspec/core/configuration_options_spec.rb

@@ -165,13 +165,11 @@ describe RSpec::Core::ConfigurationOptions do
       end
     end
 
-    it "sends all the arguments other than --drb back to the parser after parsing options" do
+    it "does not send --drb back to the parser after parsing options" do
       config_options_object("--drb", "--color").drb_argv.should_not include("--drb")
     end
   end
 
-
-  # TODO #drb_argv may not be the best name
   # TODO ensure all options are output
   # TODO check if we need to spec that the short options are "expanded" ("-v" becomes "--version" currently)
   describe "#drb_argv" do
@@ -180,6 +178,10 @@ describe RSpec::Core::ConfigurationOptions do
       config_options_object(*%w[ a --drb b --color c ]).drb_argv.should =~ %w[ --color a b c ]
     end
 
+    it "includes --fail-fast" do
+      config_options_object(*%w[--fail-fast]).drb_argv.should include("--fail-fast")
+    end
+
     context "--drb specified in ARGV" do
       it "renders all the original arguments except --drb" do
         config_options_object(*%w[ --drb --color --format s --line_number 1 --example pattern --profile --backtrace -I path/a -I path/b --require path/c --require path/d]).
@@ -191,8 +193,8 @@ describe RSpec::Core::ConfigurationOptions do
       it "renders all the original arguments except --drb" do
         File.stub(:exist?) { true }
         IO.stub(:read) { "--drb --color" }
-        config_options_object(*%w[ --autotest --format s --line_number 1 --example pattern --profile --backtrace ]).
-          drb_argv.should eq(%w[ --color --profile --backtrace --autotest --format s --line_number 1 --example pattern ])
+        config_options_object(*%w[ --tty --format s --line_number 1 --example pattern --profile --backtrace ]).
+          drb_argv.should eq(%w[ --color --profile --backtrace --tty --format s --line_number 1 --example pattern ])
       end
     end