junit_merge 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 169f38c3ea35ae927f10d041fbad8900d4f4a6f2
-  data.tar.gz: 4a030a4641249fb436e1743f9d94af9c531e3a30
+  metadata.gz: 7c5988839b9f2e70c06f6c8537422507866f45f9
+  data.tar.gz: 433480317edd29129dfeea288ae73e66780e9e2c
 SHA512:
-  metadata.gz: ba9ad5426d4470db02143255d8417e3b78d870be9b31b3334fbb89e77e0a19967c8fdfe7c03f853d1bee02cd083f4a4a86a07cc9cbc967c6f074998bfcd2235d
-  data.tar.gz: 8ed014fb7239a6964fa45804ac453062613d7af00c7ddbd1679b6ca1dad872164c2a9fca2d5fcc6f9fc4809c642ce984185d594b319739b8c3e793b2b59effa8
+  metadata.gz: 4976b5600a486350cd924e8dce075a69a15d1ac6b17ca18a58a28c455687aebf14079c8f50eee1c48a47dde9b9b6753b8a823ac2e27ce67c88c657be0120c969
+  data.tar.gz: 7f8430c30a18fb3d1f145f064199e96cc617c5a9f99ba002a67dfdbc28397553249963564b5d829ee8865f08996c5bce139701cacacec72924210449577c1ec6

data/CHANGELOG

@@ -1,3 +1,8 @@
+== 0.1.0 2014-04-18
+
+ * Allow passing any number of source files.
+ * Add --update-only option, to not append new tests in the source.
+
 == 0.0.1 2014-04-15
 
  * Hi.

data/lib/junit_merge/app.rb

@@ -1,3 +1,4 @@
+require 'optparse'
 require 'find'
 require 'fileutils'
 require 'nokogiri'
@@ -10,35 +11,41 @@ module JunitMerge
       @stdin  = options[:stdin ] || STDIN
       @stdout = options[:stdout] || STDOUT
       @stderr = options[:stderr] || STDERR
+      @update_only = false
     end
 
     attr_reader :stdin, :stdout, :stderr
 
     def run(*args)
-      source_path, target_path = parse_args(args)
+      *source_paths, target_path = parse_args(args)
+      all_paths = [*source_paths, target_path]
 
-      not_found = [source_path, target_path].select { |path| !File.exist?(path) }
+      not_found = all_paths.select { |path| !File.exist?(path) }
       not_found.empty? or
-        raise Error, "no such file: #{not_found.join(', ')}"
-
-      if File.directory?(source_path)
-        Find.find(source_path) do |source_file_path|
-          next if !File.file?(source_file_path)
-          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
-            FileUtils.mkdir_p(File.dirname(target_file_path))
-            FileUtils.cp(source_file_path, target_file_path)
+        raise Error, "no such file(s): #{not_found.join(', ')}"
+
+      if source_paths.empty?
+        stderr.puts "warning: no source files given"
+      else
+        source_paths.each do |source_path|
+          if File.directory?(source_path)
+            Find.find(source_path) do |source_file_path|
+              next if !File.file?(source_file_path)
+              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
+                FileUtils.mkdir_p(File.dirname(target_file_path))
+                FileUtils.cp(source_file_path, target_file_path)
+              end
+            end
+          else File.exist?(source_path)
+            merge_file(source_path, target_path)
           end
         end
-      elsif File.exist?(source_path)
-        merge_file(source_path, target_path)
-      else
-        raise Error, "no such file: #{source_path}"
       end
       0
-    rescue Error => error
+    rescue Error, OptionParser::ParseError => error
       stderr.puts error.message
       1
     end
@@ -63,7 +70,6 @@ module JunitMerge
 
       source.xpath("//testsuite/testcase").each do |node|
         summary_diff = SummaryDiff.new
-        summary_diff.add(node, 1)
 
         predicates = [
           attribute_predicate('classname', node['classname']),
@@ -72,9 +78,11 @@ module JunitMerge
         original = target.xpath("testsuite/testcase[#{predicates}]").first
 
         if original
+          summary_diff.add(node, 1)
           summary_diff.add(original, -1)
           original.replace(node)
-        else
+        elsif !@update_only
+          summary_diff.add(node, 1)
           testsuite = target.xpath("testsuite").first
           testsuite.add_child(node)
         end
@@ -121,13 +129,19 @@ module JunitMerge
     end
 
     def parse_args(args)
-      args.size == 2 or
-        raise Error, usage
-      args
-    end
+      parser = OptionParser.new do |parser|
+        parser.banner = "USAGE: #$0 [options] SOURCES ... TARGET"
+        parser.on '-u', '--update-only', "Only update nodes, don't append new nodes in the source." do
+          @update_only = true
+        end
+      end
+
+      parser.parse!(args)
 
-    def usage
-      "USAGE: #$0 SOURCE TARGET"
+      args.size >= 1 or
+        raise Error, parser.banner
+
+      args
     end
   end
 end

data/lib/junit_merge/version.rb

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

data/test/junit_merge/test_app.rb

@@ -95,7 +95,7 @@ describe JunitMerge::App do
       stderr.string.must_equal('')
     end
 
-    it "appends nodes only in the source" do
+    it "appends nodes only in the source by default" do
       create_file("#{tmp}/source.xml", 'a.a' => :fail, 'a.b' => :error)
       create_file("#{tmp}/target.xml", 'a.a' => :pass)
       app.run("#{tmp}/source.xml", "#{tmp}/target.xml").must_equal 0
@@ -106,6 +106,17 @@ describe JunitMerge::App do
       stderr.string.must_equal('')
     end
 
+    it "skips nodes only in the source if --update 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
+      document = parse_file("#{tmp}/target.xml")
+      results(document).must_equal([['a.a', :fail]])
+      summaries(document).must_equal([{tests: 1, failures: 1, errors: 0, skipped: 0}])
+      stdout.string.must_equal('')
+      stderr.string.must_equal('')
+    end
+
     it "correctly merges tests with metacharacters in the name" do
       create_file("#{tmp}/source.xml", 'a\'"a.b"\'b' => :pass)
       create_file("#{tmp}/target.xml", 'a\'"a.b"\'b' => :fail)
@@ -184,9 +195,29 @@ describe JunitMerge::App do
     stderr.string.must_match /no such file/
   end
 
-  it "errors with a usage message if 2 args aren't given" do
+  it "exits with a warning if no source files are given" do
+    create_file("#{tmp}/target.xml", 'a.a' => :pass, 'a.b' => :fail)
+    app.run("#{tmp}/target.xml").must_equal 0
+    document = parse_file("#{tmp}/target.xml")
+    results(document).must_equal([['a.a', :pass], ['a.b', :fail]])
+    stdout.string.must_equal('')
+    stderr.string.must_equal("warning: no source files given\n")
+  end
+
+  it "can merge multiple source files into the target in order" do
+    create_file("#{tmp}/source1.xml", 'a.a' => :fail, 'a.b' => :fail)
+    create_file("#{tmp}/source2.xml", 'a.a' => :pass)
+    create_file("#{tmp}/target.xml", 'a.a' => :error, 'a.b' => :error, 'a.c' => :error)
+    app.run("#{tmp}/source1.xml", "#{tmp}/source2.xml", "#{tmp}/target.xml").must_equal 0
+    document = parse_file("#{tmp}/target.xml")
+    results(document).must_equal([['a.a', :pass], ['a.b', :fail], ['a.c', :error]])
+    stdout.string.must_equal('')
+    stderr.string.must_equal('')
+  end
+
+  it "errors with a usage message if no args aren't given" do
     FileUtils.touch "#{tmp}/source.xml"
-    app.run("#{tmp}/source.xml").must_equal 1
+    app.run.must_equal 1
     File.read("#{tmp}/source.xml").must_equal('')
     stdout.string.must_equal('')
     stderr.string.must_match /USAGE/

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: junit_merge
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - George Ogata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri