pretty_test 0.0.3 → 0.0.4

data/lib/pretty_test.rb

@@ -1,2 +1,4 @@
 require "pretty_test/version"
-require "pretty_test/mini_test"
+require "pretty_test/tap"
+
+MiniTest::Unit.runner = PrettyTest::Tap.new

data/lib/pretty_test/tap.rb

@@ -0,0 +1,122 @@
+require "minitap"
+module PrettyTest
+
+  class Tap < ::MiniTest::MiniTap
+
+    SKIP_FORMAT = "\e[33m[SKIPPED] %s: %s\e[0m\n%s\n%s"
+    FAILURE_FORMAT = "\e[31m\e[1m[FAILURE] %s: %s\e[0m\n%s\n%s"
+    ERROR_FORMAT = "\e[31m\e[1m[ERROR] %s: %s\e[0m\n\e[31m%s: %s\e[0m\n%s"
+    STATUS_FORMAT = "\e[2K\r\e[?7l\e[1m\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"
+
+    attr_accessor :started_at, :progress, :suite_name, :test_name
+
+    def tapout_before_suites(suites, type)
+      @started_at = Time.now
+      @progress = 0
+    end
+
+    def tapout_before_suite(suite)
+      @suite_name = pretty_suite_name(suite.name)
+    end
+
+    def tapout_before_test(suite, test)
+      @test_name = pretty_test_name(test)
+      remove_status
+      update_status("#{suite_name}: #{test_name}")
+    end
+
+    def tapout_pass(suite, test, test_runner)
+      @progress += 1
+      update_status("")
+    end
+
+    def tapout_skip(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 SKIP_FORMAT, suite_name, test_name, message, location
+    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
+    end
+
+    def tapout_error(suite, test, test_runner)
+      @progress += 1
+      error = test_runner.exception
+      test_name = pretty_test_name(test)
+      trace = pretty_trace(error)
+      print_error ERROR_FORMAT, suite_name, test_name, error.class, error.message, trace
+    end
+
+    def tapout_after_suites(suites, type)
+      update_status
+      puts "\n\nSuite seed: #{options[:seed]}\n"
+    end
+
+    protected
+
+    def pretty_suite_name(suite)
+      suite = suite.dup
+      suite.gsub!(/(::|_)/, " ")
+      suite.gsub!(/\btest/i, "")
+      suite.gsub!(/test\b/i, "")
+      suite.gsub!(/\b([a-z])/i) { $1.upcase }
+      suite.gsub!(/([A-Z]+)([A-Z][a-z])/, '\1 \2')
+      suite.gsub!(/([a-z\d])([A-Z])/, '\1 \2')
+      suite
+    end
+
+    def pretty_test_name(test)
+      test = test.dup
+      test.gsub!(/^test_/, "")
+      test.gsub!(/_+/, " ")
+      test
+    end
+
+    def pretty_location(e)
+      path, line = location(e)
+      clean_trace_line("\e[1m-> ", path, line)
+    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")
+    end
+
+    def clean_trace_line(prefix, path, line)
+      case path
+      when %r{^#{Dir.pwd}/(.+?)/(.+)$} then "\e[37m#{prefix}[#{$1}] #{$2}:#{line}\e[0m"
+      when %r{^.*/gems/(minitap|minitest)-.+/(.+)$} then nil
+      when %r{^.*/gems/(.+?)/(.+)$} then "\e[36m#{prefix}[#{$1}] #{$2}:#{line}\e[0m"
+      when %r{^.*/rubies/(.+?)/(.+)$} then "\e[35m#{prefix}[#{$1}] #{$2}:#{line}\e[0m"
+      else "#{prefix}#{path}:#{line}"
+      end
+    end
+
+    def print_error(format, *args)
+      remove_status
+      puts format % args
+      puts
+    end
+
+    def update_status(message = "")
+      print STATUS_FORMAT % [Time.now - started_at, progress, test_count, assertion_count, errors, failures, skips, message]
+    end
+
+    def remove_status
+      print "\e[2K\r"
+    end
+  end
+end

data/lib/pretty_test/version.rb

@@ -1,3 +1,3 @@
 module PrettyTest
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/pretty_test.gemspec

@@ -14,4 +14,7 @@ Gem::Specification.new do |gem|
   gem.name          = "pretty_test"
   gem.require_paths = ["lib"]
   gem.version       = PrettyTest::VERSION
+
+  gem.add_dependency "minitest", ">= 2.6"
+  gem.add_dependency "minitap", ">= 0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pretty_test
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,30 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-10 00:00:00.000000000Z
-dependencies: []
+date: 2011-10-11 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &70094970515380 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70094970515380
+- !ruby/object:Gem::Dependency
+  name: minitap
+  requirement: &70094970513840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70094970513840
 description: Minitest patch for pretty (and useful) output.
 email:
 - vladimir@tuzinsky.com
@@ -21,7 +43,7 @@ files:
 - .gitignore
 - Gemfile
 - lib/pretty_test.rb
-- lib/pretty_test/mini_test.rb
+- lib/pretty_test/tap.rb
 - lib/pretty_test/version.rb
 - pretty_test.gemspec
 homepage: https://github.com/bobes/pretty_test

data/lib/pretty_test/mini_test.rb

@@ -1,137 +0,0 @@
-class MiniTest::Unit
-
-  STATUS_FORMAT = "\e[?7l\e[1m\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"
-
-  def run(args = [])
-    options = process_args args
-
-    @verbose = options[:verbose]
-
-    filter = options[:filter] || '/./'
-    filter = Regexp.new $1 if filter and filter =~ /\/(.*)\//
-
-    seed = options[:seed]
-    unless seed then
-      srand
-      seed = srand % 0xFFFF
-    end
-
-    srand seed
-
-    @@out.puts "Loaded suite #{$0.sub(/\.rb$/, '')}\nStarted"
-
-    @started_at = Time.now
-    run_test_suites filter
-
-    help = ["--seed", seed]
-    help.push "--verbose" if @verbose
-    help.push("--name", options[:filter].inspect) if options[:filter]
-
-    @@out.puts "\n\nTest run options: #{help.join(" ")}\n"
-
-    failures + errors if @test_count > 0
-  rescue Interrupt
-    abort "Interrupted"
-  end
-
-  def run_test_suites(filter = /./)
-    @test_count, @assertion_count = 0, 0
-    old_sync, @@out.sync = @@out.sync, true if @@out.respond_to? :sync=
-    tests = {}
-    TestCase.test_suites.each do |suite|
-      suite_name = suite.name.split("::").map { |token|
-        token =~ /^(test)?(.*?)(test)?$/i && $2.underscore.humanize
-      }.join(" ")
-      suite.test_methods.grep(filter).each do |test|
-        test_name = test =~ /^(test_)?(.*)$/ && $2.underscore.humanize.downcase
-        tests["#{suite_name}: #{test_name}"] = [suite, test]
-      end
-    end
-    @test_count = tests.size
-    tests.keys.each_with_index do |name, index|
-      update_status(index, name)
-      suite, test = tests[name]
-      inst = suite.new(test)
-      inst._assertions = 0
-      klass, method, error = inst.run(self)
-      @assertion_count += inst._assertions
-      remove_status
-      print_error(klass, method, error) if error
-    end
-    update_status(@test_count)
-    @@out.sync = old_sync if @@out.respond_to? :sync=
-    [@test_count, @assertion_count]
-  end
-
-  def puke(klass, method, error)
-    [klass, method, error]
-  end
-
-  def print_error(klass, method, error)
-    report = case error
-    when MiniTest::Skip then
-      @skips += 1
-      "\e[30m\e[43m[SKIPPED] #{pretty_test_name(klass, method)}\e[0m\n#{pretty_skipped_location(error)}\n\e[31m#{error.message}\e[0m"
-    when MiniTest::Assertion then
-      @failures += 1
-      "\e[37m\e[41m\e[1m[FAILURE] #{pretty_test_name(klass, method)}\e[0m\n#{pretty_failure_location(error)}\n#{error.message}"
-    else
-      @errors += 1
-      "\e[37m\e[41m\e[1m[ERROR] #{pretty_test_name(klass, method)}\e[0m\n#{pretty_error_trace(error)}"
-    end
-    @@out.puts "#{report}\n\n"
-  end
-
-  def pretty_test_name(klass, test)
-    suite_name = klass.name.split("::").map { |token|
-      token =~ /^(test)?(.*?)(test)?$/i && $2.underscore.humanize
-    }.join(" ")
-    test_name = test =~ /^(test_)?(.*)$/i && $2.underscore.humanize.downcase
-    "#{suite_name}: #{test_name}"
-  end
-
-  def pretty_skipped_location(error)
-    location = error.backtrace.detect do |line|
-      line =~ %r{^#{Dir.pwd}/}
-    end
-    clean_trace_line("\e[1m-> ", location)
-  end
-
-  def pretty_failure_location(error)
-    location = nil
-    error.backtrace.reverse.each do |line|
-      break if line =~ /in .(assert|refute)_/
-      location = line if line =~ %r{^#{Dir.pwd}/}
-    end
-    clean_trace_line("\e[1m-> ", location)
-  end
-
-  def pretty_error_trace(error)
-    location = error.backtrace.detect do |line|
-      line =~ %r{^#{Dir.pwd}/}
-    end
-    trace = error.backtrace.map do |line|
-      prefix = line == location ? "\e[1m-> " : "   "
-      clean_trace_line(prefix, line)
-    end
-    "\e[31m#{error.class}: #{error.message}\e[0m\n#{trace.join("\n")}"
-  end
-
-  def clean_trace_line(prefix, line)
-    case line
-    when %r{^#{Dir.pwd}/(.+?)/(.+)$} then "\e[37m#{prefix}[#{$1}] #{$2}\e[0m"
-    when %r{^.*/gems/(.+?)/(.+)$} then "\e[36m#{prefix}[#{$1}] #{$2}\e[0m"
-    when %r{^.*/rubies/(.+?)/(.+)$} then "\e[35m#{prefix}[#{$1}] #{$2}\e[0m"
-    else "#{prefix}#{line}"
-    end
-  end
-
-  def update_status(index, test_name = nil)
-    status = STATUS_FORMAT % [Time.now - @started_at, index, @test_count, @assertion_count, @errors, @failures, @skips, test_name]
-    @@out.print status
-  end
-
-  def remove_status
-    @@out.print "\e[2K\r"
-  end
-end