shindo 0.1.4 → 0.1.5

data/bin/shindo

@@ -1,81 +1,4 @@
 #!/usr/bin/env ruby
-@interrupt = lambda do
-  formatador = Thread.current[:formatador] || Formatador
-  unless Thread.main[:exit]
-    formatador.display_line('Gracefully Exiting... (ctrl-c to force)')
-    Thread.main[:exit] = true
-  else
-    formatador.display_line('Exiting...')
-    Thread.exit
-  end
-end
-Kernel.trap('INT', @interrupt)
-
-require File.join(File.dirname(__FILE__), '..', 'lib', 'shindo')
-
-helpers = Dir.glob(File.join(Dir.pwd, 'tests', '**', '*helper.rb')).sort_by {|helper| helper.count(File::SEPARATOR)}
-tags = []
-for argument in ARGV
-  if argument.match(/^[\+\-]/)
-    tags << argument
-  else
-    path = File.expand_path(argument)
-    if File.directory?(path)
-      tests ||= []
-      tests |= Dir.glob(File.join(path, '**', '*tests.rb'))
-    elsif File.exists?(path)
-      tests ||= []
-      tests << path
-    else
-      Formatador.display_line("[red][bold]#{argument}[/] [red]does not exist, please fix this path and try again.[/]")
-      Kernel.exit(1)
-    end
-  end
-end
-
-# ARGV was empty or only contained tags
-unless tests
-  tests = Dir.glob(File.join('tests', '**', '*tests.rb'))
-end
-
-@started_at = Time.now
-def run_in_thread(helpers, tests, tags)
-  shindo = Thread.new {
-    Thread.current[:tags] = tags
-    for file in helpers
-      unless Thread.main[:exit]
-        load(file)
-      end
-    end
-    for file in tests
-      unless Thread.main[:exit]
-        load(file)
-      end
-    end
-  }
-  shindo.join
-  if shindo[:reload]
-    run_in_thread(helpers, tests, tags)
-  else
-    @totals = shindo[:totals]
-  end
-end
-run_in_thread(helpers, tests, tags)
-
-@totals   ||= { :failed => 0, :pending => 0, :succeeded => 0 }
-@success  = @totals[:failed] == 0
-lines = []
-lines << "[red]#{@totals[:failed]} failed[/]," if @totals[:failed] > 0
-lines << "[yellow]#{@totals[:pending]} pending[/]," if @totals[:pending] > 0
-lines << "[green]#{@totals[:succeeded]} succeeded[/]"
-lines = lines[0...-2].join(', ') << ' and ' << lines[-1] if lines.length > 3
-lines << "in [bold]#{Time.now - @started_at}[/] seconds"
-Formatador.display_line
-Formatador.display_line(lines.join(' '))
-Formatador.display_line
-
-if @success
-  Kernel.exit(0)
-else
-  Kernel.exit(1)
-end
+@thread_locals = { :interactive => true }
+require File.join(File.dirname(__FILE__), '..', 'lib', 'shindo', 'verbose')
+require File.join(File.dirname(__FILE__), '..', 'lib', 'shindo', 'bin')

data/bin/shindont

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+@thread_locals = { :interactive => false }
+require File.join(File.dirname(__FILE__), '..', 'lib', 'shindo', 'taciturn')
+require File.join(File.dirname(__FILE__), '..', 'lib', 'shindo', 'bin')

data/lib/shindo.rb

@@ -5,7 +5,7 @@ require 'gestalt'
 module Shindo
 
   unless const_defined?(:VERSION)
-    VERSION = '0.1.4'
+    VERSION = '0.1.5'
   end
 
   def self.tests(description = nil, tags = [], &block)
@@ -18,7 +18,8 @@ module Shindo
     def initialize(description, tags = [], &block)
       @afters     = []
       @befores    = []
-      @tag_stack  = []
+      @description_stack  = []
+      @tag_stack          = []
       Thread.current[:formatador] = Formatador.new
       Thread.current[:reload] = false
       Thread.current[:tags] ||= []
@@ -35,7 +36,6 @@ module Shindo
       end
       Thread.current[:formatador].display_line
       tests(description, tags, &block)
-      Thread.current[:formatador].display_line
     end
 
     def after(&block)
@@ -60,13 +60,14 @@ module Shindo
       unless tags.empty?
         description << " (#{tags.join(', ')})"
       end
+      @description_stack.push(description)
 
       # if the test includes +tags and discludes -tags, evaluate it
       if (@if_tagged.empty? || !(@if_tagged & @tag_stack.flatten).empty?) &&
           (@unless_tagged.empty? || (@unless_tagged & @tag_stack.flatten).empty?)
         if block_given?
           begin
-            Thread.current[:formatador].display_line(description)
+            display_description(description)
             Thread.current[:formatador].indent { instance_eval(&block) }
           rescue => error
             display_error(error)
@@ -75,14 +76,15 @@ module Shindo
           @description = description
         end
       else
-        Thread.current[:formatador].display_line("[light_black]#{description}[/]")
+        display_description("[light_black]#{description}[/]")
       end
 
+      @description_stack.pop
       @afters.pop
       @befores.pop
       @tag_stack.pop
 
-      Thread.exit if Thread.current[:exit] || Thread.current[:reload]
+      Thread.exit if Thread.main[:exit] || Thread.current[:reload]
       self
     end
 
@@ -103,19 +105,16 @@ module Shindo
     def assert(type, expectation, description, &block)
       return if Thread.main[:exit] || Thread.current[:reload]
       description = [@description, description].compact.join(' ')
-      success = nil
-      @gestalt = Gestalt.new({'formatador' => Thread.current[:formatador]})
       if block_given?
         begin
           for before in @befores.flatten.compact
             before.call
           end
-          value = @gestalt.run(&block)
-          success = case type
+          value, success = case type
           when :raises
-            value.is_a?(expectation)
+            raises?(expectation, &block)
           when :returns
-            value == expectation
+            returns?(expectation, &block)
           end
           for after in @afters.flatten.compact
             after.call
@@ -125,9 +124,9 @@ module Shindo
           value = error
         end
         if success
-          success(description)
+          display_success(description)
         else
-          failure(description)
+          display_failure(description)
           case value
           when Exception, Interrupt
             display_error(value)
@@ -141,35 +140,16 @@ module Shindo
             end
             @message = nil
           end
-          if STDOUT.tty?
+          if Thread.current[:interactive] && STDOUT.tty?
             prompt(description, &block)
           end
         end
       else
-        pending(description)
+        display_pending(description)
       end
       success
     end
 
-    def display_error(error)
-      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
-
-    def failure(description, &block)
-      Thread.current[:totals][:failed] += 1
-      Thread.current[:formatador].display_line("[red]- #{description}[/]")
-    end
-
-    def pending(description, &block)
-      Thread.current[:totals][:pending] += 1
-      Thread.current[:formatador].display_line("[yellow]# #{description}[/]")
-    end
-
     def prompt(description, &block)
       return if Thread.main[:exit] || Thread.current[:reload]
       Thread.current[:formatador].display("Action? [c,e,i,q,r,t,?]? ")
@@ -211,7 +191,7 @@ module Shindo
           end
         when 'q', 'quit', 'exit'
           Thread.current[:formatador].display_line("Exiting...")
-          Thread.current[:exit] = true
+          Thread.main[:exit] = true
         when 'r', 'reload'
           Thread.current[:formatador].display_line("Reloading...")
           Thread.current[:reload] = true
@@ -235,17 +215,12 @@ module Shindo
         end
         Thread.current[:formatador].display_line
       end
-      unless continue || Thread.current[:exit]
+      unless continue || Thread.main[:exit]
         Thread.current[:formatador].display_line("[red]- #{description}[/]")
         prompt(description, &block)
       end
     end
 
-    def success(description, &block)
-      Thread.current[:totals][:succeeded] += 1
-      Thread.current[:formatador].display_line("[green]+ #{description}[/]")
-    end
-
   end
 
 end

data/lib/shindo/bin.rb

@@ -0,0 +1,83 @@
+require File.join(File.dirname(__FILE__), '..', 'shindo')
+
+@interrupt = lambda do
+  formatador = Thread.current[:formatador] || Formatador
+  unless Thread.main[:exit]
+    formatador.display_line('Gracefully Exiting... (ctrl-c to force)')
+    Thread.main[:exit] = true
+  else
+    formatador.display_line('Exiting...')
+    Thread.exit
+  end
+end
+Kernel.trap('INT', @interrupt)
+
+helpers = Dir.glob(File.join(Dir.pwd, 'tests', '**', '*helper.rb')).sort_by {|helper| helper.count(File::SEPARATOR)}
+tags = []
+for argument in ARGV
+  if argument.match(/^[\+\-]/)
+    tags << argument
+  else
+    path = File.expand_path(argument)
+    if File.directory?(path)
+      tests ||= []
+      tests |= Dir.glob(File.join(path, '**', '*tests.rb'))
+    elsif File.exists?(path)
+      tests ||= []
+      tests << path
+    else
+      Formatador.display_line("[red][bold]#{argument}[/] [red]does not exist, please fix this path and try again.[/]")
+      Kernel.exit(1)
+    end
+  end
+end
+
+# ARGV was empty or only contained tags
+unless tests
+  tests = Dir.glob(File.join('tests', '**', '*tests.rb'))
+end
+
+@started_at = Time.now
+def run_in_thread(helpers, tests, thread_locals)
+  shindo = Thread.new {
+    for key, value in thread_locals
+      Thread.current[key] = value
+    end
+    for file in helpers
+      unless Thread.main[:exit]
+        Thread.current[:file] = file
+        load(file)
+      end
+    end
+    for file in tests
+      unless Thread.main[:exit]
+        load(file)
+      end
+    end
+  }
+  shindo.join
+  if shindo[:reload]
+    run_in_thread(helpers, tests, thread_locals)
+  else
+    @totals = shindo[:totals]
+  end
+end
+run_in_thread(helpers, tests, @thread_locals.merge({:tags => tags}))
+
+@totals   ||= { :failed => 0, :pending => 0, :succeeded => 0 }
+@success  = @totals[:failed] == 0
+lines = []
+lines << "[red]#{@totals[:failed]} failed[/]," if @totals[:failed] > 0
+lines << "[yellow]#{@totals[:pending]} pending[/]," if @totals[:pending] > 0
+lines << "[green]#{@totals[:succeeded]} succeeded[/]"
+lines = lines[0...-2].join(', ') << ' and ' << lines[-1] if lines.length > 3
+lines << "in [bold]#{Time.now - @started_at}[/] seconds"
+Formatador.display_line
+Formatador.display_line(lines.join(' '))
+Formatador.display_line
+
+if @success
+  Kernel.exit(0)
+else
+  Kernel.exit(1)
+end

data/lib/shindo/taciturn.rb

@@ -0,0 +1,65 @@
+module Shindo
+  class Tests
+
+    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)
+      end
+    end
+
+    def display_description(description)
+      unless @indented
+        print '  '
+        @indented = 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}[/]"})
+        end
+      end
+    end
+
+    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
+
+    def display_pending(description)
+      Thread.current[:totals][:pending] += 1
+      print Formatador.parse("[yellow]#[/]")
+    end
+
+    def display_success(description)
+      Thread.current[:totals][:succeeded] += 1
+      print Formatador.parse("[green]+[/]")
+    end
+
+    def raises?(expectation, &block)
+      value = begin
+        instance_eval(&block)
+      rescue => error
+        error
+      end
+      [value, value.is_a?(expectation)]
+    end
+
+    def returns?(expectation, &block)
+      [value = instance_eval(&block), value == expectation]
+    end
+
+  end
+end

data/lib/shindo/verbose.rb

@@ -0,0 +1,45 @@
+module Shindo
+  class Tests
+
+    private
+
+    def display_description(description)
+      Thread.current[:formatador].display_line(description)
+    end
+
+    def display_error(error)
+      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
+
+    def display_failure(description)
+      Thread.current[:totals][:failed] += 1
+      Thread.current[:formatador].display_line("[red]- #{description}[/]")
+    end
+
+    def display_pending(description)
+      Thread.current[:totals][:pending] += 1
+      Thread.current[:formatador].display_line("[yellow]# #{description}[/]")
+    end
+
+    def display_success(description)
+      Thread.current[:totals][:succeeded] += 1
+      Thread.current[:formatador].display_line("[green]+ #{description}[/]")
+    end
+
+    def raises?(expectation, &block)
+      @gestalt = Gestalt.new({'formatador' => Thread.current[:formatador]})
+      [value = @gestalt.run(&block), value.is_a?(expectation)]
+    end
+
+    def returns?(expectation, &block)
+      @gestalt = Gestalt.new({'formatador' => Thread.current[:formatador]})
+      [value = @gestalt.run(&block), value == expectation]
+    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.1.4'
-  s.date              = '2010-05-30'
+  s.version           = '0.1.5'
+  s.date              = '2010-06-14'
   s.rubyforge_project = 'shindo'
 
   ## Make sure your summary is short. The description may be as long
@@ -65,8 +65,12 @@ Gem::Specification.new do |s|
     README.rdoc
     Rakefile
     bin/shindo
+    bin/shindont
     lib/shindo.rb
+    lib/shindo/bin.rb
     lib/shindo/rake.rb
+    lib/shindo/taciturn.rb
+    lib/shindo/verbose.rb
     shindo.gemspec
     tests/basic_tests.rb
     tests/bin_tests.rb

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-30 00:00:00 -05:00
+date: 2010-06-14 00:00:00 -07:00
 default_executable: shindo
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,8 +59,12 @@ files:
 - README.rdoc
 - Rakefile
 - bin/shindo
+- bin/shindont
 - lib/shindo.rb
+- lib/shindo/bin.rb
 - lib/shindo/rake.rb
+- lib/shindo/taciturn.rb
+- lib/shindo/verbose.rb
 - shindo.gemspec
 - tests/basic_tests.rb
 - tests/bin_tests.rb