minitest-reporters 1.3.0 → 1.3.1.beta1

data/Rakefile

@@ -1,60 +1,60 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
-
-task :default => :test
-Rake::TestTask.new do |t|
-  t.pattern = "test/{unit,integration}/**/*_test.rb"
-  t.verbose = true
-end
-
-rubymine_home = [
-  ENV["RUBYMINE_HOME"],
-  "../rubymine-contrib/ruby-testing/src/rb/testing/patch/common",
-  "/Applications/RubyMine.app/Contents/rb/testing/patch/common",
-].compact.detect { |d| Dir.exist?(d) }
-
-Rake::TestTask.new("test:gallery") do |t|
-  t.pattern = "test/gallery/**/*_test.rb"
-  t.verbose = true
-  t.libs << rubymine_home
-end
-
-# - RubyMineReporter must be tested separately inside of RubyMine
-# - JUnitReporter normally writes to `test/reports` instead of stdout
-task :gallery do
-  unless rubymine_home
-    warn "To see RubyMineReporter supply RUBYMINE_HOME= or git clone git://git.jetbrains.org/idea/contrib.git ../rubymine-contrib"
-    exit 1
-  end
-
-  [
-    "Pride",
-    "DefaultReporter",
-    "JUnitReporter",
-    "ProgressReporter",
-    "RubyMateReporter",
-    "SpecReporter",
-    "RubyMineReporter",
-    "HtmlReporter",
-    "MeanTimeReporter",
-  ].each do |reporter|
-    puts
-    puts "-" * 72
-    puts "Running gallery tests using #{reporter}..."
-    puts "-" * 72
-    puts
-
-    sh "rake test:gallery REPORTER=#{reporter}" do
-      # Ignore failures. They're expected when you are running the gallery
-      # test suite.
-    end
-    sh "cat test/reports/*" if reporter == "JUnitReporter"
-  end
-end
-
-task :reset_statistics do
-  require 'minitest/reporters/mean_time_reporter'
-  Minitest::Reporters::MeanTimeReporter.reset_statistics!
-  puts "The mean time reporter statistics have been reset."
-  exit 0
-end
+require "bundler/gem_tasks"
+require "rake/testtask"
+
+task :default => :test
+Rake::TestTask.new do |t|
+  t.pattern = "test/{unit,integration}/**/*_test.rb"
+  t.verbose = true
+end
+
+rubymine_home = [
+  ENV["RUBYMINE_HOME"],
+  "../rubymine-contrib/ruby-testing/src/rb/testing/patch/common",
+  "/Applications/RubyMine.app/Contents/rb/testing/patch/common",
+].compact.detect { |d| Dir.exist?(d) }
+
+Rake::TestTask.new("test:gallery") do |t|
+  t.pattern = "test/gallery/**/*_test.rb"
+  t.verbose = true
+  t.libs << rubymine_home
+end
+
+# - RubyMineReporter must be tested separately inside of RubyMine
+# - JUnitReporter normally writes to `test/reports` instead of stdout
+task :gallery do
+  unless rubymine_home
+    warn "To see RubyMineReporter supply RUBYMINE_HOME= or git clone git://git.jetbrains.org/idea/contrib.git ../rubymine-contrib"
+    exit 1
+  end
+
+  [
+    "Pride",
+    "DefaultReporter",
+    "JUnitReporter",
+    "ProgressReporter",
+    "RubyMateReporter",
+    "SpecReporter",
+    "RubyMineReporter",
+    "HtmlReporter",
+    "MeanTimeReporter",
+  ].each do |reporter|
+    puts
+    puts "-" * 72
+    puts "Running gallery tests using #{reporter}..."
+    puts "-" * 72
+    puts
+
+    sh "rake test:gallery REPORTER=#{reporter}" do
+      # Ignore failures. They're expected when you are running the gallery
+      # test suite.
+    end
+    sh "cat test/reports/*" if reporter == "JUnitReporter"
+  end
+end
+
+task :reset_statistics do
+  require 'minitest/reporters/mean_time_reporter'
+  Minitest::Reporters::MeanTimeReporter.reset_statistics!
+  puts "The mean time reporter statistics have been reset."
+  exit 0
+end

data/lib/minitest/extensible_backtrace_filter.rb

@@ -1,67 +1,67 @@
-module Minitest
-  # Filters backtraces of exceptions that may arise when running tests.
-  class ExtensibleBacktraceFilter
-    # Returns the default filter.
-    #
-    # The default filter will filter out all Minitest and minitest-reporters
-    # lines.
-    #
-    # @return [Minitest::ExtensibleBacktraceFilter]
-    def self.default_filter
-      unless defined? @default_filter
-        filter = self.new
-        filter.add_filter(/lib\/minitest/)
-        @default_filter = filter
-      end
-
-      @default_filter
-    end
-
-    # Creates a new backtrace filter.
-    def initialize
-      @filters = []
-    end
-
-    # Adds a filter.
-    #
-    # @param [Regex] regex the filter
-    def add_filter(regex)
-      @filters << regex
-    end
-
-    # Determines if the string would be filtered.
-    #
-    # @param [String] str
-    # @return [Boolean]
-    def filters?(str)
-      @filters.any? { |filter| str =~ filter }
-    end
-
-    # Filters a backtrace.
-    #
-    # This will add new lines to the new backtrace until a filtered line is
-    # encountered. If there were lines added to the new backtrace, it returns
-    # those lines. However, if the first line in the backtrace was filtered,
-    # resulting in an empty backtrace, it returns all lines that would have
-    # been unfiltered. If that in turn does not contain any lines, it returns
-    # the original backtrace.
-    #
-    # @param [Array] backtrace the backtrace to filter
-    # @return [Array] the filtered backtrace
-    # @note This logic is based off of Minitest's #filter_backtrace.
-    def filter(backtrace)
-      result = []
-      return result unless backtrace
-
-      backtrace.each do |line|
-        break if filters?(line)
-        result << line
-      end
-
-      result = backtrace.reject { |line| filters?(line) } if result.empty?
-      result = backtrace.dup if result.empty?
-
-      result
-    end
-  end
-end
+module Minitest
+  # Filters backtraces of exceptions that may arise when running tests.
+  class ExtensibleBacktraceFilter
+    # Returns the default filter.
+    #
+    # The default filter will filter out all Minitest and minitest-reporters
+    # lines.
+    #
+    # @return [Minitest::ExtensibleBacktraceFilter]
+    def self.default_filter
+      unless defined? @default_filter
+        filter = self.new
+        filter.add_filter(/lib\/minitest/)
+        @default_filter = filter
+      end
+
+      @default_filter
+    end
+
+    # Creates a new backtrace filter.
+    def initialize
+      @filters = []
+    end
+
+    # Adds a filter.
+    #
+    # @param [Regex] regex the filter
+    def add_filter(regex)
+      @filters << regex
+    end
+
+    # Determines if the string would be filtered.
+    #
+    # @param [String] str
+    # @return [Boolean]
+    def filters?(str)
+      @filters.any? { |filter| str =~ filter }
+    end
+
+    # Filters a backtrace.
+    #
+    # This will add new lines to the new backtrace until a filtered line is
+    # encountered. If there were lines added to the new backtrace, it returns
+    # those lines. However, if the first line in the backtrace was filtered,
+    # resulting in an empty backtrace, it returns all lines that would have
+    # been unfiltered. If that in turn does not contain any lines, it returns
+    # the original backtrace.
+    #
+    # @param [Array] backtrace the backtrace to filter
+    # @return [Array] the filtered backtrace
+    # @note This logic is based off of Minitest's #filter_backtrace.
+    def filter(backtrace)
+      result = []
+      return result unless backtrace
+
+      backtrace.each do |line|
+        break if filters?(line)
+        result << line
+      end
+
+      result = backtrace.reject { |line| filters?(line) } if result.empty?
+      result = backtrace.dup if result.empty?
+
+      result
+    end
+  end
+end

data/lib/minitest/minitest_reporter_plugin.rb

@@ -1,75 +1,75 @@
-module Minitest
-  module Reporters
-    class DelegateReporter < Minitest::AbstractReporter
-      def initialize(reporters, options = {})
-        @reporters = reporters
-        @options = options
-        @all_reporters = nil
-      end
-
-      def io
-        all_reporters.first.io unless all_reporters.empty?
-        @options[:io]
-      end
-
-      def start
-        all_reporters.each(&:start)
-      end
-
-      def record(result)
-        all_reporters.each do |reporter|
-          reporter.record result
-        end
-      end
-
-      def report
-        all_reporters.each(&:report)
-      end
-
-      def passed?
-        all_reporters.all?(&:passed?)
-      end
-
-      private
-      # stolen from minitest self.run
-      def total_count(options)
-        filter = options[:filter] || '/./'
-        filter = Regexp.new $1 if filter =~ /\/(.*)\//
-
-        Minitest::Runnable.runnables.map { |runnable|
-          runnable.runnable_methods.find_all { |m|
-            filter === m || filter === "#{runnable}##{m}"
-          }.size
-        }.inject(:+)
-      end
-
-      def all_reporters
-        @all_reporters ||= init_all_reporters
-      end
-
-      def init_all_reporters
-        return @reporters unless defined?(Minitest::Reporters.reporters) && Minitest::Reporters.reporters
-        (Minitest::Reporters.reporters + guard_reporter(@reporters)).each do |reporter|
-          reporter.io = @options[:io]
-          if reporter.respond_to?(:add_defaults)
-            reporter.add_defaults(@options.merge(:total_count => total_count(@options)))
-          end
-        end
-      end
-
-      def guard_reporter(reporters)
-        guards = Array(reporters.detect { |r| r.class.name == "Guard::Minitest::Reporter" })
-        return guards unless ENV['RM_INFO']
-
-        warn 'RM_INFO is set thus guard reporter has been dropped' unless guards.empty?
-        []
-      end
-    end
-  end
-
-  class << self
-    def plugin_minitest_reporter_init(options)
-      reporter.reporters = [Minitest::Reporters::DelegateReporter.new(reporter.reporters, options)]
-    end
-  end
-end
+module Minitest
+  module Reporters
+    class DelegateReporter < Minitest::AbstractReporter
+      def initialize(reporters, options = {})
+        @reporters = reporters
+        @options = options
+        @all_reporters = nil
+      end
+
+      def io
+        all_reporters.first.io unless all_reporters.empty?
+        @options[:io]
+      end
+
+      def start
+        all_reporters.each(&:start)
+      end
+
+      def record(result)
+        all_reporters.each do |reporter|
+          reporter.record result
+        end
+      end
+
+      def report
+        all_reporters.each(&:report)
+      end
+
+      def passed?
+        all_reporters.all?(&:passed?)
+      end
+
+      private
+      # stolen from minitest self.run
+      def total_count(options)
+        filter = options[:filter] || '/./'
+        filter = Regexp.new $1 if filter =~ /\/(.*)\//
+
+        Minitest::Runnable.runnables.map { |runnable|
+          runnable.runnable_methods.find_all { |m|
+            filter === m || filter === "#{runnable}##{m}"
+          }.size
+        }.inject(:+)
+      end
+
+      def all_reporters
+        @all_reporters ||= init_all_reporters
+      end
+
+      def init_all_reporters
+        return @reporters unless defined?(Minitest::Reporters.reporters) && Minitest::Reporters.reporters
+        (Minitest::Reporters.reporters + guard_reporter(@reporters)).each do |reporter|
+          reporter.io = @options[:io]
+          if reporter.respond_to?(:add_defaults)
+            reporter.add_defaults(@options.merge(:total_count => total_count(@options)))
+          end
+        end
+      end
+
+      def guard_reporter(reporters)
+        guards = Array(reporters.detect { |r| r.class.name == "Guard::Minitest::Reporter" })
+        return guards unless ENV['RM_INFO']
+
+        warn 'RM_INFO is set thus guard reporter has been dropped' unless guards.empty?
+        []
+      end
+    end
+  end
+
+  class << self
+    def plugin_minitest_reporter_init(options)
+      reporter.reporters = [Minitest::Reporters::DelegateReporter.new(reporter.reporters, options)]
+    end
+  end
+end

data/lib/minitest/old_activesupport_fix.rb

@@ -1,24 +1,24 @@
-require "active_support/testing/setup_and_teardown"
-
-module ActiveSupport
-  module Testing
-    module SetupAndTeardown
-      if defined?(ForMinitest)
-        ForMiniTest = ForMinitest
-      end
-      module ForMiniTest
-        remove_method :run
-
-        def before_setup
-          super
-          run_callbacks :setup
-        end
-
-        def after_teardown
-          run_callbacks :teardown
-          super
-        end
-      end
-    end
-  end
-end
+require "active_support/testing/setup_and_teardown"
+
+module ActiveSupport
+  module Testing
+    module SetupAndTeardown
+      if defined?(ForMinitest)
+        ForMiniTest = ForMinitest
+      end
+      module ForMiniTest
+        remove_method :run
+
+        def before_setup
+          super
+          run_callbacks :setup
+        end
+
+        def after_teardown
+          run_callbacks :teardown
+          super
+        end
+      end
+    end
+  end
+end