minitest-display 0.2.0.pre → 0.2.0.pre1

data/Gemfile

@@ -1,7 +1,8 @@
 source "http://rubygems.org"
 
+gem "minitest", "~> 4.3"
+
 group :development do
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
-  gem "minitest" 
+  gem "bundler", "~> 1.0"
+  gem "jeweler", "~> 1.5"
 end

data/Gemfile.lock

@@ -2,17 +2,21 @@ GEM
   remote: http://rubygems.org/
   specs:
     git (1.2.5)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
+    jeweler (1.8.4)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    minitest (2.3.1)
-    rake (0.9.2)
+      rdoc
+    json (1.7.5)
+    minitest (4.3.3)
+    rake (10.0.2)
+    rdoc (3.12)
+      json (~> 1.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
-  jeweler (~> 1.5.2)
-  minitest
+  bundler (~> 1.0)
+  jeweler (~> 1.5)
+  minitest (~> 4.3)

data/Rakefile

@@ -21,10 +21,6 @@ Jeweler::Tasks.new do |gem|
   gem.description = %Q{Patches MiniTest to allow for an easily configurable output. For Ruby 1.9 :Datches MiniTest to allow for an easily configurable output. For Ruby 1.9 :D. Inspired by leftright, redgreen and other test output gems, with an emphasis on configuration and style}
   gem.email = "aaron@quirkey.com"
   gem.authors = ["Aaron Quint"]
-  # Include your dependencies below. Runtime dependencies are required when using your gem,
-  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  gem.add_runtime_dependency 'minitest', '~> 2.3'
-  #  gem.add_development_dependency 'rspec', '> 1.2.3'
 end
 Jeweler::RubygemsDotOrgTasks.new
 
@@ -36,13 +32,3 @@ Rake::TestTask.new(:test) do |test|
 end
 
 task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "minitest-display #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/lib/minitest/display.rb

@@ -1,3 +1,5 @@
+require 'minitest/unit'
+
 class Hash
   unless method_defined?(:deep_merge!)
 
@@ -18,7 +20,7 @@ end
 
 module MiniTest
   module Display
-    VERSION = '0.1.0'
+    VERSION = '0.2.0.pre1'
 
     class << self
       def options
@@ -116,12 +118,57 @@ module MiniTest
   end
 end
 
-class MiniTest::Unit
-  # Monkey Patchin!
-  def _run_anything(type)
+class MiniTest::Display::Runner < MiniTest::Unit
+
+  def initialize(*args)
+    super
+    @recorders = []
+  end
+
+  # Add a recorder which for each test that has a `record`.
+  # Optionally can also have an:
+  #
+  # `record_tests_started`,
+  # `record_suite_started(suite)`,
+  # `record(suite, method, assertions, time, error)`
+  # `record_suite_finished(suite, assertions, time)`,
+  # `record_tests_finished(report, test_count, assertion_count, time)
+  #
+  # (Executed in that order)
+  #
+  def add_recorder(new_recorder)
+    new_recorder_instance = new_recorder.new(self)
+    @recorders << new_recorder_instance
+  end
+
+  def record_suite_started(suite)
+    run_recorder_method(:record_suite_started, suite)
+  end
+
+  def record_suite_finished(suite, assertions, time)
+    run_recorder_method(:record_suite_finished, suite)
+  end
+
+  def record_tests_started
+    run_recorder_method(:record_tests_started)
+  end
+
+  def record_tests_finished(report, test_count, assertion_count, time)
+    run_recorder_method(:record_tests_finished, report, test_count, assertion_count, time)
+  end
+
+  def record(suite, method, assertions, time, error)
+    run_recorder_method(:record, suite, method, assertions, time, error)
+  end
+
+  # Patched _run_anything
+  def _run_anything type
     suites = TestCase.send "#{type}_suites"
     return if suites.empty?
 
+    # PATCH
+    record_tests_started
+    # END
     start = Time.now
 
     puts
@@ -152,34 +199,49 @@ class MiniTest::Unit
 
     puts
 
+    # PATCH
+    record_tests_finished(report, test_count, assertion_count, t)
+    # END
     status
   end
 
+  # Patched _run_suite
   def _run_suite(suite, type)
-    suite_header = ""
+    header = "#{type}_suite_header"
+    suite_header = send(header, suite) if respond_to? header
+
+    # PATCH
     if display.options[:suite_names] && display.printable_suite?(suite)
-      suite_header = suite.to_s
+      suite_header ||= suite.to_s
       print display.color("\n#{suite_header}#{display.options[:suite_divider]}", :suite)
     end
+    # END
 
     filter = options[:filter] || '/./'
     filter = Regexp.new $1 if filter =~ /\/(.*)\//
 
-    wrap_at = display.options[:wrap_at] - suite_header.length
+    # PATCH
+    wrap_at = display.options[:wrap_at] - suite_header.length if suite_header
     wrap_count = wrap_at
 
+    record_suite_started(suite)
     full_start_time = Time.now
     @test_times ||= Hash.new { |h, k| h[k] = [] }
+
+    #END
     assertions = suite.send("#{type}_methods").grep(filter).map { |method|
       inst = suite.new method
       inst._assertions = 0
 
       print "#{suite}##{method} = " if @verbose
 
-      @start_time = Time.now
+      # PATCH
+      start_time = Time.now
+      # END
       result = inst.run self
-      time = Time.now - @start_time
 
+      # PATCH
+      time = Time.now - start_time
       @test_times[suite] << ["#{suite}##{method}", time]
 
       print "%.2f s = " % time if @verbose
@@ -193,6 +255,7 @@ class MiniTest::Unit
       else
         result
       end
+
       puts if @verbose
 
       wrap_count -= 1
@@ -206,6 +269,7 @@ class MiniTest::Unit
 
     total_time = Time.now - full_start_time
 
+    record_suite_finished(suite, assertions, total_time)
     if assertions.length > 0 && display.options[:suite_time]
       print "\n#{' ' * suite_header.length}#{display.options[:suite_divider]}"
       print "%.2f s" % total_time
@@ -234,7 +298,7 @@ class MiniTest::Unit
   end
 
   def display_slow_suites
-    times = @test_times.map { |suite, tests| [suite, tests.map(&:last).sum] }.sort { |a, b| b[1] <=> a[1] }
+    times = @test_times.map { |suite, tests| [suite, tests.map(&:last).inject {|sum, n| sum + n }] }.sort { |a, b| b[1] <=> a[1] }
     puts "Slowest suites:"
     times[0..display.options[:output_slow_suites].to_i].each do |suite, time|
       puts "%.2f s\t#{suite}" % time
@@ -242,7 +306,17 @@ class MiniTest::Unit
   end
 
   private
+  def run_recorder_method(method, *args)
+    @recorders.each do |recorder|
+      if recorder.respond_to?(method)
+        recorder.send method, *args
+      end
+    end
+  end
+
   def display
     ::MiniTest::Display
   end
 end
+
+MiniTest::Unit.runner = MiniTest::Display::Runner.new

data/minitest-display.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "minitest-display"
-  s.version = "0.2.0.pre"
+  s.version = "0.2.0.pre1"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Quint"]

data/test/test_minitest-display.rb

@@ -96,6 +96,67 @@ class TestMinitestDisplay < MiniTest::Unit::TestCase
   end
 
   def test_runs_basic_test_with_slow_output
+    capture_test_output <<-TESTCASE
+      MiniTest::Display.options = {
+        :suite_divider => ' // ',
+        :print => {
+          :success => 'PASS'
+        },
+        :output_slow => true
+      }
+      class PrintTest < MiniTest::Unit::TestCase
+
+        def test_truth
+          assert false
+        end
+
+        def test_equality
+          assert_equal 'test', 'test'
+        end
+      end
+    TESTCASE
+
+    assert_output(/PrintTest \/\//)
+    assert_output(/F/)
+    assert_output(/PASS/)
+    assert_output(/Slowest tests:/)
+  end
+
+  def test_adding_a_recorder
+    capture_test_output <<-TESTCASE
+      MiniTest::Display.options = {
+        :suite_divider => ' // ',
+        :print => {
+          :success => 'PASS'
+        }
+      }
+      class TestRecorder
+        def initialize(runner)
+          @runner = runner
+        end
 
+        def record(suite, method, assertions, time, error)
+          puts "I just recorded \#{method}"
+        end
+      end
+
+      MiniTest::Unit.runner.add_recorder TestRecorder
+
+      class PrintTest < MiniTest::Unit::TestCase
+
+        def test_truth
+          assert false
+        end
+
+        def test_equality
+          assert_equal 'test', 'test'
+        end
+      end
+    TESTCASE
+
+    assert_output(/PrintTest \/\//)
+    assert_output(/F/)
+    assert_output(/PASS/)
+    assert_output(/I just recorded test_truth/)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest-display
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre
+  version: 0.2.0.pre1
   prerelease: 6
 platform: ruby
 authors:
@@ -97,7 +97,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4169721688534295478
+      hash: -196578224241529299
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: