shindo 0.1.8 → 0.1.9

data/lib/shindo.rb

@@ -5,7 +5,7 @@ require 'gestalt'
 module Shindo
 
   unless const_defined?(:VERSION)
-    VERSION = '0.1.8'
+    VERSION = '0.1.9'
   end
 
   def self.tests(description = nil, tags = [], &block)

data/lib/shindo/bin.rb

@@ -45,11 +45,11 @@ def run_in_thread(helpers, tests, thread_locals)
     end
     for file in helpers
       unless Thread.main[:exit]
-        Thread.current[:file] = file
         load(file)
       end
     end
     for file in tests
+      Thread.current[:file] = file
       unless Thread.main[:exit]
         load(file)
       end

data/lib/shindo/taciturn.rb

@@ -3,30 +3,30 @@ module Shindo
 
     private
 
-    def display_description_stack(description_stack = @description_stack, formatador = Formatador.new)
-      return if description_stack.empty?
-      formatador.indent do
-        formatador.display_line(description_stack.pop)
-        display_description_stack(description_stack, formatador)
+    def display_description_stack
+      return if @description_stack.empty?
+      Thread.current[:formatador].indent do
+        Thread.current[:formatador].display_line(@description_stack.pop)
+        display_description_stack
       end
     end
 
     def display_description(description)
       unless @described
-        Thread.current[:formatador].display(description)
+        Thread.current[:formatador].display(Thread.current[:file])
         print ' '
         @described = true
       end
     end
 
     def display_error(error)
-      Thread.current[:formatador].display_line
-      Thread.current[:formatador].display_line(Thread.current[:file])
       display_description_stack
-      Thread.current[:formatador].display_line("[red]#{error.message} (#{error.class})[/]")
-      unless error.backtrace.empty?
-        Thread.current[:formatador].indent do
-          Thread.current[:formatador].display_lines(error.backtrace.map {|line| "[red]#{line}[/]"})
+      Thread.current[:formatador].indent do
+        Thread.current[:formatador].display_line("[red]#{error.message} (#{error.class})[/]")
+        unless error.backtrace.empty?
+          Thread.current[:formatador].indent do
+            Thread.current[:formatador].display_lines(error.backtrace.map {|line| "[red]#{line}[/]"})
+          end
         end
       end
     end
@@ -34,7 +34,6 @@ module Shindo
     def display_failure(description)
       Thread.current[:totals][:failed] += 1
       Thread.current[:formatador].display_line
-      Thread.current[:formatador].display_line(Thread.current[:file])
       display_description_stack
       Thread.current[:formatador].display_line("[red]- #{description}[/]")
     end

data/shindo.gemspec

@@ -13,7 +13,7 @@ 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.8'
+  s.version           = '0.1.9'
   s.date              = '2010-11-16'
   s.rubyforge_project = 'shindo'
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - geemus (Wesley Beary)