rspec 0.7.5.1 → 0.8.0

data/lib/spec/runner/context_eval.rb

@@ -9,8 +9,9 @@ module Spec
 
         def include(mod)
           context_modules << mod
+          mod.send :included, self
         end
-
+        
         def context_setup(&block)
           context_setup_parts << block
         end
@@ -27,7 +28,7 @@ module Spec
           teardown_parts << block
         end
 
-        def specify(spec_name, opts={}, &block)
+        def specify(spec_name=:__generate_description, opts={}, &block)
           specifications << Specification.new(spec_name, opts, &block)
         end
 
@@ -88,7 +89,7 @@ module Spec
         end
 
         def context_modules
-          @context_modules ||= []
+          @context_modules ||= [Spec::Matchers, Spec::Mocks]
         end
         
         def specifications

data/lib/spec/runner/context_runner.rb

@@ -1,5 +1,3 @@
-require File.dirname(__FILE__) + '/../../spec'
-
 module Spec
   module Runner
     class ContextRunner
@@ -10,8 +8,8 @@ module Spec
       end
     
       def add_context(context)
-        return if !@options.spec_name.nil? unless context.matches?(@options.spec_name)
-        context.run_single_spec(@options.spec_name) if context.matches?(@options.spec_name)
+        return unless spec_description.nil? || context.matches?(spec_description)
+        context.run_single_spec(spec_description) if context.matches?(spec_description)
         @contexts << context
       end
       
@@ -47,6 +45,11 @@ module Spec
         @contexts.inject(0) {|sum, context| sum + context.number_of_specs}
       end
       
+      private
+      def spec_description
+        @options.spec_name
+      end
+      
     end
   end
 end

data/lib/spec/runner/drb_command_line.rb

@@ -6,7 +6,7 @@ module Spec
     class DrbCommandLine
       # Runs specs on a DRB server. Note that this API is similar to that of
       # CommandLine - making it possible for clients to use both interchangeably.
-      def self.run(argv, stderr, stdout, exit=false, warn_if_no_files=true)
+      def self.run(argv, stderr, stdout, exit=true, warn_if_no_files=true)
         begin
           DRb.start_service
           rails_spec_server = DRbObject.new_with_uri("druby://localhost:8989")

data/lib/spec/runner/execution_context.rb

@@ -2,18 +2,10 @@ module Spec
   module Runner
     class ExecutionContext
       module InstanceMethods
-        def initialize(spec)
-          @spec = spec
+        def initialize(*args) #:nodoc:
+          #necessary for RSpec's own specs
         end
-
-        def mock(name, options={})
-          Spec::Mocks::Mock.new(name, options)
-        end
-
-        def duck_type(*args)
-          return Spec::Mocks::DuckTypeArgConstraint.new(*args)
-        end
-
+        
         def violated(message="")
           raise Spec::Expectations::ExpectationNotMetError.new(message)
         end

data/lib/spec/runner/extensions/kernel.rb

@@ -1,15 +1,17 @@
-require 'spec/runner/extensions/object'
-
 module Kernel
   def context(name, &block)
     context = Spec::Runner::Context.new(name, &block)
     context_runner.add_context(context)
   end
-  
+
 private
-  
+
   def context_runner
-    if $context_runner.nil?; $context_runner = ::Spec::Runner::OptionParser.new.create_context_runner(ARGV.dup, STDERR, STDOUT, false); at_exit { $context_runner.run(false) }; end
+    # TODO: Figure out a better way to get this considered "covered" and keep this statement on multiple lines 
+    unless $context_runner; \
+      $context_runner = ::Spec::Runner::OptionParser.new.create_context_runner(ARGV.dup, STDERR, STDOUT, false); \
+      at_exit { $context_runner.run(false) }; \
+    end
     $context_runner
   end
 end

data/lib/spec/runner/extensions/object.rb

@@ -1,3 +1,6 @@
+# The following copyright applies to Object#copy_instance_variables_from,
+# which we borrowed from active_support.
+#
 # Copyright (c) 2004 David Heinemeier Hansson
 # 
 # Permission is hereby granted, free of charge, to any person obtaining
@@ -20,7 +23,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 class Object
   # From active_support
-  def copy_instance_variables_from(object, exclude = [])
+  def copy_instance_variables_from(object, exclude = []) # :nodoc:
     exclude += object.protected_instance_variables if object.respond_to? :protected_instance_variables
     
     instance_variables = object.instance_variables - exclude.map { |name| name.to_s }

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

@@ -96,10 +96,18 @@ module Spec
         end
 
         def colour(text, colour_code)
-          return text unless @colour && @output == Kernel
+          return text unless @colour && output_to_tty?
           "#{colour_code}#{text}\e[0m"
         end
-    
+
+        def output_to_tty?
+          begin
+            @output == Kernel || @output.tty?
+          rescue NoMethodError
+            false
+          end
+        end
+        
         def red(text); colour(text, "\e[31m"); end
         def green(text); colour(text, "\e[32m"); end
         def magenta(text); colour(text, "\e[35m"); end
@@ -107,4 +115,4 @@ module Spec
       end
     end
   end
-end
+end

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

@@ -2,6 +2,8 @@ module Spec
   module Runner
     module Formatter
       class HtmlFormatter < BaseTextFormatter
+        attr_reader :current_spec_number, :current_context_number
+        
         def initialize(output, dry_run=false, colour=false)
           super
           @current_spec_number = 0
@@ -11,7 +13,9 @@ module Spec
         def start(spec_count)
           @spec_count = spec_count
 
-          @output.puts @@header
+          @output.puts HEADER_1
+          @output.puts extra_header_content unless extra_header_content.nil?
+          @output.puts HEADER_2
           STDOUT.flush
         end
 
@@ -34,14 +38,13 @@ module Spec
         end
 
         def spec_started(name)
-          @current_spec = name
           @current_spec_number += 1
           STDOUT.flush
         end
 
         def spec_passed(name)
           move_progress
-          @output.puts "    <dd class=\"spec passed\"><span class=\"passed_spec_name\">#{escape(@current_spec)}</span></dd>"
+          @output.puts "    <dd class=\"spec passed\"><span class=\"passed_spec_name\">#{escape(name)}</span></dd>"
           STDOUT.flush
         end
 
@@ -50,19 +53,23 @@ module Spec
           @output.puts "    <script type=\"text/javascript\">makeRed('context_#{@current_context_number}');</script>"
           move_progress
           @output.puts "    <dd class=\"spec failed\">"
-          @output.puts "      <span class=\"failed_spec_name\">#{escape(@current_spec)}</span>"
+          @output.puts "      <span class=\"failed_spec_name\">#{escape(name)}</span>"
           @output.puts "      <div class=\"failure\" id=\"failure_#{counter}\">"
           @output.puts "        <div class=\"message\"><pre>#{escape(failure.exception.message)}</pre></div>" unless failure.exception.nil?
           @output.puts "        <div class=\"backtrace\"><pre>#{format_backtrace(failure.exception.backtrace)}</pre></div>" unless failure.exception.nil?
-          extra_failure_content
+          @output.puts extra_failure_content unless extra_failure_content.nil?
           @output.puts "      </div>"
           @output.puts "    </dd>"
           STDOUT.flush
         end
         
-        # Override this method if you wish to output extra HTML for a failed spec. For example, you
-        # could output links to images or other files produced during the specs. Example:
+        # 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
+        # could output links to images or other files produced during the specs.
         #
         def extra_failure_content
         end
@@ -93,7 +100,7 @@ module Spec
           STDOUT.flush
         end
 
-        @@header = <<-HEADER
+        HEADER_1 = <<-EOF
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE html
      PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
@@ -103,7 +110,11 @@ module Spec
 <head>
   <title>RSpec results</title>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <meta http-equiv="Content-Script-Type" content="text/javascript" />
+  <meta http-equiv="Expires" content="-1" />
+  <meta http-equiv="Pragma" content="no-cache" />
+EOF
+
+        HEADER_2 = <<-EOF
   <script type="text/javascript">
   function moveProgressBar(percentDone) {
     document.getElementById("header").style.width = percentDone +"%";
@@ -201,7 +212,7 @@ module Spec
 </div>
 
 <div id="results">
-HEADER
+EOF
       end
     end
   end

data/lib/spec/runner/heckle_runner.rb

@@ -17,18 +17,24 @@ module Spec
       # methods in the matched classes.
       def heckle_with(context_runner)
         if @filter =~ /(.*)[#\.](.*)/
-          heckle = @heckle_class.new($1, $2, context_runner)
-          heckle.validate
+          heckle_method($1, $2)
         else
-          heckle_module
+          heckle_class_or_module(@filter)
         end
       end
       
-      def heckle_module
-        filter = /^#{@filter}/
+      def heckle_method(class_name, method_name)
+        verify_constant(class_name)
+        heckle = @heckle_class.new(class_name, method_name, context_runner)
+        heckle.validate
+      end
+      
+      def heckle_class_or_module(class_or_module_name)
+        verify_constant(class_or_module_name)
+        pattern = /^#{class_or_module_name}/
         classes = []
         ObjectSpace.each_object(Class) do |klass|
-          classes << klass if klass.name =~ filter
+          classes << klass if klass.name =~ pattern
         end
         
         classes.each do |klass|
@@ -38,9 +44,19 @@ module Spec
           end
         end
       end
+      
+      def verify_constant(name)
+        begin
+          # This is defined in Heckle
+          name.to_class
+        rescue
+          raise "Heckling failed - \"#{name}\" is not a known class or module"
+        end
+      end
     end
     
-    class Heckler < Heckle::Base
+    #Supports Heckle 1.2 and prior (earlier versions used Heckle::Base)
+    class Heckler < (Heckle.const_defined?(:Base) ? Heckle::Base : Heckle)
       def initialize(klass_name, method_name, context_runner)
         super(klass_name, method_name)
         @context_runner = context_runner
@@ -52,4 +68,4 @@ module Spec
       end
     end
   end
-end
+end

data/lib/spec/runner/heckle_runner_win.rb

@@ -0,0 +1,10 @@
+module Spec
+  module Runner
+    # Dummy implementation for Windows that just fails (Heckle is not supported on Windows)
+    class HeckleRunner
+      def initialize(filter)
+        raise "Heckle not supported on Windows"
+      end
+    end
+  end
+end

data/lib/spec/runner/option_parser.rb

@@ -1,5 +1,10 @@
 require 'ostruct'
 require 'optparse'
+require 'spec/runner/spec_parser'
+require 'spec/runner/formatter'
+require 'spec/runner/backtrace_tweaker'
+require 'spec/runner/reporter'
+require 'spec/runner/context_runner'
 
 module Spec
   module Runner
@@ -11,6 +16,9 @@ module Spec
 
       def create_context_runner(args, err, out, warn_if_no_files)
         options = parse(args, err, out, warn_if_no_files)
+        # 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?(OpenStruct)
 
         formatter = options.formatter_type.new(options.out, options.dry_run, options.colour)
         options.reporter = Reporter.new(formatter, options.backtrace_tweaker) 
@@ -18,15 +26,19 @@ module Spec
         # this doesn't really belong here.
         # it should, but the way things are coupled, it doesn't
         if options.differ_class
-          Spec::Expectations::Should::Base.differ = options.differ_class.new(options.diff_format, options.context_lines, options.colour)
+          Spec::Expectations.differ = options.differ_class.new(options.diff_format, options.context_lines, options.colour)
         end
 
-        ContextRunner.new(options)
+        unless options.generate
+          ContextRunner.new(options)  
+        end
       end
 
       def parse(args, err, out, warn_if_no_files)
+        options_file = nil
+        args_copy = args.dup
         options = OpenStruct.new
-        options.out = out == STDOUT ? Kernel : out
+        options.out = (out == STDOUT ? Kernel : out)
         options.formatter_type = Formatter::ProgressBarFormatter
         options.backtrace_tweaker = QuietBacktraceTweaker.new
         options.spec_name = nil
@@ -39,7 +51,6 @@ module Spec
                                            "Builtin formats: unified|u|context|c",
                                            "You can also specify a custom differ class",
                                            "(in which case you should also specify --require)") do |format|
-            require 'spec/expectations/diff'  # patches in diff extension
 
             # TODO make context_lines settable
             options.context_lines = 3
@@ -104,7 +115,7 @@ module Spec
           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|
-            require req
+            req.split(",").each{|file| require file}
           end
           
           opts.on("-b", "--backtrace", "Output full backtrace") do
@@ -115,7 +126,8 @@ module Spec
                                          "the specced code a little each time. The intent is that specs",
                                          "*should* fail, and RSpec will tell you if they don't.",
                                          "CODE should be either Some::Module, Some::Class or Some::Fabulous#method}") do |heckle|
-            require 'spec/runner/heckle_runner'
+            heckle_runner = PLATFORM == 'i386-mswin32' ? 'spec/runner/heckle_runner_win' : 'spec/runner/heckle_runner'
+            require heckle_runner
             options.heckle_runner = HeckleRunner.new(heckle)
           end
           
@@ -123,10 +135,42 @@ module Spec
             options.dry_run = true
           end
           
-          opts.on("-o", "--out OUTPUT_FILE", "Path to output file (defaults to STDOUT)") do |outfile|
-            options.out = File.new(outfile, 'w')
+          opts.on("-o", "--out OUTPUT_FILE", "Path to output file (defaults to STDOUT)") do |out_file|
+            options.out = File.new(out_file, 'w')
           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).each {|s| s.chomp!}
+            return CommandLine.run(new_args, err, out, true, warn_if_no_files)
+          end
+
+          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)
+
+            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
+          end
+          
+          opts.on("-X", "--drb", "Run specs via DRb. (For example against script/rails_spec_server)") do |options_file|
+            # Remove the --options option and the argument before writing to file
+            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)
+          end
+
           opts.on("-v", "--version", "Show version") do
             out.puts ::Spec::VERSION::DESCRIPTION
             exit if out == $stdout
@@ -141,8 +185,9 @@ module Spec
         opts.parse!(args)
 
         if args.empty? && warn_if_no_files
+          err.puts "No files specified."
           err.puts opts
-          exit(1) if err == $stderr
+          exit(6) if err == $stderr
         end
 
         if options.line_number
@@ -163,15 +208,15 @@ module Spec
               exit(1) if err == $stderr
             else
               err.puts "#{args[0]} does not exist"
-              exit(1) if err == $stderr
+              exit(2) if err == $stderr
             end
           else
-            err.puts "Only one file can be specified when using the --line option"
-            exit(1) if err == $stderr
+            err.puts "Only one file can be specified when using the --line option: #{args.inspect}"
+            exit(3) if err == $stderr
           end
         else
           err.puts "You cannot use both --line and --spec"
-          exit(1) if err == $stderr
+          exit(4) if err == $stderr
         end
       end
     end