rspec 1.2.2 → 1.2.3

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

@@ -9,7 +9,7 @@ module Spec
           @last_nested_descriptions = []
         end
 
-        def add_example_group(example_group)
+        def example_group_started(example_group)
           super
 
           example_group.nested_descriptions.each_with_index do |nested_description, i|
@@ -32,7 +32,7 @@ module Spec
           output.flush
         end
 
-        def example_pending(example, message, pending_caller)
+        def example_pending(example, message, deprecated_pending_location=nil)
           super
           output.puts yellow("#{current_indentation}#{example.description} (PENDING: #{message})")
           output.flush

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

@@ -0,0 +1,21 @@
+module Spec
+  module Runner
+    module Formatter
+      module NOOPMethodMissing
+        def respond_to?(message, include_private = false)
+          if include_private
+            true
+          else
+            !private_methods.include?(message.to_s)
+          end
+        end
+
+      private
+        
+        def method_missing(sym, *args)
+          # a no-op
+        end
+      end
+    end
+  end
+end

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

@@ -41,10 +41,6 @@ module Spec
           end
           @output.flush
         end
-        
-        def method_missing(sym, *args)
-          # ignore
-        end
       end
     end
   end

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

@@ -1,9 +1,12 @@
 require 'spec/runner/formatter/base_text_formatter'
+require 'spec/runner/formatter/no_op_method_missing'
 
 module Spec
   module Runner
     module Formatter
       class ProgressBarFormatter < BaseTextFormatter
+        include NOOPMethodMissing
+
         def example_failed(example, counter, failure)
           @output.print colorize_failure('F', failure)
           @output.flush
@@ -14,7 +17,7 @@ module Spec
           @output.flush
         end
       
-        def example_pending(example, message, pending_caller)
+        def example_pending(example, message, deprecated_pending_location=nil)
           super
           @output.print yellow('*')
           @output.flush
@@ -24,10 +27,6 @@ module Spec
           @output.puts
           @output.flush
         end
-        
-        def method_missing(sym, *args)
-          # ignore
-        end
       end
     end
   end

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

@@ -0,0 +1,10 @@
+require 'spec/runner/formatter/base_formatter'
+
+module Spec
+  module Runner
+    module Formatter
+      class SilentFormatter < BaseFormatter
+      end
+    end
+  end
+end

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

@@ -4,7 +4,7 @@ module Spec
   module Runner
     module Formatter
       class SpecdocFormatter < BaseTextFormatter
-        def add_example_group(example_group)
+        def example_group_started(example_group)
           super
           output.puts
           output.puts example_group.description
@@ -22,7 +22,7 @@ module Spec
           output.flush
         end
         
-        def example_pending(example, message, pending_caller)
+        def example_pending(example, message, deprecated_pending_location=nil)
           super
           output.puts yellow("- #{example.description} (PENDING: #{message})")
           output.flush

data/lib/spec/runner/option_parser.rb

@@ -31,7 +31,7 @@ module Spec
         :example => ["-e", "--example [NAME|FILE_NAME]",  "Execute example(s) with matching name(s). If the argument is",
                                                           "the path to an existing file (typically generated by a previous",
                                                           "run using --format failing_examples:file.txt), then the examples",
-                                                          "on each line of thatfile will be executed. If the file is empty,",
+                                                          "on each line of that file will be executed. If the file is empty,",
                                                           "all examples will be run (as if --example was not specified).",
                                                           " ",
                                                           "If the argument is not an existing file, then it is treated as",
@@ -92,7 +92,7 @@ module Spec
 
         @file_factory = File
 
-        self.banner = "Usage: spec (FILE|DIRECTORY|GLOB)+ [options]"
+        self.banner = "Usage: spec (FILE(:LINE)?|DIRECTORY|GLOB)+ [options]"
         self.separator ""
         on(*OPTIONS[:pattern])          {|pattern| @options.filename_pattern = pattern}
         on(*OPTIONS[:diff])             {|diff| @options.parse_diff(diff)}
@@ -130,6 +130,11 @@ module Spec
         return if parse_drb
         
         super(@argv) do |file|
+          if file =~ /^(.+):(\d+)$/
+            file = $1
+            @options.line_number = $2.to_i
+          end
+
           @options.files << file
           blk.call(file) if blk
         end
@@ -185,11 +190,13 @@ module Spec
         is_drb ||= argv.delete(OPTIONS[:drb][0])
         is_drb ||= argv.delete(OPTIONS[:drb][1])
         return false unless is_drb
-        @options.examples_should_not_be_run
-        DrbCommandLine.run(
-          self.class.parse(argv, @error_stream, @out_stream)
-        )
-        true
+        if DrbCommandLine.run(self.class.parse(argv, @error_stream, @out_stream))
+          @options.examples_should_not_be_run
+          true
+        else
+          @error_stream.puts "Running specs locally:"
+          false
+        end
       end
 
       def parse_version

data/lib/spec/runner/options.rb

@@ -1,3 +1,5 @@
+require 'ostruct'
+
 module Spec
   module Runner
     class Options
@@ -6,8 +8,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'],
+                'silent' => ['spec/runner/formatter/silent_formatter',                 'Formatter::SilentFormatter'],
+                     'l' => ['spec/runner/formatter/silent_formatter',                 'Formatter::SilentFormatter'],
                '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'],
@@ -208,9 +210,17 @@ module Spec
           else
             load_class(format, 'formatter', '--format')
           end
-          formatter_type.new(self, where)
+          formatter_type.new(formatter_options, where)
         end
       end
+      
+      def formatter_options
+        @formatter_options ||= OpenStruct.new(
+          :colour   => colour,
+          :autospec => autospec,
+          :dry_run  => dry_run
+        )
+      end
 
       def load_heckle_runner(heckle)
         @format_options ||= [['silent', @output_stream]]
@@ -319,7 +329,7 @@ module Spec
       end
 
       def default_differ
-        require 'spec/expectations/differs/default'
+        require 'spec/runner/differs/default'
         self.differ_class = ::Spec::Expectations::Differs::Default
       end
 
@@ -327,18 +337,18 @@ module Spec
         if examples.empty?
           if files.length == 1
             if File.directory?(files[0])
-              error_stream.puts "You must specify one file, not a directory when using the --line option"
+              error_stream.puts "You must specify one file, not a directory when providing a line number"
               exit(1) if stderr?
             else
               example = SpecParser.new(self).spec_name_for(files[0], line_number)
               @examples = [example]
             end
           else
-            error_stream.puts "Only one file can be specified when using the --line option: #{files.inspect}"
+            error_stream.puts "Only one file can be specified when providing a line number: #{files.inspect}"
             exit(3) if stderr?
           end
         else
-          error_stream.puts "You cannot use both --line and --example"
+          error_stream.puts "You cannot use --example and specify a line number"
           exit(4) if stderr?
         end
       end

data/lib/spec/runner/reporter.rb

@@ -1,19 +1,23 @@
 module Spec
   module Runner
     class Reporter
-      attr_reader :options, :example_groups
+      attr_reader :options
       
       def initialize(options)
         @options = options
         @options.reporter = self
-        clear
+        @failures = []
+        @pending_count = 0
+        @example_count = 0
+        @start_time = nil
+        @end_time = nil
       end
       
-      def add_example_group(example_group)
+      def example_group_started(example_group)
+        @example_group = example_group
         formatters.each do |f|
-          f.add_example_group(example_group)
+          f.example_group_started(example_group)
         end
-        example_groups << example_group
       end
       
       def example_started(example)
@@ -21,12 +25,12 @@ module Spec
       end
       
       def example_finished(example, error=nil)
-        @examples << example
+        @example_count += 1
         
         if error.nil?
           example_passed(example)
         elsif Spec::Example::ExamplePendingError === error
-          example_pending(example, error.pending_caller, error.message)
+          example_pending(example, example.location, error.message)
         else
           example_failed(example, error)
         end
@@ -34,7 +38,7 @@ module Spec
 
       def example_failed(example, error)
         backtrace_tweaker.tweak_backtrace(error)
-        failure = Failure.new(example_groups.empty? ? "" : example_groups.last.description, example, error)
+        failure = Failure.new(@example_group.description, example.description, error)
         @failures << failure
         formatters.each do |f|
           f.example_failed(example, @failures.length, failure)
@@ -42,7 +46,6 @@ module Spec
       end
 
       def start(number_of_examples)
-        clear
         @start_time = Time.new
         formatters.each{|f| f.start(number_of_examples)}
       end
@@ -57,12 +60,51 @@ module Spec
         dump_pending
         dump_failures
         formatters.each do |f|
-          f.dump_summary(duration, @examples.length, @failures.length, @pending_count)
+          f.dump_summary(duration, @example_count, @failures.length, @pending_count)
           f.close
         end
         @failures.length
       end
 
+      class Failure
+        def initialize(group_description, example_description, exception)  # :nodoc:
+          @example_name = "#{group_description} #{example_description}"
+          @exception = exception
+        end
+        
+        # The Exception object raised
+        attr_reader :exception
+        
+        # Header messsage for reporting this failure, including the name of the
+        # example and an indicator of the type of failure. FAILED indicates a
+        # failed expectation. FIXED indicates a pending example that passes, and
+        # no longer needs to be pending. RuntimeError indicates that a
+        # RuntimeError occured.
+        # 
+        # == Examples
+        #
+        #   'A new account should have a zero balance' FAILED
+        #   'A new account should have a zero balance' FIXED
+        #   RuntimeError in 'A new account should have a zero balance'
+        def header
+          if expectation_not_met?
+            "'#{@example_name}' FAILED"
+          elsif pending_fixed?
+            "'#{@example_name}' FIXED"
+          else
+            "#{@exception.class.name} in '#{@example_name}'"
+          end
+        end
+        
+        def pending_fixed? # :nodoc:
+          @exception.is_a?(Spec::Example::PendingExampleFixedError)
+        end
+
+        def expectation_not_met?  # :nodoc:
+          @exception.is_a?(Spec::Expectations::ExpectationNotMetError)
+        end
+      end
+
     private
 
       def formatters
@@ -73,15 +115,6 @@ module Spec
         @options.backtrace_tweaker
       end
   
-      def clear
-        @example_groups = []
-        @failures = []
-        @pending_count = 0
-        @examples = []
-        @start_time = nil
-        @end_time = nil
-      end
-  
       def dump_failures
         return if @failures.empty?
         @failures.inject(1) do |index, failure|
@@ -104,63 +137,35 @@ module Spec
       end
 
       EXAMPLE_PENDING_DEPRECATION_WARNING = <<-WARNING
-        DEPRECATION NOTICE: RSpec's formatters have changed example_pending
-        to accept three arguments instead of just two. Please see the rdoc
-        for Spec::Runner::Formatter::BaseFormatter#example_pending
-        for more information.
-          
-        Please update any custom formatters to accept the third argument
-        to example_pending. Support for example_pending with two arguments
-        and this warning message will be removed after the RSpec 1.1.5 release.
-      WARNING
+
+*********************************************************************
+DEPRECATION WARNING: RSpec's formatters have changed example_pending
+to accept two arguments instead of three. Please see the rdoc
+for Spec::Runner::Formatter::BaseFormatter#example_pending
+for more information.
+  
+Please update any custom formatters to accept only two arguments
+to example_pending. Support for example_pending with two arguments
+and this warning message will be removed after the RSpec 2.0 release.
+*********************************************************************      
+WARNING
       
-      def example_pending(example, pending_caller, message="Not Yet Implemented")
+      def example_pending(example, ignore, message="Not Yet Implemented")
         @pending_count += 1
         formatters.each do |formatter|
           if formatter_uses_deprecated_example_pending_method?(formatter)
-            Kernel.warn EXAMPLE_PENDING_DEPRECATION_WARNING
-            formatter.example_pending(example, message)
+            Spec.warn EXAMPLE_PENDING_DEPRECATION_WARNING
+            formatter.example_pending(example, message, example.location)
           else
-            formatter.example_pending(example, message, pending_caller)
+            formatter.example_pending(example, message)
           end
         end
       end
       
       def formatter_uses_deprecated_example_pending_method?(formatter)
-        formatter.method(:example_pending).arity == 2
+        formatter.method(:example_pending).arity == 3
       end
       
-      class Failure
-        attr_reader :example, :exception
-        
-        def initialize(group, example, exception)
-          @group, @example, @exception = group, example, exception
-        end
-        
-        def header
-          if expectation_not_met?
-            "'#{example_name}' FAILED"
-          elsif pending_fixed?
-            "'#{example_name}' FIXED"
-          else
-            "#{@exception.class.name} in '#{example_name}'"
-          end
-        end
-        
-        def pending_fixed?
-          @exception.is_a?(Spec::Example::PendingExampleFixedError)
-        end
-
-        def expectation_not_met?
-          @exception.is_a?(Spec::Expectations::ExpectationNotMetError)
-        end
-
-      protected
-
-        def example_name
-          "#{@group} #{@example.description}"
-        end
-      end
     end
   end
 end

data/lib/spec/version.rb

@@ -3,7 +3,7 @@ module Spec # :nodoc:
     unless defined? MAJOR
       MAJOR  = 1
       MINOR  = 2
-      TINY   = 2
+      TINY   = 3
       
       STRING = [MAJOR, MINOR, TINY].compact.join('.')
 

data/spec/spec/dsl/main_spec.rb

@@ -16,6 +16,13 @@ module Spec
             )
             @main.__send__ method, "The ExampleGroup", &block
           end
+          
+          it "raises with no description" do
+            block = lambda {|a,b|}
+            lambda do
+              @main.__send__ method, &block
+            end.should raise_error(ArgumentError, /No description supplied for example group declared on #{__FILE__}:#{__LINE__ - 1}/)
+          end
         end
       end