rspec 0.7.2 → 0.7.5.1

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

@@ -1,21 +1,29 @@
-# http://eigenclass.org/hiki.rb?bounded+space+instance_exec
+# Copyright (c) 2004 David Heinemeier Hansson
+# 
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 class Object
-  module InstanceExecHelper; end
-  include InstanceExecHelper
-  def instance_exec(*args, &block)
-    begin
-      old_critical, Thread.critical = Thread.critical, true
-      n = 0
-      n += 1 while respond_to?(mname="__instance_exec#{n}")
-      InstanceExecHelper.module_eval{ define_method(mname, &block) }
-    ensure
-      Thread.critical = old_critical
-    end
-    begin
-      ret = send(mname, *args)
-    ensure
-      InstanceExecHelper.module_eval{ remove_method(mname) } rescue nil
-    end
-    ret
+  # From active_support
+  def copy_instance_variables_from(object, exclude = [])
+    exclude += object.protected_instance_variables if object.respond_to? :protected_instance_variables
+    
+    instance_variables = object.instance_variables - exclude.map { |name| name.to_s }
+    instance_variables.each { |name| instance_variable_set(name, object.instance_variable_get(name)) }
   end
 end

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

@@ -92,7 +92,7 @@ module Spec
       protected
       
         def backtrace_line(line)
-          line
+          line.sub(/\A([^:]+:\d+)$/, '\\1:')
         end
 
         def colour(text, colour_code)

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

@@ -4,83 +4,98 @@ module Spec
       class HtmlFormatter < BaseTextFormatter
         def initialize(output, dry_run=false, colour=false)
           super
-          @current_count = 0
-          @spec_count = 0
+          @current_spec_number = 0
+          @current_context_number = 0
         end
-      
+
         def start(spec_count)
           @spec_count = spec_count
-      
-          @output.puts HEADER
+
+          @output.puts @@header
           STDOUT.flush
         end
 
         def add_context(name, first)
+          @current_context_number += 1
           unless first
-            @output.puts "  </ul>"
+            @output.puts "  </dl>"
             @output.puts "</div>"
           end
           @output.puts "<div class=\"context\">"
-          @output.puts "  <ul>"
-          @output.puts "  <li class=\"context_name\">#{name}</li>"
+          @output.puts "  <dl>"
+          @output.puts "  <dt id=\"context_#{@current_context_number}\">#{name}</dt>"
           STDOUT.flush
         end
 
         def start_dump
-          @output.puts "  </ul>"
+          @output.puts "  </dl>"
           @output.puts "</div>"
           STDOUT.flush
         end
 
         def spec_started(name)
           @current_spec = name
-          @current_count += 1
+          @current_spec_number += 1
           STDOUT.flush
         end
 
         def spec_passed(name)
           move_progress
-          @output.puts "    <li class=\"spec passed\"><div class=\"passed_spec_name\">#{escape(@current_spec)}</div></li>"
+          @output.puts "    <dd class=\"spec passed\"><span class=\"passed_spec_name\">#{escape(@current_spec)}</span></dd>"
           STDOUT.flush
         end
 
         def spec_failed(name, counter, failure)
-          @output.puts "    <script type=\"text/javascript\">makeProgressbarRed();</script>"
+          @output.puts "    <script type=\"text/javascript\">makeRed('header');</script>"
+          @output.puts "    <script type=\"text/javascript\">makeRed('context_#{@current_context_number}');</script>"
           move_progress
-          @output.puts "    <li class=\"spec failed\">"
-          @output.puts "      <div class=\"failed_spec_name\">#{escape(@current_spec)}</div>"
+          @output.puts "    <dd class=\"spec failed\">"
+          @output.puts "      <span class=\"failed_spec_name\">#{escape(@current_spec)}</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 "      </div>"
-          @output.puts "    </li>"
+          @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:
+        #
+        #
+        def extra_failure_content
+        end
+        
         def move_progress
-          percent_done = @spec_count == 0 ? 100.0 : (@current_count.to_f / @spec_count.to_f * 1000).to_i / 10.0
+          percent_done = @spec_count == 0 ? 100.0 : (@current_spec_number.to_f / @spec_count.to_f * 1000).to_i / 10.0
           @output.puts "    <script type=\"text/javascript\">moveProgressBar('#{percent_done}');</script>"
         end
         
         def escape(string)
           string.gsub(/&/n, '&amp;').gsub(/\"/n, '&quot;').gsub(/>/n, '&gt;').gsub(/</n, '&lt;')
         end
-    
+
         def dump_failure(counter, failure)
         end
 
         def dump_summary(duration, spec_count, failure_count)
+          if @dry_run
+            totals = "This was a dry-run"
+          else
+            totals = "#{spec_count} specification#{'s' unless spec_count == 1}, #{failure_count} failure#{'s' unless failure_count == 1}"
+          end
+          @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>"
           STDOUT.flush
         end
-        
-        RED_BACKGROUND   = '#CD0000'
-        GREEN_BACKGROUND = '#659D32'
-        
-        HEADER = <<-HEADER
+
+        @@header = <<-HEADER
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html 
+<!DOCTYPE html
      PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -91,98 +106,103 @@ module Spec
   <meta http-equiv="Content-Script-Type" content="text/javascript" />
   <script type="text/javascript">
   function moveProgressBar(percentDone) {
-    document.getElementById("progress-bar").style.width = percentDone +"%";
+    document.getElementById("header").style.width = percentDone +"%";
   }
-  function makeProgressbarRed() {
-    document.getElementById('progress-bar').style.background = '#{RED_BACKGROUND}';
+  function makeRed(element_id) {
+    document.getElementById(element_id).style.background = '#C40D0D';
   }
   </script>
   <style type="text/css">
   body {
-    font-size: 9pt;
-    font-family: verdana, arial, helvetica;
-    width: 85%;
+    margin: 0; padding: 0;
+    background: #fff;
   }
 
-  #progress-bar-bg {
-    background-color: #C9C9C9; 
-    border-bottom: 1px solid gray; 
-    border-right: 1px solid gray;
+  #header {
+    background: #65C400; color: #fff;
   }
 
-  #progress-bar {
-    background-color: #{GREEN_BACKGROUND};
-    width: 0px;
+  h1 {
+    margin: 0 0 10px;
+    padding: 10px;
+    font: bold 18px "Lucida Grande", Helvetica, sans-serif;
   }
 
-  div.context {
-    padding: 0px;
-    background: #fff;
-    margin-top: 0px;
+  #summary {
+    margin: 0; padding: 5px 10px;
+    font: bold 10px "Lucida Grande", Helvetica, sans-serif;
+    text-align: right;
+    position: absolute;
+    top: 0px;
+    right: 0px;
   }
 
-  ul {
-    padding-left: 0px;
+  #summary p {
+    margin: 0 0 2px;
   }
 
-  li { 
-    list-style-type: none; 
-    margin: 0;
-    border: 1px solid #fff;
+  #summary #totals {
+    font-size: 14px;
   }
 
-  li.context_name {
-    font-size: 1.3em;
-    font-weight: bold;
-    color: #589CCF;
+  .context {
+    margin: 0 10px 5px;
+    background: #fff;
   }
 
-  div.passed_spec_name {
-    font-weight: bold;
-    color: #324F17;
+  dl {
+    margin: 0; padding: 0 0 5px;
+    font: normal 11px "Lucida Grande", Helvetica, sans-serif;
   }
 
-  div.failed_spec_name {
+  dt {
+    padding: 3px;
+    background: #65C400;
+    color: #fff;
     font-weight: bold;
-    color: #EEB4B4;
   }
 
-  li.passed {
-    display: block; 
-    background: #659D32; 
-    padding: 1px 4px; 
+  dd {
+    margin: 5px 0 5px 5px;
+    padding: 3px 3px 3px 18px;
   }
 
-  li.failed {
-    display: block; 
-    background: #CD0000; 
-    color: #000; 
-    padding: 2px 4px; 
+  dd.spec.passed {
+    border-left: 5px solid #65C400;
+    border-bottom: 1px solid #65C400;
+    background: #DBFFB4; color: #3D7700;
   }
 
-  li.failed .failure {
-    font-weight: normal;
-    font-size: 9pt;
+  dd.spec.failed {
+    border-left: 5px solid #C20000;
+    border-bottom: 1px solid #C20000;
+    color: #C20000; background: #FFFBD3;
   }
 
   div.backtrace {
-    color: #fff; 
+    color: #000;
+    font-size: 12px;
   }
 
-  div.backtrace a {
-    color: #fff; 
+  a {
+    color: #BE5C00;
   }
-
   </style>
 </head>
 <body>
 
-<div id="progress-bar-bg">
-  <div id="progress-bar">&nbsp;</div>
+<div id="header">
+  <h1>RSpec Results</h1>
+
+  <div id="summary">
+    <p id="duration">&nbsp;</p>
+    <p id="totals">&nbsp;</p>
+  </div>
 </div>
 
+<div id="results">
 HEADER
       end
     end
   end
-end
+end

data/lib/spec/runner/heckle_runner.rb

@@ -0,0 +1,55 @@
+begin
+  require 'rubygems'
+  require 'heckle'
+rescue LoadError ; raise "You must gem install heckle to use --heckle" ; end
+
+module Spec
+  module Runner
+    # Creates a new Heckler configured to heckle all methods in the classes
+    # whose name matches +filter+
+    class HeckleRunner
+      def initialize(filter, heckle_class=Heckler)
+        @filter = filter
+        @heckle_class = heckle_class
+      end
+      
+      # Runs all the contexts held by +context_runner+ once for each of the 
+      # methods in the matched classes.
+      def heckle_with(context_runner)
+        if @filter =~ /(.*)[#\.](.*)/
+          heckle = @heckle_class.new($1, $2, context_runner)
+          heckle.validate
+        else
+          heckle_module
+        end
+      end
+      
+      def heckle_module
+        filter = /^#{@filter}/
+        classes = []
+        ObjectSpace.each_object(Class) do |klass|
+          classes << klass if klass.name =~ filter
+        end
+        
+        classes.each do |klass|
+          klass.instance_methods(false).each do |method_name|
+            heckle = @heckle_class.new(klass.name, method_name, context_runner)
+            heckle.validate
+          end
+        end
+      end
+    end
+    
+    class Heckler < Heckle::Base
+      def initialize(klass_name, method_name, context_runner)
+        super(klass_name, method_name)
+        @context_runner = context_runner
+      end
+
+      def tests_pass?
+        failure_count = @context_runner.run(false)
+        failure_count == 0
+      end
+    end
+  end
+end

data/lib/spec/runner/option_parser.rb

@@ -13,7 +13,7 @@ module Spec
         options = parse(args, err, out, warn_if_no_files)
 
         formatter = options.formatter_type.new(options.out, options.dry_run, options.colour)
-        reporter = Reporter.new(formatter, options.backtrace_tweaker) 
+        options.reporter = Reporter.new(formatter, options.backtrace_tweaker) 
 
         # this doesn't really belong here.
         # it should, but the way things are coupled, it doesn't
@@ -21,7 +21,7 @@ module Spec
           Spec::Expectations::Should::Base.differ = options.differ_class.new(options.diff_format, options.context_lines, options.colour)
         end
 
-        ContextRunner.new(reporter, options.dry_run, options.spec_name)
+        ContextRunner.new(options)
       end
 
       def parse(args, err, out, warn_if_no_files)
@@ -74,7 +74,7 @@ module Spec
           opts.on("-s", "--spec SPECIFICATION_NAME", "Execute context or specification with matching name") do |spec_name|
             options.spec_name = spec_name
           end
-
+          
           opts.on("-l", "--line LINE_NUMBER", Integer, "Execute context or specification at given line") do |line_number|
             options.line_number = line_number.to_i
           end
@@ -110,11 +110,23 @@ module Spec
           opts.on("-b", "--backtrace", "Output full backtrace") do
             options.backtrace_tweaker = NoisyBacktraceTweaker.new
           end
+
+          opts.on("-H", "--heckle CODE", "If all specs pass, this will run your specs many times, mutating",
+                                         "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'
+            options.heckle_runner = HeckleRunner.new(heckle)
+          end
           
           opts.on("-d", "--dry-run", "Don't execute specs") do
             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')
+          end
+          
           opts.on("-v", "--version", "Show version") do
             out.puts ::Spec::VERSION::DESCRIPTION
             exit if out == $stdout

data/lib/spec/runner/reporter.rb

@@ -4,14 +4,10 @@ module Spec
       
       def initialize(formatter, backtrace_tweaker)
         @formatter = formatter
-        @context_names = []
-        @failures = []
-        @spec_names = []
         @backtrace_tweaker = backtrace_tweaker
-        @start_time = nil
-        @end_time = nil
+        clear!
       end
-  
+      
       def add_context(name)
         #TODO - @context_names.empty? tells the formatter whether this is the first context or not - that's a little slippery
         @formatter.add_context(name, @context_names.empty?)
@@ -31,8 +27,9 @@ module Spec
           spec_failed(name, Failure.new(@context_names.last, name, error))
         end
       end
-      
+
       def start(number_of_specs)
+        clear!
         @start_time = Time.new
         @formatter.start(number_of_specs)
       end
@@ -51,6 +48,14 @@ module Spec
 
       private
   
+      def clear!
+        @context_names = []
+        @failures = []
+        @spec_names = []
+        @start_time = nil
+        @end_time = nil
+      end
+  
       def dump_failures
         return if @failures.empty?
         @failures.inject(1) do |index, failure|
@@ -97,4 +102,4 @@ module Spec
       end
     end
   end
-end
+end

data/lib/spec/runner/specification.rb

@@ -1,70 +1,95 @@
 module Spec
   module Runner
     class Specification
-      
-      @@current_spec = nil
-    
-      def self.add_listener listener
-        @@current_spec.add_listener listener unless @@current_spec.nil?
+      module ClassMethods
+        attr_accessor :current
+        protected :current=
+
+        callback_events :before_setup, :after_teardown
       end
-      
+      extend ClassMethods
+
+      attr_reader :command
+      callback_events :before_setup, :after_teardown
+
       def initialize(name, opts={}, &block)
         @from = caller(0)[3]
         @name = name
         @options = opts
-        @block = block
-        @listeners = []
+        @command = block
       end
 
-      def run(reporter=nil, setup_block=nil, teardown_block=nil, dry_run=false, execution_context=nil)
-        reporter.spec_started(@name) unless reporter.nil?
+      def run(reporter, setup_block, teardown_block, dry_run, execution_context)
+        reporter.spec_started(@name) if reporter
         return reporter.spec_finished(@name) if dry_run
-        @@current_spec = self
-        execution_context = execution_context || ::Spec::Runner::ExecutionContext.new(self)
-        errors = []
-        begin
-          execution_context.instance_exec(&setup_block) unless setup_block.nil?
-          setup_ok = true
-          execution_context.instance_exec(&@block)
-          spec_ok = true
-        rescue => e
-          errors << e
-        end
 
+        errors = []
         begin
-          execution_context.instance_exec(&teardown_block) unless teardown_block.nil?
-          teardown_ok = true
-        rescue => e
-          errors << e
+          set_current
+          setup_ok = setup_spec(execution_context, errors, &setup_block)
+          spec_ok = execute_spec(execution_context, errors) if setup_ok
+          teardown_ok = teardown_spec(execution_context, errors, &teardown_block)
         ensure
-          notify_after_teardown errors
-          @@current_spec = nil
+          clear_current
         end
-        
-        SpecShouldRaiseHandler.new(@from, @options).handle(errors)
 
-        reporter.spec_finished(@name, errors.first, failure_location(setup_ok, spec_ok, teardown_ok)) unless reporter.nil?
+        SpecShouldRaiseHandler.new(@from, @options).handle(errors)
+        reporter.spec_finished(@name, errors.first, failure_location(setup_ok, spec_ok, teardown_ok)) if reporter
       end
 
       def matches_matcher?(matcher)
         matcher.matches? @name 
       end
 
-      def add_listener listener
-        @listeners << listener
+      private
+      def setup_spec(execution_context, errors, &setup_block)
+        notify_before_setup(errors)
+        execution_context.instance_eval(&setup_block) if setup_block
+        return errors.empty?
+      rescue => e
+        errors << e
+        return false
       end
 
-      def notify_after_teardown errors
-        @listeners.each do |listener|
-          begin
-            listener.spec_finished(self) if listener.respond_to?(:spec_finished)
-          rescue => e
-            errors << e
-          end
-        end
+      def execute_spec(execution_context, errors)
+        execution_context.instance_eval(&command)
+        return true
+      rescue => e
+        errors << e
+        return false
+      end
+
+      def teardown_spec(execution_context, errors, &teardown_block)
+        execution_context.instance_eval(&teardown_block) if teardown_block
+        notify_after_teardown(errors)
+        return errors.empty?
+      rescue => e
+        errors << e
+        return false
+      end
+
+      def notify_before_setup(errors)
+        self.class.send(:notify_callbacks, :before_setup, self, &append_errors(errors))
+        notify_callbacks(:before_setup, self, &append_errors(errors))
+      end
+      
+      def notify_after_teardown(errors)
+        notify_callbacks(:after_teardown, self, &append_errors(errors))
+        self.class.send(:notify_callbacks, :after_teardown, self, &append_errors(errors))
+      end
+      
+      def append_errors(errors)
+        proc {|error| errors << error}
+      end
+      
+      def set_current
+        self.class.send(:current=, self)
+      end
+
+      def clear_current
+        self.class.send(:current=, nil)
       end
 
-      private
       def failure_location(setup_ok, spec_ok, teardown_ok)
         return 'setup' unless setup_ok
         return @name unless spec_ok
@@ -72,4 +97,4 @@ module Spec
       end
     end
   end
-end
+end

data/lib/spec/runner.rb

@@ -6,10 +6,10 @@ require 'spec/runner/execution_context'
 require 'spec/runner/context_runner'
 require 'spec/runner/option_parser'
 require 'spec/runner/command_line'
+require 'spec/runner/drb_command_line'
 require 'spec/runner/backtrace_tweaker'
 require 'spec/runner/reporter'
 require 'spec/runner/spec_matcher'
 require 'spec/runner/extensions/kernel'
-require 'spec/runner/extensions/object'
 require 'spec/runner/spec_should_raise_handler'
 require 'spec/runner/spec_parser'

data/lib/spec/version.rb

@@ -3,13 +3,14 @@ module Spec
     unless defined? MAJOR
       MAJOR  = 0
       MINOR  = 7
-      TINY   = 2
-      # RANDOM_TOKEN: 0.868668446220024
-      REV    = "$LastChangedRevision: 1095 $".match(/LastChangedRevision: (\d+)/)[1]
+      TINY   = 5
+      MINISCULE = 1
+      # RANDOM_TOKEN: 0.0543628986724853
+      REV    = "$LastChangedRevision: 1395 $".match(/LastChangedRevision: (\d+)/)[1]
 
-      STRING = [MAJOR, MINOR, TINY].join('.')
+      STRING = [MAJOR, MINOR, TINY, MINISCULE].join('.')
       FULL_VERSION = "#{STRING} (r#{REV})"
-      TAG    = "REL_" + [MAJOR, MINOR, TINY].join('_')
+      TAG    = "REL_" + [MAJOR, MINOR, TINY, MINISCULE].join('_')
 
       NAME   = "RSpec"
       URL    = "http://rspec.rubyforge.org/"  

data/lib/spec.rb

@@ -1,4 +1,5 @@
 require 'spec/version'
+require 'spec/callback'
 require 'spec/expectations'
 require 'spec/mocks'
 require 'spec/runner'