rspec 1.1.12 → 1.2.0

data/lib/spec/runner/formatter/base_text_formatter.rb

@@ -1,4 +1,5 @@
 require 'spec/runner/formatter/base_formatter'
+require 'fileutils'
 
 module Spec
   module Runner
@@ -23,27 +24,31 @@ module Spec
         end
         
         def example_pending(example, message, pending_caller)
-          @pending_examples << [example.full_description, message, pending_caller]
+          @pending_examples << ["#{@example_group.description} #{example.description}", message, pending_caller]
         end
         
         def dump_failure(counter, failure)
           @output.puts
           @output.puts "#{counter.to_s})"
-          @output.puts colourise("#{failure.header}\n#{failure.exception.message}", failure)
+          @output.puts colorize_failure("#{failure.header}\n#{failure.exception.message}", failure)
           @output.puts format_backtrace(failure.exception.backtrace)
           @output.flush
         end
         
-        def colourise(s, failure)
-          if(failure.expectation_not_met?)
-            red(s)
-          elsif(failure.pending_fixed?)
-            blue(s)
-          else
-            magenta(s)
-          end
+        def colorize_failure(message, failure)
+          failure.pending_fixed? ? blue(message) : red(message)
         end
-      
+        
+        def colourise(message, failure)
+          Kernel.warn <<-NOTICE
+DEPRECATED: BaseTextFormatter#colourise is deprecated and will be
+removed from a future version of RSpec.
+
+Please use colorize_failure instead.
+NOTICE
+          colorize_failure(message, failure)
+        end
+        
         def dump_summary(duration, example_count, failure_count, pending_count)
           return if dry_run?
           @output.puts
@@ -78,9 +83,7 @@ module Spec
         end
         
         def close
-          if IO === @output && @output != $stdout
-            @output.close 
-          end
+          @output.close  if (IO === @output) & (@output != $stdout)
         end
         
         def format_backtrace(backtrace)
@@ -91,11 +94,15 @@ module Spec
       protected
 
         def colour?
-          @options.colour ? true : false
+          !!@options.colour
         end
 
         def dry_run?
-          @options.dry_run ? true : false
+          !!@options.dry_run
+        end
+        
+        def autospec?
+          !!@options.autospec
         end
         
         def backtrace_line(line)
@@ -103,7 +110,7 @@ module Spec
         end
 
         def colour(text, colour_code)
-          return text unless colour? && output_to_tty?
+          return text unless ENV['RSPEC_COLOR'] || (colour? & (autospec? || output_to_tty?))
           "#{colour_code}#{text}\e[0m"
         end
 
@@ -117,10 +124,18 @@ module Spec
         
         def green(text); colour(text, "\e[32m"); end
         def red(text); colour(text, "\e[31m"); end
-        def magenta(text); colour(text, "\e[35m"); end
         def yellow(text); colour(text, "\e[33m"); end
         def blue(text); colour(text, "\e[34m"); end
-        
+
+        def magenta(text)
+          Kernel.warn <<-NOTICE
+DEPRECATED: BaseTextFormatter#magenta is deprecated and will be
+removed from a future version of RSpec.
+
+Please use red instead (it is red/green/refactor after all).
+NOTICE
+          red(text)
+        end
       end
     end
   end

data/lib/spec/runner/formatter/failing_example_groups_formatter.rb

@@ -6,21 +6,19 @@ module Spec
       class FailingExampleGroupsFormatter < BaseTextFormatter
         def example_failed(example, counter, failure)
           if @example_group
-            description_parts = @example_group.description_parts.collect do |description|
-              description =~ /(.*) \(druby.*\)$/ ? $1 : description
-            end
-            @output.puts ::Spec::Example::ExampleGroupMethods.description_text(*description_parts)
+            @output.puts @example_group.filtered_description(/(.*) \(druby.*\)$/)
 
             @output.flush
             @example_group = nil
           end
         end
-
+        
         def dump_failure(counter, failure)
         end
 
         def dump_summary(duration, example_count, failure_count, pending_count)
         end
+        
       end
     end
   end

data/lib/spec/runner/formatter/html_formatter.rb

@@ -38,7 +38,6 @@ module Spec
         def add_example_group(example_group)
           super
           @example_group_red = false
-          @example_group_red = false
           @example_group_number += 1
           unless example_group_number == 1
             @output.puts "  </dl>"
@@ -214,7 +213,7 @@ EOF
         def global_styles
           <<-EOF
 #rspec-header {
-  background: #65C400; color: #fff; height: 42px;
+  background: #65C400; color: #fff; height: 4em;
 }
 
 .rspec-report h1 {
@@ -222,7 +221,7 @@ EOF
   padding: 10px;
   font-family: "Lucida Grande", Helvetica, sans-serif;
   font-size: 1.8em;
-  float: left;
+  position: absolute;
 }
 
 #summary {

data/lib/spec/runner/formatter/nested_text_formatter.rb

@@ -4,33 +4,25 @@ module Spec
   module Runner
     module Formatter
       class NestedTextFormatter < BaseTextFormatter
-        attr_reader :previous_nested_example_groups
         def initialize(options, where)
           super
-          @previous_nested_example_groups = []
+          @last_nested_descriptions = []
         end
 
         def add_example_group(example_group)
           super
 
-          current_nested_example_groups = described_example_group_chain
-          current_nested_example_groups.each_with_index do |nested_example_group, i|
-            unless nested_example_group == previous_nested_example_groups[i]
-              output.puts "#{'  ' * i}#{nested_example_group.description_args.join}"
+          example_group.nested_descriptions.each_with_index do |nested_description, i|
+            unless nested_description == @last_nested_descriptions[i]
+              output.puts "#{'  ' * i}#{nested_description}"
             end
           end
 
-          @previous_nested_example_groups = described_example_group_chain
+          @last_nested_descriptions = example_group.nested_descriptions
         end
 
         def example_failed(example, counter, failure)
-          message = if failure.expectation_not_met?
-            "#{current_indentation}#{example.description} (FAILED - #{counter})"
-          else
-            "#{current_indentation}#{example.description} (ERROR - #{counter})"
-          end
-
-          output.puts(failure.expectation_not_met? ? red(message) : magenta(message))
+          output.puts(red("#{current_indentation}#{example.description} (FAILED - #{counter})"))
           output.flush
         end
 
@@ -47,17 +39,7 @@ module Spec
         end
 
         def current_indentation
-          '  ' * previous_nested_example_groups.length
-        end
-
-        def described_example_group_chain
-          example_group_chain = []
-          example_group.__send__(:example_group_hierarchy).each do |example_group_class|
-            unless example_group_class.description_args.empty?
-              example_group_chain << example_group_class
-            end
-          end
-          example_group_chain
+          '  ' * @last_nested_descriptions.length
         end
       end
     end

data/lib/spec/runner/formatter/progress_bar_formatter.rb

@@ -5,7 +5,7 @@ module Spec
     module Formatter
       class ProgressBarFormatter < BaseTextFormatter
         def example_failed(example, counter, failure)
-          @output.print colourise('F', failure)
+          @output.print colorize_failure('F', failure)
           @output.flush
         end
 

data/lib/spec/runner/formatter/snippet_extractor.rb

@@ -4,7 +4,7 @@ module Spec
       # 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 'rubygems'; 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])

data/lib/spec/runner/formatter/specdoc_formatter.rb

@@ -12,13 +12,7 @@ module Spec
         end
       
         def example_failed(example, counter, failure)
-          message = if failure.expectation_not_met?
-            "- #{example.description} (FAILED - #{counter})"
-          else
-            "- #{example.description} (ERROR - #{counter})"
-          end
-          
-          output.puts(failure.expectation_not_met? ? red(message) : magenta(message))
+          output.puts(red("- #{example.description} (FAILED - #{counter})"))
           output.flush
         end
         

data/lib/spec/runner/heckle_runner.rb

@@ -1,6 +1,5 @@
-unless Spec::Ruby.version.to_f == 1.9
+if Spec::Ruby.version.to_f < 1.9
   begin
-    require 'rubygems'
     require 'heckle'
   rescue LoadError ; raise "You must gem install heckle to use --heckle" ; end
 
@@ -56,16 +55,14 @@ unless Spec::Ruby.version.to_f == 1.9
         end
       end
     
-      #Supports Heckle 1.2 and prior (earlier versions used Heckle::Base)
-      class Heckler < (Heckle.const_defined?(:Base) ? Heckle::Base : Heckle)
+      class Heckler < Heckle
         def initialize(klass_name, method_name, rspec_options)
           super(klass_name, method_name)
           @rspec_options = rspec_options
         end
 
         def tests_pass?
-          success = @rspec_options.run_examples
-          success
+          @rspec_options.run_examples
         end
 
       end

data/lib/spec/runner/heckle_runner_unsupported.rb

@@ -3,7 +3,7 @@ module Spec
     # Dummy implementation for Windows that just fails (Heckle is not supported on Windows)
     class HeckleRunner
       def initialize(filter)
-        raise "Heckle not supported on Windows"
+        raise "Heckle is not supported on Windows or Ruby 1.9"
       end
     end
   end

data/lib/spec/runner/option_parser.rb

@@ -46,20 +46,15 @@ module Spec
                                                     "not specified. The --format option may be specified several times",
                                                     "if you want several outputs",
                                                     " ",
-                                                    "Builtin formats for code examples:",
-                                                    "progress|p               : Text-based progress bar",
+                                                    "Builtin formats:",
+                                                    "silent|l                 : No output",                                                    "progress|p               : Text-based progress bar",
                                                     "profile|o                : Text-based progress bar with profiling of 10 slowest examples",
                                                     "specdoc|s                : Code example doc strings",
-                                                    "nested|n                 : Code example doc strings with nested groups intented",
+                                                    "nested|n                 : Code example doc strings with nested groups indented",
                                                     "html|h                   : A nice HTML report",
                                                     "failing_examples|e       : Write all failing examples - input for --example",
                                                     "failing_example_groups|g : Write all failing example groups - input for --example",
                                                     " ",
-                                                    "Builtin formats for stories:",
-                                                    "plain|p                  : Plain Text",
-                                                    "html|h                   : A nice HTML report",
-                                                    "progress|r               : Text progress",
-                                                    " ",
                                                     "FORMAT can also be the name of a custom formatter class",
                                                     "(in which case you should also specify --require to load it)"],
         :require => ["-r", "--require FILE", "Require FILE before running specs",
@@ -112,19 +107,24 @@ module Spec
         on(*OPTIONS[:timeout])          {|timeout| @options.timeout = timeout.to_f}
         on(*OPTIONS[:heckle])           {|heckle| @options.load_heckle_runner(heckle)}
         on(*OPTIONS[:dry_run])          {@options.dry_run = true}
-        on(*OPTIONS[:options_file])     {|options_file| parse_options_file(options_file)}
+        on(*OPTIONS[:options_file])     {|options_file|}
         on(*OPTIONS[:generate_options]) {|options_file|}
         on(*OPTIONS[:runner])           {|runner|  @options.user_input_for_runner = runner}
         on(*OPTIONS[:drb])              {}
         on(*OPTIONS[:version])          {parse_version}
+        on("--autospec")                {@options.autospec = true}
         on_tail(*OPTIONS[:help])        {parse_help}
       end
       
       def order!(argv, &blk)
         @argv = argv.dup
-        @argv = (@argv.empty? && self.class.spec_command?) ? ['--help'] : @argv 
+        @argv = (@argv.empty? & self.class.spec_command?) ? ['--help'] : @argv 
+        
+        # Parse options file first
+        parse_file_options(:options_file, :parse_options_file)
+        
         @options.argv = @argv.dup
-        return if parse_generate_options
+        return if parse_file_options(:generate_options, :write_generated_options)
         return if parse_drb
         
         super(@argv) do |file|
@@ -145,16 +145,14 @@ module Spec
       def parse_options_file(options_file)
         option_file_args = IO.readlines(options_file).map {|l| l.chomp.split " "}.flatten
         @argv.push(*option_file_args)
-        # TODO - this is a brute force solution to http://rspec.lighthouseapp.com/projects/5645/tickets/293.
-        # Let's look for a cleaner way. Might not be one. But let's look. If not, perhaps
-        # this can be moved to a different method to indicate the special handling for drb?
-        parse_drb(@argv)
       end
 
-      def parse_generate_options
-        # Remove the --generate-options option and the argument before writing to file
+      def parse_file_options(option_name, action)
+        # Remove the file option and the argument before handling the file
         options_file = nil
-        ['-G', '--generate-options'].each do |option|
+        options_list = OPTIONS[option_name][0..1]
+        options_list[1].gsub!(" PATH", "")
+        options_list.each do |option|
           if index = @argv.index(option)
             @argv.delete_at(index)
             options_file = @argv.delete_at(index)
@@ -162,7 +160,7 @@ module Spec
         end
         
         if options_file
-          write_generated_options(options_file)
+          send(action, options_file)
           return true
         else
           return false
@@ -178,8 +176,8 @@ module Spec
         @options.examples_should_not_be_run
       end
 
-      def parse_drb(argv = nil)
-        argv ||= @options.argv # TODO - see note about about http://rspec.lighthouseapp.com/projects/5645/tickets/293
+      def parse_drb
+        argv = @options.argv
         is_drb = false
         is_drb ||= argv.delete(OPTIONS[:drb][0])
         is_drb ||= argv.delete(OPTIONS[:drb][1])

data/lib/spec/runner/options.rb

@@ -6,6 +6,8 @@ module Spec
       }
 
       EXAMPLE_FORMATTERS = { # Load these lazily for better speed
+                'silent' => ['spec/runner/formatter/base_formatter',                   'Formatter::BaseFormatter'],
+                     'l' => ['spec/runner/formatter/base_formatter',                   'Formatter::BaseFormatter'],
                'specdoc' => ['spec/runner/formatter/specdoc_formatter',                'Formatter::SpecdocFormatter'],
                      's' => ['spec/runner/formatter/specdoc_formatter',                'Formatter::SpecdocFormatter'],
                 'nested' => ['spec/runner/formatter/nested_text_formatter',            'Formatter::NestedTextFormatter'],
@@ -23,17 +25,8 @@ module Spec
               'textmate' => ['spec/runner/formatter/text_mate_formatter',              'Formatter::TextMateFormatter']
       }
 
-      STORY_FORMATTERS = {
-        'plain' => ['spec/runner/formatter/story/plain_text_formatter',   'Formatter::Story::PlainTextFormatter'],
-            'p' => ['spec/runner/formatter/story/plain_text_formatter',   'Formatter::Story::PlainTextFormatter'],
-         'html' => ['spec/runner/formatter/story/html_formatter',         'Formatter::Story::HtmlFormatter'],
-            'h' => ['spec/runner/formatter/story/html_formatter',         'Formatter::Story::HtmlFormatter'],
-     'progress' => ['spec/runner/formatter/story/progress_bar_formatter', 'Formatter::Story::ProgressBarFormatter'],
-            'r' => ['spec/runner/formatter/story/progress_bar_formatter', 'Formatter::Story::ProgressBarFormatter']
-            
-      }
-
       attr_accessor(
+        :autospec, # hack to tell 
         :filename_pattern,
         :backtrace_tweaker,
         :context_lines,
@@ -94,11 +87,14 @@ module Spec
             runner.load_files(files_to_load)
             @files_loaded = true
           end
+          
+          define_predicate_matchers
+          plugin_mock_framework
 
           # TODO - this has to happen after the files get loaded,
           # otherwise the before_suite_parts are not populated
           # from the configuration. There is no spec for this
-          # directly, but stories/configuration/before_blocks.story
+          # directly, but features/before_and_after_blocks/before_and_after_blocks.story
           # will fail if this happens before the files are loaded.
           before_suite_parts.each do |part|
             part.call
@@ -115,7 +111,7 @@ module Spec
           end
         ensure
           after_suite_parts.each do |part|
-            part.call(success)
+            part.arity < 1 ? part.call : part.call(success)
           end
         end
       end
@@ -136,11 +132,6 @@ module Spec
         @examples_should_be_run = false
       end
       
-      def predicate_matchers
-        # TODO - don't like this dependency - perhaps store these in here instead?
-        Spec::Runner.configuration.predicate_matchers
-      end
-      
       def mock_framework
         # TODO - don't like this dependency - perhaps store this in here instead?
         Spec::Runner.configuration.mock_framework
@@ -151,7 +142,6 @@ module Spec
         if @colour && RUBY_PLATFORM =~ /mswin|mingw/ ;\
           begin ;\
             replace_output = @output_stream.equal?($stdout) ;\
-            require 'rubygems' ;\
             require 'Win32/Console/ANSI' ;\
             @output_stream = $stdout if replace_output ;\
           rescue LoadError ;\
@@ -199,11 +189,6 @@ module Spec
         @formatters ||= load_formatters(@format_options, EXAMPLE_FORMATTERS)
       end
 
-      def story_formatters
-        @format_options ||= [['plain', @output_stream]]
-        @formatters ||= load_formatters(@format_options, STORY_FORMATTERS)
-      end
-      
       def load_formatters(format_options, formatters)
         format_options.map do |format, where|
           formatter_type = if formatters[format]
@@ -217,9 +202,10 @@ module Spec
       end
 
       def load_heckle_runner(heckle)
-        suffix = [/mswin/, /java/].detect{|p| p =~ RUBY_PLATFORM} ? '_unsupported' : ''
+        @format_options ||= [['silent', @output_stream]]
+        suffix = ([/mswin/, /java/].detect{|p| p =~ RUBY_PLATFORM} || Spec::Ruby.version.to_f == 1.9) ? '_unsupported' : ''
         require "spec/runner/heckle_runner#{suffix}"
-        @heckle_runner = HeckleRunner.new(heckle)
+        @heckle_runner = ::Spec::Runner::HeckleRunner.new(heckle)
       end
 
       def number_of_examples
@@ -247,7 +233,26 @@ module Spec
         @dry_run == true
       end
       
-      protected
+    protected
+
+      def define_predicate_matchers
+        Spec::Runner.configuration.predicate_matchers.each_pair do |matcher_method, method_on_object|
+          Spec::Example::ExampleMethods::__send__ :define_method, matcher_method do |*args|
+            eval("be_#{method_on_object.to_s.gsub('?','')}(*args)")
+          end
+        end
+      end
+      
+      def plugin_mock_framework
+        case mock_framework
+        when Module
+          Spec::Example::ExampleMethods.__send__ :include, mock_framework
+        else
+          require mock_framework
+          Spec::Example::ExampleMethods.__send__ :include, Spec::Adapters::MockFramework
+        end
+      end
+
       def examples_should_be_run?
         return @examples_should_be_run unless @examples_should_be_run.nil?
         @examples_should_be_run = true
@@ -304,7 +309,7 @@ module Spec
 
       def default_differ
         require 'spec/expectations/differs/default'
-        self.differ_class = Spec::Expectations::Differs::Default
+        self.differ_class = ::Spec::Expectations::Differs::Default
       end
 
       def set_spec_from_line_number