cobertura_xml_merger 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3dbc6dab79a03768be5cb4d3e81d938c72d5e233
-  data.tar.gz: 666f412066520f8f5fcb6803589755e4315488e8
+  metadata.gz: cdc89d3c738951a9b7cea4a9445f28199480e276
+  data.tar.gz: 4ada94f6fa645818f5b9f9181abbaa2d849e49dd
 SHA512:
-  metadata.gz: 21bed2d5c70367eefb2603bd19e1e22b9cf93b117d9c7db2f63bcf04c48ea1b9d6c5bcb9df6c9bc4fa461cc70e44c2474168f07d1d396fa2acdc7d48fdd4d8c5
-  data.tar.gz: fc2a5788dfd4dba5769f26307f48566d9d966cfc2d28edacb78ef4e7eb0a51c179d5ba994d0053f4c9a44522185ed1b4377ebe709394aae9e2f60ee22dd5d3be
+  metadata.gz: c25cd69f81ee9f10ad5b96c4561c5e81043f3fa110137adf17beb58ee9e50d55f3eb59faaffa2c9b6b11323c05e6baaf9765516ca49def3440d8a2380c91e69b
+  data.tar.gz: 7455d4c4fb5853cfcfd7d65a5aa9e1212268ffa69c90143c0774a74321f73e697233ccf7cfd65960c7e98584337f1109f9a054867afd9075af7ec433e489013b

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 2.2
+before_install: gem install bundler -v 1.11.2

data/README.md

@@ -1,4 +1,4 @@
-# CoberturaXmlMerger
+# CoberturaXmlMerger [![Build Status](https://travis-ci.org/juanger/cobertura_xml_merger.svg?branch=master)](https://travis-ci.org/juanger/cobertura_xml_merger)
 
 Merge Cobertura XML reports into a single file.
 
@@ -7,9 +7,6 @@ Merge Cobertura XML reports into a single file.
   1) It assumes you used the simplecov-cobertura gem to generate the reports which means only one package
     per report.
 
-  2) It assumes your code is the same, so all reports should have the same number of classes and lines
-    in each class
-
 ## Installation
 
     $ gem install cobertura_xml_merger

data/Rakefile

@@ -1,2 +1,10 @@
 require "bundler/gem_tasks"
+require "rake/testtask"
+
+Rake::TestTask.new(:spec) do |t|
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList['test/**/*_test.rb']
+end
+
 task :default => :spec

data/cobertura_xml_merger.gemspec

@@ -19,5 +19,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.11'
   spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'minitest', '~> 5.9.1'
   spec.add_dependency 'nokogiri', '~> 1.6'
 end

data/lib/cobertura_xml_merger.rb

@@ -88,18 +88,35 @@ module CoberturaXmlMerger
       end
 
       package2.css('class').each do |klass|
+        lines = klasses.delete(klass['filename'])
         klass.css('line').each do |line|
-          lines = klasses[klass['filename']]
+          next unless lines
+
           begin
             line['hits'] = lines[line['number']] + line['hits'].to_i
           rescue => e
-            puts "error matching #{klass['filename']} line #{line['number']}" if @verbose
+            puts e.message
+            puts "error matching #{klass['filename']} line #{line['number']}"
             puts lines.inspect if @verbose
+            puts line.inspect if @verbose
+
             throw e
           end
         end
       end
 
+      # This is a hacky way to keep lines from first xml that don't appear in second xml
+      unless klasses.empty?
+        klasses.each do |klass, lines|
+          klass_name = klass.split('/').last.split('.').first
+          line_nodes = lines.map do |number, hits|
+            "<line number='#{number}' branch='false' hits='#{hits}'/>"
+          end.join("\n")
+          new_class_node = "<class name='#{klass_name}' filename='#{klass}'>#{line_nodes}</class>"
+          package2.css('class').last.add_next_sibling(new_class_node)
+        end
+      end
+
       package2
     end
 

data/lib/cobertura_xml_merger/version.rb

@@ -1,3 +1,3 @@
 module CoberturaXmlMerger
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cobertura_xml_merger
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Juan Germán Castañeda Echevarría
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-26 00:00:00.000000000 Z
+date: 2016-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.9.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.9.1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -61,6 +75,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md