capistrano-s3_archive 0.3.9 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8099885e253e2283ea9b2c86cbdddd7e0f6263ad
-  data.tar.gz: dc35bc64c15adf44abf5c2a952448b36aeb312d8
+  metadata.gz: 5a8c996040a7790ff1a596a28b0831ea45aa7ce8
+  data.tar.gz: dc697ea439e36316ca1e53bfbb9b78899085eb3c
 SHA512:
-  metadata.gz: 3a588f84614d9c584217e0b94009ad9a49c1852856c7fa6355515551c8f22a2d55030c90ec24a218ae946f651613b4844151b3f46518313d0d8d7e2f8317c741
-  data.tar.gz: 4dc224f56800eb74bfd02d149586a0ed544e298a877f80d92d3930aeca58eab562f161ef9a681d511cdb1b1ff5053d7b9cd2289d70488787fda50f9e16c72fb3
+  metadata.gz: d880c7190585d09d07f0daceb55a46356b77db33f8f47a599367227d5bf26184cfc05c964e9c2acab92e6069e11d2e9c145c7ed75949832baccf955953186f09
+  data.tar.gz: 94fb5aecf5ae0d807a779b028aea5a8f6884f7e002969e08c40abcf0934c896b8a9522862cdaefa0107755322bd74f11d6befe92e28ed0fce53201d3f2707e44

data/lib/capistrano/s3_archive/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module S3Archive
-    VERSION = "0.3.9"
+    VERSION = "0.3.10"
   end
 end

data/lib/capistrano/s3_archive.rb

@@ -72,7 +72,7 @@ module Capistrano
         def check
           list_objects(false)
           return if context.class == SSHKit::Backend::Local
-          ssh_key  = context.host.keys.first || Array(context.host.ssh_options[:keys]).first
+          ssh_key  = ssh_key_for(context.host)
           if ssh_key.nil?
             fail MissingSSHKyesError, "#{RsyncStrategy} only supports publickey authentication. Please set #{context.host.hostname}.keys or ssh_options."
           end
@@ -129,7 +129,7 @@ module Capistrano
         def release(server = context.host)
           unless context.class == SSHKit::Backend::Local
             user = server.user + '@' unless server.user.nil?
-            key  = server.keys.first || Array(server.ssh_options[:keys]).first
+            key  = ssh_key_for(server)
             ssh_port_option = server.port.nil? ? '' : "-p #{server.port}"
           end
           rsync = ['rsync']
@@ -164,6 +164,16 @@ module Capistrano
           archive_object_key
         end
 
+        def ssh_key_for(host)
+          if not host.keys.empty?
+            host.keys.first
+          elsif host.ssh_options && host.ssh_options.has_key?(:keys)
+            Array(host.ssh_options[:keys]).first
+          else fetch(:ssh_options, nil) && fetch(:ssh_options).has_key?(:keys)
+            fetch(:ssh_options)[:keys].first
+          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.3.9
+  version: 0.3.10
 platform: ruby
 authors:
 - Takuto Komazaki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-13 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Capistrano deployment from an archive on Amazon S3.