rspec 1.0.5 → 1.0.6

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

@@ -6,17 +6,17 @@ module Spec
           @output.puts "# #{name}"
         end
   
-        def example_passed(name)
-          @output.puts "# * #{name}"
+        def example_passed(example)
+          @output.puts "# * #{example.description}"
           @output.flush
         end
 
-        def example_failed(name, counter, failure)
-          @output.puts "# * #{name} [#{counter} - FAILED]"
+        def example_failed(example, counter, failure)
+          @output.puts "# * #{example.description} [#{counter} - FAILED]"
         end
         
-        def example_not_implemented(name)
-          @output.puts "# * #{name} [NOT IMPLEMENTED]"
+        def example_pending(behaviour_name, example_name, message)
+          @output.puts "# * #{behaviour_name} #{example_name} [PENDING: #{message}]"
         end
       end
     end

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

@@ -8,18 +8,19 @@ module Spec
           @output.flush
         end
       
-        def example_failed(name, counter, failure)
-          @output.puts failure.expectation_not_met? ? red("- #{name} (FAILED - #{counter})") : magenta("- #{name} (ERROR - #{counter})")
+        def example_failed(example, counter, failure)
+          @output.puts failure.expectation_not_met? ? red("- #{example.description} (FAILED - #{counter})") : magenta("- #{example.description} (ERROR - #{counter})")
           @output.flush
         end
       
-        def example_passed(name)
-          @output.puts green("- #{name}")
+        def example_passed(example)
+          @output.puts green("- #{example.description}")
           @output.flush
         end
         
-        def example_not_implemented(name)
-          @output.puts yellow("- #{name} (NOT IMPLEMENTED)")
+        def example_pending(behaviour_name, example_name, message)
+          super
+          @output.puts yellow("- #{example_name} (PENDING: #{message})")
           @output.flush
         end
       end

data/lib/spec/runner/option_parser.rb

@@ -89,13 +89,14 @@ module Spec
         # Some exit points in parse (--generate-options, --drb) don't return the options, 
         # but hand over control. In that case we don't want to continue.
         return nil unless options.is_a?(Options)
-        options.create_behaviour_runner
+        options.configure
+        options.behaviour_runner
       end
 
       def parse(args, err, out, warn_if_no_files)
         options_file = nil
         args_copy = args.dup
-        options = Options.new
+        options = Options.new(err, out)
 
         opts = ::OptionParser.new do |opts|
           opts.banner = "Usage: spec (FILE|DIRECTORY|GLOB)+ [options]"
@@ -105,7 +106,7 @@ module Spec
             on(*COMMAND_LINE[name], &block)
           end
 
-          opts.rspec_on(:diff) {|diff| options.parse_diff(diff, out, err)}
+          opts.rspec_on(:diff) {|diff| options.parse_diff(diff)}
 
           opts.rspec_on(:colour) {options.colour = true}
 
@@ -115,7 +116,7 @@ module Spec
 
           opts.rspec_on(:line) {|line_number| options.line_number = line_number.to_i}
 
-          opts.rspec_on(:format) {|format| options.parse_format(format, out, err)}
+          opts.rspec_on(:format) {|format| options.parse_format(format)}
 
           opts.rspec_on(:require) {|req| options.parse_require(req)}
 
@@ -140,7 +141,7 @@ module Spec
           end
 
           opts.rspec_on(:runner) do |runner|
-            options.parse_runner(runner, out, err)
+            options.runner_arg = runner
           end
 
           opts.rspec_on(:drb) do

data/lib/spec/runner/options.rb

@@ -32,12 +32,14 @@ module Spec
         :loadby,
         :reporter,
         :reverse,
-        :runner_type,
         :timeout,
-        :verbose
+        :verbose,
+        :runner_arg,
+        :behaviour_runner
       )
 
-      def initialize
+      def initialize(err, out)
+        @err, @out = err, out
         @backtrace_tweaker = QuietBacktraceTweaker.new
         @examples = []
         @formatters = []
@@ -45,29 +47,42 @@ module Spec
         @dry_run = false
       end
 
+      def configure
+        configure_formatters
+        create_reporter
+        configure_differ
+        create_behaviour_runner
+      end
+
       def create_behaviour_runner
+        return nil if @generate
+        @behaviour_runner = if @runner_arg
+          klass_name, arg = split_at_colon(@runner_arg)
+          runner_type = load_class(klass_name, 'behaviour runner', '--runner')
+          runner_type.new(self, arg)
+        else
+          BehaviourRunner.new(self)
+        end
+      end
+
+      def configure_formatters
         @formatters.each do |formatter|
           formatter.colour = @colour if formatter.respond_to?(:colour=)
           formatter.dry_run = @dry_run if formatter.respond_to?(:dry_run=)
         end
+      end
+
+      def create_reporter
         @reporter = Reporter.new(@formatters, @backtrace_tweaker)
+      end
 
-        # this doesn't really belong here.
-        # it should, but the way things are coupled, it doesn't
+      def configure_differ
         if @differ_class
           Spec::Expectations.differ = @differ_class.new(@diff_format, @context_lines, @colour)
         end
-
-        return nil if @generate
-
-        if @runner_type
-          @runner_type.new(self)
-        else
-          BehaviourRunner.new(self)
-        end
       end
 
-      def parse_diff(format, out_stream, error_stream)
+      def parse_diff(format)
         @context_lines = 3
         case format
           when :context, 'context', 'c'
@@ -80,14 +95,8 @@ module Spec
           require 'spec/expectations/differs/default'
           @differ_class = Spec::Expectations::Differs::Default
         else
-          begin
-            @diff_format  = :custom
-            @differ_class = eval(format)
-          rescue NameError
-            error_stream.puts "Couldn't find differ class #{format}"
-            error_stream.puts "Make sure the --require option is specified *before* --diff"
-            exit if out_stream == $stdout
-          end
+          @diff_format  = :custom
+          @differ_class = load_class(format, 'differ', '--diff')
         end
       end
 
@@ -99,25 +108,17 @@ module Spec
         end
       end
 
-      def parse_format(format, out_stream, error_stream)
-        where = out_stream
+      def parse_format(format_arg)
+        format, where = split_at_colon(format_arg)
         # This funky regexp checks whether we have a FILE_NAME or not
-        if (format =~ /([a-zA-Z_]+(?:::[a-zA-Z_]+)*):?(.*)/) && ($2 != '')
-          format = $1
-          where = $2
-        else
+        if where.nil?
           raise "When using several --format options only one of them can be without a file" if @out_used
+          where = @out
           @out_used = true
         end
 
-        begin
-          formatter_type = BUILT_IN_FORMATTERS[format] || eval(format)
-          @formatters << formatter_type.new(where)
-        rescue NameError
-          error_stream.puts "Couldn't find formatter class #{format}"
-          error_stream.puts "Make sure the --require option is specified *before* --format"
-          exit if out_stream == $stdout
-        end
+        formatter_type = BUILT_IN_FORMATTERS[format] || load_class(format, 'formatter', '--format')
+        @formatters << formatter_type.new(where)
       end
 
       def parse_require(req)
@@ -135,7 +136,6 @@ module Spec
         index = args_copy.index("-G") || args_copy.index("--generate-options")
         args_copy.delete_at(index)
         args_copy.delete_at(index)
-
         File.open(options_file, 'w') do |io|
           io.puts args_copy.join("\n")
         end
@@ -144,13 +144,30 @@ module Spec
         @generate = true
       end
 
-      def parse_runner(runner, out_stream, error_stream)
+      def split_at_colon(s)
+        if s =~ /([a-zA-Z_]+(?:::[a-zA-Z_]+)*):?(.*)/
+          arg = $2 == "" ? nil : $2
+          [$1, arg]
+        else
+          raise "Couldn't parse #{s.inspect}"
+        end
+      end
+      
+      def load_class(name, kind, option)
+        if name =~ /\A(?:::)?([A-Z]\w*(?:::[A-Z]\w*)*)\z/
+          arg = $2 == "" ? nil : $2
+          [$1, arg]
+        else
+          m = "#{name.inspect} is not a valid class name"
+          @err.puts m
+          raise m
+        end
         begin
-          @runner_type = eval(runner)
-        rescue NameError
-          error_stream.puts "Couldn't find behaviour runner class #{runner}"
-          error_stream.puts "Make sure the --require option is specified."
-          exit if out_stream == $stdout
+          eval(name, binding, __FILE__, __LINE__)
+        rescue NameError => e
+          @err.puts "Couldn't find #{kind} class #{name}"
+          @err.puts "Make sure the --require option is specified *before* #{option}"
+          if $_spec_spec ; raise e ; else exit(1) ; end
         end
       end
     end

data/lib/spec/runner/reporter.rb

@@ -21,9 +21,11 @@ module Spec
         @example_names << name
         
         if not_implemented
-          example_not_implemented(name)
+          example_pending(@behaviour_names.last, name)
         elsif error.nil?
           example_passed(name)
+        elsif Spec::DSL::ExamplePendingError === error
+          example_pending(@behaviour_names.last, name, error.message)
         else
           example_failed(name, error, failure_location)
         end
@@ -43,7 +45,10 @@ module Spec
       def dump
         @formatters.each{|f| f.start_dump}
         dump_failures
-        @formatters.each{|f| f.dump_summary(duration, @example_names.length, @failures.length, @not_implemented_count)}
+        @formatters.each do |f| 
+          f.dump_summary(duration, @example_names.length, @failures.length, @pending_count)
+          f.close
+        end
         @failures.length
       end
 
@@ -52,7 +57,7 @@ module Spec
       def clear!
         @behaviour_names = []
         @failures = []
-        @not_implemented_count = 0
+        @pending_count = 0
         @example_names = []
         @start_time = nil
         @end_time = nil
@@ -83,9 +88,9 @@ module Spec
         @formatters.each{|f| f.example_failed(name, @failures.length, failure)}
       end
       
-      def example_not_implemented(name)
-        @not_implemented_count += 1
-        @formatters.each{|f| f.example_not_implemented(name)}
+      def example_pending(behaviour_name, example_name, message="Not Yet Implemented")
+        @pending_count += 1
+        @formatters.each{|f| f.example_pending(behaviour_name, example_name, message)}
       end
       
       class Failure
@@ -99,11 +104,17 @@ module Spec
         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::DSL::PendingFixedError)
+        end
+
         def expectation_not_met?
           @exception.is_a?(Spec::Expectations::ExpectationNotMetError)
         end

data/lib/spec/runner/spec_parser.rb

@@ -35,7 +35,7 @@ module Spec
 
       def lines_above_reversed(source, line_number)
         lines = source.split("\n")
-      	lines[0...line_number].reverse
+        lines[0...line_number].reverse
       end
       
       def parse_description(str)

data/lib/spec/translator.rb

@@ -34,6 +34,14 @@ module Spec
     end
 
     def translate_line(line)
+      # Translate deprecated mock constraints
+      line.gsub!(/:any_args/, 'any_args')
+      line.gsub!(/:anything/, 'anything')
+      line.gsub!(/:boolean/, 'boolean')
+      line.gsub!(/:no_args/, 'no_args')
+      line.gsub!(/:numeric/, 'an_instance_of(Numeric)')
+      line.gsub!(/:string/, 'an_instance_of(String)')
+
       return line if line =~ /(should_not|should)_receive/
       
       line.gsub!(/(^\s*)context([\s*|\(]['|"|A-Z])/, '\1describe\2')

data/lib/spec/version.rb

@@ -3,11 +3,11 @@ module Spec
     unless defined? MAJOR
       MAJOR  = 1
       MINOR  = 0
-      TINY   = 5
+      TINY   = 6
       RELEASE_CANDIDATE = nil
 
-      # RANDOM_TOKEN: 0.956731547671535
-      REV = "$LastChangedRevision: 2081 $".match(/LastChangedRevision: (\d+)/)[1]
+      # RANDOM_TOKEN: 0.450848541683348
+      REV = "$LastChangedRevision: 2326 $".match(/LastChangedRevision: (\d+)/)[1]
 
       STRING = [MAJOR, MINOR, TINY].join('.')
       TAG = "REL_#{[MAJOR, MINOR, TINY, RELEASE_CANDIDATE].compact.join('_')}".upcase.gsub(/\.|-/, '_')

data/plugins/mock_frameworks/flexmock.rb

@@ -3,25 +3,21 @@
 #  Created by Jim Weirich on 2007-04-10.
 #  Copyright (c) 2007. All rights reserved.
 
-begin
- require 'rubygems'
-rescue LoadError => ex
-end
 require 'flexmock/rspec'
 
 module Spec
- module Plugins
-   module MockFramework
-     include FlexMock::MockContainer
-     def setup_mocks_for_rspec
-       # No setup required
-     end
-     def verify_mocks_for_rspec
-       flexmock_verify
-     end
-     def teardown_mocks_for_rspec
-       flexmock_close
-     end
-   end
- end
+  module Plugins
+    module MockFramework
+      include FlexMock::MockContainer
+      def setup_mocks_for_rspec
+        # No setup required
+      end
+      def verify_mocks_for_rspec
+        flexmock_verify
+      end
+      def teardown_mocks_for_rspec
+        flexmock_close
+      end
+    end
+  end
 end

data/plugins/mock_frameworks/mocha.rb

@@ -1,5 +1,3 @@
-require 'rubygems'
-gem 'mocha'
 require 'mocha/standalone'
 require 'mocha/object'
 

data/plugins/mock_frameworks/rr.rb

@@ -0,0 +1,21 @@
+require 'rr'
+
+patterns = ::Spec::Runner::QuietBacktraceTweaker::IGNORE_PATTERNS
+patterns.push(RR::Errors::BACKTRACE_IDENTIFIER)
+
+module Spec
+  module Plugins
+    module MockFramework
+      include RR::Extensions::InstanceMethods
+      def setup_mocks_for_rspec
+        RR::Space.instance.reset
+      end
+      def verify_mocks_for_rspec
+        RR::Space.instance.verify_doubles
+      end
+      def teardown_mocks_for_rspec
+        RR::Space.instance.reset
+      end
+    end
+  end
+end

data/spec/autotest/discover_spec.rb

@@ -0,0 +1,19 @@
+require File.dirname(__FILE__) + "/../autotest_helper"
+
+module DiscoveryHelper
+  def load_discovery
+    require File.dirname(__FILE__) + "/../../lib/autotest/discover"
+  end
+end
+
+
+class Autotest
+  describe Rspec, "discovery" do
+    include DiscoveryHelper
+    
+    it "should add the rspec autotest plugin" do
+      Autotest.should_receive(:add_discovery).and_yield
+      load_discovery
+    end
+  end  
+end