simplecov-cobertura 2.1.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c2d0c9eebf10fae25ce491aa5b33fd744cb72c8bd3b9645706e8b6f35495e88
-  data.tar.gz: 8890ee7ca2a87b49a4f37ee049bbb6d9375f5ead377bc2e3e32ee793883f56a4
+  metadata.gz: 7f4e823da3eaf503a2ba1f94202b474e87e1461864d60df99fbef33f55b877d2
+  data.tar.gz: 21969345160bc14566b87f3d457f89bb0b27b9f9cc4607cd5a1b7bd658d7b176
 SHA512:
-  metadata.gz: ce64fbbd3eb2986a45d90800573739d5f558162a8a66223007926a799e0ba082c4393a7eae1974fe8f40c7b1a22b1f3bebe3adb696805a29a2206c7c5a0b6a21
-  data.tar.gz: ed1e556b151833e2db0eeb4a2e8a0539946f80af3a3a85429e708a119065def438032eb660437367f1bd34c91eb1d75d7636ca3958844ca83249ef433080eb6d
+  metadata.gz: b857a2943394c10dfe3afaf3cfc2bc9c9e809e7aec136503e9ec75f8815008c9f519e7bd6b7f34901905ce92c35bc1b953ca601f74392ff1941fa3b983c5e833
+  data.tar.gz: 278a3e88e3429d000688a334dc83202af4d084601ceee911d3a8a4e17e1a53ae4eab370b39f2722ffdb28947e2f01bb7e4724adf0ee7c2cb98949b2770c4f12f

data/.github/workflows/build.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: [2.5, 2.6, 2.7, 3.0]
+        ruby-version: [2.5, 2.6, 2.7, '3.0', 3.1, 3.2, 3.3, 3.4]
 
     steps:
       - uses: actions/checkout@v2
@@ -25,4 +25,4 @@ jobs:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
       - name: Run tests
-        run: bundle exec rake
+        run: bundle exec rake

data/.gitignore

@@ -15,3 +15,4 @@ mkmf.log
 
 *.iml
 .idea
+.ruby-*

data/README.md

@@ -1,5 +1,5 @@
 # simplecov-cobertura 
-[![Build](https://github.com/dashingrocket/simplecov-cobertura/actions/workflows/build.yml/badge.svg)](https://github.com/dashingrocket/simplecov-cobertura/actions/workflows/build.yml)   [![Gem Version](https://badge.fury.io/rb/simplecov-cobertura.svg)](http://badge.fury.io/rb/simplecov-cobertura)  [![Downloads](http://ruby-gem-downloads-badge.herokuapp.com/simplecov-cobertura?type=total)](https://rubygems.org/gems/simplecov-cobertura)
+[![Build](https://github.com/jessebs/simplecov-cobertura/actions/workflows/build.yml/badge.svg)](https://github.com/jessebs/simplecov-cobertura/actions/workflows/build.yml)   [![Gem Version](https://badge.fury.io/rb/simplecov-cobertura.svg)](http://badge.fury.io/rb/simplecov-cobertura)
 
 
 Produces [Cobertura](http://cobertura.sourceforge.net/) formatted XML from [SimpleCov](https://github.com/colszowka/simplecov).
@@ -33,21 +33,19 @@ SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter
 
 ## Continuous Integration
 Tested in a CI environment against the following Ruby versions:
-* 3.0
-* 2.7
-* 2.6
-* 2.5
+* 3.0 - 3.4
+* 2.5 - 2.7
 
 ## Contributing
 
-1. Fork it ( https://github.com/dashingrocket/simplecov-cobertura/fork )
+1. Fork it ( https://github.com/jessebs/simplecov-cobertura/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
 
 ## License
-Copyright 2021 Dashing Rocket, Ltd.
+Copyright 2025 Jesse Bowes
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/lib/simplecov-cobertura/version.rb

@@ -1,7 +1,7 @@
 module SimpleCov
   module Formatter
     class CoberturaFormatter
-      VERSION = '2.1.0'
+      VERSION = '3.0.0'
     end
   end
 end

data/lib/simplecov-cobertura.rb

@@ -1,5 +1,3 @@
-require 'simplecov'
-
 require 'rexml/document'
 require 'rexml/element'
 require 'pathname'
@@ -27,7 +25,8 @@ module SimpleCov
 
         xml_str = string_io.string
         File.write(result_path, xml_str)
-        puts "Coverage report generated for #{result.command_name} to #{result_path}. #{coverage_output(result)}"
+        puts output_message(result, result_path)
+
         xml_str
       end
 
@@ -117,7 +116,7 @@ module SimpleCov
           bs = file.coverage_statistics[:branch]
 
           filename = file.filename
-          class_.attributes['name'] = File.basename(filename, '.*')
+          class_.attributes['name'] = resolve_filename(filename)
           class_.attributes['filename'] = resolve_filename(filename)
           class_.attributes['line-rate'] = extract_rate(ls.percent)
           if SimpleCov.branch_coverage?
@@ -144,20 +143,17 @@ module SimpleCov
         def set_xml_head(lines=[])
           lines << "<?xml version=\"1.0\"?>"
           lines << "<!DOCTYPE coverage SYSTEM \"#{DTD_URL}\">"
-          lines << "<!-- Generated by simplecov-cobertura version #{VERSION} (https://github.com/dashingrocket/simplecov-cobertura) -->"
+          lines << "<!-- Generated by simplecov-cobertura version #{VERSION} (https://github.com/jessebs/simplecov-cobertura) -->"
           lines.join("\n")
         end
 
-        def coverage_output(result)
-          ls = result.coverage_statistics[:line]
-          bs = result.coverage_statistics[:branch]
-
-          if SimpleCov.branch_coverage?
-            "%d / %d LOC (%.2f%%) covered; %d / %d BC (%.2f%%) covered" % [ls.covered, ls.total, ls.percent, bs.covered, bs.total, bs.percent]
-          else
-            "%d / %d LOC (%.2f%%) covered" % [ls.covered, ls.total, ls.percent]
-          end
-        end
+      # Roughly mirrors private method SimpleCov::Formatter::HTMLFormatter#output_coverage
+      def output_message(result, output_path)
+        output = "Coverage report generated for #{result.command_name} to #{output_path}."
+        output += "\nLine Coverage: #{result.covered_percent.round(2)}% (#{result.covered_lines} / #{result.total_lines})"
+        output += "\nBranch Coverage: #{result.coverage_statistics[:branch].percent.round(2)}% (#{result.covered_branches} / #{result.total_branches})" if SimpleCov.branch_coverage?
+        output
+      end
 
         def resolve_filename(filename)
           Pathname.new(filename).relative_path_from(project_root).to_s

data/simplecov-cobertura.gemspec

@@ -8,10 +8,10 @@ Gem::Specification.new do |spec|
   spec.name          = 'simplecov-cobertura'
   spec.version       = SimpleCov::Formatter::CoberturaFormatter::VERSION
   spec.authors       = ['Jesse Bowes']
-  spec.email         = ['jbowes@dashingrocket.com']
+  spec.email         = ['jessebowes@acm.org']
   spec.summary       = 'SimpleCov Cobertura Formatter'
   spec.description   = 'Produces Cobertura XML formatted output from SimpleCov'
-  spec.homepage      = 'https://github.com/dashingrocket/simplecov-cobertura'
+  spec.homepage      = 'https://github.com/jessebs/simplecov-cobertura'
   spec.license       = 'Apache-2.0'
   spec.required_ruby_version = '>= 2.5.0'
 

data/test/simplecov-cobertura_test.rb

@@ -45,16 +45,20 @@ class CoberturaFormatterTest < Test::Unit::TestCase
   def test_terminal_output
     output, _ = capture_output { @formatter.format(@result) }
     result_path = File.join(SimpleCov.coverage_path, SimpleCov::Formatter::CoberturaFormatter::RESULT_FILE_NAME)
-    output_regex = /Coverage report generated for #{@result.command_name} to #{result_path}. (.*) covered./
+    output_regex = /Coverage report generated for #{@result.command_name} to #{result_path}.\nLine Coverage: (.*)\nBranch Coverage: (.*)/
     assert_match(output_regex, output)
   end
 
-  def test_format_dtd_validates
-    xml = @formatter.format(@result)
-    options = Nokogiri::XML::ParseOptions::DTDLOAD
-    doc = Nokogiri::XML::Document.parse(xml, nil, nil, options)
-    assert_empty doc.external_subset.validate(doc)
-  end
+  # Rather than support HTTPS the HTTP client was removed from libxml2 / xmllint:
+  # https://gitlab.gnome.org/GNOME/libxml2/-/issues/160
+  # I am not sure what this means for Nokogiri or this issue, but it certainly means something will change soon.
+  # Disable this test until it becomes clear what the new behavior should be.
+  # def test_format_dtd_validates
+  #   xml = @formatter.format(@result)
+  #   options = Nokogiri::XML::ParseOptions::DTDLOAD
+  #   doc = Nokogiri::XML::Document.parse(xml, nil, nil, options)
+  #   assert_empty doc.external_subset.validate(doc)
+  # end
 
   def test_no_groups
     xml = @formatter.format(@result)
@@ -86,7 +90,7 @@ class CoberturaFormatterTest < Test::Unit::TestCase
     classes = doc.xpath '/coverage/packages/package/classes/class'
     assert_equal 1, classes.length
     clazz = classes.first
-    assert_equal 'simplecov-cobertura_test', clazz.attribute('name').value
+    assert_equal 'test/simplecov-cobertura_test.rb', clazz.attribute('name').value
     assert_equal 'test/simplecov-cobertura_test.rb', clazz.attribute('filename').value
     assert_equal '0.86', clazz.attribute('line-rate').value
     assert_equal '0.5', clazz.attribute('branch-rate').value
@@ -136,7 +140,7 @@ class CoberturaFormatterTest < Test::Unit::TestCase
     classes = doc.xpath '/coverage/packages/package/classes/class'
     assert_equal 1, classes.length
     clazz = classes.first
-    assert_equal 'simplecov-cobertura_test', clazz.attribute('name').value
+    assert_equal 'test/simplecov-cobertura_test.rb', clazz.attribute('name').value
     assert_equal 'test/simplecov-cobertura_test.rb', clazz.attribute('filename').value
     assert_equal '0.86', clazz.attribute('line-rate').value
     assert_equal '0.5', clazz.attribute('branch-rate').value
@@ -165,7 +169,7 @@ class CoberturaFormatterTest < Test::Unit::TestCase
     classes = doc.xpath '/coverage/packages/package/classes/class'
     assert_equal 1, classes.length
     clazz = classes.first
-    assert_equal 'simplecov-cobertura_test', clazz.attribute('name').value
+    assert_equal "../#{expected_base}/test/simplecov-cobertura_test.rb", clazz.attribute('name').value
     assert_equal "../#{expected_base}/test/simplecov-cobertura_test.rb", clazz.attribute('filename').value
   ensure
     SimpleCov.root(old_root)

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: simplecov-cobertura
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Jesse Bowes
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-14 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -82,7 +81,7 @@ dependencies:
         version: '0'
 description: Produces Cobertura XML formatted output from SimpleCov
 email:
-- jbowes@dashingrocket.com
+- jessebowes@acm.org
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -96,13 +95,11 @@ files:
 - lib/simplecov-cobertura.rb
 - lib/simplecov-cobertura/version.rb
 - simplecov-cobertura.gemspec
-- test/coverage/coverage.xml
 - test/simplecov-cobertura_test.rb
-homepage: https://github.com/dashingrocket/simplecov-cobertura
+homepage: https://github.com/jessebs/simplecov-cobertura
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -117,10 +114,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: SimpleCov Cobertura Formatter
 test_files:
-- test/coverage/coverage.xml
 - test/simplecov-cobertura_test.rb

data/test/coverage/coverage.xml

@@ -1,21 +0,0 @@
-<?xml version='1.0'?> 
-<!DOCTYPE coverage SYSTEM "http://cobertura.sourceforge.net/xml/coverage-04.dtd">
-<!-- Generated by simplecov-cobertura version 1.4.3-dev (https://github.com/dashingrocket/simplecov-cobertura) -->
-<coverage line-rate="1.0" branch-rate="0" lines-covered="2" lines-valid="2" branches-covered="0" branches-valid="0" complexity="0" version="0" timestamp="1636204971">
-  <sources>
-    <source>/Users/st0012/projects/simplecov-cobertura/test</source>
-  </sources>
-  <packages>
-    <package name="test" line-rate="1.0" branch-rate="0" complexity="0">
-      <classes>
-        <class name="simplecov-cobertura_test" filename="simplecov-cobertura_test.rb" line-rate="1.0" branch-rate="0" complexity="0">
-          <methods/>
-          <lines>
-            <line number="1" branch="false" hits="1"/>
-            <line number="2" branch="false" hits="2"/>
-          </lines>
-        </class>
-      </classes>
-    </package>
-  </packages>
-</coverage>