minitap 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fd52937451ba7b8dd7e6aa13c046edd8f1e155d
-  data.tar.gz: a6ade0eef28c83ceed201e31bca1ce26a70f6f53
+  metadata.gz: 4a1aac6d60ba24d1f8587c4697194bb57f3babb1
+  data.tar.gz: 7c697b1e323b760f78d257714b6d0b619b7150d2
 SHA512:
-  metadata.gz: 6711b064107559933f4feed63a07a7502f3ccd7d25c6442d6de1a5d34b606b4f598cd74af0aed3da94446f607818d5d626a7153de5644d4e5f57719b0122d611
-  data.tar.gz: a14469a6138cc9c29454f64710f5172aebc32a9d6d8ab91ee670d5481d2c2fad1aa2854e19467271155c2c373bafe03ea8e58ece9b7c693624dd073503acb96d
+  metadata.gz: 4c8433a7a7e624f2f6b96e18edff3bd6dc7a0a8ad725983d61a859d0379e85360c4363adf7dcb86b93bfb98daae3d95f20a05d9f200328e77a68a4d401e04af5
+  data.tar.gz: daeac831863b03bb58500d18a1d0d52c6aded6ab6e27d55c887bbc6801b3da0ca315e96d0e39df82643022188a52b8df1ee5a587643573129d8a846b73c5ef07

data/.index

@@ -60,5 +60,5 @@ title: MiniTap
 summary: TAP-Y/J reporters for MiniTest
 description: MiniTap provides a MiniTest TAP-Y/J report format suitable for use with
   TAPOUT.
-version: 0.5.0
-date: '2013-11-15'
+version: 0.5.1
+date: '2013-11-16'

data/HISTORY.md

@@ -1,12 +1,23 @@
 # RELEASE HISTORY
 
+## 0.5.1 | 2013-11-16
+
+This release simply removes all the remaing v4 code that
+is no longer needed to work with Minitest 5. This also
+fixes an issue Minitap has with working with Rails 4.
+
+Changes:
+
+* Remove all vestigial v4 code.
+
+
 ## 0.5.0 | 2013-11-15
 
 The release adds support for MiniTest 5. Minitest completely 
 changes the way custom reporters are handled so this release
 includes extensive new code. Note that this version is also
 no longer intended for use with Minitest 4 or older. If you
-are using Minitest 4, please use Minitap 4.x as well.
+are using Minitest 4, please use Minitap 0.4.x as well.
 
 Changes:
 

data/README.md

@@ -58,7 +58,7 @@ If you are still using MiniTest 4.x you will need to use Minitap version 4.x
 as well. In your dependencies be sure to specify this version. For example in 
 your Gemfile:
 
-    gem "minitap", "~> 4.0"
+    gem "minitap", "~> 0.4.0"
 
 For Minitest 4 and and older, custom report formats are set by assigning
 the `MiniTest::Unit.runner` to an instance of a custom runner class. 

data/lib/minitap.rb

@@ -1,660 +0,0 @@
-# MiniTest adaptor for tapout.
-
-# Have to make sure the latest version of minitest is used.
-begin; gem 'minitest'; rescue; end
-
-require 'minitest/unit'
-require 'minitap/ignore_callers'
-require 'stringio'
-
-# Becuase of some wierdness in MiniTest
-#debug, $DEBUG = $DEBUG, false
-#require 'minitest/unit'
-#$DEBUG = debug
-
-module MiniTest
-
-  ##
-  # Base class for TapY and TapJ runners.
-  # 
-  # Based upon Alexander Kern's MiniTest-Reporters (MIT License).
-  # @see https://github.com/CapnKernul/minitest-reporters
-  #
-  class MiniTap < ::MiniTest::Unit
-
-    # TAP-Y/J Revision
-    REVISION = 4
-
-    # Backtrace patterns to be omitted.
-    IGNORE_CALLERS = $RUBY_IGNORE_CALLERS
-
-    # Test results.
-    attr_reader :test_results
-
-    attr_accessor :suites_start_time
-    attr_accessor :suite_start_time
-    attr_accessor :test_start_time
-
-    # Initialize new MiniTap MiniTest runner.
-    def initialize
-      super
-
-      @_stdout = ''
-      @_stderr = ''
-
-      @test_results = {}
-      #self.assertion_count = 0
-      @_source_cache = {}
-    end
-
-    def _run_suites(suites, type)
-      #output.puts "# Run options: #{@help}"
-
-      @suites_start_time = Time.now
-      count_tests!(suites, type)
-      trigger_callback(:before_suites, suites, type)
-      super(suites, type)
-    ensure
-      trigger_callback(:after_suites, suites, type)
-    end
-
-    def _run_suite(suite, type)
-      # The only reason this is here is b/c MiniTest wil try to run
-      # base classes like `MiniTest::Spec`. So to prevent that,
-      # if there are no tests to run, we don't bother to process
-      # the "suite" at all.
-      @_suite_tests = suite.send("#{type}_methods")
-      return [0,0] if @_suite_tests.empty?
-
-      begin
-        @suite_start_time = Time.now
-        trigger_callback(:before_suite, suite)
-
-        super_result = nil
-        @_stdout, @_stderr = capture_io do
-          super_result = super(suite, type)
-        end
-        super_result
-      ensure
-        trigger_callback(:after_suite, suite)
-      end
-    end
-
-    def before_test(suite, test)
-      @test_start_time = Time.now
-      trigger_callback(:before_test, suite, test)
-    end
-
-    def record(suite, test, assertions, time, exception)
-      record = TestRecord.new(suite, test.to_sym, assertions, time, exception)
-
-      #if exception #&& ENV['minitap_debug']
-      #  STDERR.puts exception
-      #  STDERR.puts exception.backtrace.join("\n")
-      #end
-
-      @test_results[suite] ||= {}
-      @test_results[suite][test.to_sym] = record
-      #@test_recorder.record(runner)
-
-      # MiniTest < 4.1.0 sends #record after all teardown hooks, so explicitly
-      # call #after_test here after recording.
-      after_test(suite, test) if Unit::VERSION <= "4.1.0"
-    end
-
-    def after_test(suite, test)
-      #runners = @test_recorder[suite, test.to_sym]
-      #records = @test_results[suite][test.to_sym]
-      record = @test_results[suite][test.to_sym]
-
-      #records.each do |record|
-      #  trigger_callback(record.result, suite, test.to_sym, record)
-      #end
-
-      trigger_callback(record.result, suite, test.to_sym, record)
-
-      #trigger_callback(:after_test, suite, test.to_sym)
-    end
-
-    # Trigger the tapout callback.
-    def trigger_callback(callback, *args)
-      send("tapout_#{callback}", *args)
-    end
-
-    # Stub out the three IO methods used by the built-in reporter.
-    def puts(*args); end
-    def print(*args); end
-    def status(io = output); end
-
-  private
-
-    #    
-    def filtered_tests(suite, type)
-      filter = options[:filter] || '/./'
-      filter = Regexp.new($1) if filter =~ /\/(.*)\//
-      suite.send("#{type}_methods").grep(filter)
-    end
-
-    #
-    #def suites_of_type(type)
-    #  TestCase.send("#{type}_suites")
-    #end
-
-=begin
-    #
-    def add_test_result(suite, test, test_runner)
-      self.report[suite] ||= {}
-      self.report[suite][test.to_sym] = test_runner
-      
-      self.assertion_count += test_runner.assertions
-      
-      case test_runner.result
-      when :skip then self.skips += 1
-      when :failure then self.failures += 1
-      when :error then self.errors += 1
-      end
-    end
-=end
-
-    def count_tests!(suites, type)
-      filter = options[:filter] || '/./'
-      filter = Regexp.new $1 if filter =~ /\/(.*)\//
-
-      @test_count = suites.inject(0) do |acc, suite|
-        acc + suite.send("#{type}_methods").grep(filter).length
-      end
-    end
-
-    #
-    def tapout_before_suites(suites, type)
-      doc = {
-        'type'  => 'suite',
-        'start' => self.suites_start_time.strftime('%Y-%m-%d %H:%M:%S'),
-        'count' => self.test_count,
-        'seed'  => self.options[:seed],
-        'rev'   => REVISION
-      }
-      return doc
-    end
-
-    #
-    def tapout_after_suites(suites, type)
-      doc = {
-        'type' => 'final',
-        'time' => Time.now - self.suites_start_time,
-        'counts' => {
-          'total' => self.test_count,
-          'pass'  => self.test_count - self.failures - self.errors - self.skips,
-          'fail'  => self.failures,
-          'error' => self.errors,
-          'omit'  => self.skips,
-          'todo'  => 0  # TODO: does minitest support pending tests?
-        }
-      }
-      return doc
-    end
-
-    #
-    def tapout_before_suite(suite)
-      doc = {
-        'type'    => 'case',
-        'subtype' => '',
-        'label'   => "#{suite}",
-        'level'   => 0
-      }
-      return doc
-    end
-
-    #
-    def tapout_after_suite(suite)
-    end
-
-    #
-    def tapout_before_test(suite, test)
-    end
-
-    #
-    def tapout_after_test(suite, test)
-    end
-
-    #
-    def tapout_pass(suite, test, test_runner)
-      doc = {
-        'type'        => 'test',
-        'subtype'     => '',
-        'status'      => 'pass',
-        #'setup': foo instance
-        'label'       => "#{test}",
-        #'expected' => 2
-        #'returned' => 2
-        #'file' => 'test/test_foo.rb'
-        #'line': 45
-        #'source': ok 1, 2
-        #'snippet':
-        #  - 44: ok 0,0
-        #  - 45: ok 1,2
-        #  - 46: ok 2,4
-        #'coverage':
-        #  file: lib/foo.rb
-        #  line: 11..13
-        #  code: Foo#*
-        'time' => Time.now - self.suite_start_time
-      }
-
-      stdout, stderr = @_stdout, @_stderr
-      doc['stdout'] = stdout unless stdout.empty?
-      doc['stderr'] = stderr unless stderr.empty?
-
-      return doc
-    end
-
-    #
-    def tapout_skip(suite, test, test_runner)
-      e = test_runner.exception
-      e_file, e_line = location(test_runner.exception)
-      r_file = e_file.sub(Dir.pwd+'/', '')
-
-      doc = {
-        'type'        => 'test',
-        'subtype'     => '',
-        'status'      => 'skip',
-        'label'       => "#{test}",
-        #'setup' => "foo instance",
-        #'expected' => 2,
-        #'returned' => 1,
-        #'file' => test/test_foo.rb
-        #'line' => 45
-        #'source' => ok 1, 2
-        #'snippet' =>
-        #  - 44: ok 0,0
-        #  - 45: ok 1,2
-        #  - 46: ok 2,4
-        #'coverage' =>
-        #  'file' => lib/foo.rb
-        #  'line' => 11..13
-        #  'code' => Foo#*
-        'exception' => {
-          'message'   => clean_message(e.message),
-          'class'     => e.class.name,
-          'file'      => r_file,
-          'line'      => e_line,
-          'source'    => source(e_file)[e_line-1].strip,
-          'snippet'   => code_snippet(e_file, e_line),
-          'backtrace' => filter_backtrace(e.backtrace)
-        },
-        'time' => Time.now - self.suite_start_time
-      }
-      return doc
-    end
-
-    #
-    def tapout_failure(suite, test, test_runner)
-      e = test_runner.exception
-      e_file, e_line = location(test_runner.exception)
-      r_file = e_file.sub(Dir.pwd+'/', '')
-
-      doc = {
-        'type'        => 'test',
-        'subtype'     => '',
-        'status'      => 'fail',
-        'label'       => "#{test}",
-        #'setup' => "foo instance",
-        #'expected' => 2,
-        #'returned' => 1,
-        #'file' => test/test_foo.rb
-        #'line' => 45
-        #'source' => ok 1, 2
-        #'snippet' =>
-        #  - 44: ok 0,0
-        #  - 45: ok 1,2
-        #  - 46: ok 2,4
-        #'coverage' =>
-        #  'file' => lib/foo.rb
-        #  'line' => 11..13
-        #  'code' => Foo#*
-        'exception' => {
-          'message'   => clean_message(e.message),
-          'class'     => e.class.name,
-          'file'      => r_file,
-          'line'      => e_line,
-          'source'    => source(e_file)[e_line-1].strip,
-          'snippet'   => code_snippet(e_file, e_line),
-          'backtrace' => filter_backtrace(e.backtrace)
-        },
-        'time' => Time.now - self.suite_start_time
-      }
-
-      stdout, stderr = @_stdout, @_stderr
-      doc['stdout'] = stdout unless stdout.empty?
-      doc['stderr'] = stderr unless stderr.empty?
-
-      return doc
-    end
-
-    #
-    def tapout_error(suite, test, test_runner)
-      e = test_runner.exception
-      e_file, e_line = location(test_runner.exception)
-      r_file = e_file.sub(Dir.pwd+'/', '')
-
-      doc = {
-        'type'        => 'test',
-        'subtype'     => '',
-        'status'      => 'error',
-        'label'       => "#{test}",
-        #'setup' => "foo instance",
-        #'expected' => 2,
-        #'returned' => 1,
-        #'file' => test/test_foo.rb
-        #'line' => 45
-        #'source' => ok 1, 2
-        #'snippet' =>
-        #  - 44: ok 0,0
-        #  - 45: ok 1,2
-        #  - 46: ok 2,4
-        #'coverage' =>
-        #  'file' => lib/foo.rb
-        #  'line' => 11..13
-        #  'code' => Foo#*
-        'exception' => {
-          'message'   => clean_message(e.message),
-          'class'     => e.class.name,
-          'file'      => r_file,
-          'line'      => e_line,
-          'source'    => source(e_file)[e_line-1].strip,
-          'snippet'   => code_snippet(e_file, e_line),
-          'backtrace' => filter_backtrace(e.backtrace)
-        },
-        'time' => Time.now - self.suite_start_time
-      }
-
-      stdout, stderr = @_stdout, @_stderr
-      doc['stdout'] = stdout unless stdout.empty?
-      doc['stderr'] = stderr unless stderr.empty?
-
-      return doc
-    end
-
-    #
-    #def filter_backtrace(backtrace)
-    #  trace = backtrace
-    #  trace = clean_backtrace(trace)
-    #  trace = MiniTest::filter_backtrace(trace)
-    #  trace
-    #end
-
-    # Clean the backtrace of any reference to test framework itself.
-    def filter_backtrace(backtrace)
-      ## remove backtraces that match any pattern in IGNORE_CALLERS
-      trace = backtrace.reject{|b| IGNORE_CALLERS.any?{|i| i=~b}}
-      ## remove `:in ...` portion of backtraces
-      trace = trace.map do |bt| 
-        i = bt.index(':in')
-        i ? bt[0...i] :  bt
-      end
-      ## now apply MiniTest's own filter (note: doesn't work if done first, why?)
-      trace = MiniTest::filter_backtrace(trace)
-      ## if the backtrace is empty now then revert to the original
-      trace = backtrace if trace.empty?
-      ## simplify paths to be relative to current workding diectory
-      trace = trace.map{ |bt| bt.sub(Dir.pwd+File::SEPARATOR,'') }
-      return trace
-    end
-
-    # 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[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
-
-    # Get location of exception.
-    def location e # :nodoc:
-      last_before_assertion = ""
-      e.backtrace.reverse_each do |s|
-        break if s =~ /in .(assert|refute|flunk|pass|fail|raise|must|wont)/
-        last_before_assertion = s
-      end
-      file, line = last_before_assertion.sub(/:in .*$/, '').split(':')
-      line = line.to_i if line
-      return file, line
-    end
-
-    #
-    def clean_message(message)
-      message.strip #.gsub(/\s*\n\s*/, "\n")
-    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
-
-  ##
-  # Used to keep a record of each test and it's result.
-  #
-  class TestRecord < Struct.new(:suite, :test, :assertions, :time, :exception)
-    def result
-      case exception
-      when nil then :pass
-      when Skip then :skip
-      when Assertion then :failure
-      else :error
-      end
-    end
-  end
-
-=begin
-  # Runner for individual MiniTest tests.
-  # 
-  # You *should not* create instances of this class directly. Instances of
-  # {SuiteRunner} will create these and send them to the reporters.
-  # 
-  # Based upon Ryan Davis of Seattle.rb's MiniTest (MIT License).
-  # 
-  # @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
-      @assertions = 0
-    end
-    
-    def run
-      suite_instance = suite.new(test)
-      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]
-      when MiniTest::Assertion then [:failure, exception]
-      else [:error, exception]
-      end
-    end
-
-    def record(suite, method, assertions, time, error)
-    end
-
-  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
-=end
-
-  ##
-  # Around advice.
-  #
-  module AroundTestHooks
-    def self.before_test(instance)
-      if before_test = (MiniTest::Unit.runner.method(:before_test) rescue nil)
-        before_test.call(instance.class, instance.__name__)
-      end
-    end
-
-    def self.after_test(instance)
-      # MiniTest < 4.1.0 sends #record after all teardown hooks, so don't call
-      # #after_test here.
-      if MiniTest::Unit::VERSION > "4.1.0"
-        if after_test = (MiniTest::Unit.runner.method(:after_test) rescue nil)
-          after_test.call(instance.class, instance.__name__)
-        end
-      end
-    end
-
-    def before_setup
-      AroundTestHooks.before_test(self)
-      super
-    end
-
-    def after_teardown
-      super
-      AroundTestHooks.after_test(self)
-    end
-  end
-
-  class Unit::TestCase
-    include AroundTestHooks
-  end
-
-  ##
-  # TAP-Y adapater.
-  #
-  class TapY < MiniTap
-    def initialize
-      require 'yaml' unless respond_to?(:to_yaml)
-      super
-    end
-
-    def tapout_before_suites(suites, type)
-      wp super(suites, type).to_yaml
-    end
-    def tapout_before_suite(suite)
-      wp super(suite).to_yaml
-    end
-    def tapout_pass(suite, test, test_runner)
-      wp super(suite, test, test_runner).to_yaml
-    end
-    def tapout_skip(suite, test, test_runner)
-      wp super(suite, test, test_runner).to_yaml
-    end
-    def tapout_failure(suite, test, test_runner)
-      wp super(suite, test, test_runner).to_yaml
-    end
-    def tapout_error(suite, test, test_runner)
-      wp super(suite, test, test_runner).to_yaml
-    end
-    def tapout_after_suites(suites, type)
-      wp super(suites, type).to_yaml
-      wp "..."
-    end
-
-    def wp(str)
-      STDOUT.puts(str)
-    end
-  end
-
-  ##
-  # TAP-J adapater.
-  #
-  class TapJ < MiniTap
-    def initialize
-      require 'json' unless respond_to?(:to_json)
-      super
-    end
-
-    def tapout_before_suites(suites, type)
-      wp super(suites, type).to_json
-    end
-    def tapout_before_suite(suite)
-      wp super(suite).to_json
-    end
-    def tapout_pass(suite, test, test_runner)
-      wp super(suite, test, test_runner).to_json
-    end
-    def tapout_skip(suite, test, test_runner)
-      wp super(suite, test, test_runner).to_json
-    end
-    def tapout_failure(suite, test, test_runner)
-      wp super(suite, test, test_runner).to_json
-    end
-    def tapout_error(suite, test, test_runner)
-      wp super(suite, test, test_runner).to_json
-    end
-    def tapout_after_suites(suites, type)
-      wp super(suites, type).to_json
-    end
-
-    def wp(str)
-      STDOUT.puts(str)
-    end
-  end
-
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minitap
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - trans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-15 00:00:00.000000000 Z
+date: 2013-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tapout
@@ -97,8 +97,6 @@ files:
 - .yardopts
 - lib/minitap/ignore_callers.rb
 - lib/minitap/minitest5.rb
-- lib/minitap/tapj.rb
-- lib/minitap/tapy.rb
 - lib/minitap.rb
 - lib/minitest/minitap_plugin.rb
 - NOTICE.md

data/lib/minitap/tapj.rb

@@ -1,5 +0,0 @@
-require 'minitap'
-MiniTest::Unit.runner = MiniTest::TapJ.new
-
-# TODO Support ENV['rpt'], but how to select other formats ?
-

data/lib/minitap/tapy.rb

@@ -1,5 +0,0 @@
-require 'minitap'
-MiniTest::Unit.runner = MiniTest::TapY.new
-
-# TODO Support ENV['rpt'], but how to select other formats ?
-