svn_command_helper 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f438a83212dbe4da273cda92edd62841f0f30e2a
-  data.tar.gz: e4383ac7c0af643f8d4cf07672beed1d8ca51736
+  metadata.gz: 473a682621ce0f8423b8be51fead333becdd3b2f
+  data.tar.gz: eee8e3adda5ca606288174952cd81eb10b052e0d
 SHA512:
-  metadata.gz: f1c2ac125404824a24960f0f8e770eba0fed9c34d780e822a67e9929c4016c14309fe72fa591125250d542d569f1f662f3e4011364d52d3361340e6741e8bcb2
-  data.tar.gz: a5afe470e20e8d9a624a37e1e779dba5f9e75f1d45d3b6467445b111b5b413165f74d641c042a8fab971f28357673a097616d154f724fe0e1d6e67ddc1514c6e
+  metadata.gz: 7ce776c91106a12049c74df657e2a98b3d69ba17e996941a4d218581ea8b648a2a0335e42bc2818e96ba99b2c64c4a9a76dda912757ef24450b43b568020b649
+  data.tar.gz: 94f8feb724b65a45a9dda3767fc9094a41e818bcd3061dbaf7f234bf85a055102294862fd5b18045e4f205a77e2f55a3f8d9107fb72a4ea1eb77557e9c017fec

data/lib/svn_command_helper/version.rb

@@ -1,4 +1,4 @@
 module SvnCommandHelper
   # version
-  VERSION = "0.6.1"
+  VERSION = "0.7.0"
 end

data/lib/svn_command_helper.rb

@@ -213,8 +213,9 @@ module SvnCommandHelper
       # copy single transaction
       # @param [SvnFileCopyTransaction] transaction from and to info
       # @param [String] message commit message
-      def copy_single(transaction, message)
-        transactions = transaction.glob_transactions
+      # @param [Boolean] recursive list --recursive
+      def copy_single(transaction, message, recursive = false)
+        transactions = transaction.glob_transactions(recursive)
         raise "copy_single: #{transaction.from} not exists" if transactions.empty?
         to_exist_transactions = Svn.list_files(transaction.to_base).map do |_file|
           transactions.find {|_transaction| _transaction.file == _file}
@@ -253,12 +254,13 @@ module SvnCommandHelper
             sys "svn checkout --depth empty #{base_uri} ."
             transactions.each do |transaction|
               relative_to = transaction.relative_to(base_uri)
-              Svn.update_deep(relative_to, "empty", false) # mkpath的な なくてもエラーにはならないので
 
               if transaction.to_exist?  # toがある場合マージ
+                Svn.update_deep(relative_to, "empty", false)
                 sys "svn export --force #{transaction.from} #{relative_to}"
                 sys "svn add --force #{relative_to}"
               else # toがない場合コピー
+                Svn.update_deep(File.dirname(relative_to), "empty", false) # mkpath的な なくてもエラーにはならないので
                 sys "svn copy --parents #{transaction.from} #{relative_to}"
               end
             end
@@ -319,9 +321,10 @@ module SvnCommandHelper
     end
 
     # filename glob (like "hoge*") to each single file transaction
+    # @param [Boolean] recursive list --recursive
     # @return [Array<SvnFileCopyTransaction>] transactions
-    def glob_transactions
-      Svn.list_files(@from_base)
+    def glob_transactions(recursive = false)
+      Svn.list_files(@from_base, recursive)
         .select{|_file| File.fnmatch(@file, _file)}
         .map{|_file| SvnFileCopyTransaction.new(from_base: @from_base, to_base: @to_base, file: _file)}
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: svn_command_helper
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Narazaka