simplecov-cobertura 1.0.3.beta.1 → 1.0.3.beta.4

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 4cfd70e08a9f0d92c8bb2099b662992b210a1bba
-  data.tar.gz: 2b25de89f8263b8ec0f00e3120412bd39d3f3cab
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YmViY2IyY2U0ZTJjYjdkMTA1MjM4ZThlNDgxNmUyZGZhOGUwMGY3Ng==
+  data.tar.gz: !binary |-
+    N2ZmMzU1NGI0MGQwN2Y3Y2FjMDY4NjBkZTUxN2U0Zjk4MDMzNDYwOQ==
 SHA512:
-  metadata.gz: c7f6e99955bde887f5472f4bdc10123cdec433515a902b92661ba9e5cf50da8d134adf647c534624741b749b742727b543739eaa941bfdd25eee9b44c7808a5b
-  data.tar.gz: cc5d4d18eac3c57bcdb4bfb0b1036fccca7a2aaf711a90237f72d14feaa78220f3466dc9883e24a4339396f47e355fde15646014c24c8494804bdb785af5c9a4
+  metadata.gz: !binary |-
+    OTBhNzYzZTVlZmRjMTQ5NGFhYzA3YmY5YTZkNWVkNjhiNjQxNzg0N2JmYTBi
+    MDNjZTEzYjc5YzMwNWQzNGVjOWU1Zjk5MjIzOGNlNTkwZTZkNzg2OGVmZTMw
+    ZmNlZDQ2Zjg1NTk0YmNmYTAyNTQ1M2VmMjEyNjQ2NWJlMWYwOWQ=
+  data.tar.gz: !binary |-
+    ZmRiMmIwZTAyY2JjOThlMjhkYTNlODk4NjYzMmMyOGI5ZWM1YzFlMWUxZDA2
+    YmU2NThkYjJjYjQzNGFlMDZmY2RlMTVjYWQ3MzM4NmNiNGUyZDM3OThiZmI5
+    Nzc0MjdjMjA5NjczNjQ0ODEwOWI0MDAyNWJiZTdhZmIwYTYzZjQ=

data/README.md

@@ -43,7 +43,7 @@ Tested in a CI environment against the following Ruby versions:
 * No support for branch coverage
 
 ## Troubleshooting
-If you get an error about not being able to install the libxml-ruby gem, do the following
+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
 
@@ -60,7 +60,7 @@ If you get an error about not being able to install the libxml-ruby gem, do the
 5. Create a new Pull Request
 
 ## License
-Copyright 2014 Dashing Rocket, Ltd.
+Copyright 2016 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/lib/simplecov-cobertura.rb

@@ -1,94 +1,107 @@
 require 'rexml/document'
 require 'rexml/element'
-require 'simplecov'
-
-class SimpleCov::Formatter::CoberturaFormatter
-  RESULT_FILE_NAME = 'coverage.xml'
-  DTD_URL = 'http://cobertura.sourceforge.net/xml/coverage-04.dtd'
-
-  def format(result)
-    xml = result_to_xml result
-    result_path = File.join( SimpleCov.coverage_path, RESULT_FILE_NAME )
-    File.write(result_path, xml)
-    puts "Coverage report generated for #{result.command_name} to #{result_path}"
-    xml
-  end
 
-  private
-  def result_to_xml(result)
-    doc = REXML::Document.new set_xml_head
-    doc.add_element REXML::Element.new('coverage')
-    coverage = doc.root
+module SimpleCov
+  module Formatter
+    class CoberturaFormatter
+      VERSION = '1.0.3.beta.4'
+
+      RESULT_FILE_NAME = 'coverage.xml'
+      DTD_URL = 'http://cobertura.sourceforge.net/xml/coverage-04.dtd'
+
+      def format(result)
+        xml_doc = result_to_xml result
+        result_path = File.join(SimpleCov.coverage_path, RESULT_FILE_NAME)
+
+        formatter = REXML::Formatters::Pretty.new
+        formatter.compact = true
+        string_io = StringIO.new
+        formatter.write(xml_doc, string_io)
+
+        xml_str = string_io.string
+        File.write(result_path, xml_str)
+        puts "Coverage report generated for #{result.command_name} to #{result_path}"
+        xml_str
+      end
 
-    set_coverage_attributes(coverage, result)
+      private
+      def result_to_xml(result)
+        doc = REXML::Document.new set_xml_head
+        doc.add_element REXML::Element.new('coverage')
+        coverage = doc.root
 
-    coverage.add_element(sources = REXML::Element.new('sources'))
-    sources.add_element(source = REXML::Element.new('source'))
-    source.text = SimpleCov.root
+        set_coverage_attributes(coverage, result)
 
-    coverage.add_element(packages = REXML::Element.new('packages'))
-    packages.add_element(package = REXML::Element.new('package'))
-    set_package_attributes(package, result)
+        coverage.add_element(sources = REXML::Element.new('sources'))
+        sources.add_element(source = REXML::Element.new('source'))
+        source.text = SimpleCov.root
 
-    package.add_element(classes = REXML::Element.new('classes'))
+        coverage.add_element(packages = REXML::Element.new('packages'))
+        packages.add_element(package = REXML::Element.new('package'))
+        set_package_attributes(package, result)
 
-    result.files.each do |file|
-      classes.add_element(class_ = REXML::Element.new('class'))
-      set_class_attributes(class_, file)
+        package.add_element(classes = REXML::Element.new('classes'))
 
-      class_.add_element(REXML::Element.new('methods'))
-      class_.add_element(lines = REXML::Element.new('lines'))
+        result.files.each do |file|
+          classes.add_element(class_ = REXML::Element.new('class'))
+          set_class_attributes(class_, file)
 
-      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)
+          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)
+            end
+          end
         end
-      end
-    end
 
-    doc.to_s
-  end
+        doc
+      end
 
-  def set_coverage_attributes(coverage, result)
-    coverage.attributes['line-rate'] = (result.covered_percent/100).round(2).to_s
-    coverage.attributes['branch-rate'] = '0'
-    coverage.attributes['lines-covered'] = result.covered_lines.to_s
-    coverage.attributes['lines-valid'] = (result.covered_lines + result.missed_lines).to_s
-    coverage.attributes['branches-covered'] = '0'
-    coverage.attributes['branches-valid'] = '0'
-    coverage.attributes['branch-rate'] = '0'
-    coverage.attributes['complexity'] = '0'
-    coverage.attributes['version'] = '0'
-    coverage.attributes['timestamp'] = Time.now.to_i.to_s
-  end
+      def set_coverage_attributes(coverage, result)
+        coverage.attributes['line-rate'] = (result.covered_percent/100).round(2).to_s
+        coverage.attributes['branch-rate'] = '0'
+        coverage.attributes['lines-covered'] = result.covered_lines.to_s
+        coverage.attributes['lines-valid'] = (result.covered_lines + result.missed_lines).to_s
+        coverage.attributes['branches-covered'] = '0'
+        coverage.attributes['branches-valid'] = '0'
+        coverage.attributes['branch-rate'] = '0'
+        coverage.attributes['complexity'] = '0'
+        coverage.attributes['version'] = '0'
+        coverage.attributes['timestamp'] = Time.now.to_i.to_s
+      end
 
-  def set_package_attributes(package, result)
-    package.attributes['name'] = 'simplecov-cobertura'
-    package.attributes['line-rate'] = (result.covered_percent/100).round(2).to_s
-    package.attributes['branch-rate'] = '0'
-    package.attributes['complexity'] = '0'
-  end
+      def set_package_attributes(package, result)
+        package.attributes['name'] = 'simplecov-cobertura'
+        package.attributes['line-rate'] = (result.covered_percent/100).round(2).to_s
+        package.attributes['branch-rate'] = '0'
+        package.attributes['complexity'] = '0'
+      end
 
-  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['line-rate'] = (file.covered_percent/100).round(2).to_s
-    class_.attributes['branch-rate'] = '0'
-    class_.attributes['complexity'] = '0'
-  end
+      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['line-rate'] = (file.covered_percent/100).round(2).to_s
+        class_.attributes['branch-rate'] = '0'
+        class_.attributes['complexity'] = '0'
+      end
 
-  def set_line_attributes(line, file_line)
-    line.attributes['number'] = file_line.line_number.to_s
-    line.attributes['branch'] = 'false'
-    line.attributes['hits'] = file_line.coverage.to_s
-  end
+      def set_line_attributes(line, file_line)
+        line.attributes['number'] = file_line.line_number.to_s
+        line.attributes['branch'] = 'false'
+        line.attributes['hits'] = file_line.coverage.to_s
+      end
 
-  def set_xml_head(lines=[])
-    lines << "<!DOCTYPE coverage SYSTEM \"#{DTD_URL}\">"
-    lines << '<!-- Generated by simplecov-cobertura -->'
-    lines.join("\n")
+      def set_xml_head(lines=[])
+        lines << "<!DOCTYPE coverage SYSTEM \"#{DTD_URL}\">"
+        lines << "<!-- Generated by simplecov-cobertura version #{VERSION} (https://github.com/dashingrocket/simplecov-cobertura) -->"
+        lines.join("\n")
+      end
+    end
   end
 end
+

data/shippable.yml

@@ -7,7 +7,8 @@ rvm:
   - 2.1.5
   - 2.0.0
   - 1.9.3
-  
+  - jruby-19mode
+
 env:
   - CI_REPORTS=shippable/testresults COVERAGE_REPORTS=shippable/codecoverage
   

data/simplecov-cobertura.gemspec

@@ -2,9 +2,11 @@
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
+require 'simplecov-cobertura'
+
 Gem::Specification.new do |spec|
   spec.name          = 'simplecov-cobertura'
-  spec.version       = '1.0.3.beta.1'
+  spec.version       = SimpleCov::Formatter::CoberturaFormatter::VERSION
   spec.authors       = ['Jesse Bowes']
   spec.email         = ['jbowes@dashingrocket.com']
   spec.summary       = 'SimpleCov Cobertura Formatter'
@@ -21,7 +23,7 @@ Gem::Specification.new do |spec|
   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 'libxml-ruby', '~> 2.7'
+  spec.add_development_dependency 'nokogiri'
 
   spec.add_runtime_dependency 'simplecov', '~> 0.8'
 end

data/test/simplecov-cobertura_test.rb

@@ -1,6 +1,9 @@
 require 'test/unit'
-require 'libxml'
+
+require 'nokogiri'
+
 require 'open-uri'
+require 'simplecov'
 require 'simplecov-cobertura'
 
 class CoberturaFormatterTest < Test::Unit::TestCase
@@ -23,9 +26,8 @@ class CoberturaFormatterTest < Test::Unit::TestCase
 
   def test_format_dtd_validates
     xml = @formatter.format(@result)
-    dtd_text = open(SimpleCov::Formatter::CoberturaFormatter::DTD_URL) { |io| io.read }
-    dtd = LibXML::XML::Dtd.new(dtd_text)
-    doc = LibXML::XML::Document.string(xml)
-    assert_true doc.validate(dtd)
+    options = Nokogiri::XML::ParseOptions::DTDLOAD
+    doc = Nokogiri::XML::Document.parse(xml, nil, nil, options)
+    assert_empty doc.external_subset.validate(doc)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simplecov-cobertura
 version: !ruby/object:Gem::Version
-  version: 1.0.3.beta.1
+  version: 1.0.3.beta.4
 platform: ruby
 authors:
 - Jesse Bowes
@@ -14,70 +14,70 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
 - !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
   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: libxml-ruby
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '0'
 - !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'
 description: Produces Cobertura XML formatted output from SimpleCov
@@ -87,7 +87,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - LICENSE
 - README.md
@@ -106,17 +106,17 @@ 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: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: SimpleCov Cobertura Formatter