Restore OutputCapture.wrap as it's a semi-public API

lib/ci/reporter/output_capture.rb

@@ -5,6 +5,11 @@ module CI
   module Reporter
     # Captures $stdout or $stderr in order report it in the XML file.
     class OutputCapture
+      # Creates an OutputCapture and immediately starts capturing.
+      def self.wrap(io, &assign)
+        new(io, &assign).tap {|oc| oc.start}
+      end
+
       def initialize(io, &assign)
         @original_io = io
         @captured_io = StringIO.new

lib/ci/reporter/test_suite.rb

@@ -16,10 +16,8 @@ def initialize(name)
       def start
         @start = Time.now
         unless ENV['CI_CAPTURE'] == "off"
-          @capture_out = OutputCapture.new($stdout) {|io| $stdout = io }
-          @capture_err = OutputCapture.new($stderr) {|io| $stderr = io }
-          @capture_out.start
-          @capture_err.start
+          @capture_out = OutputCapture.wrap($stdout) {|io| $stdout = io }
+          @capture_err = OutputCapture.wrap($stderr) {|io| $stderr = io }
         end
       end