rspec-ontap 0.1.0 → 0.2.0

data/.ruby

@@ -30,9 +30,9 @@ load_path:
 revision: 0
 created: '2011-12-13'
 summary: RSpec On Tap-Y/J
-title: RSpecOnTap
-version: 0.1.0
+title: RSpec-On-Tap
+version: 0.2.0
 name: rspec-ontap
-description: RSpecOnTap is a TAP-Y/J formatter for RSpec.
+description: RSpec-On-Tap is a TAP-Y/J formatter for RSpec.
 organization: Rubyworks
-date: '2011-12-12'
+date: '2012-02-01'

data/HISTORY.md

@@ -1,6 +1,15 @@
 # Release History
 
 
+## 0.2.0 / 2012-02-01
+
+This release adds support for $stdout and $stderr capturing.
+
+Changes:
+
+* Handle captured stdout and stderr.
+
+
 ## 0.1.0 / 2011-12-13
 
 This is the first release of `RSpec On Tap`, a formatter for RSpec

data/lib/rspec/ontap.rb

@@ -8,21 +8,27 @@ module RSpec
   class TapBaseFormatter < Core::Formatters::BaseFormatter
 
     # TAP-Y/J Revision
-    REVISION = 3
+    REVISION = 4
 
+    #
     attr_accessor :example_group_stack
 
+    #
+    #
+    #
     def initialize(output)
       super(output)
       @example_group_stack = []
     end
 
+    #
     # This method is invoked before any examples are run, right after
     # they have all been collected. This can be useful for special
     # formatters that need to provide progress on feedback (graphical ones)
     #
     # This will only be invoked once, and the next one to be invoked
     # is #example_group_started
+    #
     def start(example_count)
       super(example_count)
 
@@ -38,11 +44,13 @@ module RSpec
       return doc
     end
 
+    #
     # This method is invoked at the beginning of the execution of each example group.
     # +example_group+ is the example_group.
     #
     # The next method to be invoked after this is +example_passed+,
     # +example_pending+, or +example_finished+
+    #
     def example_group_started(example_group)
       super(example_group) #@example_group = example_group
       doc = {
@@ -64,6 +72,8 @@ module RSpec
     #
     def example_started(example)
       examples << example
+      # set up stdout and stderr to be captured
+      reset_output
     end
 
     #
@@ -93,6 +103,9 @@ module RSpec
         #}
         'time' => Time.now - @start_time
       }
+
+      doc.update(captured_output)
+   
       return doc
     end
 
@@ -121,6 +134,9 @@ module RSpec
         #}
         'time' => Time.now - @start_time
       }
+
+      doc.update(captured_output)
+
       return doc
     end
 
@@ -185,6 +201,8 @@ module RSpec
         'time' => Time.now - @start_time
       )
 
+      doc.update(captured_output)
+
       return doc
     end
 
@@ -276,6 +294,47 @@ module RSpec
       return source_file, source_line
     end
 
+    #
+    def reset_output
+      @_oldout = $stdout
+      @_olderr = $stderr
+
+      @_newout = StringIO.new
+      @_newerr = StringIO.new
+
+      $stdout = @_newout
+      $stderr = @_newerr
+    end
+
+    #
+    def captured_output
+      stdout = @_newout.string.chomp("\n")
+      stderr = @_newerr.string.chomp("\n")
+
+      doc = {}
+      doc['stdout'] = stdout unless stdout.empty?
+      doc['stderr'] = stderr unless stderr.empty?
+
+      $stdout = @_oldout
+      $stderr = @_olderr
+
+      return doc
+    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
 
   #
@@ -305,7 +364,7 @@ module RSpec
     end
   end
 
-  #
+  #rspec -f RSpec::TapY spec/*.rb | tapout progress
   class TapJ < TapBaseFormatter
     def initialize(*whatever)
       require 'json'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-ontap
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-14 00:00:00.000000000 Z
+date: 2012-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &16983840 !ruby/object:Gem::Requirement
+  requirement: &11523640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16983840
+  version_requirements: *11523640
 - !ruby/object:Gem::Dependency
   name: tapout
-  requirement: &16982400 !ruby/object:Gem::Requirement
+  requirement: &11522360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16982400
+  version_requirements: *11522360
 - !ruby/object:Gem::Dependency
   name: detroit
-  requirement: &16980480 !ruby/object:Gem::Requirement
+  requirement: &11521320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,8 +43,8 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16980480
-description: RSpecOnTap is a TAP-Y/J formatter for RSpec.
+  version_requirements: *11521320
+description: RSpec-On-Tap is a TAP-Y/J formatter for RSpec.
 email:
 - transfire@gmail.com
 executables: []
@@ -57,10 +57,8 @@ files:
 - .ruby
 - .yardopts
 - lib/rspec/ontap.rb
-- lib/rspec/tap.rb
 - lib/rspec/tap_j.rb
 - lib/rspec/tap_y.rb
-- spec/demonstrate.rb
 - HISTORY.md
 - README.md
 - COPYING.rdoc
@@ -85,7 +83,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: RSpec On Tap-Y/J

data/lib/rspec/tap.rb

@@ -1,336 +0,0 @@
-require 'rspec/core/formatters/base_formatter'
-
-module RSpec
-  #module Core
-    #module Formatters
-
-  #  
-  class TapBaseFormatter < Core::Formatters::BaseFormatter
-
-    # TAP-Y/J Revision
-    REVISION = 3
-
-    attr_accessor :example_group_stack
-
-    def initialize(output)
-      super(output)
-      @example_group_stack = []
-    end
-
-    # This method is invoked before any examples are run, right after
-    # they have all been collected. This can be useful for special
-    # formatters that need to provide progress on feedback (graphical ones)
-    #
-    # This will only be invoked once, and the next one to be invoked
-    # is #example_group_started
-    def start(example_count)
-      super(example_count)
-
-      @start_time = Time.now
-
-      doc = {
-        'type'  => 'suite',
-        'start' => @start_time.strftime('%Y-%m-%d %H:%M:%S'),
-        'count' => example_count,
-        'seed'  => @seed,
-        'rev'   => REVISION
-      }
-      return doc
-    end
-
-    # This method is invoked at the beginning of the execution of each example group.
-    # +example_group+ is the example_group.
-    #
-    # The next method to be invoked after this is +example_passed+,
-    # +example_pending+, or +example_finished+
-    def example_group_started(example_group)
-      super(example_group) #@example_group = example_group
-      doc = {
-        'type'    => 'case',
-        'subtype' => 'describe',
-        'label'   => "#{example_group.description}",
-        'level'   => @example_group_stack.size
-      }
-      @example_group_stack << example_group
-      return doc
-    end
-
-    # This method is invoked at the end of the execution of each example group.
-    # +example_group+ is the example_group.
-    def example_group_finished(example_group)
-      @example_group_stack.pop
-    end
-
-    #
-    def example_started(example)
-      examples << example
-    end
-
-    #
-    def example_passed(example)
-      super(example)
-
-      file, line = example.location.split(':')
-      file = self.class.relative_path(file)
-      line = line.to_i
-
-      doc = {
-        'type'     => 'test',
-        'subtype'  => 'it',
-        'status'   => 'pass',
-        #'setup': foo instance
-        'label'    => "#{example.description}",
-        #'expected' => 2
-        #'returned' => 2
-        'file'     => file,
-        'line'     => line,
-        'source'   => source(file)[line-1].strip,
-        'snippet'  => code_snippet(file, line),
-        #'coverage' => {
-        #  file: lib/foo.rb
-        #  line: 11..13
-        #  code: Foo#*
-        #}
-        'time' => Time.now - @start_time
-      }
-      return doc
-    end
-
-    #
-    def example_pending(example)
-      super(example)
-
-      file, line = example.location.split(':')
-      file = self.class.relative_path(file)
-      line = line.to_i
-
-      doc = {
-        'type'    => 'test',
-        'subtype' => 'it',
-        'status'  => 'todo',
-        #'setup': foo instance
-        'label'   => "#{example.description}",
-        'file'    => file,
-        'line'    => line,
-        'source'  => source(file)[line-1].strip,
-        'snippet' => code_snippet(file, line),
-        #'coverage' => {
-        #  file: lib/foo.rb
-        #  line: 11..13
-        #  code: Foo#*
-        #}
-        'time' => Time.now - @start_time
-      }
-      return doc
-    end
-
-    def example_failed(example)
-      super(example)
-
-      file, line = example.location.split(':')
-
-      file = self.class.relative_path(file)
-      line = line.to_i
-
-      if RSpec::Expectations::ExpectationNotMetError === example.exception
-        status = 'fail'
-        if md = /expected:\s*(.*?)\n\s*got:\s*(.*?)\s+/.match(example.exception.to_s)
-          expected, returned = md[1], md[2]
-        else
-          expected, returned = nil, nil
-        end
-      else
-        status = 'error'
-      end
-
-      backtrace = format_backtrace(example.exception.backtrace, example)
-
-      efile, eline = parse_source_location(backtrace)
-
-      doc = {
-        'type'        => 'test',
-        'subtype'     => 'it',
-        'status'      => status,
-        'label'       => "#{example.description}",
-        #'setup' => "foo instance",
-        'file'    => file,
-        'line'    => line,
-        'source'  => source(file)[line-1].strip,
-        'snippet' => code_snippet(file, line),
-        #'coverage' =>
-        #{
-        #  'file' => lib/foo.rb
-        #  'line' => 11..13
-        #  'code' => Foo#*
-        #}
-      }
-
-      if expected or returned
-        doc.update(
-          'expected' => expected,
-          'returned' => returned,
-        )
-      end
-
-      doc.update(
-        'exception' => {
-          'message'   => example.exception.to_s.strip,
-          'class'     => example.exception.class.name,
-          'file'      => efile,
-          'line'      => eline,
-          'source'    => source(efile)[eline-1].strip,
-          'snippet'   => code_snippet(efile, eline),
-          'backtrace' => backtrace
-        },
-        'time' => Time.now - @start_time
-      )
-
-      return doc
-    end
-
-    # @todo Is this a note?
-    def message(message)
-    end
-
-    #def stop
-    #end
-
-    # This method is invoked after the dumping of examples and failures.
-    def dump_summary(duration, example_count, failure_count, pending_count)
-      super(duration, example_count, failure_count, pending_count)
-
-      error_count = 0
-
-      @failed_examples.each do |e|
-        if RSpec::Expectations::ExpectationNotMetError === e.exception
-          #failure_count += 1
-        else
-          failure_count -= 1
-          error_count += 1
-        end
-      end
-
-      passing_count = example_count - failure_count - error_count - pending_count
-
-      doc = {
-        'type' => 'final',
-        'time' => duration,
-        'counts' => {
-          'total' => example_count,
-          'pass'  => passing_count,
-          'fail'  => failure_count,
-          'error' => error_count,
-          'omit'  => 0,
-          'todo'  => pending_count
-        }
-      }
-      return doc
-    end
-
-    # This gets invoked after the summary if option is set to do so.
-    #def dump_pending
-    #end
-
-    def seed(number)
-      @seed = number
-    end
-
-  private
-
-    # Returns a String of source code.
-    def code_snippet(file, line)
-      s = []
-      if File.file?(file)
-        source = source(file)
-        radius = 2 # TODO: make customizable (number of surrounding lines to show)
-        region = [line - radius, 1].max ..
-                 [line + radius, source.length].min
-
-        s = region.map do |n|
-          {n => source[n-1].chomp}
-        end
-      end
-      return s
-    end
-
-    # Cache source file text. This is only used if the TAP-Y stream
-    # doesn not provide a snippet and the test file is locatable.
-    def source(file)
-      @_source_cache ||= {}
-      @_source_cache[file] ||= (
-        File.readlines(file)
-      )
-    end
-
-    # Parse source location from caller, caller[0] or an Exception object.
-    def parse_source_location(caller)
-      case caller
-      when Exception
-        trace  = caller.backtrace #.reject{ |bt| bt =~ INTERNALS }
-        caller = trace.first
-      when Array
-        caller = caller.first
-      end
-      caller =~ /(.+?):(\d+(?=:|\z))/ or return ""
-      source_file, source_line = $1, $2.to_i
-      return source_file, source_line
-    end
-
-  end
-
-  #
-  class TapY < TapBaseFormatter
-    def initialize(*whatever)
-      require 'yaml'
-      super(*whatever)
-    end
-    def start(example_count)
-      output.puts super(example_count).to_yaml
-    end
-    def example_group_started(example_group)
-      output.puts super(example_group).to_yaml
-    end
-    def example_passed(example)
-      output.puts super(example).to_yaml
-    end
-    def example_pending(example)
-      output.puts super(example).to_yaml
-    end
-    def example_failed(example)
-      output.puts super(example).to_yaml
-    end
-    def dump_summary(duration, example_count, failure_count, pending_count)
-      output.puts super(duration, example_count, failure_count, pending_count).to_yaml
-      output.puts "..."
-    end
-  end
-
-  #
-  class TapJ < TapBaseFormatter
-    def initialize(*whatever)
-      require 'json'
-      super(*whatever)
-    end
-    def start(example_count)
-      output.puts super(example_count).to_json
-    end
-    def example_group_started(example_group)
-      output.puts super(example_group).to_json
-    end
-    def example_passed(example)
-      output.puts super(example).to_json
-    end
-    def example_pending(example)
-      output.puts super(example).to_json
-    end
-    def example_failed(example)
-      output.puts super(example).to_json
-    end
-    def dump_summary(duration, example_count, failure_count, pending_count)
-      output.puts super(duration, example_count, failure_count, pending_count).to_json
-    end
-  end
-
-    #end
-  #end
-end

data/spec/demonstrate.rb

@@ -1,16 +0,0 @@
-describe "demonstration" do
-
-  it "should show this passing" do
-    1.should == 1
-  end
-
-  it "should show this failing" do
-    1.should == 2
-  end
-
-  it "should show this raising an error" do
-    raise NameError
-  end
-
-end
-