rspec 0.5.6 → 0.5.7

data/lib/spec/runner/context_runner.rb

@@ -20,7 +20,7 @@ module Spec
       end
       
       def run(exit_when_done)
-        @reporter.start number_of_specs
+        @reporter.start(number_of_specs)
         @contexts.each do |context|
           context.run(@reporter, @dry_run)
         end

data/lib/spec/runner/kernel_ext.rb

@@ -9,6 +9,6 @@ module Kernel
 private
   
   def context_runner
-    $context_runner || ::Spec::Runner::OptionParser.create_context_runner(ARGV.dup, true, STDERR, STDOUT)
+    $context_runner ||= ::Spec::Runner::OptionParser.create_context_runner(ARGV.dup, true, STDERR, STDOUT)
   end
 end

data/lib/spec/runner/option_parser.rb

@@ -21,19 +21,35 @@ module Spec
         options.spec_name = nil
 
         opts = ::OptionParser.new do |opts|
-          opts.banner = "Usage: spec [options] (FILE|DIRECTORY)+"
+          opts.banner = "Usage: spec [options] (FILE|DIRECTORY|GLOB)+"
           opts.separator ""
 
           opts.on("-b", "--backtrace", "Output full backtrace") do
             options.backtrace_tweaker = NoisyBacktraceTweaker.new
           end
           
-          opts.on("-f", "--format FORMAT", "Output format (specdoc|s|rdoc|r)") do |format|
-            options.formatter_type = SpecdocFormatter if format == 'specdoc'
-            options.formatter_type = SpecdocFormatter if format == 's'
-            options.formatter_type = RdocFormatter if format == 'rdoc'
-            options.formatter_type = RdocFormatter if format == 'r'
-            options.dry_run = true if format == 'rdoc'
+          opts.on("-r", "--require FILE", "Require FILE before running specs",
+                                          "Useful for loading custom formatters or other extensions") do |req|
+            require req
+          end
+          
+          opts.on("-f", "--format FORMAT", "Builtin formats: specdoc|s|rdoc|r", 
+                                           "You can also specify a custom formatter class") do |format|
+            case format
+              when 'specdoc', 's'
+                options.formatter_type = SpecdocFormatter
+              when 'rdoc', 'r'
+                options.formatter_type = RdocFormatter
+                options.dry_run = true
+            else
+              begin
+                options.formatter_type = eval(format)
+              rescue NameError
+                err.puts "Couldn't find formatter class #{format}"
+                err.puts "Make sure the --require option is specified *before* --format"
+                exit if out == $stdout
+              end
+            end
           end
 
           opts.on("-d", "--dry-run", "Don't execute specs") do

data/lib/spec/runner/progress_bar_formatter.rb

@@ -1,6 +1,6 @@
 module Spec
   module Runner
-    class ProgressBarFormatter < BaseTextFormatter      
+    class ProgressBarFormatter < BaseTextFormatter
       def add_context(name, first)
         @output << "\n" if first
       end

data/lib/spec/runner/rdoc_formatter.rb

@@ -1,10 +1,6 @@
 module Spec
   module Runner
     class RdocFormatter < BaseTextFormatter
-      def initialize(output, dry_run=false)
-        super(output, true) # always dry
-      end
-  
       def add_context(name, first)
         @output << "# #{name}\n"
       end
@@ -16,12 +12,6 @@ module Spec
       def spec_failed(name, counter)
         @output << "# * #{name} [#{counter} - FAILED]\n"
       end
-      
-      def dump_failure(counter, failure)
-      end
-      
-      def start_dump
-      end
     end
   end
 end

data/lib/spec/runner/reporter.rb

@@ -1,8 +1,6 @@
 module Spec
   module Runner
     class Reporter
-      # TODO: remove this attr_reader!!
-      attr_reader :formatter
       
       def initialize(formatter, backtrace_tweaker)
         @formatter = formatter
@@ -18,7 +16,7 @@ module Spec
         @context_names << name
       end
       
-      def add_spec(name, error=nil, failure_location=nil)
+      def spec_finished(name, error=nil, failure_location=nil)
         if error.nil?
           spec_passed(name)
         else
@@ -27,8 +25,9 @@ module Spec
         end
       end
       
-      def start(number_of_specs=0)
+      def start(number_of_specs)
         @start_time = Time.new
+        @formatter.start(number_of_specs)
       end
   
       def end

data/lib/spec/runner/specdoc_formatter.rb

@@ -12,9 +12,6 @@ module Spec
       def spec_passed(name)
         @output << "- #{name}\n"
       end
-      
-      def start_dump
-      end
     end
   end
 end

data/lib/spec/runner/specification.rb

@@ -10,7 +10,7 @@ module Spec
     
       def run(reporter=nil, setup_block=nil, teardown_block=nil, dry_run=false)
         if dry_run
-          reporter.add_spec(@name)
+          reporter.spec_finished(@name)
         else
           execution_context = ::Spec::Runner::ExecutionContext.new(self)
           errors = []
@@ -33,7 +33,7 @@ module Spec
             errors << e
           end
 
-          reporter.add_spec(@name, first_error(errors), failure_location(setup_ok, spec_ok, teardown_ok)) unless reporter.nil?
+          reporter.spec_finished(@name, errors.first, failure_location(setup_ok, spec_ok, teardown_ok)) unless reporter.nil?
         end
       end
       
@@ -41,16 +41,12 @@ module Spec
         @mocks << mock
       end
       
-      def matches_matcher? matcher
+      def matches_matcher?(matcher)
         matcher.matches? @name 
       end
             
       private
       
-      def first_error errors
-        errors[0]
-      end
-      
       def failure_location(setup_ok, spec_ok, teardown_ok)
         return 'setup' unless setup_ok
         return @name unless spec_ok

data/lib/spec/tool/test_unit_translator.rb

@@ -3,27 +3,27 @@ module Spec
     # Translates Test::Unit tests to RSpec specs.
     class TestUnitTranslator
       ONE_ARG_TRANSLATIONS = {
-        "assert"                => "should.not.be nil",
-        "assert_nil"            => "should.be nil",
-        "assert_not_nil"        => "should.not.be nil"
+        "assert"                => "should_not_be nil",
+        "assert_nil"            => "should_be nil",
+        "assert_not_nil"        => "should_not_be nil"
         
       }
       TWO_ARG_TRANSLATIONS = {
-        "assert_equal"          => "should.equal",
-        "assert_instance_of"    => "should.be.instance.of",
-        "assert_kind_of"        => "should.be.kind.of",
-        "assert_match"          => "should.match",
-        "assert_no_match"       => "should.not.match",
-        "assert_not_equal"      => "should.not.equal",
-        "assert_not_same"       => "should.not.be",
-        "assert_same"           => "should.be"
+        "assert_equal"          => "should_equal",
+        "assert_instance_of"    => "should_be_instance_of",
+        "assert_kind_of"        => "should_be_kind_of",
+        "assert_match"          => "should_match",
+        "assert_no_match"       => "should_not_match",
+        "assert_not_equal"      => "should_not_equal",
+        "assert_not_same"       => "should_not_be",
+        "assert_same"           => "should_be"
       }
       RAISE_TRANSLATIONS = {
-        "assert_nothing_raised" => "should.not.raise",
-        "assert_nothing_thrown" => "should.not.throw",
-        "assert_raise"          => "should.raise",
-        "assert_raises"         => "should.raise",
-        "assert_throws"         => "should.throw",
+        "assert_nothing_raised" => "should_not_raise",
+        "assert_nothing_thrown" => "should_not_throw",
+        "assert_raise"          => "should_raise",
+        "assert_raises"         => "should_raise",
+        "assert_throws"         => "should_throw",
       }
     
       def translate(test_unit_file)
@@ -71,7 +71,7 @@ module Spec
               
             elsif assertion == "assert_respond_to"
               actual, method, message = args.split(",").collect{|arg| arg.strip}
-              line = "#{spaces}#{actual}.should.respond.to #{method}\n"
+              line = "#{spaces}#{actual}.should_respond_to #{method}\n"
               
             elsif translation = ONE_ARG_TRANSLATIONS[assertion]
               actual, message = args.split(",").collect{|arg| arg.strip}
@@ -87,15 +87,15 @@ module Spec
               end_replacement = "#{translation} #{expected}\n"
               
             elsif assertion == "assert_block" and suffix =~ /\{.*\}/
-              line = "#{spaces}lambda #{suffix}.should.be true\n"
+              line = "#{spaces}lambda #{suffix}.should_be true\n"
               
             elsif assertion == "assert_block"
               line = "#{spaces}lambda do\n"
-              end_replacement = "should.be true\n"
+              end_replacement = "should_be true\n"
               
             elsif assertion == "assert_in_delta"
               expected, actual, delta, message = args.split(",").collect{|arg| arg.strip}
-              line = "#{spaces}#{actual}.should.be.close #{expected}, #{delta}\n"
+              line = "#{spaces}#{actual}.should_be_close #{expected}, #{delta}\n"
             end
           elsif end_replacement && line =~ /(\s+)end/
             spaces = $1

data/lib/spec/version.rb

@@ -3,7 +3,7 @@ module Spec
     unless defined? MAJOR
       MAJOR  = 0
       MINOR  = 5
-      TINY   = 6
+      TINY   = 7
 
       STRING = [MAJOR, MINOR, TINY].join('.')
       TAG    = "REL_" + [MAJOR, MINOR, TINY].join('_')

data/test/spec/api/mocks/mock_ordering_test.rb

@@ -25,6 +25,34 @@ module Spec
         end
       end
       
+      def FIXME_test_two_in_order_calls_with_block
+        @mock.should.receive(:doit).ordered do |a, b|
+          a.should_equal "a1"
+          a.should_equal "b1"
+        end
+        @mock.should.receive(:doit).ordered do |a, b|
+          a.should_equal "a2"
+          a.should_equal "b2"
+        end
+        @mock.doit "a1", "b1"
+        @mock.doit "b1", "b2"
+        @mock.__verify
+      end
+
+      def FIXME_test_two_out_of_order_calls_with_block
+        @mock.should.receive(:doit).ordered do |a, b|
+          a.should_equal "a1"
+          a.should_equal "b1"
+        end
+        @mock.should.receive(:doit).ordered do |a, b|
+          a.should_equal "a2"
+          a.should_equal "b2"
+        end
+        @mock.doit "b1", "b2"
+        @mock.doit "a1", "b1"
+        @mock.__verify
+      end
+
       def test_three_linear_calls
         @mock.should.receive(:one).ordered
         @mock.should.receive(:two).ordered

data/test/spec/runner/context_test.rb

@@ -17,7 +17,7 @@ module Spec
       
       def test_should_run_spec
         @formatter.should.receive(:add_context).with :any_args
-        @formatter.should.receive(:add_spec).with "test", :anything, :anything
+        @formatter.should.receive(:spec_finished).with "test", :anything, :anything
         $spec_ran = false
         @context.specify("test") {$spec_ran = true}
         @context.run(@formatter)
@@ -27,7 +27,7 @@ module Spec
          
       def test_should_run_spec_dry
         @formatter.should.receive(:add_context).with :any_args
-        @formatter.should.receive(:add_spec).with "test"
+        @formatter.should.receive(:spec_finished).with "test"
         $spec_ran = false
         @context.specify("test") {$spec_ran = true}
         @context.run(@formatter, true)
@@ -37,7 +37,7 @@ module Spec
       
       def test_setup
         @formatter.should.receive(:add_context).with :any_args
-        @formatter.should.receive(:add_spec).with :any_args
+        @formatter.should.receive(:spec_finished).with :any_args
         $setup_ran = false
         @context.setup {$setup_ran = true}
         @context.specify("test") {true}
@@ -48,7 +48,7 @@ module Spec
 
       def test_teardwown
         @formatter.should.receive(:add_context).with :any_args
-        @formatter.should.receive(:add_spec).with :any_args
+        @formatter.should.receive(:spec_finished).with :any_args
         $teardwown_ran = false
         @context.teardown {$teardwown_ran = true}
         @context.specify("test") {true}

data/test/spec/runner/failure_dump_test.rb

@@ -17,7 +17,7 @@ module Spec
       def test_spacing_between_sections
         error = Spec::Api::ExpectationNotMetError.new "message"
         set_backtrace error
-        @reporter.add_spec "spec", error, "spec"
+        @reporter.spec_finished "spec", error, "spec"
         @reporter.dump
         assert_match(/\nF\n\n1\)\nExpectationNotMetError in 'context spec'\nmessage\n\/a\/b\/c\/d\/e.rb:34:in `spec'\n\nFinished in /, @io.string)
       end
@@ -25,7 +25,7 @@ module Spec
       def test_should_end_with_line_break
         error = Spec::Api::ExpectationNotMetError.new "message"
         set_backtrace error
-        @reporter.add_spec "spec", error, "spec"
+        @reporter.spec_finished "spec", error, "spec"
         @reporter.dump
         assert_match(/\n\z/, @io.string)
       end
@@ -33,7 +33,7 @@ module Spec
       def test_should_include_informational_header
         error = Spec::Api::ExpectationNotMetError.new "message"
         set_backtrace error
-        @reporter.add_spec "spec", error, "spec"
+        @reporter.spec_finished "spec", error, "spec"
         @reporter.dump
         assert_match(/^ExpectationNotMetError in 'context spec'/, @io.string)
       end
@@ -41,7 +41,7 @@ module Spec
       def test_should_include_context_and_spec_name_in_backtrace_if_error_in_spec
         error = RuntimeError.new "message"
         set_backtrace error
-        @reporter.add_spec "spec", error, "spec"
+        @reporter.spec_finished "spec", error, "spec"
         @reporter.dump
         assert_match(/RuntimeError in 'context spec'/, @io.string)
         assert_match(/:in `spec'/, @io.string)
@@ -50,7 +50,7 @@ module Spec
       def test_should_include_context_and_setup_in_backtrace_if_error_in_setup
         error = RuntimeError.new
         set_backtrace error
-        @reporter.add_spec "spec", error, "setup"
+        @reporter.spec_finished "spec", error, "setup"
         @reporter.dump
         assert_match(/RuntimeError in 'context spec'/, @io.string)
         assert_match(/in `setup'/, @io.string)
@@ -59,7 +59,7 @@ module Spec
       def test_should_include_context_and_teardown_in_backtrace_if_error_in_teardown
         error = RuntimeError.new
         set_backtrace error
-        @reporter.add_spec "spec", error, "teardown"
+        @reporter.spec_finished "spec", error, "teardown"
         @reporter.dump
         assert_match(/RuntimeError in 'context spec'/, @io.string)
         assert_match(/in `teardown'/, @io.string)
@@ -82,7 +82,7 @@ module Spec
       def test_spacing_between_sections
         error = Spec::Api::ExpectationNotMetError.new "message"
         set_backtrace error
-        @reporter.add_spec "spec", error, "spec"
+        @reporter.spec_finished "spec", error, "spec"
         @reporter.dump
         assert_match(/\ncontext\n- spec \(FAILED - 1\)\n\n1\)\nExpectationNotMetError in 'context spec'\nmessage\n\/a\/b\/c\/d\/e.rb:34:in `spec'\n\nFinished in /, @io.string)
       end

data/test/spec/runner/option_parser_test.rb

@@ -1,5 +1,10 @@
 require File.dirname(__FILE__) + '/../../test_helper'
 
+module Custom
+  class Formatter
+  end
+end
+
 module Spec
   module Runner
     class OptionParserTest < Test::Unit::TestCase
@@ -18,7 +23,7 @@ module Spec
       def test_should_print_help_to_stdout
         options = OptionParser.parse(["--help"], false, @err, @out)
         @out.rewind
-        assert_match(/Usage: spec \[options\] \(FILE\|DIRECTORY\)\+/n, @out.read)
+        assert_match(/Usage: spec \[options\] \(FILE\|DIRECTORY\|GLOB\)\+/n, @out.read)
       end
       
       def test_verbose_should_be_false_by_default
@@ -60,6 +65,22 @@ module Spec
         options = OptionParser.parse(["--format","rdoc"], false, @err, @out)
         assert(options.dry_run)
       end
+
+      def test_should_eval_and_use_custom_formatter_when_none_of_the_builtins
+        options = OptionParser.parse(["--format","Custom::Formatter"], false, @err, @out)
+        assert_equal(Custom::Formatter, options.formatter_type)
+      end
+
+      def test_should_print_instructions_about_how_to_fix_bad_formatter
+        options = OptionParser.parse(["--format","Custom::BadFormatter"], false, @err, @out)
+        assert_match(/Couldn't find formatter class Custom::BadFormatter/n, @err.string)
+      end
+      
+      def test_should_require_file_when_require_specified
+        assert_raise(LoadError) do
+          OptionParser.parse(["--require","whatever"], false, @err, @out)
+        end
+      end
       
       def test_should_print_usage_to_err_if_no_dir_specified
         options = OptionParser.parse([], false, @err, @out)

data/test/spec/runner/progress_bar_formatter_test.rb

@@ -7,6 +7,11 @@ module Spec
         @io = StringIO.new
         @formatter = ProgressBarFormatter.new(@io)
       end
+      
+      def test_should_push_nothing_on_start
+        @formatter.start(4)
+        assert_equal("", @io.string)
+      end
 
       def test_should_push_line_break_for_context
         @formatter.add_context("context", :ignored)
@@ -33,6 +38,7 @@ module Spec
         assert_equal("\n", @io.string)
       end
     end
+
     class ProgressBarFormatterDryRunTest < Test::Unit::TestCase
       def setup
         @io = StringIO.new

data/test/spec/runner/rdoc_formatter_test.rb

@@ -5,7 +5,7 @@ module Spec
 
       def setup
         @io = StringIO.new
-        @formatter = RdocFormatter.new(@io)
+        @formatter = RdocFormatter.new(@io, true)
       end
 
       def test_should_push_out_context