simplecov-cobertura 1.0.4 → 1.1.0.beta.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDFiN2I0M2NiYTEyNmNkMmYxNThhMDIxMGNjMTNjNjBmZjY3ZDExMQ==
+    YTE5YzQ2MDY0YjBjNmU3Zjg4MDQ1ZDgzYjM5NTk2M2E5NjFlNjBiYg==
   data.tar.gz: !binary |-
-    MTU4YWMzY2UwMzQzZmFlZDkxNzdkYjI0Zjg3NmExMThmNThhYWM4OQ==
+    ZmE3ODhiZjMzODg2NGM2N2Y1MjA3YzM1ZjIzYzliMmYyYzFjMmQzNw==
 SHA512:
   metadata.gz: !binary |-
-    ZTRhMDhhZjRkZWRlMjE2Y2NjMjRhYTUwNWM2Mzc0OTUwMzQwZTU1NWQ1NjFi
-    MzE1OGJmNGE5MWNmYjY0ZWU5M2E4MjQ4M2ZiYzJjZmRiOGEyODYyZTk1ZTNh
-    MTkwNDMyNjIyNTg2MGE5MWI4YjUzMGMyZTUzZTE2NzhlZjk5NTg=
+    ZDI1YmJkNWQ5OGU4ZDMwMjExMmUxOWViNzZiODIxNGQxOTBkN2Y0NGQ0ZjNh
+    OGRiOGQ5OWVkMDhlMzFkZDczZDlmNTMwZDk0MDY0MGY1NjFjNzNkYWQ5ZDg3
+    ODdiMzRiZDJmZDFkMGM4ODI2OTA3YzVmZmMzYWRjNDc5NWYxODk=
   data.tar.gz: !binary |-
-    OGNkNmEwMzA0N2VjNjVmNzMxNWU5M2Q3MTBkMzBmMWU3NjlhYjkxMTNkNDNk
-    YWIwODFlZWVhNjE1NGFmMTNkZTk4M2FhYmU5MDNiMTVlMWU1MjIwOTQ2NmM1
-    MGU2MTIzZjA1ZWQxZWJiMjEyNzk3NzkxYTJiNGU3OTExOTBlODM=
+    NDMyNTQ2Mjc1NjMzMzE1MDA2YmU2NDIzMzdkYzdjOTBkYzBiODYzNzI5MzY0
+    YjRiYmM5Yzc4NDU1NDE5ZmViNjA4MWZlZjcwZDI1ZTA0MTk4ODBkN2E3YTli
+    MmNhZTI2ZWUzZTFhNjExNTE4MDc3Y2Q0MDEwZmYxYzlmNDViMmI=

data/README.md

@@ -38,18 +38,15 @@ Tested in a CI environment against the following Ruby versions:
 * 2.1
 * 2.0.0
 * 1.9
+* JRuby (1.9 mode)
 
 ## Known Limitations
 * No support for branch coverage
 
-## Troubleshooting
-Testing requres the libxml-ruby gem.  If you get an error about not being able to install the libxml-ruby gem, do the following
-    
-    $ sudo apt-get install libxml2-dev
-
 ## Contributors
   * Jesse Bowes
   * Sean Clemmer
+  * Ivailo Petrov
 
 ## Contributing
 

data/lib/simplecov-cobertura.rb

@@ -4,7 +4,7 @@ require 'rexml/element'
 module SimpleCov
   module Formatter
     class CoberturaFormatter
-      VERSION = '1.0.4'
+      VERSION = '1.1.0.beta.1'
 
       RESULT_FILE_NAME = 'coverage.xml'
       DTD_URL = 'http://cobertura.sourceforge.net/xml/coverage-04.dtd'
@@ -37,22 +37,31 @@ module SimpleCov
         source.text = SimpleCov.root
 
         coverage.add_element(packages = REXML::Element.new('packages'))
-        packages.add_element(package = REXML::Element.new('package'))
-        set_package_attributes(package, result)
 
-        package.add_element(classes = REXML::Element.new('classes'))
+        if result.groups.empty?
+          groups = {File.basename(SimpleCov.root) => result.files}
+        else
+          groups = result.groups
+        end
+
+        groups.map do |name, files|
+          packages.add_element(package = REXML::Element.new('package'))
+          set_package_attributes(package, name, files)
+
+          package.add_element(classes = REXML::Element.new('classes'))
 
-        result.files.each do |file|
-          classes.add_element(class_ = REXML::Element.new('class'))
-          set_class_attributes(class_, file)
+          files.each do |file|
+            classes.add_element(class_ = REXML::Element.new('class'))
+            set_class_attributes(class_, file)
 
-          class_.add_element(REXML::Element.new('methods'))
-          class_.add_element(lines = REXML::Element.new('lines'))
+            class_.add_element(REXML::Element.new('methods'))
+            class_.add_element(lines = REXML::Element.new('lines'))
 
-          file.lines.each do |file_line|
-            if file_line.covered? || file_line.missed?
-              lines.add_element(line = REXML::Element.new('line'))
-              set_line_attributes(line, file_line)
+            file.lines.each do |file_line|
+              if file_line.covered? || file_line.missed?
+                lines.add_element(line = REXML::Element.new('line'))
+                set_line_attributes(line, file_line)
+              end
             end
           end
         end
@@ -73,8 +82,8 @@ module SimpleCov
         coverage.attributes['timestamp'] = Time.now.to_i.to_s
       end
 
-      def set_package_attributes(package, result)
-        package.attributes['name'] = 'simplecov-cobertura'
+      def set_package_attributes(package, name, result)
+        package.attributes['name'] = name
         package.attributes['line-rate'] = (result.covered_percent/100).round(2).to_s
         package.attributes['branch-rate'] = '0'
         package.attributes['complexity'] = '0'

data/test/simplecov-cobertura_test.rb

@@ -14,7 +14,7 @@ class CoberturaFormatterTest < Test::Unit::TestCase
   end
 
   def teardown
-    # Do nothing
+    SimpleCov.groups.clear
   end
 
   def test_format_save_file
@@ -30,4 +30,102 @@ class CoberturaFormatterTest < Test::Unit::TestCase
     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)
+    doc = Nokogiri::XML::Document.parse(xml)
+
+    coverage = doc.xpath '/coverage'
+    assert_equal '1.0', coverage.attribute('line-rate').value
+    assert_equal '0', coverage.attribute('branch-rate').value
+    assert_equal '2', coverage.attribute('lines-covered').value
+    assert_equal '2', coverage.attribute('lines-valid').value
+    assert_equal '0', coverage.attribute('branches-covered').value
+    assert_equal '0', coverage.attribute('branches-valid').value
+    assert_equal '0', coverage.attribute('complexity').value
+    assert_equal '0', coverage.attribute('version').value
+    assert_not_empty coverage.attribute('timestamp').value
+
+    sources = doc.xpath '/coverage/sources/source'
+    assert_equal 1, sources.length
+    assert_equal 'simplecov-cobertura', File.basename(sources.first.text)
+
+    packages = doc.xpath '/coverage/packages/package'
+    assert_equal 1, packages.length
+    package = packages.first
+    assert_equal 'simplecov-cobertura', package.attribute('name').value
+    assert_equal '1.0', package.attribute('line-rate').value
+    assert_equal '0', package.attribute('branch-rate').value
+    assert_equal '0', package.attribute('complexity').value
+
+    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('filename').value
+    assert_equal '1.0', clazz.attribute('line-rate').value
+    assert_equal '0', clazz.attribute('branch-rate').value
+    assert_equal '0', clazz.attribute('complexity').value
+
+    lines = doc.xpath '/coverage/packages/package/classes/class/lines/line'
+    assert_equal 2, lines.length
+    first_line = lines.first
+    assert_equal '1', first_line.attribute('number').value
+    assert_equal 'false', first_line.attribute('branch').value
+    assert_equal '1', first_line.attribute('hits').value
+    last_line = lines.last
+    assert_equal '2', last_line.attribute('number').value
+    assert_equal 'false', last_line.attribute('branch').value
+    assert_equal '2', last_line.attribute('hits').value
+  end
+
+  def test_groups
+    SimpleCov.add_group('test_group', 'test/')
+
+    xml = @formatter.format(@result)
+    doc = Nokogiri::XML::Document.parse(xml)
+
+    coverage = doc.xpath '/coverage'
+    assert_equal '1.0', coverage.attribute('line-rate').value
+    assert_equal '0', coverage.attribute('branch-rate').value
+    assert_equal '2', coverage.attribute('lines-covered').value
+    assert_equal '2', coverage.attribute('lines-valid').value
+    assert_equal '0', coverage.attribute('branches-covered').value
+    assert_equal '0', coverage.attribute('branches-valid').value
+    assert_equal '0', coverage.attribute('complexity').value
+    assert_equal '0', coverage.attribute('version').value
+    assert_not_empty coverage.attribute('timestamp').value
+
+    sources = doc.xpath '/coverage/sources/source'
+    assert_equal 1, sources.length
+    assert_equal 'simplecov-cobertura', File.basename(sources.first.text)
+
+    packages = doc.xpath '/coverage/packages/package'
+    assert_equal 1, packages.length
+    package = packages.first
+    assert_equal 'test_group', package.attribute('name').value
+    assert_equal '1.0', package.attribute('line-rate').value
+    assert_equal '0', package.attribute('branch-rate').value
+    assert_equal '0', package.attribute('complexity').value
+
+    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('filename').value
+    assert_equal '1.0', clazz.attribute('line-rate').value
+    assert_equal '0', clazz.attribute('branch-rate').value
+    assert_equal '0', clazz.attribute('complexity').value
+
+    lines = doc.xpath '/coverage/packages/package/classes/class/lines/line'
+    assert_equal 2, lines.length
+    first_line = lines.first
+    assert_equal '1', first_line.attribute('number').value
+    assert_equal 'false', first_line.attribute('branch').value
+    assert_equal '1', first_line.attribute('hits').value
+    last_line = lines.last
+    assert_equal '2', last_line.attribute('number').value
+    assert_equal 'false', last_line.attribute('branch').value
+    assert_equal '2', last_line.attribute('hits').value
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simplecov-cobertura
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0.beta.1
 platform: ruby
 authors:
 - Jesse Bowes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -111,9 +111,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.6