minitest-reporters 0.11.0 → 0.12.0

data/README.md

@@ -1,4 +1,5 @@
-# minitest-reporters - create customizable MiniTest output formats [![Build Status](http://travis-ci.org/CapnKernul/minitest-reporters.png)](http://travis-ci.org/CapnKernul/minitest-reporters) #
+# minitest-reporters - create customizable MiniTest output formats [![Build Status](https://secure.travis-ci.org/CapnKernul/minitest-reporters.png)](http://travis-ci.org/CapnKernul/minitest-reporters)
+
 
 Death to haphazard monkey-patching! Extend MiniTest through simple hooks.
 
@@ -25,7 +26,7 @@ Want to use multiple reporters?
 
 The following reporters are provided:
 
-    MiniTest::Reporters::DefaultReporter  # => Identical to the standard MiniTest reporter
+    MiniTest::Reporters::DefaultReporter  # => Redgreen version of standard MiniTest reporter
     MiniTest::Reporters::SpecReporter     # => Turn-like output that reads like a spec
     MiniTest::Reporters::ProgressReporter # => Fuubar-like output with a progress bar
     MiniTest::Reporters::RubyMateReporter # => Simple reporter designed for RubyMate

data/lib/minitest/{backtrace_filter.rb → extensible_backtrace_filter.rb}

@@ -1,12 +1,12 @@
 module MiniTest
   # Filters backtraces of exceptions that may arise when running tests.
-  class BacktraceFilter
+  class ExtensibleBacktraceFilter
     # Returns the default filter.
     #
     # The default filter will filter out all MiniTest and minitest-reporters
     # lines.
     #
-    # @return [MiniTest::BacktraceFilter]
+    # @return [MiniTest::ExtensibleBacktraceFilter]
     def self.default_filter
       unless defined? @default_filter
         filter = self.new

data/lib/minitest/reporter.rb

@@ -4,6 +4,10 @@ module MiniTest
       Unit.runner
     end
 
+    def filter_backtrace(backtrace)
+      MiniTest.filter_backtrace(backtrace)
+    end
+
     def output
       runner.output
     end

data/lib/minitest/reporters.rb

@@ -5,7 +5,7 @@ module MiniTest
   require "minitest/reporter_runner"
   require "minitest/before_test_hook"
   require "minitest/test_runner"
-  require "minitest/backtrace_filter"
+  require "minitest/extensible_backtrace_filter"
 
   module Reporters
     require "minitest/reporters/version"
@@ -18,14 +18,19 @@ module MiniTest
     autoload :GuardReporter, "minitest/reporters/guard_reporter"
     autoload :JUnitReporter, "minitest/reporters/junit_reporter"
 
-    def self.use!(console_reporters = ProgressReporter.new, env = ENV)
-      include_hook!
+    def self.use!(console_reporters = ProgressReporter.new, env = ENV, backtrace_filter = ExtensibleBacktraceFilter.default_filter)
+      use_runner!(console_reporters, env)
+      use_before_test_hook!
+      use_backtrace_filter!(backtrace_filter)
+    end
+
+    def self.use_runner!(console_reporters, env)
       runner = ReporterRunner.new
       runner.reporters = choose_reporters(console_reporters, env)
       Unit.runner = runner
     end
 
-    def self.include_hook!
+    def self.use_before_test_hook!
       if Unit::VERSION >= "3.3.0"
         Unit::TestCase.send(:include, BeforeTestHook)
       else
@@ -35,6 +40,22 @@ module MiniTest
       end
     end
 
+    def self.use_backtrace_filter!(backtrace_filter)
+      if Unit::VERSION < "4.1.0"
+        MiniTest.class_eval do
+          class << self
+            attr_accessor :backtrace_filter
+          end
+
+          def self.filter_backtrace(backtrace)
+            backtrace_filter.filter(backtrace)
+          end
+        end
+      end
+
+      MiniTest.backtrace_filter = backtrace_filter
+    end
+
     def self.choose_reporters(console_reporters, env)
       if env["TM_PID"]
         [RubyMateReporter.new]

data/lib/minitest/reporters/default_reporter.rb

@@ -1,8 +1,9 @@
-require 'ansi'
+require 'ansi/code'
 
 module MiniTest
   module Reporters
-    # A reporter identical to the standard MiniTest reporter.
+    # A reporter identical to the standard MiniTest reporter except with more
+    # colors.
     #
     # Based upon Ryan Davis of Seattle.rb's MiniTest (MIT License).
     #
@@ -11,21 +12,13 @@ module MiniTest
       include Reporter
 
       def initialize(options = {})
-        if options.is_a?(Hash)
-          @backtrace_filter = options.fetch(:backtrace_filter, BacktraceFilter.default_filter)
-          @detailed_skip = options.fetch(:detailed_skip, true)
-          @color = options.fetch(:color) do
-            output.tty? && (
-              ENV["TERM"] == "screen" ||
-              ENV["TERM"] =~ /term(?:-(?:256)?color)?\z/ ||
-              ENV["EMACS"] == "t"
-            )
-          end
-        else
-          warn "Please use :backtrace_filter => filter instead of passing in the filter directly."
-          @backtrace_filter = options
-          @detailed_skip = true
-          @color = false
+        @detailed_skip = options.fetch(:detailed_skip, true)
+        @color = options.fetch(:color) do
+          output.tty? && (
+            ENV["TERM"] == "screen" ||
+            ENV["TERM"] =~ /term(?:-(?:256)?color)?\z/ ||
+            ENV["EMACS"] == "t"
+          )
         end
       end
 
@@ -40,71 +33,70 @@ module MiniTest
       end
 
       def pass(suite, test, test_runner)
-        after_test(green { '.' })
+        after_test(green('.'))
       end
 
       def skip(suite, test, test_runner)
-        after_test(yellow { 'S' })
+        after_test(yellow('S'))
       end
 
       def failure(suite, test, test_runner)
-        after_test(red { 'F' })
+        after_test(red('F'))
       end
 
       def error(suite, test, test_runner)
-        after_test(red { 'E' })
+        after_test(red('E'))
       end
 
       def after_suites(suites, type)
         time = Time.now - runner.suites_start_time
-        status_line = colored_for(suite_result) do
-          "Finished %ss in %.6fs, %.4f tests/s, %.4f assertions/s." %
-            [type, time, runner.test_count / time, runner.assertion_count / time]
-        end
+        status_line = "Finished %ss in %.6fs, %.4f tests/s, %.4f assertions/s." %
+          [type, time, runner.test_count / time, runner.assertion_count / time]
 
         puts
         puts
-        puts status_line
+        puts colored_for(suite_result, status_line)
 
         runner.test_results.each do |suite, tests|
           tests.each do |test, test_runner|
             if message = message_for(test_runner)
               puts
-              print(colored_for(test_runner.result) { message })
+              print colored_for(test_runner.result, message)
             end
           end
         end
 
         puts
-        puts(colored_for(suite_result) { status })
+        puts colored_for(suite_result, result_line)
       end
 
       private
 
-      def green(&block)
-        @color ? ANSI::Code.green(&block) : yield
+      def green(string)
+        @color ? ANSI::Code.green(string) : string
       end
 
-      def yellow(&block)
-        @color ? ANSI::Code.yellow(&block) : yield
+      def yellow(string)
+        @color ? ANSI::Code.yellow(string) : string
       end
 
-      def red(&block)
-        @color ? ANSI::Code.red(&block) : yield
+      def red(string)
+        @color ? ANSI::Code.red(string) : string
       end
 
-      def colored_for(result, &block)
+      def colored_for(result, string)
         case result
-        when :failure, :error; red(&block)
-        when :skip; yellow(&block)
-        else green(&block)
+        when :failure, :error; red(string)
+        when :skip; yellow(string)
+        else green(string)
         end
       end
 
       def suite_result
-        if runner.failures > 0; :failure
-        elsif runner.errors > 0; :error
-        elsif runner.skips > 0; :skip
+        case
+        when runner.failures > 0; :failure
+        when runner.errors > 0; :error
+        when runner.skips > 0; :skip
         else :pass
         end
       end
@@ -141,12 +133,12 @@ module MiniTest
           end
         when :failure then "Failure:\n#{test}(#{suite}) [#{location(e)}]:\n#{e.message}\n"
         when :error
-          bt = @backtrace_filter.filter(test_runner.exception.backtrace).join "\n    "
+          bt = filter_backtrace(test_runner.exception.backtrace).join "\n    "
           "Error:\n#{test}(#{suite}):\n#{e.class}: #{e.message}\n    #{bt}\n"
         end
       end
 
-      def status
+      def result_line
         '%d tests, %d assertions, %d failures, %d errors, %d skips' %
           [runner.test_count, runner.assertion_count, runner.failures, runner.errors, runner.skips]
       end

data/lib/minitest/reporters/junit_reporter.rb

@@ -1,4 +1,4 @@
-require 'ansi'
+require 'ansi/code'
 require 'builder'
 require 'fileutils'
 module MiniTest
@@ -12,8 +12,7 @@ module MiniTest
     class JUnitReporter
       include Reporter
 
-      def initialize(reports_dir = "test/reports", backtrace_filter = BacktraceFilter.default_filter)
-        @backtrace_filter = backtrace_filter
+      def initialize(reports_dir = "test/reports")
         @reports_path = File.join(Dir.getwd, reports_dir)
         puts "Emptying #{@reports_path}"
         FileUtils.remove_dir(@reports_path) if File.exists?(@reports_path)
@@ -74,7 +73,7 @@ module MiniTest
         when :skip then "Skipped:\n#{test}(#{suite}) [#{location(e)}]:\n#{e.message}\n"
         when :failure then "Failure:\n#{test}(#{suite}) [#{location(e)}]:\n#{e.message}\n"
         when :error
-          bt = @backtrace_filter.filter(test_runner.exception.backtrace).join "\n    "
+          bt = filter_backtrace(test_runner.exception.backtrace).join "\n    "
           "Error:\n#{test}(#{suite}):\n#{e.class}: #{e.message}\n    #{bt}\n"
         end
       end

data/lib/minitest/reporters/progress_reporter.rb

@@ -1,4 +1,4 @@
-require 'ansi'
+require 'ansi/code'
 require 'powerbar'
 
 module MiniTest
@@ -17,14 +17,7 @@ module MiniTest
       INFO_PADDING = 2
 
       def initialize(options = {})
-        if options.is_a?(Hash)
-          @backtrace_filter = options.fetch(:backtrace_filter, BacktraceFilter.default_filter)
-          @detailed_skip = options.fetch(:detailed_skip, true)
-        else
-          warn "Please use :backtrace_filter => filter instead of passing in the filter directly."
-          @backtrace_filter = options
-          @detailed_skip = true
-        end
+        @detailed_skip = options.fetch(:detailed_skip, true)
 
         @progress = PowerBar.new(:msg => "0/#{runner.test_count}")
         @progress.settings.tty.finite.output = lambda { |s| print(s) }
@@ -119,7 +112,7 @@ module MiniTest
       def print_info(e)
         e.message.each_line { |line| puts pad(line) }
 
-        trace = @backtrace_filter.filter(e.backtrace)
+        trace = filter_backtrace(e.backtrace)
         trace.each { |line| puts pad(line) }
       end
 

data/lib/minitest/reporters/ruby_mate_reporter.rb

@@ -1,4 +1,4 @@
-require 'ansi'
+require 'ansi/code'
 
 module MiniTest
   module Reporters
@@ -8,10 +8,6 @@ module MiniTest
 
       INFO_PADDING = 2
 
-      def initialize(backtrace_filter = BacktraceFilter.default_filter)
-        @backtrace_filter = backtrace_filter
-      end
-
       def before_suites(suites, type)
         puts 'Started'
         puts
@@ -61,7 +57,7 @@ module MiniTest
       def print_info(e)
         e.message.each_line { |line| puts pad(line) }
 
-        trace = @backtrace_filter.filter(e.backtrace)
+        trace = filter_backtrace(e.backtrace)
         trace.each { |line| puts pad(line) }
       end
 

data/lib/minitest/reporters/rubymine_reporter.rb

@@ -1,7 +1,7 @@
 # Test results reporter for RubyMine IDE (http://www.jetbrains.com/ruby/) and
 # TeamCity(http://www.jetbrains.com/teamcity/) Continuous Integration Server
 
-require "ansi"
+require 'ansi/code'
 begin
   require 'teamcity/runner_common'
   require 'teamcity/utils/service_message_factory'

data/lib/minitest/reporters/spec_reporter.rb

@@ -1,4 +1,4 @@
-require 'ansi'
+require 'ansi/code'
 
 module MiniTest
   module Reporters
@@ -17,10 +17,6 @@ module MiniTest
       MARK_SIZE = 5
       INFO_PADDING = 8
 
-      def initialize(backtrace_filter = BacktraceFilter.default_filter)
-        @backtrace_filter = backtrace_filter
-      end
-
       def before_suites(suites, type)
         puts 'Started'
         puts
@@ -86,7 +82,7 @@ module MiniTest
       def print_info(e)
         e.message.each_line { |line| puts pad(line, INFO_PADDING) }
 
-        trace = @backtrace_filter.filter(e.backtrace)
+        trace = filter_backtrace(e.backtrace)
         trace.each { |line| puts pad(line, INFO_PADDING) }
       end
 

data/lib/minitest/reporters/version.rb

@@ -1,5 +1,5 @@
 module MiniTest
   module Reporters
-    VERSION = "0.11.0"
+    VERSION = "0.12.0"
   end
 end

data/minitest-reporters.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = 'minitest-reporters'
 
-  s.add_dependency 'minitest', '>= 2.12', '< 4.0'
+  s.add_dependency 'minitest', '>= 2.12', '< 5.0'
   s.add_dependency 'ansi'
   s.add_dependency 'powerbar'
   s.add_dependency 'builder'

data/test/unit/minitest/{backtrace_filter_test.rb → extensible_backtrace_filter_test.rb}

@@ -1,10 +1,10 @@
 require_relative "../../test_helper"
 
 module MiniTestReportersTest
-  class BacktraceFilterTest < TestCase
+  class ExtensibleBacktraceFilterTest < TestCase
     def setup
-      @default_filter = MiniTest::BacktraceFilter.default_filter
-      @filter = MiniTest::BacktraceFilter.new
+      @default_filter = MiniTest::ExtensibleBacktraceFilter.default_filter
+      @filter = MiniTest::ExtensibleBacktraceFilter.new
       @backtrace = ["foo", "bar", "baz"]
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest-reporters
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-17 00:00:00.000000000 Z
+date: 2012-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -21,7 +21,7 @@ dependencies:
         version: '2.12'
     - - <
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -32,7 +32,7 @@ dependencies:
         version: '2.12'
     - - <
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: ansi
   requirement: !ruby/object:Gem::Requirement
@@ -143,8 +143,8 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- lib/minitest/backtrace_filter.rb
 - lib/minitest/before_test_hook.rb
+- lib/minitest/extensible_backtrace_filter.rb
 - lib/minitest/reporter.rb
 - lib/minitest/reporter_runner.rb
 - lib/minitest/reporters.rb
@@ -161,7 +161,7 @@ files:
 - test/gallery/bad_test.rb
 - test/gallery/good_test.rb
 - test/test_helper.rb
-- test/unit/minitest/backtrace_filter_test.rb
+- test/unit/minitest/extensible_backtrace_filter_test.rb
 - test/unit/minitest/reporter_test.rb
 - test/unit/minitest/reporters_test.rb
 homepage: https://github.com/CapnKernul/minitest-reporters
@@ -192,7 +192,7 @@ test_files:
 - test/gallery/bad_test.rb
 - test/gallery/good_test.rb
 - test/test_helper.rb
-- test/unit/minitest/backtrace_filter_test.rb
+- test/unit/minitest/extensible_backtrace_filter_test.rb
 - test/unit/minitest/reporter_test.rb
 - test/unit/minitest/reporters_test.rb
 has_rdoc: