alpha_omega 0.0.182 → 0.0.183

data/VERSION

@@ -1 +1 @@
-0.0.182
+0.0.183

data/lib/alpha_omega/deploy.rb

@@ -154,8 +154,10 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
   # =========================================================================
   # deploy:lock defaults
   # =========================================================================
-  _cset(:want_unlock) { true }
+  _cset(:want_unlock)  { true }
   _cset(:lock_timeout) { 86400 }
+  _cset(:lock_name)    { application }
+  _cset(:lock_path)    { "#{log_path}/.#{lock_name}_deploy_lock" }
 
   # =========================================================================
   # These are helper methods that will be available to your recipes.
@@ -544,7 +546,7 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
       epoch = Time.now.to_i
       locker = ''
 
-      run "cat #{log_path}/.#{application}_deploy_lock 2>&- || true" do |ch, stream, data|
+      run "cat #{lock_path} 2>&- || true" do |ch, stream, data|
         locker << data
       end
 
@@ -555,7 +557,7 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
         lock_elasped = epoch-lock_epoch
 
         if lock_elasped < lock_timeout
-          true # don't do anything if locks timeout, jus advise unlock
+          true # don't do anything if lock times out, just advise unlock
         end
 
         system "#{figlet} failed to lock"
@@ -565,7 +567,7 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
       end
 
       run_script = <<-SCRIPT
-        echo #{epoch} #{ENV['AO_USER']} > #{log_path}/.#{application}_deploy_lock;
+        echo #{epoch} #{ENV['AO_USER']} > #{lock_path};
       SCRIPT
 
       if want_unlock
@@ -575,13 +577,23 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
       run run_script.gsub(/[\n\r]+[ \t]+/, " ")
     end
 
+    task :lock_compare do
+      set :lock_name, :compare
+      lock
+    end
+
+    task :lock_migrate do
+      set :lock_name, :migrate
+      lock
+    end
+
     task :dont_unlock  do
       set :want_unlock, false
     end
 
     task :unlock do
       if want_unlock
-        run "rm -f #{log_path}/.#{application}_deploy_lock"
+        run "rm -f #{lock_path}"
       end
     end
 

data/libexec/activate

@@ -126,7 +126,11 @@ case "$(basename $0)" in
             ;;
 
           compare)
-            bundle exec cap "$@" deploy:compare
+            bundle exec cap "$@" deploy:lock_compare deploy:compare
+            ;;
+
+          repl)
+            bundle exec cap "$@" deploy:lock_compare deploy:repl
             ;;
 
           migrate)
@@ -167,7 +171,7 @@ case "$(basename $0)" in
               echo "listing migrations"
             fi
 
-            bundle exec cap "$@" deploy:migrate
+            bundle exec cap "$@" deploy:lock_migrate deploy:migrate
             ;;
 
           *)

data/libexec/build

@@ -126,7 +126,11 @@ case "$(basename $0)" in
             ;;
 
           compare)
-            bundle exec cap "$@" deploy:compare
+            bundle exec cap "$@" deploy:lock_compare deploy:compare
+            ;;
+
+          repl)
+            bundle exec cap "$@" deploy:lock_compare deploy:repl
             ;;
 
           migrate)
@@ -167,7 +171,7 @@ case "$(basename $0)" in
               echo "listing migrations"
             fi
 
-            bundle exec cap "$@" deploy:migrate
+            bundle exec cap "$@" deploy:lock_migrate deploy:migrate
             ;;
 
           *)

data/libexec/bump

@@ -126,7 +126,11 @@ case "$(basename $0)" in
             ;;
 
           compare)
-            bundle exec cap "$@" deploy:compare
+            bundle exec cap "$@" deploy:lock_compare deploy:compare
+            ;;
+
+          repl)
+            bundle exec cap "$@" deploy:lock_compare deploy:repl
             ;;
 
           migrate)
@@ -167,7 +171,7 @@ case "$(basename $0)" in
               echo "listing migrations"
             fi
 
-            bundle exec cap "$@" deploy:migrate
+            bundle exec cap "$@" deploy:lock_migrate deploy:migrate
             ;;
 
           *)

data/libexec/check

@@ -126,7 +126,11 @@ case "$(basename $0)" in
             ;;
 
           compare)
-            bundle exec cap "$@" deploy:compare
+            bundle exec cap "$@" deploy:lock_compare deploy:compare
+            ;;
+
+          repl)
+            bundle exec cap "$@" deploy:lock_compare deploy:repl
             ;;
 
           migrate)
@@ -167,7 +171,7 @@ case "$(basename $0)" in
               echo "listing migrations"
             fi
 
-            bundle exec cap "$@" deploy:migrate
+            bundle exec cap "$@" deploy:lock_migrate deploy:migrate
             ;;
 
           *)

data/libexec/compare

@@ -126,7 +126,11 @@ case "$(basename $0)" in
             ;;
 
           compare)
-            bundle exec cap "$@" deploy:compare
+            bundle exec cap "$@" deploy:lock_compare deploy:compare
+            ;;
+
+          repl)
+            bundle exec cap "$@" deploy:lock_compare deploy:repl
             ;;
 
           migrate)
@@ -167,7 +171,7 @@ case "$(basename $0)" in
               echo "listing migrations"
             fi
 
-            bundle exec cap "$@" deploy:migrate
+            bundle exec cap "$@" deploy:lock_migrate deploy:migrate
             ;;
 
           *)

data/libexec/config

@@ -126,7 +126,11 @@ case "$(basename $0)" in
             ;;
 
           compare)
-            bundle exec cap "$@" deploy:compare
+            bundle exec cap "$@" deploy:lock_compare deploy:compare
+            ;;
+
+          repl)
+            bundle exec cap "$@" deploy:lock_compare deploy:repl
             ;;
 
           migrate)
@@ -167,7 +171,7 @@ case "$(basename $0)" in
               echo "listing migrations"
             fi
 
-            bundle exec cap "$@" deploy:migrate
+            bundle exec cap "$@" deploy:lock_migrate deploy:migrate
             ;;
 
           *)

data/libexec/debug

@@ -126,7 +126,11 @@ case "$(basename $0)" in
             ;;
 
           compare)
-            bundle exec cap "$@" deploy:compare
+            bundle exec cap "$@" deploy:lock_compare deploy:compare
+            ;;
+
+          repl)
+            bundle exec cap "$@" deploy:lock_compare deploy:repl
             ;;
 
           migrate)
@@ -167,7 +171,7 @@ case "$(basename $0)" in
               echo "listing migrations"
             fi
 
-            bundle exec cap "$@" deploy:migrate
+            bundle exec cap "$@" deploy:lock_migrate deploy:migrate
             ;;
 
           *)

data/libexec/deploy

@@ -126,7 +126,11 @@ case "$(basename $0)" in
             ;;
 
           compare)
-            bundle exec cap "$@" deploy:compare
+            bundle exec cap "$@" deploy:lock_compare deploy:compare
+            ;;
+
+          repl)
+            bundle exec cap "$@" deploy:lock_compare deploy:repl
             ;;
 
           migrate)
@@ -167,7 +171,7 @@ case "$(basename $0)" in
               echo "listing migrations"
             fi
 
-            bundle exec cap "$@" deploy:migrate
+            bundle exec cap "$@" deploy:lock_migrate deploy:migrate
             ;;
 
           *)

data/libexec/dist

@@ -126,7 +126,11 @@ case "$(basename $0)" in
             ;;
 
           compare)
-            bundle exec cap "$@" deploy:compare
+            bundle exec cap "$@" deploy:lock_compare deploy:compare
+            ;;
+
+          repl)
+            bundle exec cap "$@" deploy:lock_compare deploy:repl
             ;;
 
           migrate)
@@ -167,7 +171,7 @@ case "$(basename $0)" in
               echo "listing migrations"
             fi
 
-            bundle exec cap "$@" deploy:migrate
+            bundle exec cap "$@" deploy:lock_migrate deploy:migrate
             ;;
 
           *)

data/libexec/dna

@@ -126,7 +126,11 @@ case "$(basename $0)" in
             ;;
 
           compare)
-            bundle exec cap "$@" deploy:compare
+            bundle exec cap "$@" deploy:lock_compare deploy:compare
+            ;;
+
+          repl)
+            bundle exec cap "$@" deploy:lock_compare deploy:repl
             ;;
 
           migrate)
@@ -167,7 +171,7 @@ case "$(basename $0)" in
               echo "listing migrations"
             fi
 
-            bundle exec cap "$@" deploy:migrate
+            bundle exec cap "$@" deploy:lock_migrate deploy:migrate
             ;;
 
           *)

data/libexec/hosts

@@ -126,7 +126,11 @@ case "$(basename $0)" in
             ;;
 
           compare)
-            bundle exec cap "$@" deploy:compare
+            bundle exec cap "$@" deploy:lock_compare deploy:compare
+            ;;
+
+          repl)
+            bundle exec cap "$@" deploy:lock_compare deploy:repl
             ;;
 
           migrate)
@@ -167,7 +171,7 @@ case "$(basename $0)" in
               echo "listing migrations"
             fi
 
-            bundle exec cap "$@" deploy:migrate
+            bundle exec cap "$@" deploy:lock_migrate deploy:migrate
             ;;
 
           *)

data/libexec/invoke

@@ -126,7 +126,11 @@ case "$(basename $0)" in
             ;;
 
           compare)
-            bundle exec cap "$@" deploy:compare
+            bundle exec cap "$@" deploy:lock_compare deploy:compare
+            ;;
+
+          repl)
+            bundle exec cap "$@" deploy:lock_compare deploy:repl
             ;;
 
           migrate)
@@ -167,7 +171,7 @@ case "$(basename $0)" in
               echo "listing migrations"
             fi
 
-            bundle exec cap "$@" deploy:migrate
+            bundle exec cap "$@" deploy:lock_migrate deploy:migrate
             ;;
 
           *)

data/libexec/lock

@@ -126,7 +126,11 @@ case "$(basename $0)" in
             ;;
 
           compare)
-            bundle exec cap "$@" deploy:compare
+            bundle exec cap "$@" deploy:lock_compare deploy:compare
+            ;;
+
+          repl)
+            bundle exec cap "$@" deploy:lock_compare deploy:repl
             ;;
 
           migrate)
@@ -167,7 +171,7 @@ case "$(basename $0)" in
               echo "listing migrations"
             fi
 
-            bundle exec cap "$@" deploy:migrate
+            bundle exec cap "$@" deploy:lock_migrate deploy:migrate
             ;;
 
           *)

data/libexec/migrate

@@ -126,7 +126,11 @@ case "$(basename $0)" in
             ;;
 
           compare)
-            bundle exec cap "$@" deploy:compare
+            bundle exec cap "$@" deploy:lock_compare deploy:compare
+            ;;
+
+          repl)
+            bundle exec cap "$@" deploy:lock_compare deploy:repl
             ;;
 
           migrate)
@@ -167,7 +171,7 @@ case "$(basename $0)" in
               echo "listing migrations"
             fi
 
-            bundle exec cap "$@" deploy:migrate
+            bundle exec cap "$@" deploy:lock_migrate deploy:migrate
             ;;
 
           *)

data/libexec/plan

@@ -126,7 +126,11 @@ case "$(basename $0)" in
             ;;
 
           compare)
-            bundle exec cap "$@" deploy:compare
+            bundle exec cap "$@" deploy:lock_compare deploy:compare
+            ;;
+
+          repl)
+            bundle exec cap "$@" deploy:lock_compare deploy:repl
             ;;
 
           migrate)
@@ -167,7 +171,7 @@ case "$(basename $0)" in
               echo "listing migrations"
             fi
 
-            bundle exec cap "$@" deploy:migrate
+            bundle exec cap "$@" deploy:lock_migrate deploy:migrate
             ;;
 
           *)

data/libexec/release

@@ -126,7 +126,11 @@ case "$(basename $0)" in
             ;;
 
           compare)
-            bundle exec cap "$@" deploy:compare
+            bundle exec cap "$@" deploy:lock_compare deploy:compare
+            ;;
+
+          repl)
+            bundle exec cap "$@" deploy:lock_compare deploy:repl
             ;;
 
           migrate)
@@ -167,7 +171,7 @@ case "$(basename $0)" in
               echo "listing migrations"
             fi
 
-            bundle exec cap "$@" deploy:migrate
+            bundle exec cap "$@" deploy:lock_migrate deploy:migrate
             ;;
 
           *)

data/libexec/repl

@@ -0,0 +1,184 @@
+#!/bin/bash -e
+
+hst_this=$(hostname -s)
+if ! echo "$hst_this" | egrep -q "^(admin|develop)"; then
+  # unless the .ao_no_proxy file exists
+  if [[ ! -f ".ao_no_proxy" ]]; then
+    # ssh into deploy host and run from there
+    exec bin/proxy $(basename $0) "$@"
+    exit 1
+  fi
+fi
+
+export LOCAL_ONLY=true
+
+case "$(basename $0)" in
+  invoke)
+    export COMMAND="$1"; shift
+
+    if [[ -n $1 ]]; then
+      set -- $(for a in "$@"; do echo $a.app; done)
+    fi
+
+    LOCAL_ONLY=
+    tmp_invoke=$(mktemp -t XXXXXXXXX)
+    bundle exec cap "$@" invoke 2>&1 | perl -pe 's{.\[\d+m}{}g' | perl -ne 'm{^\s*\*+\s*\[(out|err)\s*::\s*([^]]+)\] ?(.*)} && print "$1 $2 $3\n"' > $tmp_invoke 2>&1
+
+    cat $tmp_invoke | awk '{print $2}' | sort -u | while read -r nm_host; do
+      egrep "^(out|err) $nm_host" $tmp_invoke || true
+      echo
+    done
+    rm -f $tmp_invoke
+    ;;
+  *)
+    if [[ -n $1 ]]; then
+      set -- $(for a in "$@"; do echo $a; done)
+    fi
+
+    case "$(basename $0)" in
+      debug)
+        if [[ -z $1 ]]; then
+          set "world"
+        fi
+
+        if [[ -n $1 ]]; then
+          cap $(for a in "$@"; do echo $a.echo; done)
+        fi
+        ;;
+
+      hosts)
+        {
+          if [[ -n $1 ]]; then
+            cap $(for a in "$@"; do echo $a.echo; done)
+          fi
+        } 2>&1 | grep eea914aaa8dde6fdae29242b1084a2b0415eefaf | awk '{print $NF}' | sort -u
+        ;;
+
+      dna)
+        {
+          echo "eea914aaa8dde6fdae29242b1084a2b0415eefaf ---"
+          if [[ -n $1 ]]; then
+            cap $(for a in "$@"; do echo $a.yaml; done)
+          fi
+        } 2>&1 | grep eea914aaa8dde6fdae29242b1084a2b0415eefaf | sed 's#eea914aaa8dde6fdae29242b1084a2b0415eefaf ##'
+        ;;
+
+      *)
+        LOCAL_ONLY=
+        if [[ -n $1 ]]; then
+          set -- $(for a in "$@"; do echo $a.app; done)
+        fi
+        case "$(basename $0)" in
+          deploy)
+            bundle exec cap "$@" deploy:lock deploy
+            ;;
+
+          release)
+            bundle exec cap "$@" deploy:lock deploy
+            ;;
+
+          stage)
+            bundle exec cap "$@" deploy:lock deploy:update_code deploy:symlink_next
+            ;;
+
+          restart)
+            bundle exec cap "$@" deploy:lock deploy:restart
+            ;;
+
+          config)
+            bundle exec cap "$@" deploy:lock deploy:config
+            ;;
+
+          build)
+            bundle exec cap "$@" deploy:lock deploy:build
+            ;;
+
+          dist)
+            bundle exec cap "$@" deploy:lock deploy:dist
+            ;;
+
+          activate)
+            bundle exec cap "$@" deploy:lock deploy:symlink deploy:restart
+            ;;
+
+          rollback)
+            bundle exec cap "$@" deploy:lock deploy:rollback
+            ;;
+
+          check)
+            bundle exec cap "$@" deploy:lock deploy:check
+            ;;
+
+          plan)
+            bundle exec cap "$@" deploy:lock deploy:plan
+            ;;
+
+          lock)
+            bundle exec cap "$@" deploy:dont_unlock deploy:lock
+            ;;
+
+          unlock)
+            bundle exec cap "$@" deploy:unlock
+            ;;
+
+          shell)
+            bundle exec cap "$@" shell
+            ;;
+
+          compare)
+            bundle exec cap "$@" deploy:lock_compare deploy:compare
+            ;;
+
+          repl)
+            bundle exec cap "$@" deploy:lock_compare deploy:repl
+            ;;
+
+          migrate)
+            want_list=
+            if [[ $1 = "list" ]]; then
+              want_list=1; shift
+            fi
+
+            change_group=
+            migration=
+            case $1 in
+              data)
+                change_group=$1; shift
+                ;;
+              pre)
+                change_group=$1; shift
+                ;;
+              during)
+                change_group=$1; shift
+                ;;
+              post)
+                change_group=$1; shift
+                ;;
+              [0123456789][0123456789][0123456789][0123456789][0123456789][0123456789][0123456789][0123456789][0123456789][0123456789][0123456789][0123456789][0123456789][0123456789])
+                migration=$1; shift
+                ;;
+            esac
+
+            if [[ -n $change_group ]]; then
+              if [[ -n $want_list ]]; then
+                echo "listing change group $change_group"
+              else
+                echo "running change group $change_group"
+              fi
+            elif [[ -n $migration ]]; then
+              echo "running migration $migratio"
+            elif [[ -n $want_list ]]; then
+              echo "listing migrations"
+            fi
+
+            bundle exec cap "$@" deploy:lock_migrate deploy:migrate
+            ;;
+
+          *)
+            bundle exec cap "$@"
+            ;;
+        esac
+    esac
+    ;;
+esac
+

data/libexec/restart

@@ -126,7 +126,11 @@ case "$(basename $0)" in
             ;;
 
           compare)
-            bundle exec cap "$@" deploy:compare
+            bundle exec cap "$@" deploy:lock_compare deploy:compare
+            ;;
+
+          repl)
+            bundle exec cap "$@" deploy:lock_compare deploy:repl
             ;;
 
           migrate)
@@ -167,7 +171,7 @@ case "$(basename $0)" in
               echo "listing migrations"
             fi
 
-            bundle exec cap "$@" deploy:migrate
+            bundle exec cap "$@" deploy:lock_migrate deploy:migrate
             ;;
 
           *)

data/libexec/rollback

@@ -126,7 +126,11 @@ case "$(basename $0)" in
             ;;
 
           compare)
-            bundle exec cap "$@" deploy:compare
+            bundle exec cap "$@" deploy:lock_compare deploy:compare
+            ;;
+
+          repl)
+            bundle exec cap "$@" deploy:lock_compare deploy:repl
             ;;
 
           migrate)
@@ -167,7 +171,7 @@ case "$(basename $0)" in
               echo "listing migrations"
             fi
 
-            bundle exec cap "$@" deploy:migrate
+            bundle exec cap "$@" deploy:lock_migrate deploy:migrate
             ;;
 
           *)

data/libexec/shell

@@ -126,7 +126,11 @@ case "$(basename $0)" in
             ;;
 
           compare)
-            bundle exec cap "$@" deploy:compare
+            bundle exec cap "$@" deploy:lock_compare deploy:compare
+            ;;
+
+          repl)
+            bundle exec cap "$@" deploy:lock_compare deploy:repl
             ;;
 
           migrate)
@@ -167,7 +171,7 @@ case "$(basename $0)" in
               echo "listing migrations"
             fi
 
-            bundle exec cap "$@" deploy:migrate
+            bundle exec cap "$@" deploy:lock_migrate deploy:migrate
             ;;
 
           *)

data/libexec/stage

@@ -126,7 +126,11 @@ case "$(basename $0)" in
             ;;
 
           compare)
-            bundle exec cap "$@" deploy:compare
+            bundle exec cap "$@" deploy:lock_compare deploy:compare
+            ;;
+
+          repl)
+            bundle exec cap "$@" deploy:lock_compare deploy:repl
             ;;
 
           migrate)
@@ -167,7 +171,7 @@ case "$(basename $0)" in
               echo "listing migrations"
             fi
 
-            bundle exec cap "$@" deploy:migrate
+            bundle exec cap "$@" deploy:lock_migrate deploy:migrate
             ;;
 
           *)

data/libexec/unlock

@@ -126,7 +126,11 @@ case "$(basename $0)" in
             ;;
 
           compare)
-            bundle exec cap "$@" deploy:compare
+            bundle exec cap "$@" deploy:lock_compare deploy:compare
+            ;;
+
+          repl)
+            bundle exec cap "$@" deploy:lock_compare deploy:repl
             ;;
 
           migrate)
@@ -167,7 +171,7 @@ case "$(basename $0)" in
               echo "listing migrations"
             fi
 
-            bundle exec cap "$@" deploy:migrate
+            bundle exec cap "$@" deploy:lock_migrate deploy:migrate
             ;;
 
           *)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: alpha_omega
 version: !ruby/object:Gem::Version 
-  hash: 371
+  hash: 369
   prerelease: 
   segments: 
   - 0
   - 0
-  - 182
-  version: 0.0.182
+  - 183
+  version: 0.0.183
 platform: ruby
 authors: 
 - David Nghiem
@@ -16,7 +16,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-31 00:00:00 Z
+date: 2011-08-31 00:00:00 +00:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: grit
@@ -118,41 +119,43 @@ files:
 - README.mkd
 - libexec/activate
 - libexec/build
-- libexec/bump
+- libexec/stage
 - libexec/check
-- libexec/compare
-- libexec/config
-- libexec/debug
 - libexec/deploy
 - libexec/dist
-- libexec/dna
+- libexec/restart
+- libexec/bump
 - libexec/hosts
-- libexec/invoke
-- libexec/lock
+- libexec/config
 - libexec/migrate
+- libexec/rollback
+- libexec/invoke
 - libexec/plan
-- libexec/proxy
 - libexec/release
-- libexec/restart
-- libexec/rollback
+- libexec/proxy
+- libexec/compare
+- libexec/repl
 - libexec/shell
-- libexec/stage
+- libexec/lock
 - libexec/unlock
-- lib/alpha_omega/deploy/dependencies.rb
-- lib/alpha_omega/deploy/local_dependency.rb
-- lib/alpha_omega/deploy/remote_dependency.rb
-- lib/alpha_omega/deploy/scm/base.rb
+- libexec/dna
+- libexec/debug
+- lib/alpha_omega/deploy.rb
+- lib/alpha_omega/deploy/strategy.rb
 - lib/alpha_omega/deploy/scm/git.rb
+- lib/alpha_omega/deploy/scm/base.rb
+- lib/alpha_omega/deploy/remote_dependency.rb
+- lib/alpha_omega/deploy/dependencies.rb
 - lib/alpha_omega/deploy/scm.rb
-- lib/alpha_omega/deploy/strategy/base.rb
+- lib/alpha_omega/deploy/local_dependency.rb
 - lib/alpha_omega/deploy/strategy/checkout.rb
 - lib/alpha_omega/deploy/strategy/remote.rb
-- lib/alpha_omega/deploy/strategy.rb
+- lib/alpha_omega/deploy/strategy/base.rb
 - lib/alpha_omega/deploy/templates/maintenance.rhtml
-- lib/alpha_omega/deploy.rb
-- lib/alpha_omega/utils.rb
 - lib/alpha_omega/version.rb
+- lib/alpha_omega/utils.rb
 - bin/alpha_omega
+has_rdoc: true
 homepage: https://github.com/HeSYINUvSBZfxqA/alpha_omega
 licenses: []
 
@@ -182,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: alpha_omega capistrano recipes