minitest-display 0.2.0.pre2 → 0.3.0.pre1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: cde9ca73e72519c9e38c1eadef6309ea2ce4c5f8
+  data.tar.gz: b71238f76d6d80f6f7088f47445e68a56c186bd2
+SHA512:
+  metadata.gz: 69cde4c3299d922748b38366f0f55c20e4ddf81a309926e2703a974d2c4a58f41e4bf3eb104620b9766c4d6daaf77ca166b685591ebafe182eb9c69ae1c4ee54
+  data.tar.gz: 37c1c7e1d84d801f7a224ba8202545c683277f62065936a28c5487c8b617174825215a931afac12c13c8c2f1d61d2bdacfa9d7bb8241686e10b38ecfd1ee0c31

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem "minitest", "~> 4.3"
+gem "minitest", ">= 5.0"
 
 group :development do
   gem "bundler", "~> 1.0"

data/Gemfile.lock

@@ -1,16 +1,45 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    git (1.2.5)
-    jeweler (1.8.4)
+    addressable (2.3.6)
+    builder (3.2.2)
+    faraday (0.8.9)
+      multipart-post (~> 1.2.0)
+    git (1.2.8)
+    github_api (0.10.1)
+      addressable
+      faraday (~> 0.8.1)
+      hashie (>= 1.2)
+      multi_json (~> 1.4)
+      nokogiri (~> 1.5.2)
+      oauth2
+    hashie (3.3.2)
+    highline (1.6.21)
+    jeweler (1.8.8)
+      builder
       bundler (~> 1.0)
       git (>= 1.2.5)
+      github_api (= 0.10.1)
+      highline (>= 1.6.15)
+      nokogiri (= 1.5.10)
       rake
       rdoc
-    json (1.7.5)
-    minitest (4.3.3)
-    rake (10.0.2)
-    rdoc (3.12)
+    json (1.8.1)
+    jwt (1.2.0)
+    minitest (5.4.3)
+    multi_json (1.10.1)
+    multi_xml (0.5.5)
+    multipart-post (1.2.0)
+    nokogiri (1.5.10)
+    oauth2 (1.0.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    rack (1.6.0)
+    rake (10.4.2)
+    rdoc (4.2.0)
       json (~> 1.4)
 
 PLATFORMS
@@ -19,4 +48,4 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0)
   jeweler (~> 1.5)
-  minitest (~> 4.3)
+  minitest (>= 5.0)

data/lib/minitest/display.rb

@@ -1,4 +1,4 @@
-require 'minitest/unit'
+require 'minitest' 
 
 class Hash
   unless method_defined?(:deep_merge!)
@@ -18,9 +18,9 @@ class Hash
   end
 end
 
-module MiniTest
+module Minitest
   module Display
-    VERSION = '0.2.0.pre2'
+    VERSION = '0.3.0.pre1'
 
     class << self
       def options
@@ -113,210 +113,133 @@ module MiniTest
       def printable_suite?(suite)
         !DONT_PRINT_CLASSES.include?(suite.to_s)
       end
-    end
-
-  end
-end
-
-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, assertions, time)
-  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
-    puts "# Running #{type}s:"
-    puts
-
-    @test_count, @assertion_count = 0, 0
-    sync = output.respond_to? :"sync=" # stupid emacs
-    old_sync, output.sync = output.sync, true if sync
-
-    results = _run_suites suites, type
-
-    @test_count      = results.inject(0) { |sum, (tc, _)| sum + tc }
-    @assertion_count = results.inject(0) { |sum, (_, ac)| sum + ac }
-
-    output.sync = old_sync if sync
-
-    t = Time.now - start
-
-    puts
-    puts
-    puts "Finished #{type}s in %.6fs, %.4f tests/s, %.4f assertions/s." %
-      [t, test_count / t, assertion_count / t]
-
-    report.each_with_index do |msg, i|
-      puts "\n%3d) %s" % [i + 1, msg]
-    end
-
-    puts
-
-    # PATCH
-    record_tests_finished(report, test_count, assertion_count, t)
-    # END
-    status
-  end
-
-  # Patched _run_suite
-  def _run_suite(suite, type)
-    header = "#{type}_suite_header"
-    suite_header = send(header, suite) if respond_to? header
+      
+      # 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(test_count, assertion_count, failure_count, error_count, time)
+      #
+      # (Executed in that order)
+      #
+      def add_recorder(new_recorder)
+        new_recorder_instance = new_recorder.new(self)
+        @recorders ||= []
+        @recorders << new_recorder_instance
+      end
 
-    # PATCH
-    if display.options[:suite_names] && display.printable_suite?(suite)
-      suite_header ||= suite.to_s
-      print display.color("\n#{suite_header}#{display.options[:suite_divider]}", :suite)
+      # An array of all the registered MiniTest::Display recorders
+      def recorders
+        @recorders || []
+      end
     end
-    # END
-
-    filter = options[:filter] || '/./'
-    filter = Regexp.new $1 if filter =~ /\/(.*)\//
-
-    # 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
+    class Reporter < ::Minitest::Reporter
 
-      print "#{suite}##{method} = " if @verbose
-
-      # PATCH
-      start_time = Time.now
-      # END
-      result = inst.run self
+      def initialize(*args)
+        super
+        @total_assertions = 0
+        @total_errors = 0
+        @total_failures = 0
+        @total_tests = 0
+      end
 
-      # PATCH
-      time = Time.now - start_time
-      @test_times[suite] << ["#{suite}##{method}", time]
+      def record_suite_started(suite)
+        if display.options[:suite_names] && display.printable_suite?(suite)
+          suite_header ||= suite.to_s
+          print display.color("\n#{suite_header}#{display.options[:suite_divider]}", :suite)
+          @wrap_at = display.options[:wrap_at] - suite_header.length
+          @wrap_count = @wrap_at
+        end
+        @suite_start = Time.now
+        run_recorder_method(:record_suite_started, suite)
+      end
 
-      print "%.2f s = " % time if @verbose
-      print case result
-      when "."
-        display.color(display.options[:print][:success], :success)
-      when "F"
-        display.color(display.options[:print][:failure], :failure)
-      when "E"
-        display.color(display.options[:print][:error], :error)
-      else
-        result
+      def record_suite_finished(suite)
+        @suite_finished = Time.now
+        time = start.to_i - finished.to_i
+        print "\n#{' ' * suite_header.length}#{display.options[:suite_divider]}"
+        print "%.2f s" % time 
+        run_recorder_method(:record_suite_finished, suite, @assertions, time)
       end
 
-      puts if @verbose
+      def start
+        @test_times ||= Hash.new { |h, k| h[k] = [] }
+        @tests_started = Time.now.to_i
+        run_recorder_method(:record_tests_started)
+      end
 
-      wrap_count -= 1
-      if wrap_count == 0
-        print "\n#{' ' * suite_header.length}#{display.options[:suite_divider]}"
-        wrap_count = wrap_at
+      def report
+        display_slow_tests if display.options[:output_slow]
+        display_slow_suites if display.options[:output_slow_suites]
+        run_recorder_method(:record_tests_finished, @total_tests, @total_assertions, @total_failures, @total_errors, Time.now.to_i - @tests_started)
       end
 
-      inst._assertions
-    }
+      def record(result)
+        suite = result.class
+        if suite != @current_suite
+          record_suite_finished(@current_suite) if @current_suite
+          record_suite_started(suite)
+          @assertions = 0
+        end
+        @assertions += result.assertions 
+        @total_assertions += result.assertions
+        @total_tests += 1
+        output = if result.error?
+          @total_errors += 1
+          display.color(display.options[:print][:error], :error)
+        elsif result.failure
+          @total_failures += 1
+          display.color(display.options[:print][:failure], :failure)
+        else
+          display.color(display.options[:print][:success], :success)
+        end
 
-    total_time = Time.now - full_start_time
+        print output
 
-    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
-    end
-    return assertions.size, assertions.inject(0) { |sum, n| sum + n }
-  end
+        @wrap_count -= 1
+        if @wrap_count == 0
+          print "\n#{' ' * suite.to_s.length}#{display.options[:suite_divider]}"
+          @wrap_count = @wrap_at
+        end
 
-  def status(io = self.output)
-    format = "%d tests, %d assertions, %d failures, %d errors, %d skips"
-    final_status = if errors > 0 then :error
-                   elsif failures > 0 then :failure
-                   else :success
-                   end
-    io.puts display.color(format % [test_count, assertion_count, failures, errors, skips], final_status)
+        run_recorder_method(:record, suite, result.name, result.assertions, result.time, result.failure)
+        @test_times[suite] << ["#{suite}##{result.name}", result.time]
+        @current_suite = suite
+      end
 
-    display_slow_tests if display.options[:output_slow]
-    display_slow_suites if display.options[:output_slow_suites]
-  end
+      def display_slow_tests
+        times = @test_times.values.flatten(1).sort { |a, b| b[1] <=> a[1] }
+        puts "Slowest tests:"
+        times[0..display.options[:output_slow].to_i].each do |test_name, time|
+          puts "%.2f s\t#{test_name}" % time
+        end
+      end
 
-  def display_slow_tests
-    times = @test_times.values.flatten(1).sort { |a, b| b[1] <=> a[1] }
-    puts "Slowest tests:"
-    times[0..display.options[:output_slow].to_i].each do |test_name, time|
-      puts "%.2f s\t#{test_name}" % time
-    end
-  end
+      def display_slow_suites
+        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
+        end
+      end
 
-  def display_slow_suites
-    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
-    end
-  end
+      private
+      def run_recorder_method(method, *args)
+        Minitest::Display.recorders.each do |recorder|
+          if recorder.respond_to?(method)
+            recorder.send method, *args
+          end
+        end
+      end
 
-  private
-  def run_recorder_method(method, *args)
-    @recorders.each do |recorder|
-      if recorder.respond_to?(method)
-        recorder.send method, *args
+      def display
+        ::Minitest::Display
       end
     end
-  end
 
-  def display
-    ::MiniTest::Display
   end
 end
-
-MiniTest::Unit.runner = MiniTest::Display::Runner.new

data/lib/minitest/display_plugin.rb

@@ -0,0 +1,12 @@
+require_relative 'display'
+
+# Minitest 5 plugin hook
+module Minitest
+
+  def self.plugin_display_init(options)
+    self.reporter.reporters.reject! {|r| r.class == Minitest::ProgressReporter }
+    self.reporter.reporters << Minitest::Display::Reporter.new
+  end
+
+end
+

data/minitest-display.gemspec

@@ -2,14 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: minitest-display 0.3.0.pre1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "minitest-display"
-  s.version = "0.2.0.pre2"
+  s.version = "0.3.0.pre1"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Aaron Quint"]
-  s.date = "2012-12-10"
+  s.date = "2014-12-19"
   s.description = "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"
   s.email = "aaron@quirkey.com"
   s.extra_rdoc_files = [
@@ -26,30 +28,30 @@ Gem::Specification.new do |s|
     "Rakefile",
     "TODO",
     "lib/minitest/display.rb",
+    "lib/minitest/display_plugin.rb",
     "minitest-display.gemspec",
     "test/helper.rb",
     "test/test_minitest-display.rb"
   ]
   s.homepage = "http://github.com/quirkey/minitest-display"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
+  s.rubygems_version = "2.2.2"
   s.summary = "Patches MiniTest to allow for an easily configurable output. For Ruby 1.9 :D"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<minitest>, ["~> 4.3"])
+      s.add_runtime_dependency(%q<minitest>, [">= 5.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5"])
     else
-      s.add_dependency(%q<minitest>, ["~> 4.3"])
+      s.add_dependency(%q<minitest>, [">= 5.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5"])
     end
   else
-    s.add_dependency(%q<minitest>, ["~> 4.3"])
+    s.add_dependency(%q<minitest>, [">= 5.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5"])
   end

data/test/helper.rb

@@ -10,10 +10,14 @@ end
 require 'minitest/autorun'
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'minitest/display'
+
+# Init the plugin
+Minitest.extensions = ["display"] 
+require "minitest/display_plugin"
+
 $print_runs = ENV['DEBUG']
 
-class MiniTest::Unit::TestCase
+class Minitest::Test
   attr_reader :suite_output
 
   def capture_test_output(testcase_str)
@@ -24,7 +28,9 @@ class MiniTest::Unit::TestCase
     tmpfilename = "#{tmpdir}/fake_test_suite.rb"
     header = %{
       require 'minitest/autorun'
-      require '#{lib_dir}/minitest/display'
+      $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+      Minitest.extensions = ["display"] 
+      require "#{lib_dir}/minitest/display_plugin"
     }
 
     testcase_str = header + "\n" + testcase_str

data/test/test_minitest-display.rb

@@ -1,10 +1,10 @@
 require 'helper'
 
-class TestMinitestDisplay < MiniTest::Unit::TestCase
+class TestMinitestDisplay < MiniTest::Test
 
   def test_runs_basic_test_with_default_settings
     capture_test_output <<-TESTCASE
-      class BasicTest < MiniTest::Unit::TestCase
+      class BasicTest < Minitest::Test
 
         def test_truth
           assert true
@@ -22,7 +22,7 @@ class TestMinitestDisplay < MiniTest::Unit::TestCase
 
   def test_runs_basic_test_with_failures
     capture_test_output <<-TESTCASE
-      class BasicTest < MiniTest::Unit::TestCase
+      class BasicTest < Minitest::Test
 
         def test_truth
           assert false
@@ -41,7 +41,7 @@ class TestMinitestDisplay < MiniTest::Unit::TestCase
 
   def test_runs_basic_test_with_multiple_suites
     capture_test_output <<-TESTCASE
-      class BasicTest < MiniTest::Unit::TestCase
+      class BasicTest < Minitest::Test
 
         def test_truth
           assert false
@@ -52,7 +52,7 @@ class TestMinitestDisplay < MiniTest::Unit::TestCase
         end
       end
 
-      class AnotherBasicTest < MiniTest::Unit::TestCase
+      class AnotherBasicTest < Minitest::Test
 
         def test_truth
           assert false
@@ -78,7 +78,7 @@ class TestMinitestDisplay < MiniTest::Unit::TestCase
           :success => 'PASS'
         }
       }
-      class PrintTest < MiniTest::Unit::TestCase
+      class PrintTest < Minitest::Test
 
         def test_truth
           assert false
@@ -104,7 +104,7 @@ class TestMinitestDisplay < MiniTest::Unit::TestCase
         },
         :output_slow => true
       }
-      class PrintTest < MiniTest::Unit::TestCase
+      class PrintTest < Minitest::Test
 
         def test_truth
           assert false
@@ -140,9 +140,9 @@ class TestMinitestDisplay < MiniTest::Unit::TestCase
         end
       end
 
-      MiniTest::Unit.runner.add_recorder TestRecorder
+      MiniTest::Display.add_recorder TestRecorder
 
-      class PrintTest < MiniTest::Unit::TestCase
+      class PrintTest < Minitest::Test
 
         def test_truth
           assert false

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: minitest-display
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre2
-  prerelease: 6
+  version: 0.3.0.pre1
 platform: ruby
 authors:
 - Aaron Quint
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-10 00:00:00.000000000 Z
+date: 2014-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 description: Patches MiniTest to allow for an easily configurable output. For Ruby
@@ -71,7 +64,7 @@ extra_rdoc_files:
 - README.md
 - TODO
 files:
-- .document
+- ".document"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -79,36 +72,33 @@ files:
 - Rakefile
 - TODO
 - lib/minitest/display.rb
+- lib/minitest/display_plugin.rb
 - minitest-display.gemspec
 - test/helper.rb
 - test/test_minitest-display.rb
 homepage: http://github.com/quirkey/minitest-display
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4125289219123981824
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Patches MiniTest to allow for an easily configurable output. For Ruby 1.9
   :D
 test_files: []