minitest-ci 1.0.4 → 2.0.0

data/.autotest

@@ -1,26 +1,11 @@
 # -*- ruby -*-
 
 require 'autotest/restart'
+require 'autotest/isolate'
 
 Autotest.add_hook :initialize do |at|
   at.add_exception 'test/reports'
-#   at.extra_files << "../some/external/dependency.rb"
-#
-#   at.libs << ":../some/external"
-#
-#   at.add_exception 'vendor'
-#
-#   at.add_mapping(/dependency.rb/) do |f, _|
-#     at.files_matching(/test_.*rb$/)
-#   end
-#
-#   %w(TestA TestB).each do |klass|
-#     at.extra_class_map[klass] = "test/test_misc.rb"
-#   end
   false
 end
 
-# Autotest.add_hook :run_command do |at|
-#   system "rake build"
-# end
 # vim: syntax=ruby

data/History.txt

@@ -1,3 +1,8 @@
+=== 2.0.0 / 2012-04-15
+* 1 major enhancement
+
+  * Updates to use #record method from newer MiniTest. Removes copied code, yay!
+
 === 1.0.0 / 2011-09-23
 
 * 1 major enhancement

data/Manifest.txt

@@ -1,5 +1,4 @@
 .autotest
-.gitignore
 History.txt
 Manifest.txt
 README.txt

data/README.txt

@@ -5,11 +5,12 @@
 == DESCRIPTION:
 
 CI reporter plugin for MiniTest
+
 This gem was made possible by ATT Interactive.
 
 == FEATURES/PROBLEMS:
 
-* Monkeypatches MiniTest::Unit#_run_suite so I have to fix the version of MiniTest I support.
+* Uses MiniTest::Unit#record which is only available since version 2.12.0
 
 == SYNOPSIS:
 

data/Rakefile

@@ -4,13 +4,14 @@ require 'rubygems'
 require 'hoe'
 
 Hoe.plugin :isolate
+Hoe.plugin :git
 
 Hoe.spec 'minitest-ci' do
   developer 'Brian Henderson', 'bhenderson@attinteractive.com'
 
   self.testlib = :none
 
-  extra_deps << ['minitest', '2.6.0']
+  extra_deps << ['minitest', '~> 2.12.0']
   extra_dev_deps << ['nokogiri', '~> 1.5.0']
   extra_dev_deps << ['rdoc',     '>= 2.4.2']
 end

data/lib/minitest/ci.rb

@@ -1,12 +1,7 @@
-begin
-  gem 'minitest', '2.6.0'
-  require "minitest/unit"
-rescue Gem::LoadError => e
-  msg = [
-    'minitest version 2.6.0 required',
-    'try: gem install minitest -v 2.6.0'
-  ]
-  raise e.exception msg.join("\n")
+require 'minitest/unit'
+#unless MiniTest::Unit::VERSION >= '2.12.0'
+unless MiniTest::Unit.public_method_defined? :record
+  abort 'you are running an unsupported version of MiniTest. try upgrading.'
 end
 
 require 'fileutils'
@@ -14,92 +9,49 @@ require 'cgi'
 
 module MiniTest
   module Ci
-    ###
-    # copied
-    file = if RUBY_VERSION =~ /^1\.9/ then  # bt's expanded, but __FILE__ isn't :(
-             File.expand_path __FILE__
-           elsif  __FILE__ =~ /^[^\.]/ then # assume both relative
-             require 'pathname'
-             pwd = Pathname.new Dir.pwd
-             pn = Pathname.new File.expand_path(__FILE__)
-             pn = File.join(".", pn.relative_path_from(pwd)) unless pn.relative?
-             pn.to_s
-           else                             # assume both are expanded
-             __FILE__
-           end
-    # end of copy
-    ###
-    CI_MINI_DIR = File.dirname(File.dirname(file))
-
-    VERSION = '1.0.4'
-
-    @test_dir = nil #'test/reports'
-    @error = nil
-    @munit = nil
+
+    VERSION = '2.0.0'
+
+    @report_dir = nil
     @suites = Hash.new {|h,k| h[k] = []}
 
     class << self
-      attr_accessor :test_dir
-    end
-
-    def add_error e
-      @error = e
+      # Accessor method to change the report dir if you don't like the
+      # defaults.
+      attr_accessor :report_dir
     end
 
-    def push suite, method, time, num
-      a = [method, time, num]
-      if @error
-        a << @error
-        @error = nil
-      end
-      @suites[suite] << a
+    def push suite, method, num_assertions, time, error
+      @suites[suite] << [method, num_assertions, time, error]
     end
 
-    def finish
-      @munit.puts
-      @munit.puts 'generating ci files'
+    def finish io
+      io.puts
+      io.puts 'generating ci files'
 
       clean
 
-      Dir.chdir @test_dir do
+      Dir.chdir report_dir do
         @suites.each do |name, suite|
           generate_suite name, suite
         end
       end
     end
 
-    def munit= m
-      @munit = m
-    end
-
     private
 
     def clean
-      FileUtils.rm_rf @test_dir
-      FileUtils.mkdir_p @test_dir
+      FileUtils.rm_rf report_dir
+      FileUtils.mkdir_p report_dir
     end
 
     def escape o
       CGI.escapeHTML(o.to_s)
     end
 
-    # use original as well as filtering this file.
-    def filter_backtrace bt
-      bt = MiniTest::filter_backtrace bt
-      orig_mini_dir = MiniTest::MINI_DIR
-
-      orig_verbose, $VERBOSE = $VERBOSE, nil
-
-      MiniTest.const_set :MINI_DIR, CI_MINI_DIR
-      MiniTest::filter_backtrace bt
-    ensure
-      MiniTest.const_set :MINI_DIR, orig_mini_dir
-      $VERBOSE = orig_verbose
-    end
-
     def generate_suite name, suite
       total_time, assertions, errors, failures, skips = 0, 0, 0, 0, 0
-      suite.each do |_, t, a, e|
+      suite.each do |_, a, t, e|
         total_time += t
         assertions += a
         case e
@@ -116,12 +68,12 @@ module MiniTest
         f.puts '<?xml version="1.0" encoding="UTF-8"?>'
         f.puts "<testsuite time='#{"%6f" % total_time}' skipped='#{skips}' failures='#{failures}' errors='#{errors}' name='#{name}' assertions='#{assertions}' tests='#{suite.count}'>"
 
-        suite.each do |method, time, asserts, error|
+        suite.each do |method, asserts, time, error|
           f.puts "  <testcase time='#{"%6f" % time}' name='#{method}' assertions='#{asserts}'>"
           if error
-            bt = filter_backtrace(error.backtrace).join "\n"
+            bt = MiniTest::filter_backtrace error.backtrace
             f.write "    <#{type error} type='#{escape error.class}' message=#{escape( error.message ).inspect}>"
-            f.puts escape bt
+            f.puts escape bt.join "\n"
             f.puts "    </#{type error}>"
           end
           f.puts "  </testcase>"
@@ -145,53 +97,19 @@ module MiniTest
 
   class CiUnit < Unit
 
-    # copied out of MiniTest::Unit
-    def _run_suite suite, type
-      # added this line
-      MiniTest::Ci.munit = self
-
-      header = "#{type}_suite_header"
-      puts send(header, suite) if respond_to? header
-
-      filter = options[:filter] || '/./'
-      filter = Regexp.new $1 if filter =~ /\/(.*)\//
-
-      assertions = suite.send("#{type}_methods").grep(filter).map { |method|
-        inst = suite.new method
-        inst._assertions = 0
-
-        print "#{suite}##{method} = " if @verbose
-
-        @start_time = Time.now
-        result = inst.run self
-        time = Time.now - @start_time
-
-        print "%.2f s = " % time if @verbose
-        print result
-        puts if @verbose
-
-        # added this line
-        MiniTest::Ci.push suite, method, time, inst._assertions
-
-        inst._assertions
-      }
-
-      return assertions.size, assertions.inject(0) { |sum, n| sum + n }
-    end
-
-    def puke klass, meth, e
-      MiniTest::Ci.add_error e
+    def record suite, method, assertions, time, error
+      MiniTest::Ci.push suite, method, assertions, time, error
       super
     end
 
     def status io = self.output
       super
-      MiniTest::Ci.finish
+      MiniTest::Ci.finish io
     end
 
   end
 end
 
 # set defaults
-MiniTest::Ci.test_dir = 'test/reports'
+MiniTest::Ci.report_dir = 'test/reports'
 MiniTest::Unit.runner = MiniTest::CiUnit.new

data/test/test_minitest_ci.rb

@@ -41,23 +41,22 @@ class TestMinitest::TestCi < MiniTest::Unit::TestCase
   old_out, MiniTest::Unit.output = MiniTest::Unit.output, @output
   begin
     runner = MiniTest::CiUnit.new
-    MiniTest::Ci.munit = runner
 
     runner._run_suite MockTestSuite, :test
 
     @@test_suites.delete MockTestSuite
-    MiniTest::Ci.finish
+    MiniTest::Ci.finish runner.output
   ensure
     MiniTest::Unit.output = old_out
   end
+  MiniTest::Unit.runner = nil # reset
 
   def self.output
     @output
   end
 
   def setup
-    file = "#{MiniTest::Ci.test_dir}/TEST-MockTestSuite.xml"
-    assert File.exists?( file ), 'expected xml file to exists'
+    file = "#{MiniTest::Ci.report_dir}/TEST-MockTestSuite.xml"
     @file = File.read file
     @doc = Nokogiri.parse @file
     @doc = @doc.at_xpath('/testsuite')
@@ -114,12 +113,8 @@ class TestMinitest::TestCi < MiniTest::Unit::TestCase
     assert_match( /generating ci files/, self.class.output.read )
   end
 
-  def test_filter_backtrace
-    bt = begin; raise; rescue => e; e.backtrace; end
-
-    bt = MiniTest::Ci.send :filter_backtrace, bt
-
-    assert_equal 1, bt.size
-    assert_match( /#{__FILE__}/, bt.first )
+  def test_filtering_backtraces
+    error = @doc.at_xpath('/testsuite/testcase[@name="test_raise_error"]')
+    refute_match /lib\/minitest/, error.inner_text
   end
 end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: minitest-ci
 version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: 
-  version: 1.0.4
+  segments: 
+  - 2
+  - 0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Brian Henderson
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-17 00:00:00 Z
+date: 2012-04-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest
@@ -18,31 +23,45 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.6.0
+        hash: 63
+        segments: 
+        - 2
+        - 12
+        - 0
+        version: 2.12.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
+  name: rdoc
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.5.0
+        hash: 19
+        segments: 
+        - 3
+        - 10
+        version: "3.10"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rdoc
+  name: nokogiri
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.4.2
+        hash: 3
+        segments: 
+        - 1
+        - 5
+        - 0
+        version: 1.5.0
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -53,11 +72,16 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "2.12"
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
   type: :development
   version_requirements: *id004
 description: |-
   CI reporter plugin for MiniTest
+  
   This gem was made possible by ATT Interactive.
 email: 
 - bhenderson@attinteractive.com
@@ -71,7 +95,6 @@ extra_rdoc_files:
 - README.txt
 files: 
 - .autotest
-- .gitignore
 - History.txt
 - Manifest.txt
 - README.txt
@@ -93,19 +116,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: minitest-ci
-rubygems_version: 1.8.11
+rubygems_version: 1.8.20
 signing_key: 
 specification_version: 3
-summary: CI reporter plugin for MiniTest This gem was made possible by ATT Interactive.
+summary: CI reporter plugin for MiniTest  This gem was made possible by ATT Interactive.
 test_files: 
 - test/test_minitest_ci.rb

data/.gitignore

@@ -1,3 +0,0 @@
-*.swp
-tmp
-test/reports