capistrano-s3_archive 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2e488e7dda654a95d83fb9971c56510f17b22bc
-  data.tar.gz: ff10ca9768576a97e114b46413aa5bbb05fd49fe
+  metadata.gz: 26d849aca711454ddb7add7f361971a883cca0fe
+  data.tar.gz: fd2ae963c34c97f96bf209ffb1fcbbb6b540f838
 SHA512:
-  metadata.gz: 7fa6318c80d0d105c2edc95afa89cd8ee9aada7f28d99c3715f93a8c79e32fcbf51b49704947c2fa25dc83b82a6169d5e9f5f07b257e7459485bce1e5595c862
-  data.tar.gz: 7ecaff5a54de117dc61ae501e99c70c4b9330a6bcb958cf836e9a03e3659e955d1005faf760ffdb602fcdcf0f3070202f35d305391a86dc5abb735906549299f
+  metadata.gz: c4878574aa7502b196bc97769d4757073db80a061a82a7770b6bfdf88f8d7bf498e97dc747a64abfe10ecff7594e81003f06273a35b97884bc70a600a92eef1f
+  data.tar.gz: ee39db02b789562d469e57a0c963af283192945e7d972700658a47f11b4d95d016299bfd755a8f5488d382e05278dfb8071562753f72bd00aa8ed629fee9bef3

data/lib/capistrano/s3_archive/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module S3Archive
-    VERSION = "0.4.2"
+    VERSION = "0.4.3"
   end
 end

data/lib/capistrano/s3_archive.rb

@@ -145,7 +145,7 @@ module Capistrano
 
         def release(server = context.host)
           unless context.class == SSHKit::Backend::Local
-            user = server.user + '@' unless server.user.nil?
+            user = user_for(server) + '@' unless user_for(server).nil?
             key  = ssh_key_for(server)
             ssh_port_option = server.port.nil? ? '' : "-p #{server.port}"
           end
@@ -191,6 +191,16 @@ module Capistrano
           end
         end
 
+        def user_for(host)
+          if host.user
+            host.user
+          elsif host.ssh_options && host.ssh_options.has_key?(:user)
+            host.ssh_options[:user]
+          elsif fetch(:ssh_options, nil) && fetch(:ssh_options).has_key?(:user)
+            fetch(:ssh_options)[:user]
+          end
+        end
+
         private
         def rsync_cache
           cache = fetch(:rsync_cache)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-s3_archive
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Takuto Komazaki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-08 00:00:00.000000000 Z
+date: 2016-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano