junit_merge 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe328cd3a59857e1ae738c399c84d07c08de49f2
-  data.tar.gz: fb6a05b5e0f3de689191ae90b7396bf1bb96cd43
+  metadata.gz: e9009e2072ef14939b52f9030fabba9641c543dc
+  data.tar.gz: a72084ddc5e3af79aef60c6719e941ec4ef6012c
 SHA512:
-  metadata.gz: 4ba9e33377decf1b3d48de892f042f89b47f67e6c261a320701f111d3ef5f3acf9a3872cbe210bcdd96ea21c1df2735d5d97622ced06281460282db37a7cdb56
-  data.tar.gz: c4d6a895d587d93552b086545372c46f0a7852c07e0d6179acd572f4ba670932e144f8295bacbeede71692a11bdd35281f1d3eb7e08f7e7b52d602e5f572a92a
+  metadata.gz: 064109a7a89903bae29547e66e9ca25655f7ced93e8917cea5a45f7ed75673d8751fc705479016838a9ffa084e7ccf18b192b4cebb01b07f655ff40824a6ef2f
+  data.tar.gz: 7a99474577297b24989f83d8336aa3bb178e6b80d6aa46c226c01773c791061abf26b8f9da64530c13afde967d3559f68d5ebae18aa166ead09214fbac97febe

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.1.2 2014-05-25
+
+ * Invalid UTF-8 does not crash junit_merge.
+
 == 0.1.1 2014-04-18
 
  * Merging directories with --update-only shouldn't add files only in the source.

data/README.markdown

@@ -1,7 +1,7 @@
 ## JUnit Merge
 
-Merges two JUnit XML reports, such that results from one run may override those
-in the other. Reports may be single files or directory trees.
+Merges two or more JUnit XML reports, such that results from one run may
+override those in the other. Reports may be single files or directory trees.
 
 ## Usage
 
@@ -11,10 +11,12 @@ Install:
 
 Run:
 
-    junit_merge SOURCE.xml TARGET.xml
+    junit_merge SOURCE1.xml SOURCE2.xml ... TARGET.xml
 
-Test results in SOURCE.xml will overwrite their counterparts in
-TARGET.xml. Summary statistics will be updated as necessary.
+Test results in SOURCE[1..n].xml will overwrite their counterparts in
+TARGET.xml. Summary statistics will be updated as necessary. The sources and
+target may be directories -- files at the same relative paths under each will be
+merged (recursively).
 
 ## Why?
 

data/junit_merge.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |gem|
   gem.email         = ['george.ogata@gmail.com']
   gem.description   = "Tool to merge JUnit XML reports."
   gem.summary       = ""
-  gem.homepage      = ''
+  gem.homepage      = 'https://github.com/oggy/junit_merge'
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")

data/lib/junit_merge/app.rb

@@ -53,8 +53,8 @@ module JunitMerge
     private
 
     def merge_file(source_path, target_path)
-      source_text = File.read(source_path)
-      target_text = File.read(target_path)
+      source_text = File.read(source_path).encode!('UTF-8', invalid: :replace)
+      target_text = File.read(target_path).encode!('UTF-8', invalid: :replace)
 
       if target_text =~ /\A\s*\z/m
         return

data/lib/junit_merge/version.rb

@@ -1,5 +1,5 @@
 module JunitMerge
-  VERSION = [0, 1, 1]
+  VERSION = [0, 1, 2]
 
   class << VERSION
     include Comparable

data/test/junit_merge/test_app.rb

@@ -189,6 +189,18 @@ describe JunitMerge::App do
     stderr.string.must_equal('')
   end
 
+  it "works around invalid UTF-8" do
+    create_file("#{tmp}/source.xml", "a.a\xFFb" => :pass)
+    create_file("#{tmp}/target.xml", "a.a\xFFb" => :fail)
+    app.run("#{tmp}/source.xml", "#{tmp}/target.xml").must_equal 0
+
+    document = parse_file("#{tmp}/target.xml")
+    results(document).must_equal([["a.a\uFFFDb", :pass]])
+
+    stdout.string.must_equal('')
+    stderr.string.must_equal('')
+  end
+
   it "whines if the source does not exist" do
     FileUtils.touch "#{tmp}/target.xml"
     app.run("#{tmp}/source.xml", "#{tmp}/target.xml").must_equal 1

data/test/template.xml.erb

@@ -2,7 +2,8 @@
 <testsuite tests="<%= num_tests %>" failures="<%= num_failures %>" errors="<%= num_errors %>" skipped="<%= num_skipped %>" time="0.000001" timestamp="2014-04-10T14:29:06-04:00">
   <properties/>
   <% tests.each do |name, result| %>
-  <% class_name, test_name = name.gsub('"', '&quot;').split('.') %>
+    <% name = name.dup.force_encoding('ASCII-8BIT') %>
+    <% class_name, test_name = name.gsub('"', '&quot;').split('.') %>
     <testcase classname="<%= class_name %>" name="<%= test_name %>" time="0.000001">
       <% if result == :fail %>
         <failure message="MESSAGE" type="TYPE">

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: junit_merge
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - George Ogata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-18 00:00:00.000000000 Z
+date: 2014-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -66,7 +66,7 @@ files:
 - test/junit_merge/test_app.rb
 - test/template.xml.erb
 - test/test_helper.rb
-homepage: ''
+homepage: https://github.com/oggy/junit_merge
 licenses: []
 metadata: {}
 post_install_message: