rspec-core 2.6.0 → 2.7.0.rc1

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,13 @@ 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)}")
+              if pending_example.execution_result[:exception] \
+                && RSpec.configuration.show_failures_in_pending_blocks?
+                dump_failure_info(pending_example)
+                dump_backtrace(pending_example)
+              end
             end
           end
         end
@@ -83,20 +100,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 +116,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 +148,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
 
@@ -144,8 +161,12 @@ module RSpec
         end
 
         def dump_failure(example, index)
-          exception = example.execution_result[:exception]
           output.puts "#{short_padding}#{index.next}) #{example.full_description}"
+          dump_failure_info(example)
+        end
+
+        def dump_failure_info(example)
+          exception = example.execution_result[:exception]
           output.puts "#{long_padding}#{red("Failure/Error:")} #{red(read_failed_line(exception, example).strip)}"
           output.puts "#{long_padding}#{red(exception.class.name << ":")}" unless exception.class.name =~ /RSpec/
           exception.message.split("\n").each { |line| output.puts "#{long_padding}  #{red(line)}" } if exception.message
@@ -158,7 +179,6 @@ module RSpec
             end
           end
         end
-
       end
     end
   end

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

@@ -108,8 +108,10 @@ module RSpec
         #
         def extra_failure_content(exception)
           require 'rspec/core/formatters/snippet_extractor'
+          backtrace = exception.backtrace.map {|line| backtrace_line(line)}
+          backtrace.compact!
           @snippet_extractor ||= SnippetExtractor.new
-          "    <pre class=\"ruby\"><code>#{@snippet_extractor.snippet(exception)}</code></pre>"
+          "    <pre class=\"ruby\"><code>#{@snippet_extractor.snippet(backtrace)}</code></pre>"
         end
 
         def move_progress

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

@@ -4,10 +4,16 @@ module RSpec
       # This class extracts code snippets by looking at the backtrace of the passed error
       class SnippetExtractor #:nodoc:
         class NullConverter; def convert(code, pre); code; end; end #:nodoc:
-        begin; require 'syntax/convertors/html'; @@converter = Syntax::Convertors::HTML.for_syntax "ruby"; rescue LoadError => e; @@converter = NullConverter.new; end
+        
+        begin
+          require 'syntax/convertors/html'
+          @@converter = Syntax::Convertors::HTML.for_syntax "ruby"
+        rescue LoadError => e
+          @@converter = NullConverter.new
+        end
 
-        def snippet(error)
-          raw_code, line = snippet_for(error.backtrace[0])
+        def snippet(backtrace)
+          raw_code, line = snippet_for(backtrace[0])
           highlighted = @@converter.convert(raw_code, false)
           highlighted << "\n<span class=\"comment\"># gem install syntax to get syntax highlighting</span>" if @@converter.is_a?(NullConverter)
           post_process(highlighted, line)

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

@@ -1,3 +1,4 @@
+require 'cgi'
 require 'rspec/core/formatters/html_formatter'
 
 module RSpec
@@ -5,15 +6,28 @@ module RSpec
     module Formatters
       # Formats backtraces so they're clickable by TextMate
       class TextMateFormatter < HtmlFormatter
-        def backtrace_line(line)
-          if line = super(line)
-            line.sub!(/([^:]*\.e?rb):(\d*)/) do
-              "<a href=\"txmt://open?url=file://#{File.expand_path($1)}&line=#{$2}\">#{$1}:#{$2}</a> "
-            end
+        def backtrace_line(line, skip_textmate_conversion=false)
+          if skip_textmate_conversion
+            super(line)
+          else
+            format_backtrace_line_for_textmate(super(line))
+          end
+        end
 
-            line
+        def format_backtrace_line_for_textmate(line)
+          return nil unless line
+          CGI.escapeHTML(line).sub(/([^:]*\.e?rb):(\d*)/) do
+            "<a href=\"txmt://open?url=file://#{File.expand_path($1)}&line=#{$2}\">#{$1}:#{$2}</a> "
           end
         end
+
+        def extra_failure_content(exception)
+          require 'rspec/core/formatters/snippet_extractor'
+          backtrace = exception.backtrace.map {|line| backtrace_line(line, :skip_textmate_conversion)}
+          backtrace.compact!
+          @snippet_extractor ||= SnippetExtractor.new
+          "    <pre class=\"ruby\"><code>#{@snippet_extractor.snippet(backtrace)}</code></pre>"
+        end
       end
     end
   end

data/lib/rspec/core/hooks.rb

@@ -8,12 +8,12 @@ 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
 
         def options_apply?(example_or_group)
-          !example_or_group || example_or_group.apply?(:all?, options)
+          example_or_group.all_apply?(options)
         end
 
         def to_proc
@@ -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
@@ -76,7 +77,7 @@ module RSpec
 
       class AfterHooks < HookCollection
         def run_all(example_group_instance)
-          reverse.each {|h| h.run_in(example_group_instance) } unless empty?
+          reverse.each {|h| h.run_in(example_group_instance) } 
         end
 
         def run_all!(example_group_instance)

data/lib/rspec/core/let.rb

@@ -21,7 +21,7 @@ module RSpec
         #  end
         def let(name, &block)
           define_method(name) do
-            __memoized[name] ||= instance_eval(&block)
+            __memoized.fetch(name) {|k| __memoized[k] = instance_eval(&block) }
           end
         end
 
@@ -57,12 +57,12 @@ module RSpec
         #      let(:thing) { Thing.new }
         #
         #      it "is not invoked implicitly" do
-        #        Thing.count.should == 0
+        #        Thing.count.should eq(0)
         #      end
         #
         #      it "can be invoked explicitly" do
         #        thing
-        #        Thing.count.should == 1
+        #        Thing.count.should eq(1)
         #      end
         #    end
         #
@@ -70,12 +70,12 @@ module RSpec
         #      let!(:thing) { Thing.new }
         #
         #      it "is invoked implicitly" do
-        #        Thing.count.should == 1
+        #        Thing.count.should eq(1)
         #      end
         #
         #      it "returns memoized version on first invocation" do
         #        thing
-        #        Thing.count.should == 1
+        #        Thing.count.should eq(1)
         #      end
         #    end
         #  end

data/lib/rspec/core/metadata.rb

@@ -2,7 +2,9 @@ module RSpec
   module Core
     class Metadata < Hash
 
-      module LocationKeys
+      # Used to extend metadata Hashes to support lazy evaluation of locations
+      # and descriptions.
+      module MetadataHash
         def [](key)
           return super if has_key?(key)
           case key
@@ -12,12 +14,22 @@ module RSpec
             file_path, line_number = file_and_line_number
             store(:file_path, file_path)
             store(:line_number, line_number)
-            self[key]
+            super
+          when :execution_result
+            store(:execution_result, {})
+          when :describes
+            store(:describes, described_class_for(self))
+          when :full_description
+            store(:full_description, full_description_for(self))
+          when :description
+            store(:description, build_description_from(*self[:description_args]))
           else
             super
           end
         end
 
+      private
+
         def location
           "#{self[:file_path]}:#{self[:line_number]}"
         end
@@ -30,97 +42,105 @@ module RSpec
         def first_caller_from_outside_rspec
           self[:caller].detect {|l| l !~ /\/lib\/rspec\/core/}
         end
+
+        def described_class_for(m)
+          m[:example_group][:describes]
+        end
+
+        def full_description_for(m)
+          build_description_from(m[:example_group][:full_description], *m[:description_args])
+        end
+
+        def build_description_from(*parts)
+          parts.map {|p| p.to_s}.reduce do |desc, p|
+            p =~ /^(#|::|\.)/ ? "#{desc}#{p}" : "#{desc} #{p}"
+          end || ""
+        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]}
+      module GroupMetadataHash
+        include MetadataHash
+
+        def described_class_for(*)
+          ancestors.each do |g|
+            return g[:describes] if g.has_key?(:describes)
+          end
+
+          ancestors.reverse.each do |g|
+            candidate = g[:description_args].first
+            return candidate unless String === candidate || Symbol === candidate
+          end
+
+          nil
+        end
+
+        def full_description_for(*)
+          build_description_from(*ancestors.reverse.map do |a|
+            a.has_key?(:full_description) ? a[:full_description] : a[:description_args]
+          end.flatten)
+        end
+
+      private
+
+        def ancestors
+          @ancestors ||= begin
+                           groups = [group = self]
+                           while group.has_key?(:example_group)
+                             groups << group[:example_group]
+                             group = group[:example_group]
+                           end
+                           groups
+                         end
+        end
+      end
+
+      def initialize(parent_group_metadata=nil)
+        if parent_group_metadata
+          update(parent_group_metadata)
+          store(:example_group, {:example_group => parent_group_metadata[:example_group]}.extend(GroupMetadataHash))
         else
-          example_group = {}
+          store(:example_group, {}.extend(GroupMetadataHash))
         end
 
-        store(:example_group, example_group.extend(LocationKeys))
         yield self if block_given?
       end
 
-      RESERVED_KEYS = [
-        :description,
-        :example_group,
-        :execution_result,
-        :file_path,
-        :full_description,
-        :line_number,
-        :location
-      ]
-
       def process(*args)
         user_metadata = args.last.is_a?(Hash) ? args.pop : {}
         ensure_valid_keys(user_metadata)
 
+        self[:example_group].store(:description_args, args)
         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
 
-      def ensure_valid_keys(user_metadata)
-        RESERVED_KEYS.each do |key|
-          if user_metadata.keys.include?(key)
-            raise <<-EOM
-#{"*"*50}
-:#{key} is not allowed
-
-RSpec reserves some hash keys for its own internal use,
-including :#{key}, which is used on:
-
-  #{caller(0)[4]}.
-
-Here are all of RSpec's reserved hash keys:
-
-  #{RESERVED_KEYS.join("\n  ")}
-#{"*"*50}
-EOM
-            raise ":#{key} is not allowed"
-          end
-        end
-      end
-
       def for_example(description, user_metadata)
-        dup.extend(LocationKeys).configure_for_example(description, user_metadata)
+        dup.extend(MetadataHash).configure_for_example(description, user_metadata)
       end
 
-      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, {})
-        store(:caller, user_metadata.delete(:caller) || caller)
-        update(user_metadata)
-      end
-
-      def apply?(predicate, filters)
-        filters.send(predicate) do |key, value|
-          apply_condition(key, value)
-        end
+      def any_apply?(filters)
+        filters.any? {|k,v| filter_applies?(k,v)}
       end
 
-      def relevant_line_numbers(metadata)
-        line_numbers = [metadata[:line_number]]
-        if metadata[:example_group]
-          line_numbers + relevant_line_numbers(metadata[:example_group])
-        else
-          line_numbers
-        end
+      def all_apply?(filters)
+        filters.all? {|k,v| filter_applies?(k,v)}
       end
 
-      def apply_condition(key, value, metadata=self)
+      def filter_applies?(key, value, metadata=self)
         case value
         when Hash
-          value.all? { |k, v| apply_condition(k, v, metadata[key]) }
+          if key == :locations
+            file_path     = (self[:example_group] || {})[:file_path]
+            expanded_path = file_path && File.expand_path( file_path )
+            if expanded_path && line_numbers = value[expanded_path]
+              filter_applies?(:line_numbers, line_numbers)
+            else
+              true
+            end
+          else
+            value.all? { |k, v| filter_applies?(k, v, metadata[key]) }
+          end
         when Regexp
           metadata[key] =~ value
         when Proc
@@ -135,9 +155,12 @@ EOM
           else
             value.call(metadata[key]) rescue false
           end
-        when Fixnum
-          if key == :line_number
-            relevant_line_numbers(metadata).include?(world.preceding_declaration_line(value))
+        when String
+          metadata[key].to_s == value.to_s
+        when Enumerable
+          if key == :line_numbers
+            preceding_declaration_lines = value.map{|v| world.preceding_declaration_line(v)}
+            !(relevant_line_numbers(metadata) & preceding_declaration_lines).empty?
           else
             metadata[key] == value
           end
@@ -146,42 +169,61 @@ EOM
         end
       end
 
-    private
+    protected
 
-      def world
-        RSpec.world
+      def configure_for_example(description, user_metadata)
+        store(:description_args, [description])
+        store(:caller, user_metadata.delete(:caller) || caller)
+        update(user_metadata)
       end
 
-      def superclass_metadata
-        @superclass_metadata ||= { :example_group => {} }
-      end
+    private
 
-      def description_from(*args)
-        args.inject("") do |result, a|
-          a = a.to_s.strip
-          if result == ""
-            a
-          elsif a =~ /^(#|::|\.)/
-            "#{result}#{a}"
-          else
-            "#{result} #{a}"
+      RESERVED_KEYS = [
+        :description,
+        :example_group,
+        :execution_result,
+        :file_path,
+        :full_description,
+        :line_number,
+        :location
+      ]
+
+      def ensure_valid_keys(user_metadata)
+        RESERVED_KEYS.each do |key|
+          if user_metadata.keys.include?(key)
+            raise <<-EOM
+#{"*"*50}
+:#{key} is not allowed
+
+RSpec reserves some hash keys for its own internal use,
+including :#{key}, which is used on:
+
+  #{caller(0)[4]}.
+
+Here are all of RSpec's reserved hash keys:
+
+  #{RESERVED_KEYS.join("\n  ")}
+#{"*"*50}
+EOM
+            raise ":#{key} is not allowed"
           end
         end
       end
 
-      def full_description_from(*args)
-        if superclass_metadata[:example_group][:full_description]
-          description_from(superclass_metadata[:example_group][:full_description], *args)
-        else
-          description_from(*args)
-        end
+      def world
+        RSpec.world
       end
 
-      def described_class_from(*args)
-        superclass_metadata[:example_group][:describes] || begin
-          args.first unless args.first.is_a?(String) || args.first.is_a?(Symbol)
+      def relevant_line_numbers(metadata)
+        line_numbers = [metadata[:line_number]]
+        if metadata[:example_group]
+          line_numbers + relevant_line_numbers(metadata[:example_group])
+        else
+          line_numbers
         end
       end
+
     end
   end
 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/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
 
@@ -74,8 +73,8 @@ module RSpec::Core
           options[:libs] << dir
         end
 
-        parser.on('-l', '--line_number LINE', 'Specify the line number of a single example to run') do |o|
-          options[:line_number] = o
+        parser.on('-l', '--line_number LINE', 'Specify the line number of an example to run.  May be specified multiple times.') do |o|
+          (options[:line_numbers] ||= []) << o
         end
 
         parser.on('-O', '--options PATH', 'Specify the path to an options file') do |path|
@@ -86,7 +85,7 @@ module RSpec::Core
           options[:profile_examples] = o
         end
 
-        parser.on('-P', '--pattern PATTERN', 'Load files those matching this pattern. Default is "spec/**/*_spec.rb"') do |o|
+        parser.on('-P', '--pattern PATTERN', 'Load files matching this pattern. Default is "spec/**/*_spec.rb"') do |o|
           options[:pattern] = o
         end
 
@@ -100,8 +99,8 @@ module RSpec::Core
           exit
         end
 
-        parser.on('-X', '--drb', 'Run examples via DRb') do |o|
-          options[:drb] = true
+        parser.on('-X', '--[no-]drb', 'Run examples via DRb') do |o|
+          options[:drb] = o
         end
 
         parser.on('--configure COMMAND', 'Generate configuration files') do |cmd|
@@ -133,6 +132,11 @@ module RSpec::Core
         parser.on('--tty', 'Used internally by rspec when sending commands to other processes') do |o|
           options[:tty] = true
         end
+
+        parser.on('--default_path PATH', 'Set the default path where RSpec looks for examples.',
+                                         'Can be a path to a file or a directory') do |path|
+          options[:default_path] = path
+        end
       end
     end
   end

data/lib/rspec/core/pending.rb

@@ -24,7 +24,8 @@ module RSpec
                        example.example_group_instance.instance_eval { verify_mocks_for_rspec }
                      end
             example.metadata[:pending] = false
-          rescue Exception
+          rescue Exception => e
+            example.execution_result[:exception] = e
           ensure
             teardown_mocks_for_rspec
           end