alpha_omega 0.0.11 → 0.0.16

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    alpha_omega (0.0.11)
+    alpha_omega (0.0.16)
       HeSYINUvSBZfxqA-foreman
       capistrano (= 2.5.21)
       capistrano-log_with_awesome

data/recipes/alpha_omega/deploy.rb

@@ -84,6 +84,11 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
   # with persistent releases, the latest release is always the current release
   _cset(:latest_release) { current_release }
 
+  # =========================================================================
+  # deploy:lock defaults
+  # =========================================================================
+  _cset(:lock_timeout) { 300 }
+
   # =========================================================================
   # These are helper methods that will be available to your recipes.
   # =========================================================================
@@ -236,7 +241,7 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
       end
 
       if releases.length == 1
-        sudo "ln -snf #{latest_release} #{current_path}"
+        run "[[ $(readlink #{current_path} 2>&-) = #{latest_release} ]] || sudo ln -snf #{latest_release} #{current_path}"
       else
         run "ln -snf #{latest_release} #{current_path}"
       end
@@ -414,23 +419,58 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
       end
     end
 
-  end
+    task :lock do
+      epoch = Time.now.to_i
+      locker = ''
+
+      run "cat #{deploy_to}/log/.#{application}_deploy_lock 2>&- || true" do |ch, stream, data|
+        locker << data
+      end
+
+      if !locker.empty?
+        lock_epoch = locker.split[0].to_i
+        lock_user = locker.split[1]
+
+        lock_elasped = epoch-lock_epoch
+
+        if lock_elasped < lock_timeout
+          puts "deploy in progress by #{lock_user} #{epoch-lock_epoch} seconds ago"
+          abort
+        elsif
+          puts "Found a chef lock by #{lock_user} #{epoch-lock_epoch} seconds ago: too old, deleting and ignoring"
+        end
+      end
+
+      run_script = <<-SCRIPT
+        echo #{epoch} #{ENV['USER']} > #{deploy_to}/log/.#{application}_deploy_lock;
+      SCRIPT
+
+      at_exit { self.unlock; }
+
+      run run_script.gsub(/[\n\r]+[ \t]+/, " ")
+    end
+
+    task :unlock do
+      run "rm -f #{deploy_to}/log/.#{application}_deploy_lock"
+    end
+
+  end # :deploy
 
   on :exit do
     put full_log, "#{deploy_to}/log/#{application}_last_deploy.log-#{Time.now.strftime('%Y%m%d-%H%M')}"
   end
 
-end # Capistrano::Configuration
-
-namespace :ruby do
-  task :bundle do
-    run_script = <<-SCRIPT
-      set -e; cd #{release_path};
-      [[ -f #{ruby_env} ]] && . #{ruby_env};
-      [[ -f #{ruby_rvm} ]] && { set +e; source #{ruby_rvm}; set -e; };
-      bundle check || bundle install --deployment --quiet --local --without development test || bundle check;
-    SCRIPT
-    run run_script
+  namespace :ruby do
+    task :bundle do
+      run_script = <<-SCRIPT
+        set -e; cd #{release_path};
+        [[ -f #{ruby_env} ]] && . #{ruby_env};
+        [[ -f #{ruby_rvm} ]] && { set +e; source #{ruby_rvm}; set -e; };
+        bundle check || bundle install --deployment --quiet --local --without development test || bundle check;
+      SCRIPT
+      run run_script.gsub(/[\n\r]+[ \t]+/, " ")
+    end
   end
-end
+
+end # Capistrano::Configuration
 

data/recipes/alpha_omega/version.rb

@@ -1,3 +1,3 @@
 module AlphaOmega
-  Version = "0.0.11"
+  Version = "0.0.16"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: alpha_omega
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 63
   prerelease: 
   segments: 
   - 0
   - 0
-  - 11
-  version: 0.0.11
+  - 16
+  version: 0.0.16
 platform: ruby
 authors: 
 - David Nghiem