capistrano_deploy_lock 1.3.0 → 1.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTYzYjUxMGJjZWEwZjUwN2ZjMjg0MTM3ODYyZjViNTRkYTBiNDhmNA==
+    MTMyMmZhNmNhMWViYzU5NjNiYzFkM2NiMTFjNWMwMDUxNTk2N2Y4ZA==
   data.tar.gz: !binary |-
-    ZDM5MjQ3YzUzYmJhMjhlMTAxMWM1MmYyZjRlYjY0NDAzZWE3OWM5NA==
+    MTYzNDA4MDk1MDY3YmViMDhiNTRlODllNWJiNDRmYzRmYzYzMjc0ZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MmY5YTA4MTIxZTliMTYxYzg4YTExNWViZGMwNGFjN2Q0MTJlZDY3ZmQwYWI4
-    NjdlMGUxMDEyMWY3Y2MyODE5OWQ5NzJmMDc2NjNiYmFkYWViYThjNDBkNWVl
-    Y2JlM2MwNmZjZGVhYmFiNDRkYzVjMDZkZDkzZjIwODkyOTliODI=
+    MGZkYzE1YTcwMTcyYWFhYWVlZmNjOTQzZmY0NWI3NDkxMDUyY2ZkNzNhMWNm
+    MWU2YTFmNmQ2ZDZlZWRhNWZkYjI1NmNjMWMzYmNlMzRkYjMwY2JmYmY5ZjQz
+    YzI3NjY5MGQ1Mjc0MDcyZmMxOTQwMmQ2YjRjOGEzNjZmOTEwMzg=
   data.tar.gz: !binary |-
-    NjRmOGM2M2UwNjlmZGI5OTQxM2M3NTdjZWI0OTU2YjQ0YzBhNGQ4MGM2ODFk
-    ZTg1ZjI5ODYzMTNhZDJiYzhhYTY0NGEwOWZmOTFhNDRkOTk1YjdmNDMwMTE1
-    MGE3NjcxYmViY2VkMWRhYjAzZGZkN2FjM2ExMDdkNDgwNjQyZDg=
+    Njg2ZWYyYjE3YWQ5MmFlZTlhMmZhMTNkODAyNTAwMjMzZDQ2OTc4NmNlNjFm
+    YjZmMmI4MDllYjU4NGFjZmY4NzBmYjcyYzJkNGE4MGM0ZjRlYWM3ZTI5ZmZh
+    ZWRlYTU4YWRjMzM3NDBkOGExNjZiYWUxNTI5NTdhNWYyNTJjNmE=

data/lib/capistrano/deploy_lock.rb

@@ -18,7 +18,11 @@ module Capistrano
 
   module DeployLock
     def self.message(application, stage, deploy_lock)
-      message = "#{application} (#{stage}) was locked"
+      if stage
+        message = "#{application} (#{stage}) was locked"
+      else
+        message = "#{application} was locked"
+      end
       if defined?(Capistrano::DateHelper)
         locked_ago = Capistrano::DateHelper.distance_of_time_in_words_to_now deploy_lock[:created_at].localtime
         message << " #{locked_ago} ago"
@@ -57,7 +61,7 @@ module Capistrano
           message << "\nLock expired at #{deploy_lock[:expire_at].localtime.strftime("%H:%M:%S")}"
         end
       else
-        message << "\nLock must be manually removed with: cap #{stage} deploy:unlock"
+        message << "\nLock must be manually removed with: cap #{stage ? stage + ' ' : ''}deploy:unlock"
       end
     end
   end
@@ -66,4 +70,4 @@ end
 # Load recipe if required from deploy script
 if defined?(Capistrano::Configuration) && Capistrano::Configuration.instance
   require 'capistrano/recipes/deploy_lock'
-end
+end

data/lib/capistrano/recipes/deploy_lock.rb

@@ -134,7 +134,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       self[:custom_deploy_lock] = deploy_lock[:custom]
 
       # Unexpired lock is present, so display the lock message
-      logger.important Capistrano::DeployLock.message(application, stage, deploy_lock)
+      logger.important Capistrano::DeployLock.message(application, (respond_to?(:stage) ? stage : nil), deploy_lock)
 
       # Don't raise exception if current user owns the lock, and lock has an expiry time.
       # Just sleep for a few seconds so they have a chance to cancel the deploy with Ctrl-C

data/lib/capistrano_deploy_lock/version.rb

@@ -1,3 +1,3 @@
 module CapistranoDeployLock
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano_deploy_lock
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Nathan Broadbent