capistrano-s3_archive 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbb8ac4ef17a2d5f929a0efb027aad17c7e44790
-  data.tar.gz: 099ba5e45ea14ef7ea1306ab7e953b2817b8f032
+  metadata.gz: 4ecfcfadd59e8c957d1d85db6b15490bb3e24395
+  data.tar.gz: c1d697b601b3e4fd0a5b57cdd6a7ee9ed38a6305
 SHA512:
-  metadata.gz: c590bcb06845ded9939f19123dbb67d9c264fa030d6e6f36b479293e0b178b470d1746455a887c41666d62617f59c56e56a8095db83a42b994f0efe48388031e
-  data.tar.gz: 2780597ad293784dc7052fd42e0f9e56ecee02a58e62fa737a0ebe07f3796ad9105008de086a2250a4ea634a1e33c7eb4ceab40212244e0a0712f9c7553680e4
+  metadata.gz: 0c5ca9d947f7fad702553e498cbd44cd555004903ae60356db4fd4a02d3731d5c088eff0defccfcca6b8db03fd8b90c255e7ebf561a7bb32e06a99b2cc1c7b76
+  data.tar.gz: 55d26357752657c69f03c0eaf3666dcadb13661b29b86bb88d460ced0d43f2efc7ab95f64536fbf0e63869470c289f88bf2f21dcdf881a67aa8c1ab03da3c66f

data/lib/capistrano/s3_archive/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module S3Archive
-    VERSION = "0.3.5"
+    VERSION = "0.3.6"
   end
 end

data/lib/capistrano/s3_archive.rb

@@ -5,12 +5,12 @@ load File.expand_path("../tasks/s3_archive.rake", __FILE__)
 require "capistrano/s3_archive/version"
 require 'capistrano/scm'
 
-set :rsync_options, ['-az --delete']
-set :rsync_copy, "rsync --archive --acls --xattrs"
-set :rsync_cache, "shared/deploy"
-set :local_cache, "tmp/deploy"
-set :s3_archive, "tmp/archives"
-set :sort_proc, ->(a,b) { b.key <=> a.key }
+set_if_empty :rsync_options, ['-az --delete']
+set_if_empty :rsync_copy, "rsync --archive --acls --xattrs"
+set_if_empty :rsync_cache, "shared/deploy"
+set_if_empty :local_cache, "tmp/deploy"
+set_if_empty :s3_archive, "tmp/archives"
+set_if_empty :sort_proc, ->(a,b) { b.key <=> a.key }
 
 module Capistrano
   module S3Archive
@@ -71,6 +71,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
           if ssh_key.nil?
             fail MissingSSHKyesError, "#{RsyncStrategy} only supports publickey authentication. Please set #{context.host.hostname}.keys or ssh_options."
@@ -126,16 +127,20 @@ module Capistrano
         end
 
         def release(server = context.host)
-          user = server.user + '@' unless server.user.nil?
-          key  = server.keys.first || Array(server.ssh_options[:keys]).first
-          ssh_port_option = server.port.nil? ? '' : "-p #{server.port}"
-
+          unless context.class == SSHKit::Backend::Local
+            user = server.user + '@' unless server.user.nil?
+            key  = server.keys.first || Array(server.ssh_options[:keys]).first
+            ssh_port_option = server.port.nil? ? '' : "-p #{server.port}"
+          end
           rsync = ['rsync']
           rsync.concat fetch(:rsync_options)
           rsync << fetch(:local_cache_dir) + '/'
-          rsync << "-e 'ssh -i #{key} #{ssh_port_option}'"
-          rsync << "#{user}#{server.hostname}:#{rsync_cache || release_path}"
-
+          unless context.class == SSHKit::Backend::Local
+            rsync << "-e 'ssh -i #{key} #{ssh_port_option}'"
+            rsync << "#{user}#{server.hostname}:#{rsync_cache || release_path}"
+          else
+            rsync << "#{rsync_cache || release_path}"
+          end
           release_lock do
             run_locally do
               execute *rsync
@@ -144,7 +149,7 @@ module Capistrano
 
           unless fetch(:rsync_cache).nil?
             cache = rsync_cache
-            on server do
+            on [server] do
               copy = %(#{fetch(:rsync_copy)} "#{cache}/" "#{release_path}/")
               execute copy
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-s3_archive
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Takuto Komazaki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-25 00:00:00.000000000 Z
+date: 2015-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano