rspec 0.5.11 → 0.5.12

data/lib/spec/api/helper/should_negator.rb

@@ -7,35 +7,35 @@ module Spec
     end
   
     def satisfy
-	    fail_with_message "Supplied expectation was satisfied, but should not have been" if (yield @target)
+      fail_with_message "Supplied expectation was satisfied, but should not have been" if (yield @target)
     end
         
     def equal(expected)
-	    fail_with_message(default_message("should not equal", expected)) if (@target == expected)
+      fail_with_message(default_message("should not equal", expected)) if (@target == expected)
     end
     
     def be(expected = :no_arg)
-	    return self if (expected == :no_arg)
-	    fail_with_message(default_message("should not be", expected)) if (@target.equal?(expected))
+      return self if (expected == :no_arg)
+      fail_with_message(default_message("should not be", expected)) if (@target.equal?(expected))
     end
 
-		def a
-			self
-		end
-		
-		alias an a
-		
-		def instance
-			InstanceNegator.new(@target)
-		end
-		
-		def kind
-			KindNegator.new(@target)
-		end
+    def a
+      self
+    end
+    
+    alias an a
+    
+    def instance
+      InstanceNegator.new(@target)
+    end
+    
+    def kind
+      KindNegator.new(@target)
+    end
 
-			def respond
-				RespondNegator.new(@target)
-			end
+      def respond
+        RespondNegator.new(@target)
+      end
     
     def match(expected)
         fail_with_message(default_message("should not match", expected)) if (@target =~ expected)

data/lib/spec/rake/spectask.rb

@@ -52,6 +52,10 @@ module Rake
     # Array of commandline options to pass to ruby (or rcov) when running specs.
     attr_accessor :ruby_opts
 
+    # Whether or not to fail Rake when an error occurs (typically when specs fail).
+    # Default is true
+    attr_accessor :fail_on_error
+
     # Explicitly define the list of spec files to be included in a
     # spec.  +list+ is expected to be an array of file names (a
     # FileList is acceptable).  If both +pattern+ and +spec_files+ are
@@ -72,6 +76,7 @@ module Rake
       @rcov = false
       @ruby_opts = []
       @out = nil
+      @fail_on_error = true
       yield self if block_given?
       @pattern = 'spec/**/*_spec.rb' if @pattern.nil? && @spec_files.nil?
       define
@@ -93,12 +98,16 @@ module Rake
         @ruby_opts.unshift( "-I#{lib_path}" )
         @ruby_opts.unshift( "-w" ) if @warning
         @ruby_opts.unshift( '--exclude "lib\/spec\/.*"' ) if @rcov
-        run interpreter, @ruby_opts.join(" ") +
-          " \"#{spec}\" " +
-          " #{@spec_opts.join(' ')} " +
-          file_prefix +
-          specs.collect { |fn| "\"#{fn}\"" }.join(' ') +
-          redirect
+        begin
+          run interpreter, @ruby_opts.join(" ") +
+            " \"#{spec}\" " +
+            " #{@spec_opts.join(' ')} " +
+            file_prefix +
+            specs.collect { |fn| "\"#{fn}\"" }.join(' ') +
+            redirect
+        rescue => e
+          raise e if @fail_on_error
+        end
       end
       self
     end

data/lib/spec/runner.rb

@@ -10,4 +10,5 @@ require 'spec/runner/base_text_formatter'
 require 'spec/runner/progress_bar_formatter'
 require 'spec/runner/rdoc_formatter'
 require 'spec/runner/specdoc_formatter'
+require 'spec/runner/html_formatter'
 require 'spec/runner/spec_matcher'

data/lib/spec/runner/backtrace_tweaker.rb

@@ -29,6 +29,8 @@ module Spec
           line = nil if line =~ /bin\/spec:/
           # TextMate's Ruby plugin
           line = nil if line =~ /Ruby\.tmbundle\/Support\/tmruby.rb:/
+          # RSpec on Rails
+          line = nil if line =~ /gems\/rspec_generator/
           line
         end
         error.backtrace.compact!

data/lib/spec/runner/base_text_formatter.rb

@@ -50,7 +50,7 @@ module Spec
       end
 
       # Dumps detailed information about a spec failure.
-      # This method is invoked for each failed spec. +counter+ is the sequence number
+      # This method is invoked for each failed spec after all specs have run. +counter+ is the sequence number
       # of the associated spec. +failure+ is a Failure object, which contains detailed
       # information about the failure.
       def dump_failure(counter, failure)
@@ -59,6 +59,7 @@ module Spec
         @output << "#{failure.header}\n"
         @output << "#{failure.message}\n"
         @output << "#{failure.backtrace}\n"
+        @output.flush
       end
       
       # This method is invoked at the very end.
@@ -69,6 +70,7 @@ module Spec
         @output << "#{spec_count} specification#{'s' unless spec_count == 1}, "
         @output << "#{failure_count} failure#{'s' unless failure_count == 1}"
         @output << "\n"
+        @output.flush
       end
     end
   end

data/lib/spec/runner/html_formatter.rb

@@ -0,0 +1,153 @@
+require 'spec/runner/base_text_formatter'
+
+module Spec
+  module Runner
+    class HtmlFormatter < Spec::Runner::BaseTextFormatter
+      def initialize(output, dry_run=false)
+        super
+        @current_count = 0
+      end
+      
+      def start(spec_count)
+        @spec_count = spec_count
+      
+        @output.puts HEADER
+        @output.flush
+      end
+
+      def add_context(name, first)
+        unless first
+          @output.puts "  </div>"
+          @output.puts "</div>"
+        end
+        @output.puts "<div class=\"context\">"
+        @output.puts "  <div>#{name}</div>"
+        @output.puts "  <div>"
+      end
+
+      def start_dump
+        @output.puts "  </div>"
+        @output.puts "</div>"
+        @output.flush
+      end
+
+      def spec_started(name)
+        @current_spec = name
+        @current_count += 1
+      end
+
+      def spec_passed(name)
+        @output.puts "<div class=\"spec passed\">#{escape(@current_spec)}</div>"
+      end
+
+      def spec_failed(name, counter, failure)
+        @output.puts "<div class=\"spec failed\">"
+        @output.puts "  <a href=\"#\" onclick=\"toggle('failure_#{counter}');return false;\">#{escape(@current_spec)}</a>"
+        @output.puts "  <div class=\"failure\" id=\"failure_#{counter}\" style=\"display:none\">"
+        @output.puts "    <div><pre>#{escape(failure.header)}</pre></div>" unless failure.header == ""
+        @output.puts "    <div><pre>#{escape(failure.message)}</pre></div>" unless failure.message == ""
+        @output.puts "    <div><pre>#{escape(failure.backtrace)}</pre></div>" unless failure.backtrace == ""
+        @output.puts "  </div>"
+        @output.puts "</div>"
+        @output.flush
+      end
+    
+      def escape(string)
+        string.gsub(/&/n, '&amp;').gsub(/\"/n, '&quot;').gsub(/>/n, '&gt;').gsub(/</n, '&lt;')
+      end
+    
+      def dump_failure(counter, failure)
+  #      @output << "\n"
+  #      @output << counter.to_s << ")\n"
+  #      @output << "#{failure.header}\n"
+  #      @output << "#{failure.message}\n"
+  #      @output << "#{failure.backtrace}\n"
+  #      @output.flush
+      end
+
+      def dump_summary(duration, spec_count, failure_count)
+        @output << "</body>"
+        @output << "</html>"
+        @output.flush
+      end
+      
+      HEADER = <<-HEADER
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<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" />
+  <style type="text/css">
+  body {
+    font-size: 10pt;
+    font: "lucida grande";
+    width: 85%;
+  }
+
+  .passed {
+    background-color: #DDFFDD;
+  }
+
+  .failed {
+    background-color: #FFDDDD;
+    font-weight: bold;
+  }
+
+  .failed .failure {
+    background-color: #FFDDDD;
+    font-weight: normal;
+    font-size: 9pt;
+  }
+
+  .context {
+    padding:4px;
+    border:1px solid #000000;
+    margin-top:4px;
+  }
+
+  :link, :visited {
+    color: #000000;
+    text-decoration: none;
+    padding-bottom: 0px;
+  }
+
+  :link:hover, :visited:hover {
+    color: #c00;
+  }
+
+  </style>
+  <script type="text/javascript">
+  // <![CDATA[
+
+  function toggle( id ) {
+    if ( document.getElementById )
+      elem = document.getElementById( id );
+    else if ( document.all )
+      elem = eval( "document.all." + id );
+    else
+      return false;
+
+    elemStyle = elem.style;
+
+    if ( elemStyle.display != "block" ) {
+      elemStyle.display = "block"
+    } else {
+      elemStyle.display = "none"
+    }
+
+    return true;
+  }
+  // ]]>
+  </script>
+
+</head>
+<body>
+HEADER
+    end
+  end
+end

data/lib/spec/runner/option_parser.rb

@@ -33,11 +33,14 @@ module Spec
             require req
           end
           
-          opts.on("-f", "--format FORMAT", "Builtin formats: specdoc|s|rdoc|r", 
-                                           "You can also specify a custom formatter class") do |format|
+          opts.on("-f", "--format FORMAT", "Builtin formats: specdoc|s|rdoc|r|html|h", 
+                                           "You can also specify a custom formatter class",
+                                           "(in which case you should also specify --require)") do |format|
             case format
               when 'specdoc', 's'
                 options.formatter_type = SpecdocFormatter
+              when 'html', 'h'
+                options.formatter_type = HtmlFormatter
               when 'rdoc', 'r'
                 options.formatter_type = RdocFormatter
                 options.dry_run = true
@@ -56,6 +59,10 @@ module Spec
             options.dry_run = true
           end
           
+          opts.on("--diff", "Show unified diff of Strings that are expected to be equal when they are not") do
+            require 'spec/api/helper/diff'
+          end
+          
           opts.on("-s", "--spec SPECIFICATION_NAME", "Execute a single specification") do |spec_name|
             options.spec_name = spec_name
           end

data/lib/spec/runner/progress_bar_formatter.rb

@@ -3,18 +3,22 @@ module Spec
     class ProgressBarFormatter < BaseTextFormatter
       def add_context(name, first)
         @output << "\n" if first
+        @output.flush
       end
       
       def spec_failed(name, counter, failure)
         @output << 'F'
+        @output.flush
       end
       
       def spec_passed(name)
         @output << '.'
+        @output.flush
       end
       
       def start_dump
         @output << "\n"
+        @output.flush
       end
     end
   end

data/lib/spec/runner/rdoc_formatter.rb

@@ -3,14 +3,17 @@ module Spec
     class RdocFormatter < BaseTextFormatter
       def add_context(name, first)
         @output << "# #{name}\n"
+        @output.flush
       end
   
       def spec_passed(name)
         @output << "# * #{name}\n"
+        @output.flush
       end
 
       def spec_failed(name, counter, failure)
         @output << "# * #{name} [#{counter} - FAILED]\n"
+        @output.flush
       end
     end
   end

data/lib/spec/runner/reporter.rb

@@ -72,10 +72,10 @@ module Spec
       end
 
       class Failure
-        def initialize(context_name, spec_name, error)
+        def initialize(context_name, spec_name, exception)
           @context_name = context_name
           @spec_name = spec_name
-          @error = error
+          @exception = exception
         end
 
         def header
@@ -83,17 +83,17 @@ module Spec
         end
 
         def message
-          @error.message
+          @exception.message
         end
 
         def backtrace
-          @error.backtrace.join("\n") unless @error.backtrace.nil?
+          @exception.backtrace.nil? ? "" : @exception.backtrace.join("\n")
         end
 
         private
 
         def class_name
-          @error.class.name.split('::').last
+          @exception.class.name.split('::').last
         end
 
       end

data/lib/spec/runner/specdoc_formatter.rb

@@ -3,14 +3,17 @@ module Spec
     class SpecdocFormatter < BaseTextFormatter      
       def add_context(name, first)
         @output << "\n#{name}\n"
+        @output.flush
       end
       
       def spec_failed(name, counter, failure)
         @output << "- #{name} (FAILED - #{counter})\n"
+        @output.flush
       end
       
       def spec_passed(name)
         @output << "- #{name}\n"
+        @output.flush
       end
     end
   end

data/lib/spec/test_to_spec/sexp_transformer.rb

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'sexp_processor'
 
 module Spec

data/lib/spec/test_to_spec/translation_test_runner.rb

@@ -32,8 +32,8 @@ module Spec
               end
             rescue => e
               log "Failed to translate     #{klass}"
-              log "Message: #{e.message}"
-              log e.backtrace.join("\n")
+              verbose "Message: #{e.message}"
+              verbose e.backtrace.join("\n")
             end
           end
         end
@@ -64,6 +64,14 @@ module Spec
         $test2spec_options[:quiet] == true
       end
 
+      def verbose(msg)
+        puts msg if verbose?
+      end
+
+      def verbose?
+        !quiet? && $test2spec_options[:verbose] == true
+      end
+
       def destination_path(relative_destination)
         File.join($test2spec_options[:specdir], relative_destination)
       end