minitest 4.7.5 → 5.0.7

data/lib/minitest/parallel_each.rb

@@ -4,7 +4,7 @@
 # so all the goodies come along (tho not all are wrapped yet to
 # return another ParallelEach instance).
 
-class ParallelEach
+class Minitest::ParallelEach
   require 'thread'
   include Enumerable
 
@@ -23,10 +23,6 @@ class ParallelEach
     N.times { @queue << nil }
   end
 
-  def grep pattern # :nodoc:
-    self.class.new super
-  end
-
   def select(&block) # :nodoc:
     self.class.new super
   end
@@ -49,25 +45,76 @@ class ParallelEach
     threads.map(&:join)
   end
 
-  def count
+  def count # :nodoc:
     [@queue.size - N, 0].max
   end
 
-  alias_method :size, :count
+  alias_method :size, :count # :nodoc:
 end
 
-class MiniTest::Unit
-  alias _old_run_suites _run_suites
+module Minitest
+  class << self
+    remove_method :__run
+  end
+
+  class Test
+    @mutex = Mutex.new
+
+    def self.synchronize # :nodoc:
+      if @mutex then # see parallel_each.rb
+        @mutex.synchronize { yield }
+      else
+        yield
+      end
+    end
+
+    alias :simple_capture_io :capture_io
+
+    def capture_io(&b)
+      Test.synchronize do
+        simple_capture_io(&b)
+      end
+    end
+
+    alias :simple_capture_subprocess_io :capture_subprocess_io
+
+    def capture_subprocess_io(&b)
+      Test.synchronize do
+        simple_capture_subprocess_io(&b)
+      end
+    end
+  end
+
+  class Reporter
+    @mutex = Mutex.new
+
+    def self.synchronize # :nodoc:
+      if @mutex then # see parallel_each.rb
+        @mutex.synchronize { yield }
+      else
+        yield
+      end
+    end
+
+    alias :simple_record :record
+
+    def record result
+      Reporter.synchronize do
+        simple_record result
+      end
+    end
+  end
 
   ##
   # Runs all the +suites+ for a given +type+. Runs suites declaring
   # a test_order of +:parallel+ in parallel, and everything else
   # serial.
 
-  def _run_suites suites, type
+  def self.__run reporter, options
+    suites = Runnable.runnables
     parallel, serial = suites.partition { |s| s.test_order == :parallel }
 
-    ParallelEach.new(parallel).map { |suite| _run_suite suite, type } +
-     serial.map { |suite| _run_suite suite, type }
+    ParallelEach.new(parallel).map { |suite| suite.run reporter, options } +
+     serial.map { |suite| suite.run reporter, options }
   end
 end

data/lib/minitest/pride.rb

@@ -1,112 +1,4 @@
-require "minitest/unit"
+require "minitest"
 
-##
-# Show your testing pride!
-
-class PrideIO
-
-  # Start an escape sequence
-  ESC = "\e["
-
-  # End the escape sequence
-  NND = "#{ESC}0m"
-
-  # The IO we're going to pipe through.
-  attr_reader :io
-
-  def initialize io # :nodoc:
-    @io = io
-    # stolen from /System/Library/Perl/5.10.0/Term/ANSIColor.pm
-    # also reference http://en.wikipedia.org/wiki/ANSI_escape_code
-    @colors ||= (31..36).to_a
-    @size   = @colors.size
-    @index  = 0
-    # io.sync = true
-  end
-
-  ##
-  # Wrap print to colorize the output.
-
-  def print o
-    case o
-    when "." then
-      io.print pride o
-    when "E", "F" then
-      io.print "#{ESC}41m#{ESC}37m#{o}#{NND}"
-    else
-      io.print o
-    end
-  end
-
-  def puts(*o) # :nodoc:
-    o.map! { |s|
-      s.to_s.sub(/Finished tests/) {
-        @index = 0
-        'Fabulous tests'.split(//).map { |c|
-          pride(c)
-        }.join
-      }
-    }
-
-    super
-  end
-
-  ##
-  # Color a string.
-
-  def pride string
-    string = "*" if string == "."
-    c = @colors[@index % @size]
-    @index += 1
-    "#{ESC}#{c}m#{string}#{NND}"
-  end
-
-  def method_missing msg, *args # :nodoc:
-    io.send(msg, *args)
-  end
-end
-
-##
-# If you thought the PrideIO was colorful...
-#
-# (Inspired by lolcat, but with clean math)
-
-class PrideLOL < PrideIO
-  PI_3 = Math::PI / 3 # :nodoc:
-
-  def initialize io # :nodoc:
-    # walk red, green, and blue around a circle separated by equal thirds.
-    #
-    # To visualize, type this into wolfram-alpha:
-    #
-    #   plot (3*sin(x)+3), (3*sin(x+2*pi/3)+3), (3*sin(x+4*pi/3)+3)
-
-    # 6 has wide pretty gradients. 3 == lolcat, about half the width
-    @colors = (0...(6 * 7)).map { |n|
-      n *= 1.0 / 6
-      r  = (3 * Math.sin(n           ) + 3).to_i
-      g  = (3 * Math.sin(n + 2 * PI_3) + 3).to_i
-      b  = (3 * Math.sin(n + 4 * PI_3) + 3).to_i
-
-      # Then we take rgb and encode them in a single number using base 6.
-      # For some mysterious reason, we add 16... to clear the bottom 4 bits?
-      # Yes... they're ugly.
-
-      36 * r + 6 * g + b + 16
-    }
-
-    super
-  end
-
-  ##
-  # Make the string even more colorful. Damnit.
-
-  def pride string
-    c = @colors[@index % @size]
-    @index += 1
-    "#{ESC}38;5;#{c}m#{string}#{NND}"
-  end
-end
-
-klass = ENV['TERM'] =~ /^xterm|-256color$/ ? PrideLOL : PrideIO
-MiniTest::Unit.output = klass.new(MiniTest::Unit.output)
+Minitest.load_plugins
+Minitest::PrideIO.pride!

data/lib/minitest/pride_plugin.rb

@@ -0,0 +1,143 @@
+require "minitest"
+
+module Minitest
+  def self.plugin_pride_options opts, options # :nodoc:
+    opts.on "-p", "--pride", "Pride. Show your testing pride!" do
+      PrideIO.pride!
+    end
+  end
+
+  def self.plugin_pride_init options # :nodoc:
+    if PrideIO.pride? then
+      klass = ENV["TERM"] =~ /^xterm|-256color$/ ? PrideLOL : PrideIO
+      io    = klass.new options[:io]
+
+      self.reporter.reporters.grep(Minitest::Reporter).each do |rep|
+        rep.io = io
+      end
+    end
+  end
+
+  ##
+  # Show your testing pride!
+
+  class PrideIO
+    ##
+    # Activate the pride plugin. Called from both -p option and minitest/pride
+
+    def self.pride!
+      @pride = true
+    end
+
+    ##
+    # Are we showing our testing pride?
+
+    def self.pride?
+      @pride ||= false
+    end
+
+    # Start an escape sequence
+    ESC = "\e["
+
+    # End the escape sequence
+    NND = "#{ESC}0m"
+
+    # The IO we're going to pipe through.
+    attr_reader :io
+
+    def initialize io # :nodoc:
+      @io = io
+      # stolen from /System/Library/Perl/5.10.0/Term/ANSIColor.pm
+      # also reference http://en.wikipedia.org/wiki/ANSI_escape_code
+      @colors ||= (31..36).to_a
+      @size   = @colors.size
+      @index  = 0
+      # io.sync = true
+    end
+
+    ##
+    # Wrap print to colorize the output.
+
+    def print o
+      case o
+      when "." then
+        io.print pride o
+      when "E", "F" then
+        io.print "#{ESC}41m#{ESC}37m#{o}#{NND}"
+      when "S" then
+        io.print pride o
+      else
+        io.print o
+      end
+    end
+
+    def puts(*o) # :nodoc:
+      o.map! { |s|
+        s.to_s.sub(/Finished/) {
+          @index = 0
+          'Fabulous run'.split(//).map { |c|
+            pride(c)
+          }.join
+        }
+      }
+
+      io.puts(*o)
+    end
+
+    ##
+    # Color a string.
+
+    def pride string
+      string = "*" if string == "."
+      c = @colors[@index % @size]
+      @index += 1
+      "#{ESC}#{c}m#{string}#{NND}"
+    end
+
+    def method_missing msg, *args # :nodoc:
+      io.send(msg, *args)
+    end
+  end
+
+  ##
+  # If you thought the PrideIO was colorful...
+  #
+  # (Inspired by lolcat, but with clean math)
+
+  class PrideLOL < PrideIO
+    PI_3 = Math::PI / 3 # :nodoc:
+
+    def initialize io # :nodoc:
+      # walk red, green, and blue around a circle separated by equal thirds.
+      #
+      # To visualize, type this into wolfram-alpha:
+      #
+      #   plot (3*sin(x)+3), (3*sin(x+2*pi/3)+3), (3*sin(x+4*pi/3)+3)
+
+      # 6 has wide pretty gradients. 3 == lolcat, about half the width
+      @colors = (0...(6 * 7)).map { |n|
+        n *= 1.0 / 6
+        r  = (3 * Math.sin(n           ) + 3).to_i
+        g  = (3 * Math.sin(n + 2 * PI_3) + 3).to_i
+        b  = (3 * Math.sin(n + 4 * PI_3) + 3).to_i
+
+        # Then we take rgb and encode them in a single number using base 6.
+        # For some mysterious reason, we add 16... to clear the bottom 4 bits?
+        # Yes... they're ugly.
+
+        36 * r + 6 * g + b + 16
+      }
+
+      super
+    end
+
+    ##
+    # Make the string even more colorful. Damnit.
+
+    def pride string
+      c = @colors[@index % @size]
+      @index += 1
+      "#{ESC}38;5;#{c}m#{string}#{NND}"
+    end
+  end
+end