rspec 0.6.4 → 0.7.0

data/lib/spec/runner/context_eval.rb

@@ -19,8 +19,8 @@ module Spec
           teardown_parts << block
         end
 
-        def specify(spec_name, &block)
-          specifications << Specification.new(spec_name, &block)
+        def specify(spec_name, opts={}, &block)
+          specifications << Specification.new(spec_name, opts, &block)
         end
 
         def methods
@@ -37,6 +37,38 @@ module Spec
           super
         end
 
+        private
+        def setup_block
+          parts = setup_parts.dup
+          add_context_superclass_method(:setup, parts)
+          create_block_from_parts(parts)
+        end
+        
+        def teardown_block
+          parts = teardown_parts.dup
+          add_context_superclass_method(:teardown, parts)
+          create_block_from_parts(parts)
+        end
+
+        def execution_context_class
+          @execution_context_class ||= derive_execution_context_class_from_context_superclass
+        end
+
+        def derive_execution_context_class_from_context_superclass
+          @execution_context_class = Class.new(context_superclass)
+          @execution_context_class.class_eval do
+            include ::Spec::Runner::ExecutionContext::InstanceMethods
+          end
+        end
+
+        def context_superclass
+          @context_superclass ||= Object
+        end
+
+        def context_modules
+          @context_modules ||= []
+        end
+        
         def specifications
           @specifications ||= []
         end
@@ -49,28 +81,13 @@ module Spec
           @teardown_parts ||= []
         end
 
-        def setup_block
-          parts = setup_parts.dup
-
-          setup_method = begin
-            context_superclass.instance_method(:setup)
-          rescue
-            nil
-          end
-          parts.unshift setup_method if setup_method
-          create_block_from_parts(parts)
-        end
-
-        def teardown_block
-          parts = teardown_parts.dup
-
-          teardown_method = begin
-            context_superclass.instance_method(:teardown)
+        def add_context_superclass_method sym, parts
+          superclass_method = begin
+            context_superclass.instance_method(sym)
           rescue
             nil
           end
-          parts.unshift teardown_method if teardown_method
-          create_block_from_parts(parts)
+          parts.unshift superclass_method if superclass_method
         end
 
         def create_block_from_parts(parts)
@@ -84,28 +101,11 @@ module Spec
             end
           end
         end
-
-        def execution_context_class
-          @execution_context_class ||= derive_execution_context_class_from_context_superclass
-        end
-
-        def derive_execution_context_class_from_context_superclass
-          @execution_context_class = Class.new(context_superclass)
-          @execution_context_class.class_eval do
-            include ::Spec::Runner::ExecutionContext::InstanceMethods
-          end
-        end
-
-        def context_superclass
-          @context_superclass ||= Object
-        end
-
-        def context_modules
-          @context_modules ||= []
-        end
       end
+
       module InstanceMethods
       end
+      
     end
   end
 end

data/lib/spec/runner/execution_context.rb

@@ -7,13 +7,7 @@ module Spec
         end
 
         def mock(name, options={})
-          mock = Spec::Mocks::Mock.new(name, options)
-          @spec.add_mock(mock)
-          mock
-        end
-
-        def stub(object, name="")
-          stub_space.create_stub(object, name)
+          Spec::Mocks::Mock.new(name, options)
         end
 
         def duck_type(*args)
@@ -23,11 +17,6 @@ module Spec
         def violated(message="")
           raise Spec::Expectations::ExpectationNotMetError.new(message)
         end
-
-        private
-        def stub_space
-          @spec.stub_space
-        end
       end
       include InstanceMethods
     end

data/lib/spec/runner/{kernel_ext.rb → extensions/kernel.rb}

@@ -3,12 +3,12 @@ module Kernel
     context = Spec::Runner::Context.new(name, &block)
     runner = context_runner
     runner.add_context(context)
-    runner.run(false) if runner.standalone
   end
   
 private
   
   def context_runner
-    $context_runner ||= ::Spec::Runner::OptionParser.create_context_runner(ARGV.dup, true, STDERR, STDOUT)
+    if $context_runner.nil?; $context_runner = ::Spec::Runner::OptionParser.create_context_runner(ARGV.dup, true, STDERR, STDOUT); at_exit { $context_runner.run(false) }; end
+    $context_runner
   end
 end

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

@@ -9,11 +9,7 @@ module Spec
           @output = output
           @dry_run = dry_run
           @colour = colour
-          begin
-            require 'Win32/Console/ANSI' if @colour && PLATFORM =~ /win32/
-          rescue LoadError
-            raise "You must gem install win32console to use --color on Windows"
-          end
+          begin ; require 'Win32/Console/ANSI' if @colour && PLATFORM =~ /win32/ ; rescue LoadError ; raise "You must gem install win32console to use colour on Windows" ; end
 	      end
 
         # This method is invoked before any specs are run, right after
@@ -64,28 +60,39 @@ module Spec
           @output.puts
           @output.puts "#{counter.to_s})"
           @output.puts failure.header
-          @output.puts failure.message
-          @output.puts failure.backtrace
-          @output.flush
+          @output.puts failure.exception.message
+          @output.puts failure.exception.backtrace.join("\n")
+          STDOUT.flush
         end
       
         # This method is invoked at the very end.
         def dump_summary(duration, spec_count, failure_count)
           return if @dry_run
-          if @colour && @output == STDOUT
-            colour_prefix = (failure_count == 0 ? "\e[32m" : "\e[31m")
-            colour_postfix = "\e[0m"
-            summary_output = Kernel
-          else
-            colour_prefix = colour_postfix = ""
-            summary_output = @output
-          end
           @output.puts
           @output.puts "Finished in #{duration} seconds"
           @output.puts
-          summary_output.puts "#{colour_prefix}#{spec_count} specification#{'s' unless spec_count == 1}, #{failure_count} failure#{'s' unless failure_count == 1}#{colour_postfix}"
-          @output.flush
+          summary = "#{spec_count} specification#{'s' unless spec_count == 1}, #{failure_count} failure#{'s' unless failure_count == 1}"
+          if failure_count == 0
+            @output.puts green(summary)
+          else
+            @output.puts red(summary)
+          end
         end
+
+      protected
+      
+        def colour(text, colour_code)
+          return text unless @colour && @output == Kernel
+          "#{colour_code}#{text}\e[0m"
+        end
+    
+        def red(text); colour(text, "\e[31m"); end
+        def green(text); colour(text, "\e[32m"); end
+        
+        def format_backtrace(backtrace)
+          backtrace.nil? ? "" : backtrace.join("\n")
+        end
+
       end
     end
   end

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

@@ -11,7 +11,7 @@ module Spec
           @spec_count = spec_count
       
           @output.puts HEADER
-          @output.flush
+          STDOUT.flush
         end
 
         def add_context(name, first)
@@ -20,14 +20,14 @@ module Spec
             @output.puts "</div>"
           end
           @output.puts "<div class=\"context\">"
-          @output.puts "  <div>#{name}</div>"
+          @output.puts "  <h2>#{name}</h2>"
           @output.puts "  <ul>"
         end
 
         def start_dump
           @output.puts "  </ul>"
           @output.puts "</div>"
-          @output.flush
+          STDOUT.flush
         end
 
         def spec_started(name)
@@ -36,120 +36,100 @@ module Spec
         end
 
         def spec_passed(name)
-          @output.puts "<li class=\"spec passed\">#{escape(@current_spec)}</li>"
+          @output.puts "<li class=\"spec passed\"><div class=\"name\">#{escape(@current_spec)}</div></li>"
         end
 
         def spec_failed(name, counter, failure)
-          @output.puts "<li class=\"spec failed\" onclick=\"toggle('failure_#{counter}');return false;\">"
-          @output.puts "  <div>#{escape(@current_spec)}</div>"
-          @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 "<li class=\"spec failed\">"
+          @output.puts "  <div class=\"name\">#{escape(@current_spec)}</div>"
+          @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?
           @output.puts "  </div>"
           @output.puts "</li>"
-          @output.flush
+          STDOUT.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
+          @output.print "</body>"
+          @output.print "</html>"
+          STDOUT.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%;
-    }
-
-    ul {
-      padding-left: 8px;
-    }
-
-    li.passed {
-      background-color: #DDFFDD;
-    }
-
-    li { 
-      list-style-type: none; 
-      margin: 0;
-    }
-
-    li.failed {
-      background-color: #FFBBBB;
-      font-weight: bold;
-    }
-
-    li.failed:hover {
-      color: #FFFFFF;
-      background-color: #FF0000;
-    }
-
-    li.failed .failure {
-      font-weight: normal;
-      font-size: 9pt;
-    }
-
-    div.context {
-      padding:4px;
-      border:1px solid #000000;
-      margin-top:4px;
-    }
-
-    </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
+<?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%;
+  }
+
+  h2 {
+    color: #589CCF;
+  }
+
+  div.context {
+    padding: 0px;
+    background: #fff;
+    margin-top: 0px;
+  }
+
+  ul {
+    padding-left: 0px;
+  }
+
+  li { 
+    list-style-type: none; 
+    margin: 0;
+    border: 2px solid #fff;
+  }
+
+  li.passed {
+    display: block; 
+    background: #46A002; 
+    color: #fff; 
+    padding: 2px 4px; 
+    font-weight: bold
+  }
+
+  li.failed {
+    display: block; 
+    background: red; 
+    color: #fff; 
+    padding: 2px 4px; 
+    font-weight: bold
+  }
+
+  li.failed .failure {
+    font-weight: normal;
+    font-size: 9pt;
+  }
+
+  div.backtrace {
+    color: #000; 
+  }
+
+  </style>
+</head>
+<body>
+HEADER
       end
     end
   end

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

@@ -3,23 +3,23 @@ module Spec
     module Formatter
       class ProgressBarFormatter < BaseTextFormatter
         def add_context(name, first)
-          @output << "\n" if first
-          @output.flush
+          @output.puts if first
+          STDOUT.flush
         end
       
         def spec_failed(name, counter, failure)
-          @output << 'F'
-          @output.flush
+          @output.print red('F')
+          STDOUT.flush
         end
-      
+
         def spec_passed(name)
-          @output << '.'
-          @output.flush
+          @output.print green('.')
+          STDOUT.flush
         end
       
         def start_dump
-          @output << "\n"
-          @output.flush
+          @output.puts
+          STDOUT.flush
         end
       end
     end