simplecov-cobertura 1.1.0 → 1.4.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZGUzMWJmNmI4YTIyN2NhYTVkNzM2YTczY2EyMjJmZGIyZjZkODVmMQ==
-  data.tar.gz: !binary |-
-    ODhhYzkyNWI4MWFiMDc4ZWMwNzM4NTU0ZmMzOTFkNTRjNzg3NjE4Mg==
+SHA256:
+  metadata.gz: e4a11c2c152ba855cb63e6df239c4a184bda9da9a2ead876fbc27d39e66b7f77
+  data.tar.gz: 74a55b1d64b191ac6fc09c0fd5850bf3808515deb0a854a26c1227f979350d21
 SHA512:
-  metadata.gz: !binary |-
-    N2VjNmVlN2UzZmZhOWViZDEzMGI1ZjkyYjc3YzdhYzQ0NGMyYzdkMGU2Yzg4
-    Njk4MzE3OWRmMTIxNTIxYjE2N2ZkNmMyNjZjOTM3OGQwNGU5MDA2NWIxNmQw
-    YWYyOTc5M2E0YzRlNWZmMjNmNmMzYjE0ZWNjYzZjZDVlNjY0OTQ=
-  data.tar.gz: !binary |-
-    OTQ4NDcxZmViMDAyMzhkOTBiODBjMGMxMDM1NzI2NDE4NWYyOTk1M2FkMzZj
-    OTIwMDJhZWYyYmVjNjA2MWE2YTUzMGI0MmRlYmRmN2YxODJiMzQwOTQzOGY4
-    OTFiNzkwZWQ3MjU4YWFlZjA5MTVkNzhmYjRiYjZjN2Q5NWVlODE=
+  metadata.gz: 9875b3bd65b54edccde1c463a2fc60ba72d5b43096a4b0a83b2daa2ed62396b1ef21b13609aa2a0ed4ecbe2cb1c895be022b09deb6e614f4b050b62cac920ea9
+  data.tar.gz: 1d3cd10afc26cb1a5564b7c7d570bb38b940a2609945d40009fba9f15de9c10be86cd3ed86bbcc9fafcb3d42bfbeb3299db2fa7928f9ee3e8b9e3d9d3a6c311a

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.org/dashingrocket/simplecov-cobertura.svg?branch=master)](https://travis-ci.org/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,13 +32,15 @@ SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter
 
 ## Continuous Integration
 Tested in a CI environment against the following Ruby versions:
-* ruby-head
+* 2.7
+* 2.6
+* 2.5
+* 2.4
 * 2.3
 * 2.2
 * 2.1
-* 2.0.0
+* 2.0
 * 1.9
-* JRuby (1.9 mode)
 
 ## Known Limitations
 * No support for branch coverage
@@ -47,6 +49,10 @@ Tested in a CI environment against the following Ruby versions:
   * Jesse Bowes
   * Sean Clemmer
   * Ivailo Petrov
+  * Rob Lester
+  * Denis <Zaratan> Pasin
+  * Jesper Rønn-Jensen
+  * Pramod Shinde
 
 ## Contributing
 
@@ -57,7 +63,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.1.0'
-
       RESULT_FILE_NAME = 'coverage.xml'
       DTD_URL = 'http://cobertura.sourceforge.net/xml/coverage-04.dtd'
 
@@ -20,13 +23,14 @@ 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
 
       private
       def result_to_xml(result)
         doc = REXML::Document.new set_xml_head
+        doc.context[:attribute_quote] = :quote
         doc.add_element REXML::Element.new('coverage')
         coverage = doc.root
 
@@ -91,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'
@@ -106,11 +109,23 @@ module SimpleCov
       end
 
       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.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.1'
+    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,10 +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_runtime_dependency 'simplecov', '~> 0.8'
+  spec.add_dependency 'simplecov', '~> 0.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

@@ -24,6 +24,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 +135,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,85 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: simplecov-cobertura
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Jesse Bowes
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-26 00:00:00.000000000 Z
+date: 2020-09-28 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
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :development
+        version: '0.8'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :runtime
+        version: '13.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '13.0'
 description: Produces Cobertura XML formatted output from SimpleCov
 email:
 - jbowes@dashingrocket.com
@@ -87,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,22 +0,0 @@
-language: ruby
-
-rvm:
-  - ruby-head
-  - 2.3.0
-  - 2.2.0
-  - 2.1.5
-  - 2.0.0
-  - 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