shindo 0.3.3 → 0.3.4

data/lib/shindo.rb

@@ -6,7 +6,7 @@ module Shindo
   class Pending < StandardError; end
 
   unless const_defined?(:VERSION)
-    VERSION = '0.3.3'
+    VERSION = '0.3.4'
   end
 
   def self.tests(description = nil, tags = [], &block)
@@ -59,6 +59,7 @@ module Shindo
       @afters.push([])
 
       @description = nil
+      @inline = false
       description ||= 'Shindo.tests'
       description = "[bold]#{description}[normal]"
       unless tags.empty?
@@ -72,16 +73,21 @@ module Shindo
         if block_given?
           begin
             display_description(description)
-            Formatador.indent { instance_eval(&block) }
+            # HACK: increase indent
+            indent = Thread.current[:formatador].instance_variable_get(:@indent)
+            Thread.current[:formatador].instance_variable_set(:@indent, indent + 1)
+            instance_eval(&block)
           rescue Shindo::Pending
             display_pending(description)
-            # HACK: remove indent since above doesn't
-            indent = Thread.current[:formatador].instance_variable_get(:@indent)
-            Thread.current[:formatador].instance_variable_set(:@indent, indent - 1)
           rescue => error
             display_error(error)
+          ensure
+            # HACK: decrease indent
+            indent = Thread.current[:formatador].instance_variable_get(:@indent)
+            Thread.current[:formatador].instance_variable_set(:@indent, indent - 1)
           end
         else
+          @inline = true
           display_description(description)
         end
       else

data/lib/shindo/verbose.rb

@@ -4,7 +4,12 @@ module Shindo
     private
 
     def display_description(description)
-      Formatador.display_line(description)
+      unless @inline
+        Formatador.display_line(description)
+      else
+        Formatador.display(description)
+        print ' '
+      end
     end
 
     def display_error(error)
@@ -18,17 +23,29 @@ module Shindo
 
     def display_failure(description)
       Thread.current[:totals][:failed] += 1
-      Formatador.display_line("[red]- #{description}[/]")
+      unless @inline
+        Formatador.display_line("[red]- #{description}[/]")
+      else
+        print Formatador.parse("[red]- #{description}[/]\n")
+      end
     end
 
     def display_pending(description)
       Thread.current[:totals][:pending] += 1
-      Formatador.display_line("[yellow]# #{description}[/]")
+      unless @inline
+        Formatador.display_line("[yellow]# #{description}[/]")
+      else
+        print Formatador.parse("[yellow]# #{description}[/]\n")
+      end
     end
 
     def display_success(description)
       Thread.current[:totals][:succeeded] += 1
-      Formatador.display_line("[green]+ #{description}[/]")
+      unless @inline
+        Formatador.display_line("[green]+ #{description}[/]")
+      else
+        print Formatador.parse("[green]+ #{description}[/]\n")
+      end
     end
 
   end

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.3.3'
-  s.date              = '2011-03-14'
+  s.version           = '0.3.4'
+  s.date              = '2011-03-21'
   s.rubyforge_project = 'shindo'
 
   ## Make sure your summary is short. The description may be as long
@@ -60,7 +60,6 @@ Gem::Specification.new do |s|
   # = MANIFEST =
   s.files = %w[
     Gemfile
-    Gemfile.lock
     README.rdoc
     Rakefile
     bin/shindo

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shindo
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-14 00:00:00 -07:00
+date: 2011-03-21 00:00:00 -07:00
 default_executable: shindo
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,7 +45,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - Gemfile
-- Gemfile.lock
 - README.rdoc
 - Rakefile
 - bin/shindo

data/Gemfile.lock

@@ -1,16 +0,0 @@
-PATH
-  remote: .
-  specs:
-    shindo (0.3.2)
-      formatador (>= 0.1.1)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    formatador (0.1.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  shindo!