junit_merge 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c5988839b9f2e70c06f6c8537422507866f45f9
-  data.tar.gz: 433480317edd29129dfeea288ae73e66780e9e2c
+  metadata.gz: fe328cd3a59857e1ae738c399c84d07c08de49f2
+  data.tar.gz: fb6a05b5e0f3de689191ae90b7396bf1bb96cd43
 SHA512:
-  metadata.gz: 4976b5600a486350cd924e8dce075a69a15d1ac6b17ca18a58a28c455687aebf14079c8f50eee1c48a47dde9b9b6753b8a823ac2e27ce67c88c657be0120c969
-  data.tar.gz: 7f8430c30a18fb3d1f145f064199e96cc617c5a9f99ba002a67dfdbc28397553249963564b5d829ee8865f08996c5bce139701cacacec72924210449577c1ec6
+  metadata.gz: 4ba9e33377decf1b3d48de892f042f89b47f67e6c261a320701f111d3ef5f3acf9a3872cbe210bcdd96ea21c1df2735d5d97622ced06281460282db37a7cdb56
+  data.tar.gz: c4d6a895d587d93552b086545372c46f0a7852c07e0d6179acd572f4ba670932e144f8295bacbeede71692a11bdd35281f1d3eb7e08f7e7b52d602e5f572a92a

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.1.1 2014-04-18
+
+ * Merging directories with --update-only shouldn't add files only in the source.
+
 == 0.1.0 2014-04-18
 
  * Allow passing any number of source files.

data/lib/junit_merge/app.rb

@@ -34,7 +34,7 @@ module JunitMerge
               target_file_path = source_file_path.sub(source_path, target_path)
               if File.exist?(target_file_path)
                 merge_file(source_file_path, target_file_path)
-              else
+              elsif !@update_only
                 FileUtils.mkdir_p(File.dirname(target_file_path))
                 FileUtils.cp(source_file_path, target_file_path)
               end

data/lib/junit_merge/version.rb

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

data/test/junit_merge/test_app.rb

@@ -106,7 +106,7 @@ describe JunitMerge::App do
       stderr.string.must_equal('')
     end
 
-    it "skips nodes only in the source if --update is given" do
+    it "skips nodes only in the source if --update-only is given" do
       create_file("#{tmp}/source.xml", 'a.a' => :fail, 'a.b' => :error)
       create_file("#{tmp}/target.xml", 'a.a' => :pass)
       app.run('--update-only', "#{tmp}/source.xml", "#{tmp}/target.xml").must_equal 0
@@ -160,7 +160,7 @@ describe JunitMerge::App do
       stderr.string.must_equal('')
     end
 
-    it "adds files only in the source" do
+    it "adds files only in the source by default" do
       create_file("#{tmp}/source/a.xml", 'a.a' => :fail, 'a.b' => :pass)
       create_directory("#{tmp}/target")
       app.run("#{tmp}/source", "#{tmp}/target").must_equal 0
@@ -169,6 +169,15 @@ describe JunitMerge::App do
       stdout.string.must_equal('')
       stderr.string.must_equal('')
     end
+
+    it "skips files only in the source if --update-only is given" do
+      create_file("#{tmp}/source/a.xml", 'a.a' => :fail, 'a.b' => :pass)
+      create_directory("#{tmp}/target")
+      app.run('--update-only', "#{tmp}/source", "#{tmp}/target").must_equal 0
+      File.exist?("#{tmp}/target/a.xml").must_equal false
+      stdout.string.must_equal('')
+      stderr.string.must_equal('')
+    end
   end
 
   it "does not complain about empty files" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: junit_merge
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - George Ogata