minitest 3.4.0 → 3.5.0

data/History.txt

@@ -1,3 +1,9 @@
+=== 3.5.0 / 2012-09-21
+
+* 1 minor enhancement:
+
+  * Added #capture_subprocess_io. (route)
+
 === 3.4.0 / 2012-09-05
 
 * 2 minor enhancements:

data/lib/minitest/unit.rb

@@ -307,6 +307,8 @@ module MiniTest
     # "" if you require it to be silent. Pass in a regexp if you want
     # to pattern match.
     #
+    # NOTE: this uses #capture_io, not #capture_subprocess_io.
+    #
     # See also: #assert_silent
 
     def assert_output stdout = nil, stderr = nil
@@ -439,10 +441,16 @@ module MiniTest
     # Captures $stdout and $stderr into strings:
     #
     #   out, err = capture_io do
+    #     puts "Some info"
     #     warn "You did a bad thing"
     #   end
     #
+    #   assert_match %r%info%, out
     #   assert_match %r%bad%, err
+    #
+    # NOTE: For efficiency, this method uses StringIO and does not
+    # capture IO for subprocesses. Use #capture_subprocess_io for
+    # that.
 
     def capture_io
       require 'stringio'
@@ -459,6 +467,42 @@ module MiniTest
       $stderr = orig_stderr
     end
 
+    ##
+    # Captures $stdout and $stderr into strings, using Tempfile to
+    # ensure that subprocess IO is captured as well.
+    #
+    #   out, err = capture_subprocess_io do
+    #     system "echo Some info"
+    #     system "echo You did a bad thing 1>&2"
+    #   end
+    #
+    #   assert_match %r%info%, out
+    #   assert_match %r%bad%, err
+    #
+    # NOTE: This method is approximately 10x slower than #capture_io so
+    # only use it when you need to test the output of a subprocess.
+
+    def capture_subprocess_io
+      require 'tempfile'
+
+      captured_stdout, captured_stderr = Tempfile.new("out"), Tempfile.new("err")
+      orig_stdout, orig_stderr = $stdout.dup, $stderr.dup
+      $stdout.reopen captured_stdout
+      $stderr.reopen captured_stderr
+
+      yield
+
+      $stdout.rewind
+      $stderr.rewind
+
+      return captured_stdout.read, captured_stderr.read
+    ensure
+      captured_stdout.unlink
+      captured_stderr.unlink
+      $stdout.reopen orig_stdout
+      $stderr.reopen orig_stderr
+    end
+
     ##
     # Returns details for exception +e+
 
@@ -652,7 +696,7 @@ module MiniTest
   end
 
   class Unit # :nodoc:
-    VERSION = "3.4.0" # :nodoc:
+    VERSION = "3.5.0" # :nodoc:
 
     attr_accessor :report, :failures, :errors, :skips # :nodoc:
     attr_accessor :test_count, :assertion_count       # :nodoc:

data/test/minitest/test_minitest_unit.rb

@@ -1174,6 +1174,7 @@ class TestMiniTestUnitTestCase < MiniTest::Unit::TestCase
 
     orig_verbose = $VERBOSE
     $VERBOSE = false
+
     out, err = capture_io do
       puts 'hi'
       warn 'bye!'
@@ -1185,6 +1186,23 @@ class TestMiniTestUnitTestCase < MiniTest::Unit::TestCase
     $VERBOSE = orig_verbose
   end
 
+  def test_capture_subprocess_io
+    @assertion_count = 0
+
+    orig_verbose = $VERBOSE
+    $VERBOSE = false
+
+    out, err = capture_subprocess_io do
+      system("echo 'hi'")
+      system("echo 'bye!' 1>&2")
+    end
+
+    assert_equal "hi\n", out
+    assert_equal "bye!\n", err
+  ensure
+    $VERBOSE = orig_verbose
+  end
+
   def test_class_asserts_match_refutes
     @assertion_count = 0
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: minitest
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 3
-  - 4
+  - 5
   - 0
-  version: 3.4.0
+  version: 3.5.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2012-09-05 00:00:00 Z
+date: 2012-09-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rdoc