minitest-ci 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7df74b27d06a7fc3c130ff4948fa7409006fffd9
-  data.tar.gz: 0f475b81387862ff375e1de9e790239c6bbcd656
+  metadata.gz: a89fdbe89e6a7888a4bd89af927b956760cbd5cd
+  data.tar.gz: d98276bb6a0356e48e64ed9dbced315c2cb43af5
 SHA512:
-  metadata.gz: f3602c8752a1b60b63b4c403d572c6e45932d56fd8014efb578298c4df55890721baaad6bf66a94ce2f985b30eee8adee285d1464adf0bebab88b08b5b909eaf
-  data.tar.gz: faf0bbac59b3b69b0c38b917defd428fddd7189cd65aef264100d223eb55dcec9d41211c444e9233ae16d92d954eb75cde83267cdccd1e085e6b388e2cb3b84d
+  metadata.gz: d5fe3944ec63ec15e9aa93954160cd2ac08dc7b06e326d201c369d354c1224b276f8bd44306dfecbdb46d7412c30c74fbb77299bfc0564b36ca3c3fbfc4f60db
+  data.tar.gz: 3e79116f6edd9bae67c7566bed0b3d6c6a7966a2c6e4dddf1c11ea2431fd512128fd2c55b3cfb02ab920535d364e45e97800f5644824f9f7ca0e7648e2f77984

data/README.rdoc

@@ -80,6 +80,18 @@ Alternatively, you can add the following code to your test runner setup:
     end
     task :test => %w[ci_cleanup test:one test:two]
 
+To configure report filename, use the `report_name` option like
+
+    Minitest::Ci.new $ci_io, { :report_name => :sha1 }
+
+or like
+
+    machine:
+      environment:
+        TESTOPTS: "--report-name=sha1"
+
+Supported options are: `:test_name` (default), `:sha1`, or a `Proc` (not supported through ENV var)
+
 == REQUIREMENTS:
 
 * Minitest > version 5

data/lib/minitest/ci.rb

@@ -1,136 +1,2 @@
-require 'fileutils'
-require 'cgi'
-
-module Minitest
-  class Ci < Reporter
-    class << self
-
-      ##
-      # Change the report directory. (defaults to "test/reports")
-
-      attr_accessor :report_dir
-
-      ##
-      # Clean the report_dir between test runs? (defaults to true)
-
-      attr_accessor :clean
-
-      ##
-      # Change the working directory. (defaults to `$PWD`)
-      attr_accessor :working_dir
-    end
-
-    self.report_dir = 'test/reports'
-    self.clean      = true
-    self.working_dir = Dir.pwd
-
-    attr_accessor :io
-    attr_accessor :options
-    attr_accessor :results
-
-    def initialize io = $stdout, options = {}
-      self.io      = io
-      self.options = options
-      self.results = Hash.new {|h,k| h[k] = []}
-    end
-
-    def passed?
-      true # don't care?
-    end
-
-    def start # clean
-      FileUtils.rm_rf   report_dir if clean?
-      FileUtils.mkdir_p report_dir
-    end
-
-    def record result
-      results[result.class] << result
-    end
-
-    ##
-    # Generate test report
-    def report
-      io.puts
-      io.puts '[Minitest::CI] Generating test report in JUnit XML format...'
-
-      Dir.chdir report_dir do
-        results.each do |name, result|
-          File.open(report_name(name), "w") do |f|
-            f.puts( generate_results(name, result) )
-          end
-        end
-      end
-    end
-
-    private
-
-    def escape o
-      CGI.escapeHTML(o.to_s)
-    end
-
-    def generate_results name, results
-      total_time = assertions = errors = failures = skips = 0
-      results.each do |result|
-        total_time += result.time
-        assertions += result.assertions
-
-        case result.failure
-        when Skip
-          skips += 1
-        when UnexpectedError
-          errors += 1
-        when Assertion
-          failures += 1
-        end
-      end
-
-      base = working_dir + '/'
-      xml = []
-
-      xml << '<?xml version="1.0" encoding="UTF-8"?>'
-      xml << "<testsuite time='%6f' skipped='%d' failures='%d' errors='%d' name=%p assertions='%d' tests='%d'>" %
-        [total_time, skips, failures, errors, escape(name), assertions, results.count]
-
-      results.each do |result|
-        xml << "  <testcase time='%6f' file=%p name=%p assertions='%s'>" %
-          [result.time, escape(result.method(result.name).source_location[0].gsub(base, '')), escape(result.name), result.assertions]
-        if failure = result.failure
-          label = failure.result_label.downcase
-
-          if failure.is_a?(UnexpectedError)
-            failure = failure.error
-          end
-
-          klass = failure.class
-          msg   = failure.message
-          bt    = Minitest::filter_backtrace failure.backtrace
-
-          xml << "    <%s type='%s' message=%s>%s" %
-            [label, escape(klass), escape(msg).inspect.gsub('\n', "&#13;&#10;"), escape(bt.join("\n"))]
-          xml << "    </%s>" % label
-        end
-        xml << "  </testcase>"
-      end
-
-      xml << "</testsuite>"
-
-      xml
-    end
-
-    def working_dir
-      options.fetch(:working_dir, self.class.working_dir)
-    end
-
-    def report_dir
-      options.fetch(:ci_dir, self.class.report_dir)
-    end
-
-    def clean?
-      options.fetch(:ci_clean, self.class.clean)
-    end
-
-    def report_name(name)
-      "TEST-#{CGI.escape(name.to_s.gsub(/\W+/, '_'))}.xml"[0, 255]
-    end
-  end
-end
+require 'minitest/ci_plugin'
+Minitest::Ci.report!

data/lib/minitest/ci_plugin.rb

@@ -1,12 +1,13 @@
-require 'minitest/ci'
+require 'fileutils'
+require 'cgi'
+require 'time'
 
 module Minitest
-
-  def self.plugin_ci_init options
-    self.reporter << Ci.new(options[:io], options)
-  end
-
   def self.plugin_ci_options opts, options
+    opts.on "--ci-report", "Enable Minitest::Ci Reporting." do |dir|
+      Ci.report!
+    end
+
     opts.on "--ci-dir DIR", "Set the CI report dir. Default to #{Ci.report_dir}" do |dir|
       options[:ci_dir] = dir
     end
@@ -18,6 +19,168 @@ module Minitest
     opts.on "--working-dir DIR", "Set the working dir. Default to #{Ci.working_dir}" do |dir|
       options[:working_dir] = dir
     end
+
+    opts.on "--report-name REPORT_NAME_OPTION", "Set report name option. Default to :test_name" do |report_name_option|
+      options[:report_name] = report_name_option
+    end
   end
 
+  def self.plugin_ci_init options
+    if Ci.report?
+      self.reporter << Ci.new(options[:io], options)
+    end
+  end
+
+  class Ci < Reporter
+    class << self
+      ##
+      # Activates minitest/ci plugin as a Minitest reporter
+      def report!
+        @report = true
+      end
+
+      ##
+      # Is minitest/ci activated as a Minitest reporter?
+      def report?
+        @report ||= false
+      end
+
+      ##
+      # Change the report directory. (defaults to "test/reports")
+      attr_accessor :report_dir
+
+      ##
+      # Clean the report_dir between test runs? (defaults to true)
+      attr_accessor :clean
+
+      ##
+      # Change the working directory. (defaults to `$PWD`)
+      attr_accessor :working_dir
+    end
+
+    self.report_dir = 'test/reports'
+    self.clean      = true
+    self.working_dir = Dir.pwd
+
+    attr_accessor :io
+    attr_accessor :options
+    attr_accessor :results
+
+    def initialize io = $stdout, options = {}
+      self.io      = io
+      self.options = options
+      self.results = Hash.new {|h,k| h[k] = []}
+    end
+
+    def passed?
+      true # don't care?
+    end
+
+    def start # clean
+      FileUtils.rm_rf   report_dir if clean?
+      FileUtils.mkdir_p report_dir
+    end
+
+    def record result
+      results[result.class] << result
+    end
+
+    ##
+    # Generate test report
+    def report
+      io.puts
+      io.puts '[Minitest::CI] Generating test report in JUnit XML format...'
+
+      Dir.chdir report_dir do
+        results.each do |name, result|
+          File.open(report_name(name), "w") do |f|
+            f.puts( generate_results(name, result) )
+          end
+        end
+      end
+    end
+
+    private
+
+    def escape o
+      CGI.escapeHTML(o.to_s)
+    end
+
+    def generate_results name, results
+      total_time = assertions = errors = failures = skips = 0
+      timestamp = Time.now.iso8601
+      results.each do |result|
+        total_time += result.time
+        assertions += result.assertions
+
+        case result.failure
+        when Skip
+          skips += 1
+        when UnexpectedError
+          errors += 1
+        when Assertion
+          failures += 1
+        end
+      end
+
+      base = working_dir + '/'
+      xml = []
+
+      xml << '<?xml version="1.0" encoding="UTF-8"?>'
+      xml << "<testsuite time='%6f' skipped='%d' failures='%d' errors='%d' name=%p assertions='%d' tests='%d' timestamp=%p>" %
+        [total_time, skips, failures, errors, escape(name), assertions, results.count, timestamp]
+
+      results.each do |result|
+        xml << "  <testcase time='%6f' file=%p name=%p assertions='%s'>" %
+          [result.time, escape(result.method(result.name).source_location[0].gsub(base, '')), escape(result.name), result.assertions]
+        if failure = result.failure
+          label = failure.result_label.downcase
+
+          if failure.is_a?(UnexpectedError)
+            failure = failure.error
+          end
+
+          klass = failure.class
+          msg   = failure.message
+          bt    = Minitest::filter_backtrace failure.backtrace
+
+          xml << "    <%s type='%s' message=%s>%s" %
+            [label, escape(klass), escape(msg).inspect.gsub('\n', "&#13;&#10;"), escape(bt.join("\n"))]
+          xml << "    </%s>" % label
+        end
+        xml << "  </testcase>"
+      end
+
+      xml << "</testsuite>"
+
+      xml
+    end
+
+    def working_dir
+      options.fetch(:working_dir, self.class.working_dir)
+    end
+
+    def report_dir
+      options.fetch(:ci_dir, self.class.report_dir)
+    end
+
+    def clean?
+      options.fetch(:ci_clean, self.class.clean)
+    end
+
+    def report_name(name)
+      report_name_opt = options.fetch(:report_name, :test_name)
+      return report_name_opt.call(name) if report_name_opt.is_a? Proc
+      return sha1_report_name(name) if report_name_opt.to_sym == :sha1
+      test_name_report_name(name)
+    end
+
+    def sha1_report_name(name)
+      "TEST-#{Digest::SHA1.hexdigest(name.to_s)}.xml"
+    end
+
+    def test_name_report_name(name)
+      "TEST-#{CGI.escape(name.to_s.gsub(/\W+/, '_'))[0, 246]}.xml"
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest-ci
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - zzak
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-14 00:00:00.000000000 Z
+date: 2017-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -32,42 +32,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.1.2
+        version: 12.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.1.2
+        version: 12.0.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.7.1
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Minitest JUnit XML formatter