svn_command_helper 0.9.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a26bdb93ca25d73f166efbdab7bb537138cfa7d
-  data.tar.gz: a155eb28315c094d96623fc1b03081e93b399d25
+  metadata.gz: 4bd488641380cfe1d865592138ab3b4a3ec3ed5f
+  data.tar.gz: def3e7693fabd85377e0a35dc060df7a9b117e57
 SHA512:
-  metadata.gz: 0abb87870bdb2169eb1c6885a071b9914904d0b28f87380e58bc7ca15dd2b09fa71c2fd7c59dabd91551dc955c1a9e8e69430431b3fdca76e602061e38257449
-  data.tar.gz: e05bd7035308a8b3a95f69148dcba2d8a5426ab3e29b8a6910a1a62627ad3dbdb2de8f4e5b6a82a56149ff5225d5502a9849f8e0d57208b3bdb46aea9d8f12ff
+  metadata.gz: 7b2f374ade28eab78bf98678c7ff189a2a926a802b16ad688b56dd78b7f2230ec6403232b52173dce525a80af8191899cbd225553c3409994ffb624a7e6f8897
+  data.tar.gz: 1319216bde21b959d49ff296904b44abc1b270229585dc5b699d6c7b5de185b11d813191bf261c2dca98ff53c678950198dffdb6d21540ed47448cce074badda

data/lib/svn_command_helper/version.rb

@@ -1,4 +1,4 @@
 module SvnCommandHelper
   # version
-  VERSION = "0.9.2"
+  VERSION = "1.0.0"
 end

data/lib/svn_command_helper.rb

@@ -36,8 +36,17 @@ module SvnCommandHelper
         if @list_cache && @list_cache[uri]
           @list_cache[uri]
         else
-          list = cap("svn list #{recursive ? '-R' : ''} #{uri}").split(/\n/).compact
-            .reject {|path| path.empty?}
+          list_str = cap("svn list --xml #{recursive ? '-R' : ''} #{uri}")
+          list = REXML::Document.new(list_str).elements.collect("/lists/list/entry") do |entry|
+            commit = entry.elements["commit"]
+            OpenStruct.new({
+              kind: entry.attribute("kind").value,
+              path: entry.elements["name"].text,
+              revision: commit.attribute("revision").value.to_i,
+              author: commit.elements["author"].text,
+              date: Time.iso8601(commit.elements["date"].text),
+            })
+          end
           @list_cache[uri] = list if @list_cache
           list
         end
@@ -55,7 +64,7 @@ module SvnCommandHelper
       # @param [Boolean] recursive --recursive
       # @return [Array<String>] file paths
       def list_files(uri, recursive = false)
-        list(uri, recursive).reject {|path| path.end_with?("/")} # dir
+        list(uri, recursive).select {|entry| entry.kind == "file"}
       end
 
       # svn list --recursive -> grep only files
@@ -77,7 +86,7 @@ module SvnCommandHelper
       # @return [Boolean] true if exists
       def exist?(uri)
         basename = File.basename(uri)
-        list(File.dirname(uri)).find{|_basename| File.fnmatch(basename, _basename.sub(/\/$/, ''))}
+        !list(File.dirname(uri)).find{|entry| File.fnmatch(basename, entry.path)}.nil?
       end
 
       # check svn uri file exists or not
@@ -85,7 +94,7 @@ module SvnCommandHelper
       # @return [Boolean] true if exists
       def exist_file?(uri)
         file = File.basename(uri)
-        list_files(File.dirname(uri)).find{|_file| File.fnmatch(file, _file)}
+        !list_files(File.dirname(uri)).find{|entry| File.fnmatch(file, entry.path)}.nil?
       end
 
       # svn update
@@ -276,8 +285,8 @@ module SvnCommandHelper
       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}
+        to_exist_transactions = Svn.list_files(transaction.to_base).map do |entry|
+          transactions.find {|_transaction| _transaction.file == entry.path}
         end.compact
         only_from_transactions = transactions - to_exist_transactions
         if to_exist_transactions.empty? # toにファイルがない
@@ -384,8 +393,8 @@ module SvnCommandHelper
     # @return [Array<SvnFileCopyTransaction>] transactions
     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)}
+        .select{|entry| File.fnmatch(@file, entry.path)}
+        .map{|entry| SvnFileCopyTransaction.new(from_base: @from_base, to_base: @to_base, file: entry.path)}
     end
 
     # from uri exists?

metadata

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