minitest 5.0.8 → 5.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8b0d13fa089e876d7136d72563684a26daf5559c
+  data.tar.gz: b3ad3800b28251404ce824efe8bbdcd3219d2c64
+SHA512:
+  metadata.gz: 87729f6352a71b2fe091a8822eb0765f139ee10b920c8afce63b5c285d60ae983dabfc7eb8acff8df8ffdac3521815c6ba66ae677767c79f8517554c286e6b96
+  data.tar.gz: 86724ca0e04025f5fb697454fd2544db1d68f3d0ece9f2dd86d08e181397dab9c09108d08274c9a8babd6bd7c884afbf4556c7440c72f767befd6d9d6d1e1fb8

data/History.txt

@@ -1,3 +1,13 @@
+=== 5.1.0 / 2013-12-05
+
+* 1 minor enhancement:
+
+  * Use a Queue for scheduling parallel tests. (tenderlove)
+
+* 1 bug fix:
+
+  * Fixed misspelling in doco. (amatsuda)
+
 === 5.0.8 / 2013-09-20
 
 * 1 bug fix:

data/Manifest.txt

@@ -12,7 +12,7 @@ lib/minitest/benchmark.rb
 lib/minitest/expectations.rb
 lib/minitest/hell.rb
 lib/minitest/mock.rb
-lib/minitest/parallel_each.rb
+lib/minitest/parallel.rb
 lib/minitest/pride.rb
 lib/minitest/pride_plugin.rb
 lib/minitest/spec.rb

data/README.txt

@@ -3,6 +3,7 @@
 home :: https://github.com/seattlerb/minitest
 rdoc :: http://docs.seattlerb.org/minitest
 vim  :: https://github.com/sunaku/vim-ruby-minitest
+emacs:: https://github.com/arthurnn/minitest-emacs
 
 == DESCRIPTION:
 
@@ -394,6 +395,8 @@ minitest-context            :: Defines contexts for code reuse in MiniTest
 minitest-debugger           :: Wraps assert so failed assertions drop into
                                the ruby debugger.
 minitest-display            :: Patches MiniTest to allow for an easily configurable output.
+minitest-doc_reporter       :: Detailed output inspired by rspec's documentation
+                               format.
 minitest-emoji              :: Print out emoji for your test passes, fails, and skips.
 minitest-english            :: Semantically symmetric aliases for assertions and expectations.
 minitest-excludes           :: Clean API for excluding certain tests you
@@ -425,6 +428,7 @@ minitest-spec-context       :: Provides rspec-ish context method to MiniTest::Sp
 minitest-spec-expect        :: Expect syntax for MiniTest::Spec - expect(sequences).to_include :celery_man
 minitest-spec-magic         :: Minitest::Spec extensions for Rails and beyond
 minitest-spec-rails         :: Drop in MiniTest::Spec superclass for ActiveSupport::TestCase.
+minitest-stub_any_instance  :: Stub any instance of a method on the given class for the duration of a block
 minitest-stub-const         :: Stub constants for the duration of a block
 minitest-tags               :: add tags for minitest
 minitest-wscolor            :: Yet another test colorizer.

data/Rakefile

@@ -8,7 +8,8 @@ Hoe.plugin :seattlerb
 Hoe.spec 'minitest' do
   developer 'Ryan Davis', 'ryand-ruby@zenspider.com'
 
-  self.rubyforge_name = "bfts"
+  license "MIT"
+
   self.testlib = :minitest
 end
 

data/lib/minitest.rb

@@ -1,10 +1,13 @@
 require "optparse"
+require "thread"
+require "mutex_m"
+require "minitest/parallel"
 
 ##
 # :include: README.txt
 
 module Minitest
-  VERSION = "5.0.8" # :nodoc:
+  VERSION = "5.1.0" # :nodoc:
 
   @@installed_at_exit ||= false
   @@after_run = []
@@ -12,6 +15,12 @@ module Minitest
 
   mc = (class << self; self; end)
 
+  ##
+  # Parallel test executor
+
+  mc.send :attr_accessor, :parallel_executor
+  self.parallel_executor = Parallel::Executor.new((ENV['N'] || 2).to_i)
+
   ##
   # Filter object for backtraces.
 
@@ -92,11 +101,13 @@ module Minitest
   #
   #   Minitest.autorun
   #     Minitest.run(args)
-  #       __run(reporter, options)
+  #       Minitest.__run(reporter, options)
   #         Runnable.runnables.each
   #           runnable.run(reporter, options)
   #             self.runnable_methods.each
-  #               self.new(runnable_method).run
+  #               self.run_one_method(self, runnable_method, reporter)
+  #                 Minitest.run_one_method(klass, runnable_method, reporter)
+  #                   klass.new(runnable_method).run
 
   def self.run args = []
     self.load_plugins
@@ -113,6 +124,7 @@ module Minitest
 
     reporter.start
     __run reporter, options
+    self.parallel_executor.shutdown
     reporter.report
 
     reporter.passed?
@@ -126,9 +138,16 @@ module Minitest
   # loaded if a Runnable calls parallelize_me!.
 
   def self.__run reporter, options
-    Runnable.runnables.each do |runnable|
-      runnable.run reporter, options
-    end
+    suites = Runnable.runnables
+    parallel, serial = suites.partition { |s| s.test_order == :parallel }
+
+    # If we run the parallel tests before the serial tests, the parallel tests
+    # could run in parallel with the serial tests. This would be bad because
+    # the serial tests won't lock around Reporter#record. Run the serial tests
+    # first, so that after they complete, the parallel tests will lock when
+    # recording results.
+    serial.map { |suite| suite.run reporter, options } +
+      parallel.map { |suite| suite.run reporter, options }
   end
 
   def self.process_args args = [] # :nodoc:
@@ -265,13 +284,15 @@ module Minitest
 
       with_info_handler reporter do
         filtered_methods.each do |method_name|
-          result = self.new(method_name).run
-          raise "#{self}#run _must_ return self" unless self === result
-          reporter.record result
+          run_one_method self, method_name, reporter
         end
       end
     end
 
+    def self.run_one_method klass, method_name, reporter
+      reporter.record Minitest.run_one_method(klass, method_name)
+    end
+
     def self.with_info_handler reporter, &block # :nodoc:
       handler = lambda do
         unless reporter.passed? then
@@ -369,6 +390,8 @@ module Minitest
   # you want. Go nuts.
 
   class AbstractReporter
+    include Mutex_m
+
     ##
     # Starts reporting on the run.
 
@@ -408,6 +431,7 @@ module Minitest
     attr_accessor :options
 
     def initialize io = $stdout, options = {} # :nodoc:
+      super()
       self.io      = io
       self.options = options
     end
@@ -565,6 +589,7 @@ module Minitest
     attr_accessor :reporters
 
     def initialize *reporters # :nodoc:
+      super()
       self.reporters = reporters
     end
 
@@ -729,6 +754,12 @@ module Minitest
   end
 
   self.backtrace_filter = BacktraceFilter.new
+
+  def self.run_one_method klass, method_name # :nodoc:
+    result = klass.new(method_name).run
+    raise "#{klass}#run _must_ return self" unless klass === result
+    result
+  end
 end
 
 require "minitest/test"

data/lib/minitest/assertions.rb

@@ -131,6 +131,10 @@ module Minitest
       true
     end
 
+    def _synchronize # :nodoc:
+      yield
+    end
+
     ##
     # Fails unless +obj+ is empty.
 
@@ -393,6 +397,8 @@ module Minitest
     # that.
 
     def capture_io
+      _synchronize do
+        begin
       require 'stringio'
 
       captured_stdout, captured_stderr = StringIO.new, StringIO.new
@@ -406,6 +412,8 @@ module Minitest
     ensure
       $stdout = orig_stdout
       $stderr = orig_stderr
+        end
+      end
     end
 
     ##
@@ -424,6 +432,8 @@ module Minitest
     # only use it when you need to test the output of a subprocess.
 
     def capture_subprocess_io
+      _synchronize do
+        begin
       require 'tempfile'
 
       captured_stdout, captured_stderr = Tempfile.new("out"), Tempfile.new("err")
@@ -443,6 +453,8 @@ module Minitest
       captured_stderr.unlink
       $stdout.reopen orig_stdout
       $stderr.reopen orig_stderr
+        end
+      end
     end
 
     ##

data/lib/minitest/parallel.rb

@@ -0,0 +1,40 @@
+module Minitest
+  module Parallel
+    class Executor
+      attr_reader :size
+
+      def initialize size
+        @size  = size
+        @queue = Queue.new
+        @pool  = size.times.map {
+          Thread.new(@queue) do |queue|
+          Thread.current.abort_on_exception = true
+            while job = queue.pop
+              klass, method, reporter = job
+              result = Minitest.run_one_method klass, method
+              reporter.synchronize { reporter.record result }
+            end
+          end
+        }
+      end
+
+      def << work; @queue << work; end
+
+      def shutdown
+        size.times { @queue << nil }
+        @pool.each(&:join)
+      end
+    end
+
+    module Test
+      def _synchronize; Test.io_lock.synchronize { yield }; end
+
+      module ClassMethods
+        def run_one_method klass, method_name, reporter
+          MiniTest.parallel_executor << [klass, method_name, reporter]
+        end
+        def test_order; :parallel; end
+      end
+    end
+  end
+end

data/lib/minitest/spec.rb

@@ -197,7 +197,7 @@ class Minitest::Spec < Minitest::Test
     #
     # This is also aliased to #specify and doesn't require a +desc+ arg.
     #
-    # Hint: If you _do_ want inheritence, use minitest/test. You can mix
+    # Hint: If you _do_ want inheritance, use minitest/test. You can mix
     # and match between assertions and expectations as much as you want.
 
     def it desc = "anonymous", &block

data/lib/minitest/test.rb

@@ -14,6 +14,9 @@ module Minitest
     PASSTHROUGH_EXCEPTIONS = [NoMemoryError, SignalException, # :nodoc:
                               Interrupt, SystemExit]
 
+    class << self; attr_accessor :io_lock; end
+    self.io_lock = Mutex.new
+
     ##
     # Call this at the top of your tests when you absolutely
     # positively need to have ordered tests. In doing so, you're
@@ -46,12 +49,8 @@ module Minitest
     # and your tests are awesome.
 
     def self.parallelize_me!
-      require "minitest/parallel_each"
-
-      class << self
-        undef_method :test_order if method_defined? :test_order
-        define_method :test_order do :parallel end
-      end
+      include Minitest::Parallel::Test
+      extend Minitest::Parallel::Test::ClassMethods
     end
 
     ##
@@ -63,10 +62,7 @@ module Minitest
       methods = methods_matching(/^test_/)
 
       case self.test_order
-      when :parallel
-        max = methods.size
-        ParallelEach.new methods.sort.sort_by { rand max }
-      when :random then
+      when :random, :parallel then
         max = methods.size
         methods.sort.sort_by { rand max }
       when :alpha, :sorted then

data/test/minitest/metametameta.rb

@@ -22,6 +22,8 @@ class MetaMetaMetaTestCase < Minitest::Test
 
     reporter.start
 
+    yield(reporter) if block_given?
+
     @tus ||= [@tu]
     @tus.each do |tu|
       Minitest::Runnable.runnables.delete tu
@@ -36,7 +38,7 @@ class MetaMetaMetaTestCase < Minitest::Test
     reporter.reporters.first
   end
 
-  def assert_report expected, flags = %w[--seed 42]
+  def assert_report expected, flags = %w[--seed 42], &block
     header = clean <<-EOM
       Run options: #{flags.map { |s| s =~ /\|/ ? s.inspect : s }.join " "}
 
@@ -44,7 +46,7 @@ class MetaMetaMetaTestCase < Minitest::Test
 
     EOM
 
-    run_tu_with_fresh_reporter flags
+    run_tu_with_fresh_reporter flags, &block
 
     output = normalize_output @output.string.dup
 

data/test/minitest/test_minitest_unit.rb

@@ -490,15 +490,12 @@ class TestMinitestRunner < MetaMetaMetaTestCase
     end
   end
 
-  def test_parallel_each_size
-    assert_equal 0, Minitest::ParallelEach.new([]).size
-  end
-
   def test_run_parallel
     skip "I don't have ParallelEach debugged yet" if maglev?
 
     test_count = 2
     test_latch = Latch.new test_count
+    wait_latch = Latch.new test_count
     main_latch = Latch.new
 
     thread = Thread.new {
@@ -537,7 +534,19 @@ class TestMinitestRunner < MetaMetaMetaTestCase
       2 runs, 2 assertions, 0 failures, 0 errors, 0 skips
     EOM
 
-    assert_report expected
+    assert_report(expected) do |reporter|
+      reporter.extend(Module.new {
+        define_method("record") do |result|
+          super(result)
+          wait_latch.release
+        end
+
+        define_method("report") do
+          wait_latch.await
+          super()
+        end
+      })
+    end
     assert thread.join
   end
 end

metadata

@@ -1,19 +1,13 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: minitest
-version: !ruby/object:Gem::Version 
-  hash: 39
-  prerelease: 
-  segments: 
-  - 5
-  - 0
-  - 8
-  version: 5.0.8
+version: !ruby/object:Gem::Version
+  version: 5.1.0
 platform: ruby
-authors: 
+authors:
 - Ryan Davis
 autorequire: 
 bindir: bin
-cert_chain: 
+cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIDPjCCAiagAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
@@ -35,104 +29,99 @@ cert_chain:
   Y4evBVezr3SjXz08vPqRO5YRdO3zfeMT8gBjRqZjWJGMZ2lD4XNfrs7eky74CyZw
   xx3n58i0lQkBE1EpKE0lFu/y
   -----END CERTIFICATE-----
-
-date: 2013-09-21 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-12-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rdoc
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 4
-        - 0
-        version: "4.0"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 3
-        - 7
-        version: "3.7"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.7'
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.7'
 description: |-
   minitest provides a complete suite of testing facilities supporting
   TDD, BDD, mocking, and benchmarking.
-  
+
       "I had a class with Jim Weirich on testing last week and we were
        allowed to choose our testing frameworks. Kirk Haines and I were
        paired up and we cracked open the code for a few test
        frameworks...
-  
+
        I MUST say that minitest is *very* readable / understandable
        compared to the 'other two' options we looked at. Nicely done and
        thank you for helping us keep our mental sanity."
-  
+
       -- Wayne E. Seguin
-  
+
   minitest/unit is a small and incredibly fast unit testing framework.
   It provides a rich set of assertions to make your tests clean and
   readable.
-  
+
   minitest/spec is a functionally complete spec engine. It hooks onto
   minitest/unit and seamlessly bridges test assertions over to spec
   expectations.
-  
+
   minitest/benchmark is an awesome way to assert the performance of your
   algorithms in a repeatable manner. Now you can assert that your newb
   co-worker doesn't replace your linear algorithm with an exponential
   one!
-  
+
   minitest/mock by Steven Baker, is a beautifully tiny mock (and stub)
   object framework.
-  
+
   minitest/pride shows pride in testing and adds coloring to your test
   output. I guess it is an example of how to write IO pipes too. :P
-  
+
   minitest/unit is meant to have a clean implementation for language
   implementors that need a minimal set of methods to bootstrap a working
   test suite. For example, there is no magic involved for test-case
   discovery.
-  
+
       "Again, I can't praise enough the idea of a testing/specing
        framework that I can actually read in full in one sitting!"
-  
+
       -- Piotr Szotkowski
-  
+
   Comparing to rspec:
-  
+
       rspec is a testing DSL. minitest is ruby.
-  
+
       -- Adam Hawkins, "Bow Before MiniTest"
-  
+
   minitest doesn't reinvent anything that ruby already provides, like:
   classes, modules, inheritance, methods. This means you only have to
   learn ruby to use minitest and all of your regular OO practices like
   extract-method refactorings still apply.
-email: 
+email:
 - ryand-ruby@zenspider.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.txt
 - Manifest.txt
 - README.txt
-files: 
+files:
 - .autotest
 - History.txt
 - Manifest.txt
@@ -147,7 +136,7 @@ files:
 - lib/minitest/expectations.rb
 - lib/minitest/hell.rb
 - lib/minitest/mock.rb
-- lib/minitest/parallel_each.rb
+- lib/minitest/parallel.rb
 - lib/minitest/pride.rb
 - lib/minitest/pride_plugin.rb
 - lib/minitest/spec.rb
@@ -161,40 +150,33 @@ files:
 - test/minitest/test_minitest_unit.rb
 - .gemtest
 homepage: https://github.com/seattlerb/minitest
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.txt
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: bfts
-rubygems_version: 1.8.25
+rubyforge_project: minitest
+rubygems_version: 2.1.10
 signing_key: 
-specification_version: 3
-summary: minitest provides a complete suite of testing facilities supporting TDD, BDD, mocking, and benchmarking
-test_files: 
+specification_version: 4
+summary: minitest provides a complete suite of testing facilities supporting TDD,
+  BDD, mocking, and benchmarking
+test_files:
 - test/minitest/test_minitest_benchmark.rb
 - test/minitest/test_minitest_mock.rb
 - test/minitest/test_minitest_reporter.rb

data/lib/minitest/parallel_each.rb

@@ -1,120 +0,0 @@
-##
-# Provides a parallel #each that lets you enumerate using N threads.
-# Use environment variable N to customize. Defaults to 2. Enumerable,
-# so all the goodies come along (tho not all are wrapped yet to
-# return another ParallelEach instance).
-
-class Minitest::ParallelEach
-  require 'thread'
-  include Enumerable
-
-  ##
-  # How many Threads to use for this parallel #each.
-
-  N = (ENV['N'] || 2).to_i
-
-  ##
-  # Create a new ParallelEach instance over +list+.
-
-  def initialize list
-    @queue = Queue.new # *sigh*... the Queue api sucks sooo much...
-
-    list.each { |i| @queue << i }
-    N.times { @queue << nil }
-  end
-
-  def select(&block) # :nodoc:
-    self.class.new super
-  end
-
-  alias find_all select # :nodoc:
-
-  ##
-  # Starts N threads that yield each element to your block. Joins the
-  # threads at the end.
-
-  def each
-    threads = N.times.map {
-      Thread.new do
-        Thread.current.abort_on_exception = true
-        while job = @queue.pop
-          yield job
-        end
-      end
-    }
-    threads.map(&:join)
-  end
-
-  def count # :nodoc:
-    [@queue.size - N, 0].max
-  end
-
-  alias_method :size, :count # :nodoc:
-end
-
-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 self.__run reporter, options
-    suites = Runnable.runnables
-    parallel, serial = suites.partition { |s| s.test_order == :parallel }
-
-    ParallelEach.new(parallel).map { |suite| suite.run reporter, options } +
-     serial.map { |suite| suite.run reporter, options }
-  end
-end