capistrano_deploy_lock 1.3.2 → 1.3.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTIwMmZkYjNmZmRiNjcwYWIzNDMzYTZhZWJiOWJhNjAyYWQ4MzUxMA==
+    OGE3YzQ2MDUxYTBhZGEzYzY3ZDA3OTJiOWQ0NGQ2MTc0ODk2ODBjZg==
   data.tar.gz: !binary |-
-    Y2RkNjQ1YjIyNzkwOWJhNmY5OTc5ZDY5ZmMxODU4YjZiYjIwODYxNg==
+    NjhhNzFmMTFkY2E4YjU2YWE3NmEwZTIzNDlmMjc3OWYzMTYxYjFlYw==
 SHA512:
   metadata.gz: !binary |-
-    N2YwZDkwZTM0M2EwYzY1ZWVmYmQ2ZTU5MjIxOTY2NzBmMDMxNzM3MmQzYTJl
-    ZDhkZTlmMTFhMDA0ZDViOGQ3ODEyMDAwYzY5M2QwZjU2MjMzODE1NzE3YmJi
-    MmU5MGM1YjJkYmZhZmU4OWZkYjdmMWY5NjcxZWVjOWY4NjZhOWU=
+    NDk4ZDYzMmQxYzAzNWM5MGJmOWJkMjJhNWI0NGJhZjA2OWIzMzY1MjM4MTRk
+    ZjQ1ODUyOTJmM2ZkZWYwYjVlMGNjMTRjYTYwYzRlNDhhNjc1NGYxMGI3NThh
+    NTU4YWVlYTA0YTk1M2NkMzFjYWNlMzdjNjUyYjJlYmY0ZjViMDI=
   data.tar.gz: !binary |-
-    NGMwZTI2ZjVmYzE2MGQwYzlkNjZjODRlZDhjZDgxNjY4MjFlMzczMmNmNzJj
-    NDNhMzE2NGQ0ZWQyZmYzNjRjNTVhNmFmYWQyM2U3MjZiZTMxMjcwNTRhNTUx
-    MTNlNzNhNzRkOGUxYzM0OWVjYjk2ZDQ2YzkxMGZlNWVmNDg4MmM=
+    NGEwZWYwYTNhZmMzNmM1YjVhMGFjN2VlMDY1YTU5NjkwMDlhMjg2Y2UxMTUx
+    Y2JlZDBjNDRmOTkwMDNjYmY4MWE1OWMzYTdhOTNiZDBhMDgzNjIxNGZlZTZm
+    OGFmNTk4ZTFiYzgxYjJiMmE3NGNlZjA2ZTE3ZTQ5ZGYzNTRlZTI=

data/README.md

@@ -21,14 +21,13 @@ Add this line to your `config/deploy.rb`:
 ## Usage
 
 Your deploys will now be protected by a lock. Simply run `cap deploy` as usual.
-However, if someone else tries to deploy at the same time, their deploy will abort
-with an error like this:
+However, if someone else tries to deploy at the same time, their deploy will show
+a message like this, and exit:
 
 ```
 *** Deploy locked 3 minutes ago by 'ndbroadbent'
 *** Message: Deploying master branch
 *** Expires in 12 minutes
-.../capistrano/deploy_lock.rb:132:in `block (3 levels) in <top (required)>': Capistrano::DeployLockedError (Capistrano::DeployLockedError)
 ```
 
 The default deploy lock will expire after 15 minutes. This is so that crashed or interrupted deploys don't leave a stale lock behind.

data/lib/capistrano/deploy_lock.rb

@@ -14,8 +14,6 @@ rescue LoadError
 end
 
 module Capistrano
-  DeployLockedError = Class.new(StandardError)
-
   module DeployLock
     def self.message(application, stage, deploy_lock)
       if stage

data/lib/capistrano/recipes/deploy_lock.rb

@@ -19,12 +19,20 @@ Capistrano::Configuration.instance(:must_exist).load do
       return if self[:deploy_lock_removed]
 
       if self[:deploy_lock].nil?
-        lock_file = capture("[ -e #{deploy_lockfile} ] && cat #{deploy_lockfile} || true").strip
-        if lock_file != ""
-          set :deploy_lock, YAML.load(lock_file)
-        else
-          set :deploy_lock, false
+        # Check all matching servers for a deploy lock.
+        parallel do |session|
+          find_servers_for_task(current_task).each do |current_server|
+            session.else "[ -e #{deploy_lockfile} ] && cat #{deploy_lockfile} || true" do |ch, stream, output|
+              if output && output != ""
+                logger.info "Deploy lock found on: #{current_server.host}"
+                set :deploy_lock, YAML.load(output)
+                return
+              end
+            end
+          end
         end
+
+        set :deploy_lock, false
       end
     end
 
@@ -39,13 +47,13 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
 
     desc "Deploy with a custom deploy lock"
-    task :with_lock, roles: :app do
+    task :with_lock, :except => { :no_release => true } do
       lock
       deploy.default
     end
 
     desc "Set deploy lock with a custom lock message and expiry time"
-    task :lock, roles: :app do
+    task :lock, :except => { :no_release => true } do
       set :lock_message, Capistrano::CLI.ui.ask("Lock Message: ")
       set :custom_deploy_lock, true
 
@@ -74,7 +82,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
 
     desc "Creates a lock file, so that futher deploys will be prevented"
-    task :create_lock, roles: :app do
+    task :create_lock, :except => { :no_release => true } do
       if self[:deploy_lock]
         logger.info 'Deploy lock already created.'
         next
@@ -101,7 +109,7 @@ Capistrano::Configuration.instance(:must_exist).load do
 
     namespace :unlock do
       desc "Unlocks the server for deployment"
-      task :default, roles: :app do
+      task :default, :except => { :no_release => true } do
         # Don't automatically remove custom deploy locks created by deploy:lock task
         if self[:custom_deploy_lock]
           logger.info 'Not removing custom deploy lock.'
@@ -110,13 +118,13 @@ Capistrano::Configuration.instance(:must_exist).load do
         end
       end
 
-      task :force, roles: :app do
+      task :force, :except => { :no_release => true } do
         remove_deploy_lock
       end
     end
 
     desc "Checks for a deploy lock. If present, deploy is aborted and message is displayed. Any expired locks are deleted."
-    task :check_lock, roles: :app do
+    task :check_lock, :except => { :no_release => true } do
       # Don't check the lock if we just created it
       next if self[:deploy_lock]
 
@@ -145,12 +153,12 @@ Capistrano::Configuration.instance(:must_exist).load do
         end
         puts
       else
-        raise Capistrano::DeployLockedError
+        exit 1
       end
     end
 
     desc "Refreshes an existing deploy lock's expiry time, if it is less than the default time"
-    task :refresh_lock, roles: :app do
+    task :refresh_lock, :except => { :no_release => true } do
       fetch_deploy_lock
       next unless self[:deploy_lock]
 

data/lib/capistrano_deploy_lock/version.rb

@@ -1,3 +1,3 @@
 module CapistranoDeployLock
-  VERSION = "1.3.2"
+  VERSION = "1.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano_deploy_lock
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Nathan Broadbent
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-11 00:00:00.000000000 Z
+date: 2013-12-15 00:00:00.000000000 Z
 dependencies: []
 description: Lock a server during deploy, to prevent people from deploying at the
   same time.