shindo 0.0.8 → 0.0.9

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/lib/shindo.rb

@@ -42,14 +42,8 @@ module Shindo
       @befores[-1].push(block)
     end
 
-    def tags
-      unless @tag_stack.flatten.empty?
-        " [#{@tag_stack.flatten.join(', ')}]"
-      end
-    end
-
     def prompt(description, &block)
-      @formatador.display("#{@formatador.indentation}Action? [c,i,q,r,t,#,?]? ")
+      @formatador.display("Action? [c,i,q,r,t,#,?]? ")
       choice = STDIN.gets.strip
       @formatador.display_line("")
       case choice
@@ -139,7 +133,12 @@ module Shindo
       @befores.push([])
       @afters.push([])
 
-      @formatador.display_line(description || 'Shindo.tests')
+      taggings = ''
+      unless tags.empty?
+        taggings = " (#{[*tags].join(', ')})"
+      end
+
+      @formatador.display_line((description || 'Shindo.tests') << taggings)
       if block_given?
         @formatador.indent { instance_eval(&block) }
       end
@@ -151,6 +150,10 @@ module Shindo
 
     def test(description, tags = [], &block)
       @tag_stack.push([*tags])
+      taggings = ''
+      unless tags.empty?
+        taggings = " (#{[*tags].join(', ')})"
+      end
 
       # if the test includes +tags and discludes -tags, evaluate it
       if (@if_tagged.empty? || !(@if_tagged & @tag_stack.flatten).empty?) &&
@@ -178,9 +181,9 @@ module Shindo
           end
           @success = @success && success
           if success
-            @formatador.display_line("[green]+ #{description}#{tags}[/]")
+            @formatador.display_line("[green]+ #{description}#{taggings}[/]")
           else
-            @formatador.display_line("[red]- #{description}#{tags}[/]")
+            @formatador.display_line("[red]- #{description}#{taggings}[/]")
             if STDOUT.tty?
               prompt(description, &block)
             end
@@ -190,10 +193,10 @@ module Shindo
             after.call
           end
         else
-          @formatador.display_line("[yellow]* #{description}[/]")
+          @formatador.display_line("[yellow]* #{description}#{taggings}[/]")
         end
       else
-        @formatador.display_line("_ #{description}")
+        @formatador.display_line("_ #{description}#{taggings}")
       end
 
       @tag_stack.pop

data/shindo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{shindo}
-  s.version = "0.0.8"
+  s.version = "0.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["geemus (Wesley Beary)"]
-  s.date = %q{2009-12-01}
+  s.date = %q{2009-12-03}
   s.default_executable = %q{shindo}
   s.description = %q{Simple depth first ruby testing}
   s.email = %q{me@geemus.com}

data/tests/tag_tests.rb

@@ -23,13 +23,13 @@ Shindo.tests('tags') do
   tests('negative') do
     before { @output = `#{BIN} #{negative.path} -negative` }
     test('is tested')   { @output.include?('+ is tested') }
-    test('is skipped')  { @output.include?('_ is skipped [negative]') }
+    test('is skipped')  { @output.include?('_ is skipped (negative)') }
     test('status')      { $?.exitstatus == 0 }
   end
 
   tests('positive') do
     before { @output = `#{BIN} #{positive.path} +positive` }
-    test('is tested')   { @output.include?('+ is tested [positive]') }
+    test('is tested')   { @output.include?('+ is tested (positive)') }
     test('is skipped')  { @output.include?('_ is skipped') }
     test('status')      { $?.exitstatus == 0 }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shindo
 version: !ruby/object:Gem::Version 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-01 00:00:00 -08:00
+date: 2009-12-03 00:00:00 -08:00
 default_executable: shindo
 dependencies: 
 - !ruby/object:Gem::Dependency