rspec 0.9.1 → 0.9.2

data/CHANGES

@@ -1,5 +1,14 @@
 = RSpec Changelog
 
+== Version 0.9.2
+This is a quick maintenance release. 
+
+* Added some website love
+* Fixed [#10542] reverse predicate matcher syntax
+* Added a spec:translate Rake task to make 0.9 translation easier with Spec:Rails
+* Better translation of should_redirect_to
+* Fixed --colour support for Windows. This is a regression that was introduced in 0.9.1
+
 == Version 0.9.1
 
 This release introduces #describe and #it (aliased as #context and #specify for

data/EXAMPLES.rd

@@ -99,6 +99,6 @@
 # * RSpec should be able to access TestCase methods
 # * RSpec should be able to accept included modules
 
-Finished in 0.046798 seconds
+Finished in 0.045762 seconds
 
 74 examples, 0 failures

data/README

@@ -34,7 +34,7 @@ do the following:
   rake gem
   gem install pkg/rspec-0.x.x.gem (you may have to sudo)
 
-== Running the specs ==
+== Running RSpec's specs
 In order to run RSpec's full suite of specs (rake pre_commit) you must install the following gems:
 
 * rake          # Runs the build script

data/bin/spec_translator

@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby
+raise "\n\nUsage: spec_translator from_dir to_dir\n\n" if ARGV.size != 2
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
 require 'spec/translator'
 t = ::Spec::Translator.new

data/examples/before_and_after_example.rb

@@ -21,14 +21,19 @@ describe "State created in before(:all)" do
 
   it "should not have sideffects" do
     @sideeffect.should == 1
-    $global.should == 1
+    $global.should == 2
     @isolated.should == 1
 
     @sideeffect += 1
     @isolated += 1
   end
+
+  after :each do
+    $global += 1
+  end
   
   after :all do
+    $global.should == 3
     $global = 0
   end
 end

data/lib/spec/dsl/behaviour_eval.rb

@@ -50,13 +50,13 @@ module Spec
         #   end
         #
         #   describe Fish do
-        #     predicate_matchers[:can_swim?] = :swim
+        #     predicate_matchers[:swim] = :can_swim?
         #     it "should swim" do
         #       Fish.new.should swim
         #     end
         #   end
         def predicate_matchers
-          @predicate_matchers ||= {:exist? => :exist}
+          @predicate_matchers ||= {:exist => :exist?}
         end
         
         def define_predicate_matchers(hash=nil) # :nodoc:
@@ -64,7 +64,7 @@ module Spec
             define_predicate_matchers(predicate_matchers)
             define_predicate_matchers(Spec::Runner.configuration.predicate_matchers)
           else
-            hash.each_pair do |method_on_object, matcher_method|
+            hash.each_pair do |matcher_method, method_on_object|
               define_method matcher_method do |*args|
                 eval("be_#{method_on_object.to_s.gsub('?','')}(*args)")
               end

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

@@ -14,6 +14,8 @@ module Spec
           super(where)
           if where.is_a?(String)
             @output = File.open(where, 'w')
+          elsif where == STDOUT
+            @output = Kernel
           else
             @output = where
           end
@@ -38,7 +40,6 @@ module Spec
             @output.puts magenta(failure.exception.message)
           end
           @output.puts format_backtrace(failure.exception.backtrace)
-          @output.flush
         end
       
         def dump_summary(duration, example_count, failure_count)

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

@@ -9,7 +9,6 @@ module Spec
         def example_failed(name, counter, failure)
           unless @behaviour_name.nil?
             @output.puts @behaviour_name 
-            @output.flush
             @behaviour_name = nil
           end
         end

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

@@ -8,7 +8,6 @@ module Spec
       
         def example_failed(name, counter, failure)
           @output.puts "#{@behaviour_name} #{name}"
-          @output.flush
         end
 
         def dump_failure(counter, failure)

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

@@ -7,6 +7,7 @@ module Spec
           super
           @current_behaviour_number = 0
           @current_example_number = 0
+          @html_header = true
         end
 
         # The number of the currently running behaviour
@@ -22,10 +23,10 @@ module Spec
         def start(example_count)
           @example_count = example_count
 
-          @output.puts HEADER_1
-          @output.puts extra_header_content unless extra_header_content.nil?
-          @output.puts HEADER_2
-          @output.flush
+          if(@html_header)
+            @output.puts HTML_HEADER
+          end
+          @output.puts REPORT_HEADER
         end
 
         def add_behaviour(name)
@@ -34,31 +35,28 @@ module Spec
             @output.puts "  </dl>"
             @output.puts "</div>"
           end
-          @output.puts "<div class=\"context\">"
+          @output.puts "<div class=\"behaviour\">"
           @output.puts "  <dl>"
-          @output.puts "  <dt id=\"context_#{current_behaviour_number}\">#{escape(name)}</dt>"
-          @output.flush
+          @output.puts "  <dt id=\"behaviour_#{current_behaviour_number}\">#{escape(name)}</dt>"
         end
 
         def start_dump
           @output.puts "  </dl>"
           @output.puts "</div>"
-          @output.flush
         end
 
         def example_passed(name)
           @current_example_number += 1
           move_progress
           @output.puts "    <dd class=\"spec passed\"><span class=\"passed_spec_name\">#{escape(name)}</span></dd>"
-          @output.flush
         end
 
         def example_failed(name, counter, failure)
           extra = extra_failure_content(failure)
           
           @current_example_number += 1
-          @output.puts "    <script type=\"text/javascript\">makeRed('header');</script>"
-          @output.puts "    <script type=\"text/javascript\">makeRed('context_#{current_behaviour_number}');</script>"
+          @output.puts "    <script type=\"text/javascript\">makeRed('rspec-header');</script>"
+          @output.puts "    <script type=\"text/javascript\">makeRed('behaviour_#{current_behaviour_number}');</script>"
           move_progress
           @output.puts "    <dd class=\"spec failed\">"
           @output.puts "      <span class=\"failed_spec_name\">#{escape(name)}</span>"
@@ -68,12 +66,6 @@ module Spec
           @output.puts extra unless extra == ""
           @output.puts "      </div>"
           @output.puts "    </dd>"
-          @output.flush
-        end
-        
-        # Override this method if you wish to output extra HTML in the header
-        #
-        def extra_header_content
         end
 
         # Override this method if you wish to output extra HTML for a failed spec. For example, you
@@ -104,12 +96,14 @@ module Spec
           @output.puts "<script type=\"text/javascript\">document.getElementById('duration').innerHTML = \"Finished in <strong>#{duration} seconds</strong>\";</script>"
           @output.puts "<script type=\"text/javascript\">document.getElementById('totals').innerHTML = \"#{totals}\";</script>"
           @output.puts "</div>"
-          @output.puts "</body>"
-          @output.puts "</html>"
-          @output.flush
+          @output.puts "</div>"
+          if(@html_header)
+            @output.puts "</body>"
+            @output.puts "</html>"
+          end
         end
 
-        HEADER_1 = <<-EOF
+        HTML_HEADER = <<-EOF
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE html
      PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
@@ -121,28 +115,32 @@ module Spec
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
   <meta http-equiv="Expires" content="-1" />
   <meta http-equiv="Pragma" content="no-cache" />
+  <style type="text/css">
+  body {
+    margin: 0; padding: 0;
+    background: #fff;
+  }
+  </style>
+</head>
+<body>
 EOF
 
-        HEADER_2 = <<-EOF
+        REPORT_HEADER = <<-EOF
+<div class="rspec-report">
   <script type="text/javascript">
   function moveProgressBar(percentDone) {
-    document.getElementById("header").style.width = percentDone +"%";
+    document.getElementById("rspec-header").style.width = percentDone +"%";
   }
   function makeRed(element_id) {
     document.getElementById(element_id).style.background = '#C40D0D';
   }
   </script>
   <style type="text/css">
-  body {
-    margin: 0; padding: 0;
-    background: #fff;
-  }
-
-  #header {
+  #rspec-header {
     background: #65C400; color: #fff;
   }
 
-  h1 {
+  div.rspec-report h1 {
     margin: 0 0 10px;
     padding: 10px;
     font: bold 18px "Lucida Grande", Helvetica, sans-serif;
@@ -165,7 +163,7 @@ EOF
     font-size: 14px;
   }
 
-  .context {
+  .behaviour {
     margin: 0 10px 5px;
     background: #fff;
   }
@@ -217,37 +215,35 @@ EOF
     padding: 0.1em 0 0.2em 0;
   }
 
-  .keyword { color: #FF6600; }
-  .constant { color: #339999; }
-  .attribute { color: white; }
-  .global { color: white; }
-  .module { color: white; }
-  .class { color: white; }
-  .string { color: #66FF00; }
-  .ident { color: white; }
-  .method { color: #FFCC00; }
-  .number { color: white; }
-  .char { color: white; }
-  .comment { color: #9933CC; }
-  .symbol { color: white; }
-  .regex { color: #44B4CC; }
-  .punct { color: white; }
-  .escape { color: white; }
-  .interp { color: white; }
-  .expr { color: white; }
+  pre.ruby .keyword { color: #FF6600; }
+  pre.ruby .constant { color: #339999; }
+  pre.ruby .attribute { color: white; }
+  pre.ruby .global { color: white; }
+  pre.ruby .module { color: white; }
+  pre.ruby .class { color: white; }
+  pre.ruby .string { color: #66FF00; }
+  pre.ruby .ident { color: white; }
+  pre.ruby .method { color: #FFCC00; }
+  pre.ruby .number { color: white; }
+  pre.ruby .char { color: white; }
+  pre.ruby .comment { color: #9933CC; }
+  pre.ruby .symbol { color: white; }
+  pre.ruby .regex { color: #44B4CC; }
+  pre.ruby .punct { color: white; }
+  pre.ruby .escape { color: white; }
+  pre.ruby .interp { color: white; }
+  pre.ruby .expr { color: white; }
 
-  .offending { background-color: gray; }
-  .linenum {
+  pre.ruby .offending { background-color: gray; }
+  pre.ruby .linenum {
   	width: 75px;
   	padding: 0.1em 1em 0.2em 0;
   	color: #000000;
   	background-color: #FFFBD3;
   }
   </style>
-</head>
-<body>
 
-<div id="header">
+<div id="rspec-header">
   <h1>RSpec Results</h1>
 
   <div id="summary">
@@ -256,7 +252,7 @@ EOF
   </div>
 </div>
 
-<div id="results">
+<div class="results">
 EOF
       end
     end

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

@@ -7,17 +7,14 @@ module Spec
       
         def example_failed(name, counter, failure)
           @output.print failure.expectation_not_met? ? red('F') : magenta('F')
-          @output.flush
         end
 
         def example_passed(name)
           @output.print green('.')
-          @output.flush
         end
       
         def start_dump
           @output.puts
-          @output.flush
         end
       end
     end

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

@@ -4,17 +4,14 @@ module Spec
       class RdocFormatter < BaseTextFormatter
         def add_behaviour(name)
           @output.print "# #{name}\n"
-          @output.flush
         end
   
         def example_passed(name)
           @output.print "# * #{name}\n"
-          @output.flush
         end
 
         def example_failed(name, counter, failure)
           @output.print "# * #{name} [#{counter} - FAILED]\n"
-          @output.flush
         end
       end
     end

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

@@ -5,17 +5,14 @@ module Spec
         def add_behaviour(name)
           @output.puts
           @output.puts name
-          @output.flush
         end
       
         def example_failed(name, counter, failure)
           @output.puts failure.expectation_not_met? ? red("- #{name} (FAILED - #{counter})") : magenta("- #{name} (ERROR - #{counter})")
-          @output.flush
         end
       
         def example_passed(name)
           @output.print green("- #{name}\n")
-          @output.flush
         end
       end
     end

data/lib/spec/runner/option_parser.rb

@@ -19,6 +19,66 @@ module Spec
         'b'        => Formatter::FailingBehavioursFormatter
       }
 
+      COMMAND_LINE = {
+        :diff =>    ["-D", "--diff [FORMAT]", "Show diff of objects that are expected to be equal when they are not",
+                                             "Builtin formats: unified|u|context|c",
+                                             "You can also specify a custom differ class",
+                                             "(in which case you should also specify --require)"],
+        :colour =>  ["-c", "--colour", "--color", "Show coloured (red/green) output"],
+        :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,",
+                                                          "all examples will be run (as if --example was not specified).",
+                                                          " ",
+                                                          "If the argument is not an existing file, then it is treated as",
+                                                          "an example name directly, causing RSpec to run just the example",
+                                                          "matching that name"],
+        :specification => ["-s", "--specification [NAME]", "DEPRECATED - use -e instead", "(This will be removed when autotest works with -e)"],
+        :line => ["-l", "--line LINE_NUMBER", Integer, "Execute behaviout or specification at given line.",
+                                                       "(does not work for dynamically generated specs)"],
+        :format => ["-f", "--format FORMAT[:WHERE]",  "Specifies what format to use for output. Specify WHERE to tell",
+                                                    "the formatter where to write the output. All built-in formats",
+                                                    "expect WHERE to be a file name, and will write to STDOUT if it's",
+                                                    "not specified. The --format option may be specified several times",
+                                                    "if you want several outputs",
+                                                    " ",
+                                                    "Builtin formats: ",
+                                                    "progress|p           : Text progress",
+                                                    "specdoc|s            : Behaviour doc as text",
+                                                    "rdoc|r               : Behaviour doc as RDoc",
+                                                    "html|h               : A nice HTML report",
+                                                    "failing_examples|e   : Write all failing examples - input for --example",
+                                                    "failing_behaviours|b : Write all failing behaviours - input for --example",
+                                                    " ",
+                                                    "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",
+                                          "Useful for loading custom formatters or other extensions.",
+                                          "If this option is used it must come before the others"],
+        :backtrace => ["-b", "--backtrace", "Output full backtrace"],
+        :loadby => ["-L", "--loadby STRATEGY", "Specify the strategy by which spec files should be loaded.",
+                                              "STRATEGY can currently only be 'mtime' (File modification time)",
+                                              "By default, spec files are loaded in alphabetical order if --loadby",
+                                              "is not specified."],
+        :reverse => ["-R", "--reverse", "Run examples in reverse order"],
+        :timeout => ["-t", "--timeout FLOAT", "Interrupt and fail each example that doesn't complete in the",
+                                              "specified time"],
+        :heckle => ["-H", "--heckle CODE", "If all examples pass, this will mutate the classes and methods",
+                                           "identified by CODE little by little and run all the examples again",
+                                           "for each mutation. The intent is that for each mutation, at least",
+                                           "one example *should* fail, and RSpec will tell you if this is not the",
+                                           "case. CODE should be either Some::Module, Some::Class or",
+                                           "Some::Fabulous#method}"],
+        :dry_run => ["-d", "--dry-run", "Invokes formatters without executing the examples."],
+        :options_file => ["-O", "--options PATH", "Read options from a file"],
+        :generate_options => ["-G", "--generate-options PATH", "Generate an options file for --options"],
+        :runner => ["-U", "--runner RUNNER", "Use a custom BehaviourRunner."],
+        :drb => ["-X", "--drb", "Run examples via DRb. (For example against script/spec_server)"],
+        :version => ["-v", "--version", "Show version"],
+        :help => ["-h", "--help", "You're looking at it"]
+      }
+
       def initialize
         @spec_parser = SpecParser.new
         @file_factory = File
@@ -29,234 +89,67 @@ 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.formatters.each do |formatter|
-          formatter.colour = options.colour if formatter.respond_to?(:colour=)
-          formatter.dry_run = options.dry_run if formatter.respond_to?(:dry_run=)
-        end
-        options.reporter = Reporter.new(options.formatters, options.backtrace_tweaker) 
-
-        # this doesn't really belong here.
-        # it should, but the way things are coupled, it doesn't
-        if options.differ_class
-          Spec::Expectations.differ = options.differ_class.new(options.diff_format, options.context_lines, options.colour)
-        end
-
-        unless options.generate
-          if options.runner_type
-            options.runner_type.new(options)
-          else
-            BehaviourRunner.new(options)  
-          end
-        end
+        options.create_behaviour_runner
       end
 
       def parse(args, err, out, warn_if_no_files)
         options_file = nil
         args_copy = args.dup
         options = Options.new
-        options.formatters = []
-        options.backtrace_tweaker = QuietBacktraceTweaker.new
-        options.examples = []
 
         opts = ::OptionParser.new do |opts|
           opts.banner = "Usage: spec (FILE|DIRECTORY|GLOB)+ [options]"
           opts.separator ""
 
-          opts.on("-D", "--diff [FORMAT]", "Show diff of objects that are expected to be equal when they are not",
-                                           "Builtin formats: unified|u|context|c",
-                                           "You can also specify a custom differ class",
-                                           "(in which case you should also specify --require)") do |format|
+          def opts.rspec_on(name, &block)
+            on(*COMMAND_LINE[name], &block)
+          end
 
-            # TODO make context_lines settable
-            options.context_lines = 3
+          opts.rspec_on(:diff) {|diff| options.parse_diff(diff, out, err)}
 
-            case format
-              when 'context', 'c'
-                options.diff_format  = :context
-              when 'unified', 'u', '', nil
-                options.diff_format  = :unified
-            end
+          opts.rspec_on(:colour) {options.colour = true}
 
-            if [:context,:unified].include? options.diff_format
-              require 'spec/expectations/differs/default'
-              options.differ_class = Spec::Expectations::Differs::Default
-            else
-              begin
-                options.diff_format  = :custom
-                options.differ_class = eval(format)
-              rescue NameError
-                err.puts "Couldn't find differ class #{format}"
-                err.puts "Make sure the --require option is specified *before* --diff"
-                exit if out == $stdout
-              end
-            end
+          opts.rspec_on(:example) {|example| options.parse_example(example)}
 
-          end
-          
-          opts.on("-c", "--colour", "--color", "Show coloured (red/green) output") do
-            options.colour = true
-          end
-          
-          opts.on("-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 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",
-                                                      "an example name directly, causing RSpec to run just the example",
-                                                      "matching that name") do |example|
-            if(File.file?(example))
-              options.examples = File.open(example).read.split("\n")
-            else
-              options.examples = [example]
-            end
-          end
+          opts.rspec_on(:specification) {|example| options.parse_example(example)}
 
-          opts.on("-s", "--spec [NAME]", "DEPRECATED - use -e instead", "(This will be removed when autotest works with -e)") do |example|
-            if(File.file?(example))
-              options.examples = File.open(example).read.split("\n")
-            else
-              options.examples = [example]
-            end
-          end
+          opts.rspec_on(:line) {|line_number| options.line_number = line_number.to_i}
 
-          opts.on("-l", "--line LINE_NUMBER", Integer, "Execute behaviour or example at given line.",
-                                                       "(does not work for dynamically generated specs)") do |line_number|
-            options.line_number = line_number.to_i
-          end
+          opts.rspec_on(:format) {|format| options.parse_format(format, out, err)}
 
-          opts.on("-f", "--format FORMAT[:WHERE]",  "Specifies what format to use for output. Specify WHERE to tell", 
-                                                    "the formatter where to write the output. All built-in formats", 
-                                                    "expect WHERE to be a file name, and will write to STDOUT if it's",
-                                                    "not specified. The --format option may be specified several times",
-                                                    "if you want several outputs",
-                                                    " ",
-                                                    "Builtin formats: ",
-                                                    "progress|p           : Text progress", 
-                                                    "specdoc|s            : Behaviour doc as text", 
-                                                    "rdoc|r               : Behaviour doc as RDoc", 
-                                                    "html|h               : A nice HTML report", 
-                                                    "failing_examples|e   : Write all failing examples - input for --example", 
-                                                    "failing_behaviours|b : Write all failing behaviours - input for --example", 
-                                                    " ",
-                                                    "FORMAT can also be the name of a custom formatter class",
-                                                    "(in which case you should also specify --require to load it)") do |format|
-            
-            where = out
-            # 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
-              raise "When using several --format options only one of them can be without a file" if @out_used
-              @out_used = true
-            end
+          opts.rspec_on(:require) {|req| options.parse_require(req)}
 
-            begin
-              formatter_type = BUILT_IN_FORMATTERS[format] || eval(format)
-              options.formatters << formatter_type.new(where)
-            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
+          opts.rspec_on(:backtrace) {options.backtrace_tweaker = NoisyBacktraceTweaker.new}
 
-          opts.on("-r", "--require FILE", "Require FILE before running specs",
-                                          "Useful for loading custom formatters or other extensions.",
-                                          "If this option is used it must come before the others") do |req|
-            req.split(",").each{|file| require file}
-          end
-          
-          opts.on("-b", "--backtrace", "Output full backtrace") do
-            options.backtrace_tweaker = NoisyBacktraceTweaker.new
-          end
-          
-          opts.on("-L", "--loadby STRATEGY", "Specify the strategy by which spec files should be loaded.",
-                                              "STRATEGY can currently only be 'mtime' (File modification time)",
-                                              "By default, spec files are loaded in alphabetical order if --loadby",
-                                              "is not specified.") do |loadby|
-            options.loadby = loadby
-          end
+          opts.rspec_on(:loadby) {|loadby| options.loadby = loadby}
 
-          opts.on("-R", "--reverse", "Run examples in reverse order") do
-            options.reverse = true
-          end
-          
-          opts.on("-t", "--timeout FLOAT", "Interrupt and fail each example that doesn't complete in the",
-                                             "specified time") do |timeout|
-            options.timeout = timeout.to_f
-          end
+          opts.rspec_on(:reverse) {options.reverse = true}
 
-          opts.on("-H", "--heckle CODE", "If all examples pass, this will mutate the classes and methods", 
-                                         "identified by CODE little by little and run all the examples again",
-                                         "for each mutation. The intent is that for each mutation, at least",
-                                         "one example *should* fail, and RSpec will tell you if this is not the",
-                                         "case. CODE should be either Some::Module, Some::Class or",
-                                         "Some::Fabulous#method") do |heckle|
-            heckle_runner = PLATFORM == 'i386-mswin32' ? 'spec/runner/heckle_runner_win' : 'spec/runner/heckle_runner'
-            require heckle_runner
-            options.heckle_runner = HeckleRunner.new(heckle)
-          end
-          
-          opts.on("-d", "--dry-run", "Invokes formatters without executing the examples.") do
-            options.dry_run = true
-          end
-          
-          opts.on("-O", "--options PATH", "Read options from a file") do |options_file|
-            # Remove the --options option and the argument before writing to file
-            index = args_copy.index("-O") || args_copy.index("--options")
-            args_copy.delete_at(index)
-            args_copy.delete_at(index)
-
-            new_args = args_copy + IO.readlines(options_file).map {|l| l.chomp.split " "}.flatten
-            return CommandLine.run(new_args, err, out, true, warn_if_no_files)
-          end
+          opts.rspec_on(:timeout) {|timeout| options.timeout = timeout.to_f}
 
-          opts.on("-G", "--generate-options PATH", "Generate an options file for --options") do |options_file|
-            # Remove the --generate-options option and the argument before writing to file
-            index = args_copy.index("-G") || args_copy.index("--generate-options")
-            args_copy.delete_at(index)
-            args_copy.delete_at(index)
+          opts.rspec_on(:heckle) {|heckle| options.parse_heckle(heckle)}
+          
+          opts.rspec_on(:dry_run) {options.dry_run = true}
 
-            File.open(options_file, 'w') do |io|
-              io.puts args_copy.join("\n")
-            end
-            out.puts "\nOptions written to #{options_file}. You can now use these options with:"
-            out.puts "spec --options #{options_file}"
-            options.generate = true
+          opts.rspec_on(:options_file) do |options_file|
+            return parse_options_file(options_file, out, err, args_copy, warn_if_no_files)
           end
 
-          opts.on("-U", "--runner RUNNER", "Use a custom BehaviourRunner.") do |runner|
-            begin
-              options.runner_type = eval(runner)
-            rescue NameError
-              err.puts "Couldn't find behaviour runner class #{runner}"
-              err.puts "Make sure the --require option is specified."
-              exit if out == $stdout
-            end
-          end
-          
-          opts.on("-X", "--drb", "Run examples via DRb. (For example against script/spec_server)") do |options_file|
-            # Remove the --drb option
-            index = args_copy.index("-X") || args_copy.index("--drb")
-            args_copy.delete_at(index)
-            
-            return DrbCommandLine.run(args_copy, err, out, true, warn_if_no_files)
+          opts.rspec_on(:generate_options) do |options_file|
+            options.parse_generate_options(options_file, args_copy, out)
           end
 
-          opts.on("-v", "--version", "Show version") do
-            out.puts ::Spec::VERSION::DESCRIPTION
-            exit if out == $stdout
+          opts.rspec_on(:runner) do |runner|
+            options.parse_runner(runner, out, err)
           end
 
-          opts.on_tail("-h", "--help", "You're looking at it") do
-            out.puts opts
-            exit if out == $stdout
+          opts.rspec_on(:drb) do
+            parse_drb args_copy, out, err, warn_if_no_files
           end
-          
+
+          opts.rspec_on(:version) {parse_version(out)}
+
+          opts.on_tail(*COMMAND_LINE[:help]) {parse_help(opts, out)}
         end
         opts.parse!(args)
 
@@ -269,21 +162,49 @@ module Spec
         if options.line_number
           set_spec_from_line_number(options, args, err)
         end
-        
+
         if options.formatters.empty?
           options.formatters << Formatter::ProgressBarFormatter.new(out)
         end
 
         options
       end
-      
+
+      def parse_options_file(options_file, out_stream, error_stream, args_copy, warn_if_no_files)
+        # Remove the --options option and the argument before writing to file
+        index = args_copy.index("-O") || args_copy.index("--options")
+        args_copy.delete_at(index)
+        args_copy.delete_at(index)
+
+        new_args = args_copy + IO.readlines(options_file).map {|l| l.chomp.split " "}.flatten
+        return CommandLine.run(new_args, error_stream, out_stream, true, warn_if_no_files)
+      end
+
+      def parse_drb(args_copy, out_stream, error_stream, warn_if_no_files)
+        # Remove the --drb option
+        index = args_copy.index("-X") || args_copy.index("--drb")
+        args_copy.delete_at(index)
+
+        return DrbCommandLine.run(args_copy, error_stream, out_stream, true, warn_if_no_files)
+      end
+
+      def parse_version(out_stream)
+        out_stream.puts ::Spec::VERSION::DESCRIPTION
+        exit if out_stream == $stdout
+      end
+
+      def parse_help(opts, out_stream)
+        out_stream.puts opts
+        exit if out_stream == $stdout
+      end      
+
       def set_spec_from_line_number(options, args, err)
         if options.examples.empty?
           if args.length == 1
             if @file_factory.file?(args[0])
               source = @file_factory.open(args[0])
               example = @spec_parser.spec_name_for(source, options.line_number)
-              options.examples = [example]
+              options.parse_example(example)
             elsif @file_factory.directory?(args[0])
               err.puts "You must specify one file, not a directory when using the --line option"
               exit(1) if err == $stderr

data/lib/spec/runner/options.rb

@@ -1,6 +1,21 @@
 module Spec
   module Runner
     class Options
+      BUILT_IN_FORMATTERS = {
+        'specdoc'  => Formatter::SpecdocFormatter,
+        's'        => Formatter::SpecdocFormatter,
+        'html'     => Formatter::HtmlFormatter,
+        'h'        => Formatter::HtmlFormatter,
+        'rdoc'     => Formatter::RdocFormatter,
+        'r'        => Formatter::RdocFormatter,
+        'progress' => Formatter::ProgressBarFormatter,
+        'p'        => Formatter::ProgressBarFormatter,
+        'failing_examples' => Formatter::FailingExamplesFormatter,
+        'e'        => Formatter::FailingExamplesFormatter,
+        'failing_behaviours' => Formatter::FailingBehavioursFormatter,
+        'b'        => Formatter::FailingBehavioursFormatter
+      }
+      
       attr_accessor(
         :backtrace_tweaker,
         :colour,
@@ -21,6 +36,127 @@ module Spec
         :timeout,
         :verbose
       )
+
+      def initialize
+        @backtrace_tweaker = QuietBacktraceTweaker.new
+        @examples = []
+        @formatters = []
+        @colour = false
+        @dry_run = false
+      end
+
+      def create_behaviour_runner
+        @formatters.each do |formatter|
+          formatter.colour = @colour if formatter.respond_to?(:colour=)
+          formatter.dry_run = @dry_run if formatter.respond_to?(:dry_run=)
+        end
+        @reporter = Reporter.new(@formatters, @backtrace_tweaker)
+
+        # this doesn't really belong here.
+        # it should, but the way things are coupled, it doesn't
+        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)
+        @context_lines = 3
+        case format
+          when :context, 'context', 'c'
+            @diff_format  = :context
+          when :unified, 'unified', 'u', '', nil
+            @diff_format  = :unified
+        end
+
+        if [:context,:unified].include? @diff_format
+          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
+        end
+      end
+
+      def parse_example(example)
+        if(File.file?(example))
+          @examples = File.open(example).read.split("\n")
+        else
+          @examples = [example]
+        end
+      end
+
+      def parse_line(line_number)
+        @line_number = line_number.to_i
+      end
+
+      def parse_format(format, out_stream, error_stream)
+        where = out_stream
+        # 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
+          raise "When using several --format options only one of them can be without a file" if @out_used
+          @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
+      end
+
+      def parse_require(req)
+        req.split(",").each{|file| require file}
+      end
+
+      def parse_heckle(heckle)
+        heckle_require = PLATFORM == 'i386-mswin32' ? 'spec/runner/heckle_runner_win' : 'spec/runner/heckle_runner'
+        require heckle_require
+        @heckle_runner = HeckleRunner.new(heckle)
+      end
+
+      def parse_generate_options(options_file, args_copy, out_stream)
+        # Remove the --generate-options option and the argument before writing to file
+        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
+        out_stream.puts "\nOptions written to #{options_file}. You can now use these options with:"
+        out_stream.puts "spec --options #{options_file}"
+        @generate = true
+      end
+
+      def parse_runner(runner, out_stream, error_stream)
+        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
+        end
+      end
     end
   end
 end

data/lib/spec/runner/reporter.rb

@@ -65,6 +65,7 @@ module Spec
           @formatters.each{|f| f.dump_failure(index, failure)}
           index + 1
         end
+        STDOUT.flush
       end
 
       def duration
@@ -74,12 +75,12 @@ module Spec
 
       def example_passed(name)
         @formatters.each{|f| f.example_passed(name)}
+        STDOUT.flush
       end
 
       def example_failed(name, error, failure_location)
         @backtrace_tweaker.tweak_backtrace(error, failure_location)
         example_name = "#{@behaviour_names.last} #{name}"
-        @failure_io.puts(example_name) unless @failure_io.nil?
         failure = Failure.new(example_name, error)
         @failures << failure
         @formatters.each{|f| f.example_failed(name, @failures.length, failure)}

data/lib/spec/translator.rb

@@ -66,6 +66,7 @@ module Spec
         
         # Add parenthesis
         post.gsub!(/^(\w+)\s+([\w|\.|\,|\(.*\)|\'|\"|\:|@| ]+)(\})/, '\1(\2)\3') # inside a block
+        post.gsub!(/^(redirect_to)\s+(.*)/, '\1(\2)') # redirect_to, which often has http:
         post.gsub!(/^(\w+)\s+([\w|\.|\,|\(.*\)|\{.*\}|\'|\"|\:|@| ]+)/, '\1(\2)')
         post.gsub!(/(\s+\))/, ')')
         post.gsub!(/\)\}/, ') }')
@@ -89,6 +90,7 @@ module Spec
         /^match/, 
         /^raise_error/, 
         /^respond_to/, 
+        /^redirect_to/, 
         /^satisfy/, 
         /^throw_symbol/,
         # Extra ones that we use in spec_helper

data/lib/spec/version.rb

@@ -3,11 +3,11 @@ module Spec
     unless defined? MAJOR
       MAJOR  = 0
       MINOR  = 9
-      TINY   = 1
+      TINY   = 2
       RELEASE_CANDIDATE = nil
       
-      # RANDOM_TOKEN: 0.434722315440065
-      REV = "$LastChangedRevision: 1880 $".match(/LastChangedRevision: (\d+)/)[1]
+      # RANDOM_TOKEN: 0.495595173542949
+      REV = "$LastChangedRevision: 1899 $".match(/LastChangedRevision: (\d+)/)[1]
 
       STRING = [MAJOR, MINOR, TINY].join('.')
       TAG = "REL_#{[MAJOR, MINOR, TINY, RELEASE_CANDIDATE].compact.join('_')}".upcase.gsub(/\.|-/, '_')

data/spec/spec/dsl/behaviour_spec.rb

@@ -460,7 +460,7 @@ module Spec
       
       it "should include any predicate_matchers included using configuration" do
         $included_predicate_matcher_found = false
-        Spec::Runner.configuration.predicate_matchers[:does_something?] = :do_something
+        Spec::Runner.configuration.predicate_matchers[:do_something] = :does_something?
         Behaviour.new('example') do
           it "should respond to do_something" do
             $included_predicate_matcher_found = respond_to?(:do_something)

data/spec/spec/dsl/predicate_matcher_spec.rb

@@ -9,7 +9,7 @@ module Spec
     end
     
     describe "predicate_matcher[method_on_object] = matcher_method" do
-      predicate_matchers[:can_swim?] = :swim
+      predicate_matchers[:swim] = :can_swim?
       it "should match matcher_method if method_on_object returns true" do
         swim(100).matches?(Fish.new).should be_true
       end

data/spec/spec/runner/option_parser_spec.rb

@@ -45,7 +45,7 @@ describe "OptionParser" do
 
   it "should not use colour by default" do
     options = parse([])
-    options.colour.should be_nil
+    options.colour.should == false
   end
 
   it "should print help to stdout" do

data/spec/spec/runner/options_spec.rb

@@ -0,0 +1,142 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+  module Runner
+    describe "Options" do
+      before do
+        @error_stream = StringIO.new('')
+        @out_stream = StringIO.new('')
+        @options = Options.new
+      end
+
+      it "instantiates empty arrays" do
+        @options.examples.should == []
+        @options.formatters.should == []
+      end
+
+      it "defaults to QuietBacktraceTweaker" do
+        @options.backtrace_tweaker.class.should == QuietBacktraceTweaker
+      end
+
+      it "defaults to no dry_run" do
+        @options.dry_run.should == false
+      end
+
+      it "parse_diff sets context_lines" do
+        @options.parse_diff nil, @out_stream, @error_stream
+        @options.context_lines.should == 3
+      end
+
+      it "defaults diff to unified" do
+        @options.parse_diff nil, @out_stream, @error_stream
+        @options.diff_format.should == :unified
+      end
+
+      it "should use unified diff format option when format is unified" do
+        @options.parse_diff 'unified', @out_stream, @error_stream
+        @options.diff_format.should == :unified
+        @options.differ_class.should equal(Spec::Expectations::Differs::Default)
+      end
+
+      it "should use context diff format option when format is context" do
+        @options.parse_diff 'context', @out_stream, @error_stream
+        @options.diff_format.should == :context
+        @options.differ_class.should == Spec::Expectations::Differs::Default
+      end
+
+      it "should use custom diff format option when format is a custom format" do
+        @options.parse_diff "Custom::Formatter", @out_stream, @error_stream
+        @options.diff_format.should == :custom
+        @options.differ_class.should == Custom::Formatter
+      end
+
+      it "should print instructions about how to fix bad differ" do
+        @options.parse_diff "Custom::BadFormatter", @out_stream, @error_stream
+        @error_stream.string.should match(/Couldn't find differ class Custom::BadFormatter/n)
+      end      
+
+      it "parse_example sets single example when argument not a file" do
+        example = "something or other"
+        File.file?(example).should == false
+        @options.parse_example example
+        @options.examples.should eql(["something or other"])
+      end
+
+      it "parse_example sets examples to contents of file" do
+        example = "#{File.dirname(__FILE__)}/examples.txt"
+        File.should_receive(:file?).with(example).and_return(true)
+        file = StringIO.new("Sir, if you were my husband, I would poison your drink.\nMadam, if you were my wife, I would drink it.")
+        File.should_receive(:open).with(example).and_return(file)
+        
+        @options.parse_example example
+        @options.examples.should eql([
+          "Sir, if you were my husband, I would poison your drink.",
+          "Madam, if you were my wife, I would drink it."
+        ])
+      end
+    end
+
+    describe "Options", "receiving create_behaviour_runner" do
+      before do
+        @options = Options.new
+      end
+
+      it "returns nil when generate is true" do
+        @options.generate = true
+        @options.create_behaviour_runner.should == nil
+      end
+
+      it "returns a BehaviourRunner by default" do
+        runner = @options.create_behaviour_runner
+        runner.class.should == BehaviourRunner
+      end
+
+      it "returns a custom runner when runner_type is set" do
+        runner_type = Class.new do
+          attr_reader :options
+          def initialize(options)
+            @options = options
+          end
+        end
+        @options.runner_type = runner_type
+
+        runner = @options.create_behaviour_runner
+        runner.class.should == runner_type
+        runner.options.should === @options
+      end
+
+      it "does not set Expectations differ when differ_class is not set" do
+        @options.differ_class = nil
+        Spec::Expectations.should_not_receive(:differ=)
+        @options.create_behaviour_runner
+      end
+
+      it "sets Expectations differ when differ_class is set" do
+        @options.differ_class = Spec::Expectations::Differs::Default
+        Spec::Expectations.should_receive(:differ=).with(:anything).and_return do |arg|
+          arg.class.should == Spec::Expectations::Differs::Default
+        end
+        @options.create_behaviour_runner
+      end
+
+      it "creates a Reporter" do
+        formatter = ::Spec::Runner::Formatter::BaseFormatter.new(:somewhere)
+        @options.formatters << formatter
+        reporter = Reporter.new(@formatters, @backtrace_tweaker)
+        Reporter.should_receive(:new).with(@options.formatters, @options.backtrace_tweaker).and_return(reporter)
+        @options.create_behaviour_runner
+        @options.reporter.should === reporter
+      end
+
+      it "sets colour and dry_run on the formatters" do
+        @options.colour = true
+        @options.dry_run = true
+        formatter = ::Spec::Runner::Formatter::BaseTextFormatter.new(:somewhere)
+        formatter.should_receive(:colour=).with(true)
+        formatter.should_receive(:dry_run=).with(true)
+        @options.formatters << formatter
+        @options.create_behaviour_runner
+      end
+    end
+  end
+end

data/spec/spec/translator_spec.rb

@@ -205,4 +205,12 @@ describe "Translator" do
   #     "lambda { @instance.foo = foo }.should raise_error(NoMethodError) # no writer defined"
   #   )
   # end
+
+  it "should translate redirects" do
+    @t.translate_line(
+      "controller.should_redirect_to 'http://not_existing_domain_for_novalis.test.host/404.html'"
+    ).should eql(
+      "controller.should redirect_to('http://not_existing_domain_for_novalis.test.host/404.html')"
+    )
+  end
 end

metadata

@@ -3,9 +3,9 @@ rubygems_version: 0.9.1
 specification_version: 1
 name: rspec
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
-date: 2007-05-01 00:00:00 +02:00
-summary: RSpec-0.9.1 (r1880) - BDD for Ruby http://rspec.rubyforge.org/
+  version: 0.9.2
+date: 2007-05-03 00:00:00 +02:00
+summary: RSpec-0.9.2 (r1899) - BDD for Ruby http://rspec.rubyforge.org/
 require_paths: 
 - lib
 email: rspec-devel@rubyforge.org
@@ -184,6 +184,7 @@ files:
 - spec/spec/runner/noisy_backtrace_tweaker_spec.rb
 - spec/spec/runner/object_ext_spec.rb
 - spec/spec/runner/option_parser_spec.rb
+- spec/spec/runner/options_spec.rb
 - spec/spec/runner/quiet_backtrace_tweaker_spec.rb
 - spec/spec/runner/reporter_spec.rb
 - spec/spec/runner/spec_matcher_spec.rb