minitest-junit_formatter 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6187bdbdbb70fedb0f8ae74880f5dc52be2b5fcd1dbbf8c2c33d1d45ec50951c
-  data.tar.gz: d6f6d37a483382f086aae7257bfd11b5c4df6bdcfb8e95223ffdb3388e89bdd1
+  metadata.gz: 2244c89fd3b7c3f76b0ce49128493d789c1bea57596822f91b299f13d4366d02
+  data.tar.gz: ba60d1e162b3bf1aefcb7191a73265aad154b57e426f888831a6844bc5d44348
 SHA512:
-  metadata.gz: ef3ec5092642cd0a897e94710e959090f6745ec02a659bba65fa4ffda7159f9ed3a25c0c787eb17f0e27b0f37f2327322cb391d9718005f3841e03498f600c00
-  data.tar.gz: 85257d6d9755ba2829b0d83e6ce3132768b8ab3c287b177059e37f123996cec7ba93d80ce525f94c5a6d315b13d2518eb4995dbba541bc7d612a5a6c4942b9fe
+  metadata.gz: 15616fc36e4d49e9424a978bea0d9b862da6e8e87f33e361ad7edbb9c0e62d47bcc4b08cbbcd6bc26d036da121804186f3a7617edd150ae2f5b6778b212a436e
+  data.tar.gz: 3097d847d538b471f8d780e7247b3609f492e39301b010dbf739b38d5276ba903d566b87507447a97bfd4e830a4f6c019e347e78fbd5daccf11b62f4601fe000

data/README.md

@@ -14,7 +14,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install minitest-junit
+    $ gem install minitest-junit_formatter
 
 ## Usage
 
@@ -27,10 +27,9 @@ Or install it yourself as:
             --junit-jenkins              Sanitize test names for Jenkins display
     ...
 
-## Contributing
+## Acknowledgment
+
+This project is based on
+
+https://github.com/aespinosa/minitest-junit
 
-1. Fork it ( https://github.com/aespinosa/minitest-junit/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request

data/lib/minitest/junit_formatter/version.rb

@@ -1,6 +1,6 @@
 module Minitest
   # :nodoc:
   module JunitFormatter
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/lib/minitest/junit_formatter/xml_nokogiri.rb

@@ -0,0 +1,31 @@
+module Minitest
+  module JunitFormatter
+    class NokogiriDocument
+      def document
+        @doc = Nokogiri::XML::Document.new
+        @doc.encoding = 'UTF-8'
+        @doc
+      end
+
+      def element(name)
+        Nokogiri::XML::Node.new(name, @doc)
+      end
+
+      def set_attr(el, name, value)
+        el[name.to_s] = value.to_s
+      end
+
+      def add_child(parent, child)
+        parent << child
+      end
+
+      def add_text(el, text)
+        el.content = text.to_s
+      end
+
+      def dump(doc)
+        doc.to_xml(indent: 2)
+      end
+    end
+  end
+end

data/lib/minitest/junit_formatter/xml_rexml.rb

@@ -0,0 +1,35 @@
+module Minitest
+  module JunitFormatter
+    class RexmlDocument
+      def document
+        doc = REXML::Document.new
+        doc << REXML::XMLDecl.new('1.0', 'UTF-8')
+        doc
+      end
+
+      def element(name)
+        REXML::Element.new(name)
+      end
+
+      def set_attr(el, name, value)
+        el.add_attribute(name, value.to_s)
+      end
+
+      def add_child(parent, child)
+        parent << child
+      end
+
+      def add_text(el, text)
+        el.add_text(text.to_s)
+      end
+
+      def dump(doc)
+        output = String.new
+        formatter = REXML::Formatters::Pretty.new(2)
+        formatter.compact = true
+        formatter.write(doc, output)
+        output + "\n"
+      end
+    end
+  end
+end

data/lib/minitest/junit_formatter.rb

@@ -1,9 +1,17 @@
 require "minitest/junit_formatter/version"
 require 'minitest'
-require 'ox'
 require 'socket'
 require 'time'
 
+# XML backend: Nokogiri (fast) > REXML (stdlib fallback).
+begin
+  require 'nokogiri'
+  require "minitest/junit_formatter/xml_nokogiri"
+rescue LoadError
+  require 'rexml/document'
+  require "minitest/junit_formatter/xml_rexml"
+end
+
 # :nodoc:
 module Minitest
   module JunitFormatter
@@ -15,6 +23,8 @@ module Minitest
         @options = options
         @options[:timestamp] = options.fetch(:timestamp, Time.now.iso8601)
         @options[:hostname] = options.fetch(:hostname, Socket.gethostname)
+
+        @doc = document_factory.new
       end
 
       def passed?
@@ -28,52 +38,47 @@ module Minitest
       end
 
       def report
-        doc = Ox::Document.new(version: '1.0', encoding: 'UTF-8')
-        instruct = Ox::Instruct.new(:xml)
-        instruct[:version] = '1.0'
-        instruct[:encoding] = 'UTF-8'
-        doc << instruct
-
-        testsuite = Ox::Element.new('testsuite')
-        testsuite['name'] = @options[:name] || 'minitest'
-        testsuite['timestamp'] = @options[:timestamp]
-        testsuite['hostname'] = @options[:hostname]
-        testsuite['tests'] = @results.size
-        testsuite['skipped'] = @results.count(&:skipped?)
-        testsuite['failures'] = @results.count { |result| !result.error? && result.failure }
-        testsuite['errors'] = @results.count(&:error?)
-        testsuite['time'] = format_time(@results.map(&:time).inject(0, :+))
+        doc = @doc.document
+
+        testsuites = @doc.element('testsuites')
+        testsuite = @doc.element('testsuite')
+        @doc.set_attr(testsuite, 'name', @options[:name] || 'minitest')
+        @doc.set_attr(testsuite, 'timestamp', @options[:timestamp])
+        @doc.set_attr(testsuite, 'hostname', @options[:hostname])
+        @doc.set_attr(testsuite, 'tests', @results.size)
+        @doc.set_attr(testsuite, 'skipped', @results.count(&:skipped?))
+        @doc.set_attr(testsuite, 'failures', @results.count { |result| !result.error? && result.failure })
+        @doc.set_attr(testsuite, 'errors', @results.count(&:error?))
+        @doc.set_attr(testsuite, 'time', format_time(@results.map(&:time).inject(0, :+)))
         @results.each do |result|
-          testsuite << format(result)
+          @doc.add_child(testsuite, format(result))
         end
 
-        testsuites = Ox::Element.new('testsuites')
-        testsuites << testsuite
-
-        doc << testsuites
-        @io << Ox.dump(doc)
+        @doc.add_child(testsuites, testsuite)
+        @doc.add_child(doc, testsuites)
+        @io << @doc.dump(doc)
       end
 
       def format(result, parent = nil)
-        testcase = Ox::Element.new('testcase')
-        testcase['classname'] = format_class(result)
-        testcase['name'] = format_name(result)
-        testcase['time'] = format_time(result.time)
-        testcase['file'] = relative_to_cwd(result.source_location.first)
-        testcase['line'] = result.source_location.last
-        testcase['assertions'] = result.assertions
+        testcase = @doc.element('testcase')
+        @doc.set_attr(testcase, 'classname', format_class(result))
+        @doc.set_attr(testcase, 'name', format_name(result))
+        @doc.set_attr(testcase, 'time', format_time(result.time))
+        @doc.set_attr(testcase, 'file', relative_to_cwd(result.source_location.first))
+        @doc.set_attr(testcase, 'line', result.source_location.last)
+        @doc.set_attr(testcase, 'assertions', result.assertions)
 
         if result.skipped?
-          skipped = Ox::Element.new('skipped')
-          skipped['message'] = result
-          skipped << ""
-          testcase << skipped
+          skipped = @doc.element('skipped')
+          @doc.set_attr(skipped, 'message', result)
+          @doc.add_text(skipped, '')
+          @doc.add_child(testcase, skipped)
         else
           result.failures.each do |failure|
-            failure_tag = Ox::Element.new(classify(failure))
-            failure_tag['message'] = result
-            failure_tag << format_backtrace(failure)
-            testcase << failure_tag
+            failure_tag = @doc.element(classify(failure))
+            @doc.set_attr(failure_tag, 'message', result)
+            @doc.add_text(failure_tag, format_backtrace(failure))
+            @doc.add_child(testcase, failure_tag)
           end
         end
 
@@ -82,9 +87,9 @@ module Minitest
         # Output according to Gitlab format
         # https://docs.gitlab.com/ee/ci/testing/unit_test_reports.html#view-junit-screenshots-on-gitlab
         if result.respond_to?("metadata") && result.metadata[:failure_screenshot_path]
-          screenshot = Ox::Element.new("system-out")
-          screenshot << "[[ATTACHMENT|#{result.metadata[:failure_screenshot_path]}]]"
-          testcase << screenshot
+          screenshot = @doc.element("system-out")
+          @doc.add_text(screenshot, "[[ATTACHMENT|#{result.metadata[:failure_screenshot_path]}]]")
+          @doc.add_child(testcase, screenshot)
         end
 
         testcase
@@ -92,6 +97,14 @@ module Minitest
 
       private
 
+      def document_factory
+        if defined?(Nokogiri)
+          NokogiriDocument
+        else
+          RexmlDocument
+        end
+      end
+
       def classify(failure)
         if failure.instance_of? UnexpectedError
           'error'

data/minitest-junit_formatter.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'minitest', '~> 5.11'
-  spec.add_dependency 'ox', '~> 2', '>= 2.14.2'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'nokogiri'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest-junit_formatter
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jesse Chavez
@@ -24,26 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.11'
-- !ruby/object:Gem::Dependency
-  name: ox
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.14.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.14.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -115,6 +95,8 @@ files:
 - Rakefile
 - lib/minitest/junit_formatter.rb
 - lib/minitest/junit_formatter/version.rb
+- lib/minitest/junit_formatter/xml_nokogiri.rb
+- lib/minitest/junit_formatter/xml_rexml.rb
 - lib/minitest/junit_formatter_plugin.rb
 - minitest-junit_formatter.gemspec
 - test/.rubocop.yml