minitap 0.3.2 → 0.3.3

data/.ruby

@@ -26,6 +26,10 @@ requirements:
   groups:
   - test
   development: true
+- name: ae
+  groups:
+  - test
+  development: true
 dependencies: []
 conflicts: []
 repositories:
@@ -44,9 +48,9 @@ load_path:
 revision: 0
 summary: TAP-Y/J reporters for MiniTest
 title: MiniTap
-version: 0.3.2
+version: 0.3.3
 name: minitap
-description: MiniTap provides a custom MiniTest reporter that outs TAP-Y or TAP-J
-  formatted output.
+description: MiniTap provides a MiniTest TAP-Y/J report format suitable for use with
+  TAPOUT.
 organization: rubyworks
-date: '2011-11-08'
+date: '2012-02-01'

data/.yardopts

@@ -0,0 +1,8 @@
+--title "MiniTAP"
+--readme README.rdoc
+--protected
+--private
+lib
+-
+[A-Z]*.*
+

data/HISTORY.rdoc

@@ -1,10 +1,22 @@
 = RELEASE HISTORY
 
+== 0.3.3 | 2012-02-01
+
+This release adds support for the new 'stdout' and 'stderr' fields.
+As tests are run $stdout and $stderr are captured and included in
+the TAP-Y/J stream. This prevents the structured streams from being
+corrupted and provide some nice report options too.
+
+Changes:
+
+* Add support for stdout and stderr capturing.
+
+
 == 0.3.2 | 2011-11-08
 
-This release add support for new TAP-Y/J class field, and removes
+This release add support for the new TAP-Y/J 'class' field, and removes
 the class name from the message field. It also fixes a bug that
-arose with certain versions of Ruby's YAML.load_documents implmentation.
+arose with certain versions of Ruby's YAML.load_documents implementation.
 
 Changes:
 

data/lib/minitap.rb

@@ -24,7 +24,7 @@ module MiniTest
   class MiniTap < ::MiniTest::Unit
 
     # TAP-Y/J Revision
-    REVISION = 3
+    REVISION = 4
 
     # Backtrace patterns to be omitted.
     IGNORE_CALLERS = ::RUBY_IGNORE_CALLERS
@@ -117,7 +117,7 @@ module MiniTest
       send("tapout_#{callback}", *args)
     end
 
-    private
+  private
 
     #    
     def filtered_tests(suite, type)
@@ -224,6 +224,11 @@ module MiniTest
         #  code: Foo#*
         'time' => Time.now - self.suite_start_time
       }
+
+      stdout, stderr = test_runner.stdout, test_runner.stderr
+      doc['stdout'] = stdout unless stdout.empty?
+      doc['stderr'] = stderr unless stderr.empty?
+
       return doc
     end
 
@@ -302,6 +307,11 @@ module MiniTest
         },
         'time' => Time.now - self.suite_start_time
       }
+
+      stdout, stderr = test_runner.stdout, test_runner.stderr
+      doc['stdout'] = stdout unless stdout.empty?
+      doc['stderr'] = stderr unless stderr.empty?
+
       return doc
     end
 
@@ -341,6 +351,11 @@ module MiniTest
         },
         'time' => Time.now - self.suite_start_time
       }
+
+      stdout, stderr = test_runner.stdout, test_runner.stderr
+      doc['stdout'] = stdout unless stdout.empty?
+      doc['stderr'] = stderr unless stderr.empty?
+
       return doc
     end
 
@@ -405,7 +420,7 @@ module MiniTest
       end
       caller =~ /(.+?):(\d+(?=:|\z))/ or return ""
       source_file, source_line = $1, $2.to_i
-      returnf source_file, source_line
+      return source_file, source_line
     end
 
     # Get location of exception.
@@ -437,7 +452,8 @@ module MiniTest
   # @see https://github.com/seattlerb/minitest MiniTest
   class TestRunner
     attr_reader :suite, :test, :assertions, :result, :exception
-    
+    attr_reader :stdout, :stderr
+
     def initialize(suite, test)
       @suite = suite
       @test = test
@@ -446,10 +462,14 @@ module MiniTest
     
     def run
       suite_instance = suite.new(test)
-      @result, @exception = fix_result(suite_instance.run(self))
+      test_result = nil
+      @stdout, @stderr = capture_io do
+        test_result = suite_instance.run(self)
+      end
+      @result, @exception = fix_result(test_result)
       @assertions = suite_instance._assertions
     end
-    
+
     def puke(suite, test, exception)
       case exception
       when MiniTest::Skip then [:skip, exception]
@@ -458,17 +478,32 @@ module MiniTest
       end
     end
     
-    private
+  private
     
+    #
     def fix_result(result)
       result == '.' ? [:pass, nil] : result
     end
+
+    #
+    def capture_io
+      ostdout, ostderr = $stdout, $stderr
+      cstdout, cstderr = StringIO.new, StringIO.new
+      $stdout, $stderr = cstdout, cstderr
+
+      yield
+
+      return cstdout.string.chomp("\n"), cstderr.string.chomp("\n")
+    ensure
+      $stdout = ostdout
+      $stderr = ostderr
+    end
   end
 
   #
   class TapY < MiniTap
     def initialize
-      require 'yaml'
+      require 'yaml' unless respond_to?(:to_yaml)
       super
     end
     def tapout_before_suites(suites, type)
@@ -497,8 +532,8 @@ module MiniTest
 
   #
   class TapJ < MiniTap
-    def initializebacktrace
-      require 'json'
+    def initialize
+      require 'json' unless respond_to?(:to_json)
       super
     end
     def tapout_before_suites(suites, type)

data/spec/applique/ae.rb

@@ -0,0 +1 @@
+require 'ae'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitap
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-08 00:00:00.000000000 Z
+date: 2012-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tapout
-  requirement: &17978940 !ruby/object:Gem::Requirement
+  requirement: &27848940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *17978940
+  version_requirements: *27848940
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &17978160 !ruby/object:Gem::Requirement
+  requirement: &27848020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17978160
+  version_requirements: *27848020
 - !ruby/object:Gem::Dependency
   name: detroit
-  requirement: &17977400 !ruby/object:Gem::Requirement
+  requirement: &27846700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17977400
+  version_requirements: *27846700
 - !ruby/object:Gem::Dependency
   name: reap
-  requirement: &17976680 !ruby/object:Gem::Requirement
+  requirement: &27845960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17976680
+  version_requirements: *27845960
 - !ruby/object:Gem::Dependency
   name: qed
-  requirement: &17975960 !ruby/object:Gem::Requirement
+  requirement: &27844460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,9 +65,20 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17975960
-description: MiniTap provides a custom MiniTest reporter that outs TAP-Y or TAP-J
-  formatted output.
+  version_requirements: *27844460
+- !ruby/object:Gem::Dependency
+  name: ae
+  requirement: &27841740 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *27841740
+description: MiniTap provides a MiniTest TAP-Y/J report format suitable for use with
+  TAPOUT.
 email:
 - transfire@gmail.com
 executables: []
@@ -78,8 +89,10 @@ extra_rdoc_files:
 - COPYING.rdoc
 files:
 - .ruby
+- .yardopts
 - lib/minitap/ignore_callers.rb
 - lib/minitap.rb
+- spec/applique/ae.rb
 - spec/applique/cli.rb
 - spec/fixtures/tapy.yml
 - spec/minitap.rdoc
@@ -107,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: TAP-Y/J reporters for MiniTest