shindo 0.1.2 → 0.1.3

data/lib/shindo.rb

@@ -5,7 +5,7 @@ require 'gestalt'
 module Shindo
 
   unless const_defined?(:VERSION)
-    VERSION = '0.1.2'
+    VERSION = '0.1.3'
   end
 
   def self.tests(description = nil, tags = [], &block)
@@ -47,7 +47,7 @@ module Shindo
     end
 
     def tests(description, tags = [], &block)
-      return if @exit || Thread.current[:reload]
+      return self if @exit || Thread.current[:reload]
 
       tags = [*tags]
       @tag_stack.push(tags)
@@ -69,12 +69,7 @@ module Shindo
             @formatador.display_line(description)
             @formatador.indent { instance_eval(&block) }
           rescue => error
-            @formatador.display_line("[red]#{error.message} (#{error.class})[/]")
-            unless error.backtrace.empty?
-              @formatador.indent do
-                @formatador.display_lines(error.backtrace.map {|line| "[red]#{line}[/]"})
-              end
-            end
+            display_error(error)
           end
         else
           @description = description
@@ -126,20 +121,26 @@ module Shindo
             after.call
           end
         rescue => error
-          @formatador.display_line("[red]#{error.message} (#{error.class})[/]")
+          success = false
+          value = error
         end
         if success
           success(description)
         else
           failure(description)
-          @message ||= [
-            "expected => #{expectation.inspect}",
-            "returned => #{value.inspect}"
-          ]
-          @formatador.indent do
-            @formatador.display_lines([*@message].map {|message| "[red]#{message}[/]"})
+          case value
+          when Exception, Interrupt
+            display_error(value)
+          else
+            @message ||= [
+              "expected => #{expectation.inspect}",
+              "returned => #{value.inspect}"
+            ]
+            @formatador.indent do
+              @formatador.display_lines([*@message].map {|message| "[red]#{message}[/]"})
+            end
+            @message = nil
           end
-          @message = nil
           if STDOUT.tty?
             prompt(description, &block)
           end
@@ -150,6 +151,15 @@ module Shindo
       success
     end
 
+    def display_error(error)
+      @formatador.display_line("[red]#{error.message} (#{error.class})[/]")
+      unless error.backtrace.empty?
+        @formatador.indent do
+          @formatador.display_lines(error.backtrace.map {|line| "[red]#{line}[/]"})
+        end
+      end
+    end
+
     def failure(description, &block)
       Thread.current[:totals][:failed] += 1
       @formatador.display_line("[red]- #{description}[/]")
@@ -177,7 +187,7 @@ module Shindo
             end
             @formatador.display_line(value)
           rescue => error
-            @formatador.display_line("[red]#{error.message} (#{error.class})[/]")
+            display_error(error)
           end
         when 'i', 'interactive', 'irb'
           @formatador.display_line('Starting interactive session...')

data/shindo.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'shindo'
-  s.version           = '0.1.2'
-  s.date              = '2010-05-22'
+  s.version           = '0.1.3'
+  s.date              = '2010-05-24'
   s.rubyforge_project = 'shindo'
 
   ## Make sure your summary is short. The description may be as long

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-22 00:00:00 -07:00
+date: 2010-05-24 00:00:00 -07:00
 default_executable: shindo
 dependencies: 
 - !ruby/object:Gem::Dependency