pretty_test 0.0.5 → 0.0.6

data/lib/pretty_test/tap.rb

@@ -4,7 +4,7 @@ module PrettyTest
   class Tap < ::MiniTest::MiniTap
 
     SKIP_FORMAT = "\e[33m[SKIPPED] %s: %s\e[0m\n%s\n%s"
-    FAILURE_FORMAT = "\e[31m[FAILURE] %s: %s\e[0m\n%s\n%s"
+    FAILURE_FORMAT = "\e[31m[FAILURE] %s: %s\e[0m\n\e[31m%s: %s\e[0m\n%s"
     ERROR_FORMAT = "\e[31m[ERROR] %s: %s\e[0m\n\e[31m%s: %s\e[0m\n%s"
     STATUS_FORMAT = "\e[2K\r\e[?7l\e[37m(%.1fs) \e[32m%d/%d tests\e[37m, \e[36m%d assertions\e[37m, \e[31m%d errors\e[37m, \e[31m%d failures\e[37m, \e[33m%d skips \e[37m%s\e[?7h\e[0m"
 
@@ -40,15 +40,10 @@ module PrettyTest
     end
 
     def tapout_failure(suite, test, test_runner)
-      @progress += 1
-      error = test_runner.exception
-      test_name = pretty_test_name(test)
-      location = pretty_location(error)
-      message = error.message.strip
-      print_error FAILURE_FORMAT, suite_name, test_name, message, location
+      tapout_error(suite, test, test_runner, FAILURE_FORMAT)
     end
 
-    def tapout_error(suite, test, test_runner)
+    def tapout_error(suite, test, test_runner, format = ERROR_FORMAT)
       @progress += 1
       error = test_runner.exception
       test_name = pretty_test_name(test)
@@ -66,6 +61,12 @@ module PrettyTest
       end
     end
 
+    def tapout_(suite, test, test_runner)
+      remove_status
+      puts "\n\e[31mCould not run #{suite}##{test} for an unknown reason\e[0m\n"
+      puts
+    end
+
     protected
 
     def pretty_suite_name(suite)
@@ -92,12 +93,19 @@ module PrettyTest
     end
 
     def pretty_trace(e)
-      path, line = location(e)
-      e.backtrace.map { |trace_line|
-        prefix = trace_line.index("#{path}:#{line}") ? "\e[1m-> " : "   "
-        file, line = trace_line.sub(/:in .*$/, "").split(":")
-        clean_trace_line(prefix, file, line)
-      }.compact.join("\n")
+      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
+      lines = []
+      e.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)
+      end
+      lines.compact.join("\n")
     end
 
     def clean_trace_line(prefix, path, line)

data/lib/pretty_test/version.rb

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

metadata

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