capistrano-deploy-lock 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3706dab8d4d86569c3426729f9372d4caed6417b
-  data.tar.gz: c4b39fb3656b58edaa26fac052cda2348fe78c83
+  metadata.gz: c1189621f4a67a143e88e4a95ced9252cc67d68d
+  data.tar.gz: 174b3c7ea054f3a7da172bd3aaafa20f5ce3a706
 SHA512:
-  metadata.gz: 2a2b5d3173cd4b9a1466d804d8bae8485319f09552fce810bec6f4d8127a3fc168d367c50ee71c404b9e8beef4666241a2fecbb0f33f08175bf027edd809ce51
-  data.tar.gz: fe16dd12b7e801b64ca1eb11d0199ff4c8c4d84bdf2be21a92b85fb3d6e59f7c9e820639eed2e7221b933b52c6bee6eeb45de81c3d48e3d29026898fdbbb29a0
+  metadata.gz: 4ad69733250faae70af2b5247bae86389618ff068fe521da04f9550bab1e221fe0dbcab3eb706a84c163c7f648ccbfc5641ad1faf77e043cf06a4b1b5eb62b14
+  data.tar.gz: 5d6917d14bb3150fe60b57479ec8b2e4c27c2b6dfe883320e52c5d11f4f06483bb04ad5bede86f6f2267d1b9399f50ec9339ea8d701fada369db1ccd5bd61caf

data/.gitignore

@@ -1 +1,2 @@
 nbproject/
+.idea/

data/capistrano-deploy-lock.gemspec

@@ -3,18 +3,18 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
-  spec.name          = "capistrano-deploy-lock"
-  spec.version       = "1.0.3"
-  spec.author        = "Maruf Hasan Bulbul"
-  spec.email         = "mhb.cse@gmail.com"
-  spec.summary       = %q{Deploy lock feature for Capistrano 3.4.x}
-  spec.description   = %q{Lock deploy when deployment is running or custom lock to prevent further deployment for Capistrano 3.}
-  spec.homepage      = "https://github.com/maruf-freelancer/capistrano-deploy-lock"
+  spec.name = 'capistrano-deploy-lock'
+  spec.version = '1.0.4'
+  spec.author = 'Maruf Hasan Bulbul'
+  spec.email = 'mhb.cse@gmail.com'
+  spec.summary = %q{Deploy lock feature for Capistrano 3.4.x}
+  spec.description = %q{Lock deploy when deployment is running or custom lock to prevent further deployment for Capistrano 3.}
+  spec.homepage = 'https://github.com/maruf-freelancer/capistrano-deploy-lock'
 
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.require_paths = ["lib"]
+  spec.files = `git ls-files -z`.split("\x0")
+  spec.require_paths = ['lib']
 
   spec.add_dependency 'capistrano', '>= 3.4'
-  spec.add_development_dependency "rake", ">= 10.0"
+  spec.add_development_dependency 'rake', '>= 10.0'
   spec.required_ruby_version = '>= 1.9.3'
 end

data/lib/capistrano/tasks/deploy-lock.rake

@@ -1,4 +1,4 @@
-set :deploy_lock_file, -> { File.join(shared_path, "deploy-lock.yml") }
+set :deploy_lock_file, -> { File.join(shared_path, 'deploy-lock.yml') }
 set :deploy_lock_roles, -> { :app }
 set :default_lock_expiry, (15 * 60)
 set :deploy_lock, false
@@ -6,27 +6,27 @@ set :lock_message, nil
 set :lock_expiry, nil
 
 namespace :deploy do
-  
-  desc "Deploy with a custom deploy lock"
+
+  desc 'Deploy with a custom deploy lock'
   task :with_lock do
     invoke 'deploy:lock'
     invoke 'deploy'
   end
-  
-  desc "Set deploy lock with a custom lock message and expiry time"
+
+  desc 'Set deploy lock with a custom lock message and expiry time'
   task :lock do
     set :custom_deploy_lock, true
     set :lock_message, ask('lock message', '', echo: true)
     puts "Lock message: #{fetch(:lock_message)}"
 
     while fetch(:lock_expiry).nil?
-      set :expire_after, ask('minutes of expiry', 'optional', echo: true) 
+      set :expire_after, ask('minutes of expiry', 'optional', echo: true)
       expire_after = fetch(:expire_after)
-          
-      if expire_after == "optional"
+
+      if expire_after == 'optional'
         # Never expire an explicit lock if no time given
         set :lock_expiry, false
-        puts colorize("Lock will never expire automatically.", color: 33)
+        puts colorize('Lock will never expire automatically.', color: 33)
       else
         unless expire_after.to_i == 0
           set :lock_expiry, (Time.now + expire_after.to_i * 60).utc
@@ -36,11 +36,11 @@ namespace :deploy do
         end
       end
     end
- 
+
     invoke 'deploy:create_lock'
   end
-  
-  desc "Creates a lock file, so that futher deploys will be prevented"
+
+  desc 'Creates a lock file, so that futher deploys will be prevented'
   task :create_lock do
     if fetch(:deploy_lock)
       puts colorize('Deploy lock already created.', color: 33)
@@ -50,7 +50,7 @@ namespace :deploy do
     if fetch(:lock_message).nil?
       set :lock_message, "Deploying #{fetch(:branch)} branch in #{fetch(:rails_env)}"
     end
-        
+
     if fetch(:lock_expiry).nil?
       set :lock_expiry, (Time.now + fetch(:default_lock_expiry)).utc
     end
@@ -62,24 +62,24 @@ namespace :deploy do
       message: fetch(:lock_message).to_s,
       custom: !!fetch(:custom_deploy_lock)
     }
-        
+
     write_deploy_lock(deploy_lock_data)
-    
+
     set :deploy_lock, deploy_lock_data
   end
-  
-  desc "Checks for a deploy lock. If present, deploy is aborted and message is displayed. Any expired locks are deleted."
+
+  desc 'Checks for a deploy lock. If present, deploy is aborted and message is displayed. Any expired locks are deleted.'
   task :check_lock do
     # Don't check the lock if we just created it
     next if fetch(:deploy_lock)
 
     fetch_deploy_lock
-        
+
     # Return if no lock
     next unless fetch(:deploy_lock)
 
     deploy_lock = fetch(:deploy_lock)
-        
+
     if deploy_lock[:expire_at] && deploy_lock[:expire_at] < Time.now
       remove_deploy_lock
       next
@@ -103,37 +103,30 @@ namespace :deploy do
       exit 1
     end
   end
-  
+
   namespace :unlock do
-    desc "Unlocks the server for deployment"
+    desc 'Unlocks the server for deployment'
     task :default do
       # Don't automatically remove custom deploy locks created by deploy:lock task
       if fetch(:custom_deploy_lock)
         puts colorize('Not removing custom deploy lock.', color: 33)
       else
         remove_deploy_lock
-        puts colorize("Deploy unlocked.", color: 32)
+        puts colorize('Deploy unlocked.', color: 32)
       end
     end
 
     task :force do
       remove_deploy_lock
-      puts colorize("Deploy unlocked.", color: 32)
+      puts colorize('Deploy unlocked.', color: 32)
     end
   end
-  
-  before 'deploy:started', 'check_lock' do
-    invoke 'deploy:check_lock'
-  end
-  before 'deploy:started', 'create_lock' do
-    invoke 'deploy:create_lock'
-  end
-  after 'deploy:published', 'unlock' do
-    invoke 'deploy:unlock:default'
-  end
-  after 'deploy:rollback', 'unlock' do
-    invoke 'deploy:unlock:default'
-  end
+
+  before 'deploy:started', 'check_lock'
+  before 'deploy:started', 'create_lock'
+  after 'deploy:published', 'unlock:default'
+  after 'deploy:rollback', 'unlock:default'
+  after 'deploy:failed', 'unlock:default'
 
 end
 
@@ -144,7 +137,7 @@ def fetch_deploy_lock
 
   unless fetch(:deploy_lock)
     # Check all matching servers for a deploy lock.
-    on roles(fetch(:deploy_lock_roles)).to_a, in: :parallel do |host|
+    on roles(fetch(:deploy_lock_roles)), in: :parallel do |host|
       if test("[ -f #{fetch(:deploy_lock_file)} ]")
         output = capture "cat #{fetch(:deploy_lock_file)}"
         set :deploy_lock, YAML.load(output)
@@ -164,7 +157,7 @@ end
 
 def remove_deploy_lock
   on roles(fetch(:deploy_lock_roles)), in: :parallel do |host|
-    execute :rm, "-f", fetch(:deploy_lock_file)
+    execute :rm, '-f', fetch(:deploy_lock_file)
   end
   set :deploy_lock, nil
   set :deploy_lock_removed, true
@@ -180,7 +173,7 @@ def message(application, stage, deploy_lock)
   else
     message << "\n\e[0;33mLock must be manually removed with: cap #{stage} deploy:unlock\e[0m"
   end
-  
+
   colorize(message)
 end
 
@@ -188,4 +181,4 @@ def colorize(text, options = {})
   attribute = options[:attribute] || 0
   color = options[:color] || 31
   "\e[#{attribute};#{color}m" + text.strip + "\e[0m\n"
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-deploy-lock
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Maruf Hasan Bulbul
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -73,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Deploy lock feature for Capistrano 3.4.x