simplecov-cobertura 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d45fef6ea611d2031f6ff6848adf6c675cc65acc
-  data.tar.gz: 866477feb2d6bd962c72543b997d7be691d94caf
+  metadata.gz: 8d7c7d11c3b4ce40568ebab85bcd7b30ca458e9f
+  data.tar.gz: da1e2eb057565a9c7313f44d8ca6583862fbef31
 SHA512:
-  metadata.gz: ac16e80d816b6d24dcc0d7cab59237210ef0a321ac0a9b71792383e5d778b8c7b9b072eca307788a0ff7187ae854e74315c67a6b78f4c0703fea24ed0e8d7218
-  data.tar.gz: ce0a9b8c6a742d3951713af95a86b723728d6245b10dfee2d9d5e2970da56041260779220c524ec7bd9d176c674830da67d681b48a029c86d32f6192976450b8
+  metadata.gz: b20ac65140f5f376fd0c736ef55f23b7833d5e9d9017d8f440d6431144f5987a038410dc9bb2fb4f212aa0385547a221af78025247024dab8b88367a20d23f09
+  data.tar.gz: 2efab639d9a76e680154c03e7551037561f373d697ff83e6d01b7b8860296e8a62525c4af9793e04a334b67e8567a7ed2046e75b9e8e3fc3b5becee9338689cf

data/lib/simplecov-cobertura.rb

@@ -18,46 +18,25 @@ class SimpleCov::Formatter::CoberturaFormatter
   
   private
   def result_to_xml(result)
-    root_dir = SimpleCov.root
-    
     doc = LibXML::XML::Document.new()
     doc.root = LibXML::XML::Node.new('coverage')
     coverage = doc.root
 
-    coverage['line-rate'] = (result.covered_percent/100).round(2).to_s
-    coverage['branch-rate'] = '0'
-    coverage['lines-covered'] = result.covered_lines.to_s
-    coverage['lines-valid'] = (result.covered_lines + result.missed_lines).to_s
-    coverage['branches-covered'] = '0'
-    coverage['branches-valid'] = '0'
-    coverage['branch-rate'] = '0'
-    coverage['complexity'] = '0'
-    coverage['version'] = '0'
-    coverage['timestamp'] = Time.now.to_i.to_s
+    set_coverage_attributes(coverage, result)
 
     coverage << sources = LibXML::XML::Node.new('sources')
     sources << source = LibXML::XML::Node.new('source')
-    source << root_dir
+    source << SimpleCov.root
 
     coverage << packages = LibXML::XML::Node.new('packages')
     packages << package = LibXML::XML::Node.new('package')
-    package['name'] = 'simplecov-cobertura'
-    package['line-rate'] = (result.covered_percent/100).round(2).to_s
-    package['branch-rate'] = '0'
-    package['complexity'] = '0'
+    set_package_attributes(package, result)
 
     package << classes = LibXML::XML::Node.new('classes')
 
     result.files.each do |file|
-      filename = file.filename
-      path = filename.gsub(File.join(root_dir, ''), '')
-
       classes << class_ = LibXML::XML::Node.new('class')
-      class_['name'] = File.basename(filename, '.*')
-      class_['filename'] = path
-      class_['line-rate'] = (file.covered_percent/100).round(2).to_s
-      class_['branch-rate'] = '0'
-      class_['complexity'] = '0'
+      set_class_attributes(class_, file)
 
       class_ << methods = LibXML::XML::Node.new('methods')
       class_ << lines = LibXML::XML::Node.new('lines')
@@ -65,15 +44,52 @@ class SimpleCov::Formatter::CoberturaFormatter
       file.lines.each do |file_line|
         if file_line.covered? || file_line.missed?
           lines << line = LibXML::XML::Node.new('line')
-          line['number'] = file_line.line_number.to_s
-          line['branch'] = 'false'
-          line['hits'] = file_line.coverage.to_s
+          set_line_attributes(line, file_line)
         end
       end
     end
 
-    text = doc.to_s
-    lines = text.split("\n")
+    set_xml_head(doc.to_s)
+  end
+  
+  def set_coverage_attributes(coverage, result)
+    coverage['line-rate'] = (result.covered_percent/100).round(2).to_s
+    coverage['branch-rate'] = '0'
+    coverage['lines-covered'] = result.covered_lines.to_s
+    coverage['lines-valid'] = (result.covered_lines + result.missed_lines).to_s
+    coverage['branches-covered'] = '0'
+    coverage['branches-valid'] = '0'
+    coverage['branch-rate'] = '0'
+    coverage['complexity'] = '0'
+    coverage['version'] = '0'
+    coverage['timestamp'] = Time.now.to_i.to_s
+  end
+  
+  def set_package_attributes(package, result)
+    package['name'] = 'simplecov-cobertura'
+    package['line-rate'] = (result.covered_percent/100).round(2).to_s
+    package['branch-rate'] = '0'
+    package['complexity'] = '0'
+  end
+  
+  def set_class_attributes(class_, file)
+    filename = file.filename
+    path = filename.gsub(File.join(SimpleCov.root, ''), '')
+    class_['name'] = File.basename(filename, '.*')
+    class_['filename'] = path
+    class_['line-rate'] = (file.covered_percent/100).round(2).to_s
+    class_['branch-rate'] = '0'
+    class_['complexity'] = '0'
+  end
+  
+  def set_line_attributes(line, file_line)
+    line['number'] = file_line.line_number.to_s
+    line['branch'] = 'false'
+    line['hits'] = file_line.coverage.to_s
+  end
+  
+  def set_xml_head(xml)
+    lines = xml.split("\n")
     lines.insert(1, "<!DOCTYPE coverage SYSTEM \"#{DTD_URL}\">")
     lines.insert(2, '<!-- Generated by simplecov-cobertura -->')
     lines.join("\n")

data/simplecov-cobertura.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'simplecov-cobertura'
-  spec.version       = '1.0.0'
+  spec.version       = '1.0.1'
   spec.authors       = ['Jesse Bowes']
   spec.email         = ['jbowes@dashingrocket.com']
   spec.summary       = 'SimpleCov Cobertura Formatter'

data/test/simplecov-cobertura_test.rb

@@ -24,6 +24,8 @@ class CoberturaFormatterTest < Test::Unit::TestCase
   def test_format_dtd_validates
     xml = @formatter.format(@result)
     
+    STDERR.puts xml
+    
     dtd_text = open(SimpleCov::Formatter::CoberturaFormatter::DTD_URL) { |io| io.read }
     dtd = LibXML::XML::Dtd.new(dtd_text)
     doc = LibXML::XML::Document.string(xml)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simplecov-cobertura
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Jesse Bowes