shindo 0.0.7 → 0.0.8

data/Rakefile

@@ -4,7 +4,6 @@ require 'rake'
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
-    gem.add_dependency('annals')
     gem.name = "shindo"
     gem.summary = %Q{ruby testing}
     gem.description = %Q{Simple depth first ruby testing}
@@ -12,6 +11,8 @@ begin
     gem.homepage = "http://github.com/geemus/shindo"
     gem.authors = ["geemus (Wesley Beary)"]
     gem.rubyforge_project = "shindo"
+    gem.add_dependency('annals', '>=0.0.2')
+    gem.add_dependency('formatador', '>=0.0.2')
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/lib/shindo.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'annals'
+require 'formatador'
 
 module Shindo
 
@@ -16,7 +17,10 @@ module Shindo
       @afters     = []
       @annals     = Annals.new
       @befores    = []
-      @description_stack = []
+      @formatador = Formatador.new
+      @success    = true
+      @tag_stack  = []
+      Thread.current[:reload] = false;
       Thread.current[:tags] ||= []
       @if_tagged      = Thread.current[:tags].
                           select {|tag| tag.match(/^\+/)}.
@@ -24,18 +28,10 @@ module Shindo
       @unless_tagged  = Thread.current[:tags].
                           select {|tag| tag.match(/^\-/)}.
                           map {|tag| tag[1..-1]}
-      @indent     = 1
-      @success    = true
-      @tag_stack  = []
-      Thread.current[:reload] = false
-      print("\n")
+      @formatador.display_line('')
       tests(header, tags, &block)
-      print("\n")
-      if @success
-        Thread.current[:success] = true
-      else
-        Thread.current[:success] = false
-      end
+      @formatador.display_line('')
+      Thread.current[:success] = @success
     end
 
     def after(&block)
@@ -46,58 +42,33 @@ module Shindo
       @befores[-1].push(block)
     end
 
-    def full_description
-      "#{@description_stack.compact.join(' ')}#{full_tags}"
-    end
-
-    def full_tags
+    def tags
       unless @tag_stack.flatten.empty?
         " [#{@tag_stack.flatten.join(', ')}]"
       end
     end
 
-    def green_line(content)
-      print_line(content, "\e[32m")
-    end
-
-    def indent(&block)
-      @indent += 1
-      yield
-      @indent -= 1
-    end
-
-    def indentation
-      '  ' * @indent
-    end
-
-    def print_line(content, color = nil)
-      if color && STDOUT.tty?
-        content = "#{color}#{content}\e[0m"
-      end
-      print("#{indentation}#{content}\n")
-    end
-
-    def prompt(&block)
-      print("#{indentation}Action? [c,i,q,r,t,#,?]? ")
+    def prompt(description, &block)
+      @formatador.display("#{@formatador.indentation}Action? [c,i,q,r,t,#,?]? ")
       choice = STDIN.gets.strip
-      print("\n")
+      @formatador.display_line("")
       case choice
       when 'c'
         return
       when 'i'
-        print_line('Starting interactive session...')
+        @formatador.display_line('Starting interactive session...')
         if @irb.nil?
           require 'irb'
           ARGV.clear # Avoid passing args to IRB
           IRB.setup(nil)
           @irb = IRB::Irb.new(nil)
           IRB.conf[:MAIN_CONTEXT] = @irb.context
-          IRB.conf[:PROMPT][:TREST] = {}
+          IRB.conf[:PROMPT][:SHINDO] = {}
         end
         for key, value in IRB.conf[:PROMPT][:SIMPLE]
-          IRB.conf[:PROMPT][:TREST][key] = "#{indentation}#{value}"
+          IRB.conf[:PROMPT][:SHINDO][key] = "#{@formatador.indentation}#{value}"
         end
-        @irb.context.prompt_mode = :TREST
+        @irb.context.prompt_mode = :SHINDO
         @irb.context.workspace = IRB::WorkSpace.new(block.binding)
         begin
           @irb.eval_input
@@ -107,37 +78,35 @@ module Shindo
         Thread.current[:success] = false
         Thread.exit
       when 'r'
-        print("Reloading...\n")
+        @formatador.display_line("Reloading...")
         Thread.current[:reload] = true
         Thread.exit
       when 't'
-        indent {
+        @formatador.indent do
           if @annals.lines.empty?
-            print_line('no backtrace available')
+            @formatador.display_line('no backtrace available')
           else
-            index = 1
-            for line in @annals.lines
-              print_line("#{' ' * (2 - index.to_s.length)}#{index}  #{line}")
-              index += 1
+            @annals.lines.each_with_index do |line, index|
+              @formatador.display_line("#{' ' * (2 - index.to_s.length)}#{index}  #{line}")
             end
           end
-        }
-        print("\n")
+        end
+        @formatador.display_line('')
       when '?'
-        print_line('c - ignore this error and continue')
-        print_line('i - interactive mode')
-        print_line('q - quit Shindo')
-        print_line('r - reload and run the tests again')
-        print_line('t - display backtrace')
-        print_line('# - enter a number of a backtrace line to see its context')
-        print_line('? - display help')
+        @formatador.display_line('c - ignore this error and continue')
+        @formatador.display_line('i - interactive mode')
+        @formatador.display_line('q - quit Shindo')
+        @formatador.display_line('r - reload and run the tests again')
+        @formatador.display_line('t - display backtrace')
+        @formatador.display_line('# - enter a number of a backtrace line to see its context')
+        @formatador.display_line('? - display help')
       when /\d/
         index = choice.to_i - 1
         if @annals.lines[index]
-          indent {
-            print_line("#{@annals.lines[index]}: ")
-            indent {
-              print("\n")
+          @formatador.indent do
+            @formatador.display_line("#{@annals.lines[index]}: ")
+            @formatador.indent do
+              @formatador.display("\n")
               current_line = @annals.buffer[index]
               File.open(current_line[:file], 'r') do |file|
                 data = file.readlines
@@ -145,38 +114,34 @@ module Shindo
                 min     = [0, current - (@annals.max / 2)].max
                 max     = [current + (@annals.max / 2), data.length].min
                 min.upto(current - 1) do |line|
-                  print_line("#{line}  #{data[line].rstrip}")
+                  @formatador.display_line("#{line}  #{data[line].rstrip}")
                 end
-                yellow_line("#{current}  #{data[current].rstrip}")
+                @formatador.display_line("[yellow]#{current}  #{data[current].rstrip}[/]")
                 (current + 1).upto(max - 1) do |line|
-                  print_line("#{line}  #{data[line].rstrip}")
+                  @formatador.display_line("#{line}  #{data[line].rstrip}")
                 end
               end
-              print("\n")
-            }
-          }
+              @formatador.display_line('')
+            end
+          end
         else
-          red_line("#{choice} is not a valid backtrace line, please try again.")
+          @formatador.display_line("[red]#{choice} is not a valid backtrace line, please try again.[/]")
         end
       else
-        red_line("#{choice} is not a valid choice, please try again.")
+        @formatador.display_line("[red]#{choice} is not a valid choice, please try again.[/]")
       end
-      red_line("- #{full_description}")
+      @formatador.display_line("[red]- #{description}[/]")
       prompt(&block)
     end
 
-    def red_line(content)
-      print_line(content, "\e[31m")
-    end
-
     def tests(description, tags = [], &block)
       @tag_stack.push([*tags])
       @befores.push([])
       @afters.push([])
 
-      print_line(description || 'Shindo.tests')
+      @formatador.display_line(description || 'Shindo.tests')
       if block_given?
-        indent { instance_eval(&block) }
+        @formatador.indent { instance_eval(&block) }
       end
 
       @afters.pop
@@ -185,10 +150,9 @@ module Shindo
     end
 
     def test(description, tags = [], &block)
-      @description_stack.push(description)
       @tag_stack.push([*tags])
 
-      # if the test includes tags and discludes ^tags, evaluate it
+      # 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?
@@ -201,6 +165,7 @@ module Shindo
             success = instance_eval(&block)
             @annals.stop
           rescue => error
+            @annals.stop
             success = false
             file, line, method = error.backtrace.first.split(':')
             if method
@@ -209,16 +174,15 @@ module Shindo
               method = ''
             end
             method << "! #{error.message} (#{error.class})"
-            @annals.stop
             @annals.unshift(:file => file, :line => line.to_i, :method => method)
           end
           @success = @success && success
           if success
-            green_line("+ #{full_description}")
+            @formatador.display_line("[green]+ #{description}#{tags}[/]")
           else
-            red_line("- #{full_description}")
+            @formatador.display_line("[red]- #{description}#{tags}[/]")
             if STDOUT.tty?
-              prompt(&block)
+              prompt(description, &block)
             end
           end
 
@@ -226,18 +190,13 @@ module Shindo
             after.call
           end
         else
-          yellow_line("* #{full_description}")
+          @formatador.display_line("[yellow]* #{description}[/]")
         end
       else
-        print_line("_ #{full_description}")
+        @formatador.display_line("_ #{description}")
       end
 
       @tag_stack.pop
-      @description_stack.pop
-    end
-
-    def yellow_line(content)
-      print_line(content, "\e[33m")
     end
 
   end

data/shindo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{shindo}
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["geemus (Wesley Beary)"]
-  s.date = %q{2009-11-23}
+  s.date = %q{2009-12-01}
   s.default_executable = %q{shindo}
   s.description = %q{Simple depth first ruby testing}
   s.email = %q{me@geemus.com}
@@ -43,12 +43,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<annals>, [">= 0"])
+      s.add_runtime_dependency(%q<annals>, [">= 0.0.2"])
+      s.add_runtime_dependency(%q<formatador>, [">= 0.0.2"])
     else
-      s.add_dependency(%q<annals>, [">= 0"])
+      s.add_dependency(%q<annals>, [">= 0.0.2"])
+      s.add_dependency(%q<formatador>, [">= 0.0.2"])
     end
   else
-    s.add_dependency(%q<annals>, [">= 0"])
+    s.add_dependency(%q<annals>, [">= 0.0.2"])
+    s.add_dependency(%q<formatador>, [">= 0.0.2"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shindo
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-23 00:00:00 -08:00
+date: 2009-12-01 00:00:00 -08:00
 default_executable: shindo
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,17 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.0.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: formatador
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.0.2
     version: 
 description: Simple depth first ruby testing
 email: me@geemus.com