capistrano-s3_archive 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a65462e28020e98554628d02a2bc8a109970fa4
-  data.tar.gz: 361c7fe4058246b23d276252063257622c30e2b9
+  metadata.gz: 270d0445f78fdccee13f4d069148a4c73fef1dd0
+  data.tar.gz: 269e6176739259c329cd6c401ddc3326b6625317
 SHA512:
-  metadata.gz: 2066614fc32d715b597ddac1a00db38d74ab33bb8b6558669031600ceeb58a1e1d7f0ec0ea43e9c227be29c95ee4b7ebb67aae96edfda652f98047b2c5b5539d
-  data.tar.gz: f133689db1b32b029505f5fb0064c91d24fd9ae9a7d9a8acf197a95129ee1b65751b00c7782a8d6950137b7136f04dc3beba3ebdc06ac07febd71adfd7b1dc5d
+  metadata.gz: 150b7fea2b9bf4fe5c51a61d567252792c7435e7a0537a390c496bf9f4c6ea959286925e2b0f1a6942e35dba28b6b294dc84f19e976aa4626459e583e233ac81
+  data.tar.gz: d8978b666b74a52d118f60323b427f282dde0332615b7c80c7b875d7e67c8a1a224da98144b99ef6d95e09aa5b2017da830343635b665c4fea89066430bc94df

data/lib/capistrano/s3_archive.rb

@@ -65,35 +65,47 @@ module Capistrano
       ### Default strategy
       private
       module RsyncStrategy
+        class MissingSSHKyesError < StandardError; end
+        class ResourceBusyError < StandardError; end
+
         def check
           list_objects(false)
+          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."
+          end
         end
 
         def stage
-          archive_file = File.join(fetch(:s3_archive), fetch(:stage).to_s, File.basename(archive_object_key))
-          if not File.exist?(archive_file)
-            mkdir_p(File.dirname(archive_file))
-            content = get_object.body.read
-            File.open(archive_file, 'w') do |f|
-              f.write(content)
+          stage_lock do
+            archive_file = File.join(fetch(:s3_archive), fetch(:stage).to_s, File.basename(archive_object_key))
+            tmp_file = "#{archive_file}.part"
+            fail "#{tmp_file} is found. Another process is running?" if File.exist?(tmp_file)
+            if not File.exist?(archive_file)
+              File.open(tmp_file, 'w') do |f|
+                mkdir_p(File.dirname(archive_file))
+                content = get_object.body.read
+                f.write(content)
+              end
+              move(tmp_file, archive_file)
+            else
+              context.info "#{archive_file} is found."
             end
-          else
-            context.info "#{archive_file} is found."
-          end
 
-          remove_entry_secure(fetch(:local_cache_dir)) if File.exist? fetch(:local_cache_dir)
-          mkdir_p(fetch(:local_cache_dir))
-          case archive_file
-          when /\.zip\Z/
-            dir = archive_file.gsub(/\.zip\Z/, '')
-            cmd = "unzip -q -d #{fetch(:local_cache_dir)} #{archive_file}"
-          when /\.tar\.gz\Z|\.tar\.bz2\Z/
-            dir = archive_file.gsub(/\.tar\.gz\Z|\.tar\.bz2\Z/, '')
-            cmd = "tar xf #{archive_file} -C #{fetch(:local_cache_dir)}"
-          end
+            remove_entry_secure(fetch(:local_cache_dir)) if File.exist? fetch(:local_cache_dir)
+            mkdir_p(fetch(:local_cache_dir))
+            case archive_file
+            when /\.zip\Z/
+              cmd = "unzip -q -d #{fetch(:local_cache_dir)} #{archive_file}"
+            when /\.tar\.gz\Z|\.tar\.bz2\Z/
+              cmd = "tar xf #{archive_file} -C #{fetch(:local_cache_dir)}"
+            end
 
-          run_locally do
-            execute cmd
+            release_lock(true) do
+              run_locally do
+                execute cmd
+              end
+            end
           end
         end
 
@@ -108,8 +120,10 @@ module Capistrano
           rsync << "-e 'ssh -i #{key} #{ssh_port_option}'"
           rsync << "#{user}#{server.hostname}:#{rsync_cache || release_path}"
 
-          run_locally do
-            execute *rsync
+          release_lock do
+            run_locally do
+              execute *rsync
+            end
           end
 
           unless fetch(:rsync_cache).nil?
@@ -131,6 +145,35 @@ module Capistrano
           cache = deploy_to + "/" + cache if cache && cache !~ /^\//
           cache
         end
+
+        def stage_lock(&block)
+          lockfile = "#{fetch(:local_cache)}.#{fetch(:stage)}.lock"
+          File.open(lockfile, "w") do |f|
+            if f.flock(File::LOCK_EX | File::LOCK_NB)
+              block.call
+            else
+              fail ResourceBusyError, "Could not get #{lockfile}"
+            end
+          end
+        ensure
+          rm lockfile if File.exist? lockfile
+        end
+
+        def release_lock(exclusive = false, &block)
+          lockfile = "#{fetch(:local_cache)}.#{fetch(:stage)}.release.lock"
+          File.open(lockfile, File::RDONLY|File::CREAT) do |f|
+            mode = if exclusive
+                     File::LOCK_EX | File::LOCK_NB
+                   else
+                     File::LOCK_SH
+                   end
+            if f.flock(mode)
+              block.call
+            else
+              fail ResourceBusyError, "Could not get #{fetch(:lockfile)}"
+            end
+          end
+        end
       end
     end
   end

data/lib/capistrano/s3_archive/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module S3Archive
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-s3_archive
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Takuto Komazaki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-28 00:00:00.000000000 Z
+date: 2015-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano