simplecov-cobertura 1.2.0 → 1.4.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZTEzZGFiNGNhYjhkYjAyNDBiNWZhNTc2NGNhMTIyZWRjNGRhZmE2Mg==
-  data.tar.gz: !binary |-
-    YmU3ZWJkMTQ3YmQ3ZjI4MzIzYWIzYTNmYmI5YjJmZjM5NjU1ZjFkNg==
+SHA256:
+  metadata.gz: 17f485d57f75e4ffb86132662c75714f039b493fb03cab4fa1875fe1dd01fd32
+  data.tar.gz: 5d6b51cfcc1bbe0dec7f8ac0a9a051c9e67064b185b280725bc101667f42ebd7
 SHA512:
-  metadata.gz: !binary |-
-    ZDVmNjdkZGYxMDNjMTRkNzk1MWEyNmJjMDY5YjY5ZTdjZTliYzBiOGEyODZm
-    ZjlkNDQwNmUzOTY5NmE4NWIwMDU4YjA0MDg5M2ZmZjUxNDQ2NWVhZjUxMjVh
-    Mjc2MDhjMDkxZjMzNDA4YjZmNTZjN2M5NWQzMjdkYjkyM2ZhOWQ=
-  data.tar.gz: !binary |-
-    NjU4ODZjMjlhMTI0MGVjOTZlZTc0M2Q4NjUwZDVlYTE0MzA4ZmNiNWI4OTFl
-    ZmVlOWJlYTViMjg3ODk3MWZlODg3ZjllZjI0ZTY2NDIxOWUzMDRmNTllOTcz
-    MzY1MWIwZjNhMmUxNjQ5YzE3MmQzNTljZjllNmEzODRhZTAwODU=
+  metadata.gz: 996338e8d5fb7ea79e3f912e8734e0ae0795ff3ffe41bf1e00ef722f4ff50b423d8a2e95d3bf7e7cfd18179785d5dcd5bdb4318ed5f91bb912b10341c5b91d78
+  data.tar.gz: 98adbf973e7c454ac7645556cbf1e83b3c50b9071523e5c536fbdad86f53eb48afbdbcde6212f9e699a692bce226a19b094a0e8823348f2fc0a49f4032150c24

data/.travis.yml

@@ -0,0 +1,13 @@
+language: ruby
+cache: bundler
+
+rvm:
+  - 2.7
+  - 2.6
+  - 2.5
+  - 2.4
+  - 2.3
+  - 2.2
+  - 2.1
+  - 2.0
+  - 1.9

data/README.md

@@ -1,5 +1,5 @@
 # simplecov-cobertura 
-[![Build Status](https://api.shippable.com/projects/549b1fbbd46935d5fbc0f9f3/badge?branchName=master)](https://app.shippable.com/projects/549b1fbbd46935d5fbc0f9f3/builds/latest) [![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 Status](https://travis-ci.com/dashingrocket/simplecov-cobertura.svg?branch=master)](https://travis-ci.com/dashingrocket/simplecov-cobertura)   [![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)
 
 Produces [Cobertura](http://cobertura.sourceforge.net/) formatted XML from [SimpleCov](https://github.com/colszowka/simplecov).
 
@@ -32,11 +32,15 @@ SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter
 
 ## Continuous Integration
 Tested in a CI environment against the following Ruby versions:
-* 2.3.1
-* 2.2.5
-* 2.1.10
-* 1.9.3
-* JRuby (1.9 mode)
+* 2.7
+* 2.6
+* 2.5
+* 2.4
+* 2.3
+* 2.2
+* 2.1
+* 2.0
+* 1.9
 
 ## Known Limitations
 * No support for branch coverage
@@ -46,6 +50,11 @@ Tested in a CI environment against the following Ruby versions:
   * Sean Clemmer
   * Ivailo Petrov
   * Rob Lester
+  * Denis <Zaratan> Pasin
+  * Jesper Rønn-Jensen
+  * Pramod Shinde
+  * Magnus Bergmark
+  * Peter Leitzen
 
 ## Contributing
 
@@ -56,7 +65,7 @@ Tested in a CI environment against the following Ruby versions:
 5. Create a new Pull Request
 
 ## License
-Copyright 2016 Dashing Rocket, Ltd.
+Copyright 2020 Dashing Rocket, Ltd.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/Rakefile

@@ -1,6 +1,5 @@
 require 'bundler/gem_tasks'
 require 'rake/testtask'
-require 'ci/reporter/rake/test_unit'
 
 Rake::TestTask.new do |t|
   t.libs << 'test'
@@ -8,4 +7,4 @@ Rake::TestTask.new do |t|
 end
 
 desc 'Run tests'
-task :default => ['ci:setup:testunit', :test]
+task :default => [:test]

data/lib/simplecov-cobertura.rb

@@ -1,11 +1,14 @@
+require 'simplecov'
+
 require 'rexml/document'
 require 'rexml/element'
+require 'pathname'
+
+require_relative 'simplecov-cobertura/version'
 
 module SimpleCov
   module Formatter
     class CoberturaFormatter
-      VERSION = '1.2.0'
-
       RESULT_FILE_NAME = 'coverage.xml'
       DTD_URL = 'http://cobertura.sourceforge.net/xml/coverage-04.dtd'
 
@@ -20,7 +23,7 @@ module SimpleCov
 
         xml_str = string_io.string
         File.write(result_path, xml_str)
-        puts "Coverage report generated for #{result.command_name} to #{result_path}"
+        puts "Coverage report generated for #{result.command_name} to #{result_path}. #{coverage_output(result)}"
         xml_str
       end
 
@@ -92,9 +95,8 @@ module SimpleCov
 
       def set_class_attributes(class_, file)
         filename = file.filename
-        path = filename[SimpleCov.root.length+1..-1]
         class_.attributes['name'] = File.basename(filename, '.*')
-        class_.attributes['filename'] = path
+        class_.attributes['filename'] = resolve_filename(filename)
         class_.attributes['line-rate'] = (file.covered_percent/100).round(2).to_s
         class_.attributes['branch-rate'] = '0'
         class_.attributes['complexity'] = '0'
@@ -112,6 +114,18 @@ module SimpleCov
         lines << "<!-- Generated by simplecov-cobertura version #{VERSION} (https://github.com/dashingrocket/simplecov-cobertura) -->"
         lines.join("\n")
       end
+
+      def coverage_output(result)
+        "#{result.covered_lines} / #{result.covered_lines + result.missed_lines} LOC (#{result.covered_percent.round(2)}%) covered."
+      end
+
+      def resolve_filename(filename)
+        Pathname.new(filename).relative_path_from(project_root).to_s
+      end
+
+      def project_root
+        @project_root ||= Pathname.new(SimpleCov.root)
+      end
     end
   end
 end

data/lib/simplecov-cobertura/version.rb

@@ -0,0 +1,7 @@
+module SimpleCov
+  module Formatter
+    class CoberturaFormatter
+      VERSION = '1.4.2'
+    end
+  end
+end

data/simplecov-cobertura.gemspec

@@ -2,7 +2,7 @@
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
-require 'simplecov-cobertura'
+require 'simplecov-cobertura/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'simplecov-cobertura'
@@ -20,11 +20,17 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.7'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'ci_reporter_test_unit', '~> 1.0'
-  spec.add_development_dependency 'nokogiri', '~> 1.6'
+  spec.add_development_dependency 'test-unit', '~> 3.2'
+  spec.add_development_dependency 'nokogiri', '~> 1.0'
 
   spec.add_dependency 'simplecov', '~> 0.8'
-  spec.add_dependency 'json', '~> 1.8'
+
+  if RUBY_VERSION < '2.0'
+    spec.add_dependency 'json', '< 2.3.0'
+    spec.add_development_dependency 'rake', '~> 12.0', '< 12.3'
+  elsif RUBY_VERSION < '2.2'
+    spec.add_development_dependency 'rake', '~> 12.0'
+  else
+    spec.add_development_dependency 'rake', '~> 13.0'
+  end
 end

data/test/simplecov-cobertura_test.rb

@@ -7,9 +7,8 @@ require 'simplecov'
 require 'simplecov-cobertura'
 
 class CoberturaFormatterTest < Test::Unit::TestCase
-
   def setup
-    @result = SimpleCov::Result.new("#{__FILE__}" => [1,2])
+    @result = SimpleCov::Result.new({ "#{__FILE__}" => [1,2] })
     @formatter = SimpleCov::Formatter::CoberturaFormatter.new
   end
 
@@ -24,6 +23,13 @@ class CoberturaFormatterTest < Test::Unit::TestCase
     assert_equal(xml, IO.read(result_path))
   end
 
+  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./
+    assert_match(output_regex, output)
+  end
+
   def test_format_dtd_validates
     xml = @formatter.format(@result)
     options = Nokogiri::XML::ParseOptions::DTDLOAD
@@ -128,4 +134,21 @@ class CoberturaFormatterTest < Test::Unit::TestCase
     assert_equal 'false', last_line.attribute('branch').value
     assert_equal '2', last_line.attribute('hits').value
   end
-end
+
+  def test_supports_root_project_path
+    old_root = SimpleCov.root
+    SimpleCov.root('/')
+    expected_base = old_root[1..-1] # Remove leading "/"
+
+    xml = @formatter.format(@result)
+    doc = Nokogiri::XML::Document.parse(xml)
+
+    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('filename').value
+  ensure
+    SimpleCov.root(old_root)
+  end
+end

metadata

@@ -1,99 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: simplecov-cobertura
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.4.2
 platform: ruby
 authors:
 - Jesse Bowes
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-10-05 00:00:00.000000000 Z
+date: 2020-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: ci_reporter_test_unit
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :runtime
+        version: '13.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '13.0'
 description: Produces Cobertura XML formatted output from SimpleCov
 email:
 - jbowes@dashingrocket.com
@@ -101,37 +73,37 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - lib/simplecov-cobertura.rb
-- shippable.yml
+- lib/simplecov-cobertura/version.rb
 - simplecov-cobertura.gemspec
 - test/simplecov-cobertura_test.rb
 homepage: https://github.com/dashingrocket/simplecov-cobertura
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: SimpleCov Cobertura Formatter
 test_files:

data/shippable.yml

@@ -1,20 +0,0 @@
-language: ruby
-
-rvm:
-  - 2.3.1
-  - 2.2.5
-  - 2.1.10
-  - 1.9.3
-  - jruby-19mode
-
-env:
-  - CI_REPORTS=shippable/testresults COVERAGE_REPORTS=shippable/codecoverage
-  
-cache: true
-  
-notifications:
-  email:
-    recipients:
-      - jbowes@dashingrocket.com
-    on_success: change
-    on_failure: always