minitest-reporters 1.3.0 → 1.3.1.beta1

data/lib/minitest/relative_position.rb

@@ -1,26 +1,26 @@
-module Minitest
-  module RelativePosition
-    TEST_PADDING = 2
-    TEST_SIZE = 63
-    MARK_SIZE = 5
-    INFO_PADDING = 8
-
-    private
-
-    def print_with_info_padding(line)
-      puts pad(line, INFO_PADDING)
-    end
-
-    def pad(str, size = INFO_PADDING)
-      ' ' * size + str
-    end
-
-    def pad_mark(str)
-      "%#{MARK_SIZE}s" % str
-    end
-
-    def pad_test(str)
-      pad("%-#{TEST_SIZE}s" % str, TEST_PADDING)
-    end
-  end
-end
+module Minitest
+  module RelativePosition
+    TEST_PADDING = 2
+    TEST_SIZE = 63
+    MARK_SIZE = 5
+    INFO_PADDING = 8
+
+    private
+
+    def print_with_info_padding(line)
+      puts pad(line, INFO_PADDING)
+    end
+
+    def pad(str, size = INFO_PADDING)
+      ' ' * size + str
+    end
+
+    def pad_mark(str)
+      "%#{MARK_SIZE}s" % str
+    end
+
+    def pad_test(str)
+      pad("%-#{TEST_SIZE}s" % str, TEST_PADDING)
+    end
+  end
+end

data/lib/minitest/reporters.rb

@@ -1,91 +1,91 @@
-require 'minitest'
-
-module Minitest
-  require "minitest/relative_position"
-  require "minitest/extensible_backtrace_filter"
-
-  module Reporters
-    require "minitest/reporters/version"
-
-    autoload :ANSI, "minitest/reporters/ansi"
-    autoload :BaseReporter, "minitest/reporters/base_reporter"
-    autoload :DefaultReporter, "minitest/reporters/default_reporter"
-    autoload :SpecReporter, "minitest/reporters/spec_reporter"
-    autoload :ProgressReporter, "minitest/reporters/progress_reporter"
-    autoload :RubyMateReporter, "minitest/reporters/ruby_mate_reporter"
-    autoload :RubyMineReporter, "minitest/reporters/rubymine_reporter"
-    autoload :JUnitReporter, "minitest/reporters/junit_reporter"
-    autoload :HtmlReporter, "minitest/reporters/html_reporter"
-    autoload :MeanTimeReporter, "minitest/reporters/mean_time_reporter"
-
-    class << self
-      attr_accessor :reporters
-    end
-
-    def self.use!(console_reporters = ProgressReporter.new, env = ENV, backtrace_filter = nil)
-      use_runner!(console_reporters, env)
-      if backtrace_filter.nil? && !defined?(::Rails)
-        backtrace_filter = ExtensibleBacktraceFilter.default_filter
-      end
-      Minitest.backtrace_filter = backtrace_filter unless backtrace_filter.nil?
-
-      unless defined?(@@loaded)
-        use_around_test_hooks!
-        use_old_activesupport_fix!
-        @@loaded = true
-      end
-    end
-
-    def self.use_runner!(console_reporters, env)
-      self.reporters = choose_reporters(console_reporters, env)
-    end
-
-    def self.use_around_test_hooks!
-      Minitest::Test.class_eval do
-        def run_with_hooks(*args)
-          if defined?(Minitest::Reporters) && (reporters = Minitest::Reporters.reporters)
-            reporters.each { |r| r.before_test(self) }
-            result = run_without_hooks(*args)
-            reporters.each { |r| r.after_test(self) }
-            result
-          else
-            run_without_hooks(*args)
-          end
-        end
-
-        alias_method :run_without_hooks, :run
-        alias_method :run, :run_with_hooks
-      end
-    end
-
-    def self.choose_reporters(console_reporters, env)
-      if env["MINITEST_REPORTER"]
-        [Minitest::Reporters.const_get(env["MINITEST_REPORTER"]).new]
-      elsif env["TM_PID"]
-        [RubyMateReporter.new]
-      elsif env["RM_INFO"] || env["TEAMCITY_VERSION"]
-        [RubyMineReporter.new]
-      elsif !env["VIM"]
-        Array(console_reporters)
-      end
-    end
-
-    def self.clock_time
-      if minitest_version >= 561
-        Minitest.clock_time
-      else
-        Time.now
-      end
-    end
-
-    def self.minitest_version
-      Minitest::VERSION.gsub('.', '').to_i
-    end
-
-    def self.use_old_activesupport_fix!
-      if defined?(ActiveSupport::VERSION) && ActiveSupport::VERSION::MAJOR < 4
-        require "minitest/old_activesupport_fix"
-      end
-    end
-  end
-end
+require 'minitest'
+
+module Minitest
+  require "minitest/relative_position"
+  require "minitest/extensible_backtrace_filter"
+
+  module Reporters
+    require "minitest/reporters/version"
+
+    autoload :ANSI, "minitest/reporters/ansi"
+    autoload :BaseReporter, "minitest/reporters/base_reporter"
+    autoload :DefaultReporter, "minitest/reporters/default_reporter"
+    autoload :SpecReporter, "minitest/reporters/spec_reporter"
+    autoload :ProgressReporter, "minitest/reporters/progress_reporter"
+    autoload :RubyMateReporter, "minitest/reporters/ruby_mate_reporter"
+    autoload :RubyMineReporter, "minitest/reporters/rubymine_reporter"
+    autoload :JUnitReporter, "minitest/reporters/junit_reporter"
+    autoload :HtmlReporter, "minitest/reporters/html_reporter"
+    autoload :MeanTimeReporter, "minitest/reporters/mean_time_reporter"
+
+    class << self
+      attr_accessor :reporters
+    end
+
+    def self.use!(console_reporters = ProgressReporter.new, env = ENV, backtrace_filter = nil)
+      use_runner!(console_reporters, env)
+      if backtrace_filter.nil? && !defined?(::Rails)
+        backtrace_filter = ExtensibleBacktraceFilter.default_filter
+      end
+      Minitest.backtrace_filter = backtrace_filter unless backtrace_filter.nil?
+
+      unless defined?(@@loaded)
+        use_around_test_hooks!
+        use_old_activesupport_fix!
+        @@loaded = true
+      end
+    end
+
+    def self.use_runner!(console_reporters, env)
+      self.reporters = choose_reporters(console_reporters, env)
+    end
+
+    def self.use_around_test_hooks!
+      Minitest::Test.class_eval do
+        def run_with_hooks(*args)
+          if defined?(Minitest::Reporters) && (reporters = Minitest::Reporters.reporters)
+            reporters.each { |r| r.before_test(self) }
+            result = run_without_hooks(*args)
+            reporters.each { |r| r.after_test(self) }
+            result
+          else
+            run_without_hooks(*args)
+          end
+        end
+
+        alias_method :run_without_hooks, :run
+        alias_method :run, :run_with_hooks
+      end
+    end
+
+    def self.choose_reporters(console_reporters, env)
+      if env["MINITEST_REPORTER"]
+        [Minitest::Reporters.const_get(env["MINITEST_REPORTER"]).new]
+      elsif env["TM_PID"]
+        [RubyMateReporter.new]
+      elsif env["RM_INFO"] || env["TEAMCITY_VERSION"]
+        [RubyMineReporter.new]
+      elsif !env["VIM"]
+        Array(console_reporters)
+      end
+    end
+
+    def self.clock_time
+      if minitest_version >= 561
+        Minitest.clock_time
+      else
+        Time.now
+      end
+    end
+
+    def self.minitest_version
+      Minitest::VERSION.gsub('.', '').to_i
+    end
+
+    def self.use_old_activesupport_fix!
+      if defined?(ActiveSupport::VERSION) && ActiveSupport::VERSION::MAJOR < 4
+        require "minitest/old_activesupport_fix"
+      end
+    end
+  end
+end

data/lib/minitest/reporters/ansi.rb

@@ -1,31 +1,31 @@
-module Minitest
-  module Reporters
-    module ANSI
-      module Code
-
-        def self.color?
-          return false if ENV['MINITEST_REPORTERS_MONO']
-          color_terminal = ENV['TERM'].to_s.downcase.include?("color")
-          $stdout.tty? || color_terminal
-        end
-
-        if color?
-          require 'ansi/code'
-
-          include ::ANSI::Code
-          extend ::ANSI::Code
-        else
-          def black(s = nil)
-            block_given? ? yield : s
-          end
-
-          %w[ red green yellow blue magenta cyan white ].each do |color|
-            alias_method color, :black
-          end
-
-          extend self
-        end
-      end
-    end
-  end
-end
+module Minitest
+  module Reporters
+    module ANSI
+      module Code
+
+        def self.color?
+          return false if ENV['MINITEST_REPORTERS_MONO']
+          color_terminal = ENV['TERM'].to_s.downcase.include?("color")
+          $stdout.tty? || color_terminal
+        end
+
+        if color?
+          require 'ansi/code'
+
+          include ::ANSI::Code
+          extend ::ANSI::Code
+        else
+          def black(s = nil)
+            block_given? ? yield : s
+          end
+
+          %w[ red green yellow blue magenta cyan white ].each do |color|
+            alias_method color, :black
+          end
+
+          extend self
+        end
+      end
+    end
+  end
+end

data/lib/minitest/reporters/base_reporter.rb

@@ -1,117 +1,119 @@
-module Minitest
-  module Reporters
-    class BaseReporter < Minitest::StatisticsReporter
-      attr_accessor :tests
-
-      def initialize(options={})
-        super($stdout, options)
-        self.tests = []
-      end
-
-      def add_defaults(defaults)
-        self.options = defaults.merge(options)
-      end
-
-      # called by our own before hooks
-      def before_test(test)
-        last_test = tests.last
-
-        # Minitest broke API between 5.10 and 5.11 this gets around Result object
-        if last_test.respond_to? :klass
-          suite_changed = last_test.klass != test.class.name
-        else
-          suite_changed = last_test.class != test.class
-        end
-
-        if suite_changed
-          after_suite(last_test.class) if last_test
-          before_suite(test.class)
-        end
-      end
-
-      def record(test)
-        super
-        tests << test
-      end
-
-      # called by our own after hooks
-      def after_test(test)
-      end
-
-      def report
-        super
-        after_suite(tests.last.class)
-      end
-
-      protected
-
-      def after_suite(test)
-      end
-
-      def before_suite(test)
-      end
-
-      def result(test)
-        if test.error?
-          :error
-        elsif test.skipped?
-          :skip
-        elsif test.failure
-          :fail
-        else
-          :pass
-        end
-      end
-
-      def test_class(result)
-        if result.respond_to? :klass
-          result.klass
-        else
-          result.class
-        end
-      end
-
-      def print_colored_status(test)
-        if test.passed?
-          print(green { pad_mark( result(test).to_s.upcase ) })
-        elsif test.skipped?
-          print(yellow { pad_mark( result(test).to_s.upcase ) })
-        else
-          print(red { pad_mark( result(test).to_s.upcase ) })
-        end
-      end
-
-      def total_time
-        super || Minitest::Reporters.clock_time - start_time
-      end
-
-      def total_count
-        options[:total_count]
-      end
-
-      def filter_backtrace(backtrace)
-        Minitest.filter_backtrace(backtrace)
-      end
-
-      def puts(*args)
-        io.puts(*args)
-      end
-
-      def print(*args)
-        io.print(*args)
-      end
-
-      def print_info(e, name=true)
-        print "#{e.exception.class.to_s}: " if name
-        e.message.each_line { |line| print_with_info_padding(line) }
-
-        # When e is a Minitest::UnexpectedError, the filtered backtrace is already part of the message printed out
-        # by the previous line. In that case, and that case only, skip the backtrace output.
-        unless e.is_a?(MiniTest::UnexpectedError)
-          trace = filter_backtrace(e.backtrace)
-          trace.each { |line| print_with_info_padding(line) }
-        end
-      end
-    end
-  end
-end
+module Minitest
+  module Reporters
+    class BaseReporter < Minitest::StatisticsReporter
+      attr_accessor :tests
+
+      def initialize(options={})
+        super($stdout, options)
+        self.tests = []
+      end
+
+      def add_defaults(defaults)
+        self.options = defaults.merge(options)
+      end
+
+      # called by our own before hooks
+      def before_test(test)
+        last_test = tests.last
+        suite_changed = test_class(last_test) != test.class
+
+        if suite_changed
+          after_suite(test_class(last_test)) if last_test
+          before_suite(test.class)
+        end
+      end
+
+      def record(test)
+        super
+        tests << test
+      end
+
+      # called by our own after hooks
+      def after_test(test)
+      end
+
+      def report
+        super
+        after_suite(test_class(tests.last))
+      end
+
+      protected
+
+      def after_suite(test)
+      end
+
+      def before_suite(test)
+      end
+
+      def result(test)
+        if test.error?
+          :error
+        elsif test.skipped?
+          :skip
+        elsif test.failure
+          :fail
+        else
+          :pass
+        end
+      end
+
+      def test_class(result)
+        if result.respond_to?(:klass) && result.klass
+          load_constant(result.klass)
+        else
+          result.class
+        end
+      end
+
+      def print_colored_status(test)
+        if test.passed?
+          print(green { pad_mark( result(test).to_s.upcase ) })
+        elsif test.skipped?
+          print(yellow { pad_mark( result(test).to_s.upcase ) })
+        else
+          print(red { pad_mark( result(test).to_s.upcase ) })
+        end
+      end
+
+      def total_time
+        super || Minitest::Reporters.clock_time - start_time
+      end
+
+      def total_count
+        options[:total_count]
+      end
+
+      def filter_backtrace(backtrace)
+        Minitest.filter_backtrace(backtrace)
+      end
+
+      def puts(*args)
+        io.puts(*args)
+      end
+
+      def print(*args)
+        io.print(*args)
+      end
+
+      def print_info(e, name=true)
+        print "#{e.exception.class.to_s}: " if name
+        e.message.each_line { |line| print_with_info_padding(line) }
+
+        # When e is a Minitest::UnexpectedError, the filtered backtrace is already part of the message printed out
+        # by the previous line. In that case, and that case only, skip the backtrace output.
+        unless e.is_a?(MiniTest::UnexpectedError)
+          trace = filter_backtrace(e.backtrace)
+          trace.each { |line| print_with_info_padding(line) }
+        end
+      end
+
+      # This method is to be version compatible with ruby 1.X. In these
+      # versions constant lookup was not namespace aware
+      def load_constant(name)
+        name.to_s.split('::').inject(Object) do |namespace, const_name|
+          namespace.const_get(const_name)
+        end
+      end
+    end
+  end
+end