capistrano-file-transfer-ext 0.0.2 → 0.0.3

data/lib/capistrano/configuration/actions/file_transfer_ext.rb

@@ -7,7 +7,20 @@ module Capistrano
   class Configuration
     module Actions
       module FileTransferExt
-        DIGEST_FILTER_CMD = %{awk '{for(n=1;n<=NF;n++){if(match($n,"^[0-9a-z]{16,}$")){print($n);break}}}'}
+# FIXME: better way to filter out hexdigests from output of md5sum (both GNU and BSD).
+#        currently, we regards 16+ consecutive [0-9a-f] as string of hexdigest.
+#        since mawk does not recognize /.{n}/ style quantifier, the regex is very scary.
+        DIGEST_FILTER_CMD = "awk '%s'" % %q{
+{
+  for(n=1;n<=NF;n++){
+    if(match($n,
+"^[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]+$"
+       )){
+      print($n);break
+    }
+  }
+}
+                            }.gsub(/\s+/, "").strip
 
         def safe_put(data, path, options={})
           opts = options.dup
@@ -62,13 +75,15 @@ module Capistrano
               digest = nil
             end
           end
+          logger.debug("#{digest_method.upcase}(#{target}) = #{digest}")
           if dry_run
             logger.debug("transfering: #{[direction, from, to] * ', '}")
           else
             execute_on_servers(options) do |servers|
               targets = servers.map { |server| sessions[server] }.reject { |session|
                 remote_digest = session.exec!("test -f #{remote_target.dump} && #{digest_cmd} #{remote_target.dump} | #{DIGEST_FILTER_CMD}")
-                result = !( digest.nil? or remote_digest.nil? ) && digest == remote_digest.strip
+                logger.debug("#{session.xserver.host}: #{digest_method.upcase}(#{remote_target}) = #{remote_digest}")
+                result = !( digest.nil? or remote_digest.nil? ) && digest.strip == remote_digest.strip
                 logger.info("#{session.xserver.host}: skip transfering since no changes: #{[direction, from, to] * ', '}") if result
                 result
               }
@@ -113,9 +128,21 @@ module Capistrano
           digest_cmd = options.fetch(:digest_cmd, "#{digest_method.downcase}sum")
           execute = []
           execute << %{( test -d #{File.dirname(to).dump} || #{try_sudo} mkdir -p #{File.dirname(to).dump} )}
-          execute << %{from=$(#{digest_cmd} #{from.dump} | #{DIGEST_FILTER_CMD})}
-          execute << %{to=$(#{digest_cmd} #{to.dump} | #{DIGEST_FILTER_CMD})}
-          execute << %{( test "x${from}" = "x${to}" || ( echo #{from.dump} '->' #{to.dump}; #{try_sudo} mv -f #{from.dump} #{to.dump} ) )}
+          # calculate hexdigest of `from'
+          execute << %{from=$(#{digest_cmd} #{from.dump} 2>/dev/null | #{DIGEST_FILTER_CMD} || true)}
+          execute << %{echo %s} % ["#{digest_method.upcase}(#{from}) = ${from}".dump]
+          # calculate hexdigest of `to'
+          execute << %{to=$(#{digest_cmd} #{to.dump} 2>/dev/null | #{DIGEST_FILTER_CMD} || true)}
+          execute << %{echo %s} % ["#{digest_method.upcase}(#{to}) = ${to}".dump]
+          # check the hexdigests
+          execute << (<<-EOS).gsub(/\s+/, " ").strip
+            if [ -n "${from}" -a "${to}" ] && [ "${from}" = "${to}" ]; then
+              echo "skip placing since no changes.";
+            else
+              #{try_sudo} mv -f #{from.dump} #{to.dump};
+            fi
+          EOS
+
           if mode
             mode = mode.is_a?(Numeric) ? mode.to_s(8) : mode.to_s
             execute << "#{try_sudo} chmod #{mode} #{to.dump}"

data/lib/capistrano/configuration/actions/file_transfer_ext/version.rb

@@ -2,7 +2,7 @@ module Capistrano
   class Configuration
     module Actions
       module FileTransferExt
-        VERSION = "0.0.2"
+        VERSION = "0.0.3"
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-file-transfer-ext
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-22 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -67,4 +67,3 @@ signing_key:
 specification_version: 3
 summary: A sort of utilities which helps you transferring files with Capistrano.
 test_files: []
-has_rdoc: