pretty_test 0.0.6 → 0.0.7

data/lib/pretty_test.rb

@@ -1,4 +1,4 @@
 require "pretty_test/version"
 require "pretty_test/tap"
 
-MiniTest::Unit.runner = PrettyTest::Tap.new
+MiniTest::Unit.runner = PrettyTest::Tap.new if STDOUT.tty?

data/lib/pretty_test/tap.rb

@@ -40,14 +40,20 @@ module PrettyTest
     end
 
     def tapout_failure(suite, test, test_runner)
-      tapout_error(suite, test, test_runner, FAILURE_FORMAT)
+      @progress += 1
+      error = test_runner.exception
+      test_name = pretty_test_name(test)
+      index = find_assertion_index(error)
+      trace = pretty_trace(error, index)
+      print_error FAILURE_FORMAT, suite_name, test_name, error.class, error.message, trace
     end
 
-    def tapout_error(suite, test, test_runner, format = ERROR_FORMAT)
+    def tapout_error(suite, test, test_runner)
       @progress += 1
       error = test_runner.exception
       test_name = pretty_test_name(test)
-      trace = pretty_trace(error)
+      index = find_exception_index(error)
+      trace = pretty_trace(error, index)
       print_error ERROR_FORMAT, suite_name, test_name, error.class, error.message, trace
     end
 
@@ -92,15 +98,18 @@ module PrettyTest
       clean_trace_line("\e[1m-> ", path, line)
     end
 
-    def pretty_trace(e)
-      assertion_index = e.backtrace.rindex { |trace| trace =~ /:in .(assert|refute|flunk|pass|fail|raise|must|wont)/ }
-      location_index = if assertion_index
-        assertion_index + 1
-      else
-        e.backtrace.index { |trace_line| trace_line.index(Dir.pwd) }
-      end
+    def find_assertion_index(error)
+      index = error.backtrace.index { |trace| trace =~ /:in .(assert|refute|flunk|pass|fail|raise|must|wont)/ }
+      index ? index + 1 : find_exception_index(error)
+    end
+
+    def find_exception_index(error)
+      error.backtrace.index { |trace| trace.index(Dir.pwd) }
+    end
+
+    def pretty_trace(error, location_index)
       lines = []
-      e.backtrace.each_with_index do |trace, index|
+      error.backtrace.each_with_index do |trace, index|
         prefix = index == location_index ? "\e[1m-> " : "   "
         trace_file, trace_line = trace.sub(/:in .*$/, "").split(":")
         lines << clean_trace_line(prefix, trace_file, trace_line)

data/lib/pretty_test/version.rb

@@ -1,3 +1,3 @@
 module PrettyTest
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pretty_test
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-13 00:00:00.000000000Z
+date: 2012-01-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70207780914120 !ruby/object:Gem::Requirement
+  requirement: &70144707253360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '2.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70207780914120
+  version_requirements: *70144707253360
 - !ruby/object:Gem::Dependency
   name: minitap
-  requirement: &70207780913080 !ruby/object:Gem::Requirement
+  requirement: &70144707252840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70207780913080
+  version_requirements: *70144707252840
 description: Minitest patch for pretty (and useful) output.
 email:
 - vladimir@tuzinsky.com