svn_command_helper 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a84fa200fd38076ba2001eae98357c7fdc7c4f3
-  data.tar.gz: c7492259bd925af2e146716d44c1453c93c2e94b
+  metadata.gz: 2ed319daca7d4f6456d4adedafb1f8b8ea01fd85
+  data.tar.gz: 685413932344a4a488fcf3054ec98942fc3157a9
 SHA512:
-  metadata.gz: cc3dfc80506eda2eeff7733003a1b505c493272255e92c42b7d60c6f15df8bcab8d109748999dc6c0c7c57724cb7f0a71eba33a11e88e25499ee7cbcb1b69611
-  data.tar.gz: 40a8b8e8c9d11972cc2f53fa2c959e4e6c95c703039165b480653976e25a5a26f8f7f9177eae2b6cbbac2ca5f94a224d01a495f9025082b74a665ebe9f1d86ac
+  metadata.gz: 738a56bbb2526afc473bb3f6d5f1b0b9c07b1d9c5394db8e763a8e9b5b6c8abb36f6159b2225b171dab4c5544372b5530a8a8d3d0bff4f30f35fb4aa0849ba6a
+  data.tar.gz: ecaed0d02d0e3f097ee315c5fa4b68548addcf8d5f73657fe7be604e3ce15c72f6db2251a8551e001eddf1d6f035b03664b0b4cca67d20b3697d14ec254045bd

data/lib/svn_command_helper.rb

@@ -165,20 +165,48 @@ module SvnCommandHelper
       # @param [String] from_uri from uri
       # @param [String] to_path to local path
       def merge1(start_rev, end_rev, from_uri, to_path = ".")
-        safe_merge "svn merge -r #{start_rev}:#{end_rev} #{from_uri} #{to_path}"
+        safe_merge merge1_command(start_rev, end_rev, from_uri, to_path)
+      end
+
+      # svn merge -r start_rev:end_rev from_uri to_path --dry-run
+      # @param [Integer] start_rev start revision
+      # @param [Integer] end_rev end revision
+      # @param [String] from_uri from uri
+      # @param [String] to_path to local path
+      def merge1_dry_run(start_rev, end_rev, from_uri, to_path = ".")
+        merge_dry_run merge1_command(start_rev, end_rev, from_uri, to_path)
+      end
+
+      # "svn merge -r start_rev:end_rev from_uri to_path"
+      # @param [Integer] start_rev start revision
+      # @param [Integer] end_rev end revision
+      # @param [String] from_uri from uri
+      # @param [String] to_path to local path
+      # @param [Boolean] dry_run --dry-run
+      def merge1_command(start_rev, end_rev, from_uri, to_path = ".", dry_run: false)
+        "svn merge -r #{start_rev}:#{end_rev} #{from_uri} #{to_path} #{dry_run ? "--dry-run" : ""}"
       end
 
       # merge after dry-run conflict check
       # @param [String] command svn merge full command
       def safe_merge(command)
-        dry_run = cap("#{command} --dry-run")
-        if dry_run.each_line.any? {|line| line.start_with?("C")}
-          raise "[ERROR] merge_branch_to_trunk: `#{command}` has conflict!\n#{dry_run}"
+        dry_run = merge_dry_run(command)
+        if dry_run.any? {|entry| entry.status.include?("C")}
+          dry_run_str = dry_run.map {|entry| "#{entry.status} #{entry.path}"}.join("\n")
+          raise "[ERROR] merge_branch_to_trunk: `#{command}` has conflict!\n#{dry_run_str}"
         else
           sys command
         end
       end
 
+      # merge dry-run conflict check result
+      # @param [String] command svn merge full command
+      def merge_dry_run(command)
+        cap("#{command} --dry-run")
+          .each_line.map(&:chomp).reject {|line| line.start_with?('-')}
+          .map {|line| OpenStruct.new({status: line[0...4], path: line[5..-1]})}
+      end
+
       # svn merge branch to trunk with detecting revision range
       # @param [String] from_uri from uri
       # @param [String] to_path to local path

data/lib/svn_command_helper/version.rb

@@ -1,4 +1,4 @@
 module SvnCommandHelper
   # version
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: svn_command_helper
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Narazaka
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-22 00:00:00.000000000 Z
+date: 2016-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: system_command_helper