alpha_omega 1.4.1 → 1.4.2

data/VERSION

@@ -1 +1 @@
-1.4.1
+1.4.2

data/lib/alpha_omega/config/deploy_challenge.rb

@@ -4,14 +4,20 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
   namespace :deploy do
     task :challenge do
       if dna["app_env"] == "production"
-        who = Capistrano::CLI.ui.ask(" -- Who has reviewed this deploy to #{dna["app_env"]}? ")
-        if who.empty?
+        unless ENV['FLAGS_tag'] && !(ENV['FLAGS_tag'].empty? || ENV['FLAGS_tag'] == "HEAD")
+          puts "Did not specify a tag for production via -t vX.Y.Z"
           abort
-        else
-          set :reviewed, who
-          sleep 3
         end
-      end if reviewed.nil?
+
+        unless ENV['FLAGS_reviewer'] && active_path_name == current_path_name
+          a, b = rand(10), rand(10)
+          if Capistrano::CLI.ui.ask(" -- WARNING: Accessing production, please think: #{a} + #{b} = ").downcase.strip.to_i != (a + b)
+            abort
+          else
+            sleep(3)
+          end
+        end
+      end
     end
   end
 

data/lib/alpha_omega/config/deploy_notify.rb

@@ -3,10 +3,11 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
     namespace :notify do
       task :default do
         if $deploy["notify"]
-          unless dna["app_env"] == "development" || dna["env_pod"] == "dev"
+          email if $deploy["notify"].member? "email"
+
+          unless skip_notifications
             airbrake if $deploy["notify"].member? "airbrake"
             newrelic if $deploy["notify"].member? "newrelic"
-            email if $deploy["notify"].member? "email"
             campfire if $deploy["notify"].member? "campfire"
             flowdock if $deploy["notify"].member? "flowdock"
           end
@@ -14,7 +15,7 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
       end
 
       task :email do
-        run_locally "echo '#{notify_message}' | mail -s '#{notify_message}' #{$deploy["notify"]["email"]["recipients"].join(" ")}"
+        run_locally "echo '#{notify_message}' | mail -s '#{notify_message_abbr}' #{$deploy["notify"]["email"]["recipients"].join(" ")}"
       end
 
       task :campfire do
@@ -76,7 +77,11 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
       end
 
       def notify_message
-        "#{ENV['_AO_USER']} deployed #{application} (#{current_revision}@#{repository}) to #{dna['app_env']}"
+        "#{ENV['_AO_USER']} deployed #{application} to #{dna['app_env']}: #{repository}: #{ENV['FLAGS_tag']} => #{current_revision}"
+      end 
+
+      def notify_message_abbr
+        "#{ENV['_AO_USER']} deployed #{application} to #{dna['app_env']}: #{ENV['FLAGS_tag']}"
       end 
     end
   end

data/lib/alpha_omega/config/deploy_perf.rb

@@ -5,13 +5,19 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
   order = []
 
   on :before do 
-    order << [:start, current_task]
-    start_times[current_task] = Time.now    
+    unless skip_performance
+      order << [:start, current_task]
+      start_times[current_task] = Time.now    
+    end
   end
 
   on :after do 
-    order << [:end, current_task]
-    end_times[current_task] = Time.now    
+    unless skip_performance
+      unless skip_performance_task == current_task
+        order << [:end, current_task]
+        end_times[current_task] = Time.now    
+      end
+    end
   end
 
   config.on :exit do
@@ -28,7 +34,7 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
     l " Performance Report"
     l "=========================================================="
     
-    indent = 0 
+    indent = 1
     (order + [nil]).each_cons(2) do |payload1, payload2|
       action, task = payload1
       if action == :start
@@ -36,9 +42,22 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
         indent += 1
       else
         indent -= 1
-        l "#{".." * indent}#{task.fully_qualified_name} #{(end_times[task] - start_times[task]).to_i}s"
+        if end_times[task] && start_times[task]
+          l "#{".." * indent}#{task.fully_qualified_name} #{(end_times[task] - start_times[task]).to_i}s"
+        end
       end
     end
     l "=========================================================="
   end
+
+  namespace :deploy do
+    namespace :enable do
+      task :performance do
+        set :skip_performance, false
+        set :skip_performance_task, current_task
+      end
+    end
+  end
+
+  before "deploy:began", "deploy:enable:performance"
 end

data/lib/alpha_omega/deploy.rb

@@ -34,10 +34,13 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
   # =========================================================================
 
   _cset :skip_scm, false
+  _cset :skip_notifications, false
+  _cset :skip_performance, true
+  _cset :skip_performance_task, ""
   _cset :scm, :git
   _cset :deploy_via, :checkout
   _cset(:branch) { AlphaOmega.what_branch }
-  _cset(:revision) { source.head }
+  _cset(:revision) { ENV['FLAGS_tag'] || source.head }
 
   _cset :default_shell, "/bin/bash"
   _cset(:deploy_to) { "/data/#{application}" }
@@ -53,6 +56,7 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
   _cset(:run_method)        { fetch(:use_sudo, true) ? :sudo : :run }
 
   _cset :last_pod, nil
+  _cset :success, false
 
   _cset (:figlet) { [%x(which figlet).strip].reject {|f| !(File.executable? f)}.first || echo }
 
@@ -305,12 +309,10 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
       task (if you want to perform the `restart' task separately).
     DESC
     task :update_code do
-      strategy.deploy! unless skip_scm
+      scm
       bundle
-      unless deploy_path_name == migrate_path_name 
-        build
-        dist
-      end
+      build
+      dist
     end
 
     task :symlink_next do
@@ -404,6 +406,9 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
     task :dist do
     end
 
+    task :scm do
+      strategy.deploy! unless skip_scm
+    end
 
     desc <<-DESC
       Checkpoint for various language bundlers
@@ -615,9 +620,14 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
       end
     end
 
-    task :finished do
+    task :successful, :only => { :primary => true } do
+      set :success, true
+      run_locally"#{figlet} success | perl -pe 's{( +)}{chr(46) x length($1)}e'"
     end
 
+    task :finished do
+      successful
+    end
   end # :deploy
 end # Capistrano::Configuration
 

data/libexec/_ao

@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# first time, this will be empty, to trigger enforce_rvm
-: ${_AO_RVM:=}
-
 export _AO_OPT="$@"
 
 function deploy_basename {
@@ -10,31 +7,6 @@ function deploy_basename {
   echo "${cmd#aoh-}"
 } 
 
-# ensure script runs under rvm
-function enforce_rvm {
-  if [[ -n "$_AO_RVM" ]]; then
-    return 
-  fi
-
-  export _AO_RVM=1
-
-  local pth_ruby_loader="${_AO_RUBY_LOADER:-}"
-  : ${pth_ruby_loader:=$(ryaml $_AO_HOME/config/deploy.yml ruby_loader)}
-  local ruby_deploy="$(ryaml $_AO_HOME/config/deploy.yml app_ruby)"
-
-  if [[ -z $pth_ruby_loader || -z $ruby_deploy ]]; then
-    return
-  fi
-
-  if [[ ! -x $pth_ruby_loader ]]; then
-    return
-  fi
-
-  exec $pth_ruby_loader $ruby_deploy "$0" "$@"
-}
-
-enforce_rvm "$@"
-
 # define command line options:
 #   var name, default, description, short option
 DEFINE_string "gateway" "" "deploy gateway host" "G"
@@ -45,6 +17,8 @@ DEFINE_string "tag" "HEAD" "tag to deploy in production" "t"
 DEFINE_string "user" "" "app user override" "u"
 DEFINE_string "group" "" "app group override" "g"
 DEFINE_string "ssh_login" "" "ssh login override" "l"
+DEFINE_boolean "migrations" "$FLAGS_FALSE" "run development migrations" "M"
+DEFINE_string "reviewer" "" "who has reviewed the production version" "R"
 
 # entry point
 function main {
@@ -55,37 +29,37 @@ function main {
     exit 1
   fi
 
-  local nm_component="$1" # will shift later since this could be an integration environment
+  local nm_pod="$1" # will shift later since this could be an integration environment
   if [[ "$#" = 1 ]]; then
     local deploy_base="$(ryaml $_AO_HOME/config/deploy.yml deploy_base)"
     if [[ -n "$deploy_base" ]]; then
-      local pod_shortcut="$(ryaml $HOME/.getting-started/config/pods.yml pods ${deploy_base}${nm_component} pod)"
+      local pod_shortcut="$(ryaml $HOME/.getting-started/config/pods.yml pods ${deploy_base}${nm_pod} pod)"
       if [[ -n "$pod_shortcut" ]]; then
-        nm_component="${deploy_base}${nm_component}"
-        set -- "$nm_component"
+        nm_pod="${deploy_base}${nm_pod}"
+        set -- "$nm_pod"
       fi
       unset pod_shortcut
     fi
   fi
 
   if [[ -r "$HOME/.getting-started/config/pods.yml" ]]; then
-    local pod_shortcut="$(ryaml $HOME/.getting-started/config/pods.yml pods $nm_component pod)"
+    local pod_shortcut="$(ryaml $HOME/.getting-started/config/pods.yml pods $nm_pod pod)"
     if [[ -n "$pod_shortcut" ]]; then
-      nm_component="$pod_shortcut"
+      nm_pod="$pod_shortcut"
     else
       shift # treat as a pod name
     fi
 
-    local pod_alias="$(ryaml $HOME/.getting-started/config/pods.yml pods $nm_component alias)"
+    local pod_alias="$(ryaml $HOME/.getting-started/config/pods.yml pods $nm_pod alias)"
     if [[ -n "$pod_alias" ]]; then
-      nm_component="$pod_alias"
+      nm_pod="$pod_alias"
     fi
 
-    local is_local="$(ryaml $HOME/.getting-started/config/pods.yml pods $nm_component local)"
-    local hst_gateway="$(ryaml $HOME/.getting-started/config/pods.yml pods $nm_component gateway)"
+    local is_local="$(ryaml $HOME/.getting-started/config/pods.yml pods $nm_pod local)"
+    local hst_gateway="$(ryaml $HOME/.getting-started/config/pods.yml pods $nm_pod gateway)"
     if [[ -z "$is_local" ]]; then
       if [[ -z "$hst_gateway" ]]; then
-        logger_fatal "$nm_component is not a pod name"
+        logger_fatal "$nm_pod is not a pod name"
         exit 1
       fi
       FLAGS_proxy="$FLAGS_TRUE"
@@ -93,10 +67,10 @@ function main {
       if [[ -z "$FLAGS_chef" ]]; then
         FLAGS_chef="$HOME/.getting-started"
       fi
-      export _AO_ENV="$(ryaml $HOME/.getting-started/config/pods.yml pods $nm_component ao_env)"
+      export _AO_ENV="$(ryaml $HOME/.getting-started/config/pods.yml pods $nm_pod ao_env)"
       export RAILS_ENV="$_AO_ENV"
       if [[ -z "$_AO_ENV" ]]; then
-        _AO_ENV="$(ryaml $HOME/.getting-started/config/pods.yml pods $nm_component env)"
+        _AO_ENV="$(ryaml $HOME/.getting-started/config/pods.yml pods $nm_pod env)"
       fi
       export _AO_SSH="$HOME/.getting-started/ssh/config"
     fi
@@ -104,6 +78,8 @@ function main {
     if [[ -z "$FLAGS_gateway" ]]; then
       FLAGS_gateway="$hst_gateway"
     fi
+  else
+    shift # not proxied, so expect full names here
   fi
 
   if [[ -n "$FLAGS_user" ]]; then
@@ -129,59 +105,77 @@ function main {
     export GATEWAY="$FLAGS_gateway"
   fi
 
-  case "$nm_component" in 
-    *)
-
-      if [[ "$FLAGS_proxy" = "$FLAGS_FALSE" || "$FLAGS_direct" = "$FLAGS_TRUE" || -z "$FLAGS_gateway" ]]; then
-        export _AO_DEPLOY=1
-
-        local _AO_THIS_HOST="$(ryaml $HOME/.getting-started/config/pods.yml pods $nm_component this_host)"
-        if [[ -n "$_AO_THIS_HOST" ]]; then
-          export _AO_THIS_HOST
-        fi
-
-        local _AO_THIS_POD="$(ryaml $HOME/.getting-started/config/pods.yml pods $nm_component this_pod)"
-        if [[ -n "$_AO_THIS_POD" ]]; then
-          export _AO_THIS_POD
-        fi
-
-        bundle check 2>&1 >/dev/null || { bundle install --quiet --local --path vendor/bundle || bundle check > /dev/null; }
-        aomain "$nm_component" "$@"
-      else 
-        if [[ "$#" > 0 ]]; then
-          case "$1" in
-            all|world)
-              logger_fatal "cannot use all or world, these are dangerous"
-              exit 1
-              ;;
-            production)
-              if [[ -z "$FLAGS_tag" || "$FLAGS_tag" = "HEAD" ]]; then
-                case "$(deploy_basename $0)" in
-                  hosts|debug)
-                    true
-                    ;;
-                  *)
-                    logger_fatal "must specify a version using --tag"
-                    exit 1
-                    ;;
-                esac
-              fi
-              ;;
-          esac
-        fi
-
-        local gateway="$FLAGS_gateway"
-        if [[ -n "$FLAGS_ssh_login" ]]; then
-          gateway="${FLAGS_ssh_login}@${gateway}"
-        fi
-
-        local remote_chef=""
-        if [[ -n "$FLAGS_chef" ]]; then
-          remote_chef="-c $FLAGS_chef "
-        fi
-
-        $shome/sbin/proxy "$gateway" "$FLAGS_tag" $(deploy_basename $0) ${remote_chef}"$nm_component" "$@"
+  if [[ "$FLAGS_proxy" = "$FLAGS_FALSE" || "$FLAGS_direct" = "$FLAGS_TRUE" || -z "$FLAGS_gateway" ]]; then
+    export _AO_DEPLOY=1
+
+    local _AO_THIS_HOST="$(ryaml $HOME/.getting-started/config/pods.yml pods $nm_pod this_host)"
+    if [[ -n "$_AO_THIS_HOST" ]]; then
+      export _AO_THIS_HOST
+    fi
+
+    local _AO_THIS_POD="$(ryaml $HOME/.getting-started/config/pods.yml pods $nm_pod this_pod)"
+    if [[ -n "$_AO_THIS_POD" ]]; then
+      export _AO_THIS_POD
+    fi
+
+    bundle check 2>&1 >/dev/null || { bundle install --quiet --local --path vendor/bundle || bundle check > /dev/null; }
+
+    if [[ "$nm_pod" = "pod1" ]]; then
+      nm_pod="sys"
+    fi
+
+    if [[ "$nm_pod" = "sys" && "$#" > 0 ]]; then
+      if [[ "${1%.*}" = "production" ]]; then
+        set -- "admin" "$@"
       fi
-      ;;
-  esac
+    fi
+
+    if [[ "$FLAGS_migrations" = "$FLAGS_TRUE" ]]; then
+      export FLAGS_migrations
+    fi
+
+    if [[ -n "$FLAGS_tag" ]]; then
+      export FLAGS_tag
+    fi
+
+    if [[ -n "$FLAGS_reviewer" ]]; then
+      export FLAGS_reviewer
+    fi
+
+    aomain "$nm_pod" "$@"
+  else 
+    if [[ "$#" > 0 ]]; then
+      case "$1" in
+        all|world)
+          logger_fatal "cannot use all or world, these are dangerous"
+          exit 1
+          ;;
+        production)
+          if [[ -z "$FLAGS_tag" || "$FLAGS_tag" = "HEAD" ]]; then
+            case "$(deploy_basename $0)" in
+              hosts|debug|dna)
+                true
+                ;;
+              *)
+                logger_fatal "must specify a version using --tag|-t"
+                exit 1
+                ;;
+            esac
+          fi
+          ;;
+      esac
+    fi
+
+    local gateway="$FLAGS_gateway"
+    if [[ -n "$FLAGS_ssh_login" ]]; then
+      gateway="${FLAGS_ssh_login}@${gateway}"
+    fi
+
+    local remote_chef=""
+    if [[ -n "$FLAGS_chef" ]]; then
+      remote_chef="-c $FLAGS_chef "
+    fi
+
+    $shome/sbin/proxy "$gateway" "$FLAGS_tag" $(deploy_basename $0) ${remote_chef}"$nm_pod" "$@"
+  fi
 }

data/libexec/_sub

@@ -14,6 +14,7 @@ function sub {
 
   if [[ "$bsource_cmd" = "$bsource" ]]; then
     FLAGS_SUB="$FLAGS_TRUE"
+    export _SUB_ARGS="$@"
     parse_command_line "$@" || exit $?
     eval set -- "${FLAGS_ARGV}"
   fi

data/libexec/aoh-activate

@@ -16,7 +16,7 @@ require 'ao'
 
 function aomain {
   set -- $(for a in "$@"; do echo $a.app; done)
-  bundle exec cap "$@" deploy:began deploy:lock deploy:symlink deploy:restart deploy:finished
+  cap "$@" deploy:began deploy:lock deploy:symlink deploy:restart deploy:finished
 }
 
 require sub "$BASH_SOURCE" "$@"

data/libexec/aoh-check

@@ -17,7 +17,7 @@ require 'ao'
 
 function aomain {
   set -- $(for a in "$@"; do echo $a.app; done)
-  bundle exec cap "$@" deploy:began deploy:lock deploy:check deploy:finished
+  cap "$@" deploy:began deploy:lock deploy:check deploy:finished
 }
 
 require sub "$BASH_SOURCE" "$@"

data/libexec/aoh-compare

@@ -17,7 +17,7 @@ require 'ao'
 
 function aomain {
   set -- $(for a in "$@"; do echo $a.app; done)
-  bundle exec cap "$@" deploy:began deploy:lock_compare deploy:compare deploy:finished
+  cap "$@" deploy:began deploy:lock_compare deploy:compare deploy:finished
 }
 
 require sub "$BASH_SOURCE" "$@"

data/libexec/aoh-debug

@@ -17,7 +17,7 @@ require 'ao'
 function aomain {
   export LOCAL_ONLY=true
   set -- $(for a in "$@"; do echo $a.echo; done)
-  bundle exec cap "$@" deploy:began deploy:finished
+  cap "$@"
 }
 
 require sub "$BASH_SOURCE" "$@"

data/libexec/aoh-deploy

@@ -16,7 +16,7 @@ require 'ao'
 
 function aomain {
   set -- $(for a in "$@"; do echo $a.app; done)
-  bundle exec cap "$@" deploy:began deploy:lock deploy deploy:finished
+  cap "$@" deploy:began deploy:lock deploy deploy:finished
 }
 
 require sub "$BASH_SOURCE" "$@"

data/libexec/aoh-dist

@@ -17,7 +17,7 @@ require 'ao'
 
 function aomain {
   set -- $(for a in "$@"; do echo $a.app; done)
-  bundle exec cap "$@" deploy:began deploy:lock deploy:dist deploy:finished
+  cap "$@" deploy:began deploy:lock deploy:dist deploy:finished
 }
 
 require sub "$BASH_SOURCE" "$@"

data/libexec/aoh-dna

@@ -20,7 +20,7 @@ function aomain {
   {
     set -- $(for a in "$@"; do echo $a.yaml; done)
     echo "eea914aaa8dde6fdae29242b1084a2b0415eefaf ---"
-    bundle exec cap "$@" deploy:began deploy:finished
+    cap "$@"
   } 2>&1 | grep eea914aaa8dde6fdae29242b1084a2b0415eefaf | sed 's#eea914aaa8dde6fdae29242b1084a2b0415eefaf ##'
 }
 

data/libexec/aoh-hosts

@@ -18,7 +18,7 @@ require 'ao'
 function aomain {
   export LOCAL_ONLY=true
   set -- $(for a in "$@"; do echo $a.echo; done)
-  bundle exec cap "$@" deploy:began deploy:finished 2>&1 | grep eea914aaa8dde6fdae29242b1084a2b0415eefaf | awk '{print $NF}' | sort -u 2>&1
+  cap "$@" 2>&1 | grep eea914aaa8dde6fdae29242b1084a2b0415eefaf | awk '{print $NF}' | sort -u 2>&1
 }
 
 require sub "$BASH_SOURCE" "$@"

data/libexec/aoh-init

@@ -13,16 +13,43 @@ shome="$(cd -P -- "$(dirname -- "$BASH_SOURCE")/.." && pwd -P)"
 # load a jason bourne library
 source "$shome/libexec/_treadstone"
 
-function main {
-  if [[ "$#" < 1 ]]; then
-    logger_fatal "missing application name"
-    exit 1
-  fi
+DEFINE_boolean "helpers" "$FLAGS_FALSE" "Generate the bin and libexec helpers" "H"
 
-  local nm_app="$1"; shift
+function main {
   local dollar='$'
 
-  cat > "Capfile" <<EOF
+  if [[ "$FLAGS_helpers" = "$FLAGS_TRUE" ]]; then
+    mkdir -p "libexec"
+    cat > "libexec/aohelper" <<EOF
+function ryaml { 
+  ruby -ryaml -e 'def ps x; unless x.nil?; puts (x.class == String || x.class == Fixnum) ? x : x.to_yaml; end; end; ps ARGV[1..-1].inject(YAML.load(File.read(ARGV[0]))) {|acc, key| acc[acc.class == Array ? key.to_i : key] }' "${dollar}@" 2>&-
+}
+
+shome="${dollar}(cd -P -- "${dollar}(dirname -- "${dollar}BASH_SOURCE")/.." && pwd -P)"
+
+app_ruby="${dollar}(ryaml ${dollar}shome/config/deploy.yml app_ruby)"
+ruby_loader="${dollar}(ryaml ${dollar}shome/config/deploy.yml ruby_loader)"
+PATH="${dollar}PATH:/usr/local/rvm/bin:${dollar}HOME/.rvm/bin"
+
+if ! ${dollar}ruby_loader ${dollar}app_ruby bundle check 2>&- > /dev/null; then
+  ${dollar}ruby_loader ${dollar}app_ruby bundle install --local --quiet
+fi
+${dollar}ruby_loader ${dollar}app_ruby bundle exec ao "${dollar}{BASH_SOURCE##*/}" "${dollar}@"
+EOF
+    chmod 755 "libexec/aohelper"
+
+    for nm_cmd in activate check compare debug deploy dna hosts lock migrate proxy release restart rollback shell stage unlock; do
+      ln -nfs "../libexec/aohelper" $shome/bin/$nm_cmd
+    done
+  else
+    if [[ "$#" < 1 ]]; then
+      logger_fatal "missing application name"
+      exit 1
+    fi
+
+    local nm_app="$1"; shift
+
+    cat > "Capfile" <<EOF
 #!/usr/bin/env ruby
 
 require 'alpha_omega/deploy'
@@ -51,8 +78,8 @@ Deploy self, __FILE__ do |admin, node|
 end
 EOF
 
-  mkdir -p "config"
-  cat > "config/deploy.yml" <<EOF
+    mkdir -p "config"
+    cat > "config/deploy.yml" <<EOF
 --- 
 repository: git@github.com:someone/something_something
 application: ${nm_app}
@@ -63,6 +90,7 @@ app_ruby: ree
 branches: [ production staging master ]
 branch_regex: /
 EOF
+  fi
 }
 
 require sub "$BASH_SOURCE" "$@"

data/libexec/aoh-lock

@@ -21,11 +21,11 @@ function aomain {
     compare|migrate)
       nm_lock="${1}"; shift
       set -- $(for a in "$@"; do echo $a.app; done)
-      bundle exec cap "$@" deploy:began deploy:dont_unlock "deploy:lock_${nm_lock}" deploy:finished
+      cap "$@" deploy:began deploy:dont_unlock "deploy:lock_${nm_lock}" deploy:finished
       ;;
     *)
       set -- $(for a in "$@"; do echo $a.app; done)
-      bundle exec cap "$@" deploy:began deploy:dont_unlock deploy:lock deploy:finished
+      cap "$@" deploy:began deploy:dont_unlock deploy:lock deploy:finished
       ;;
   esac
 }

data/libexec/aoh-migrate

@@ -17,7 +17,7 @@ require 'ao'
 
 function aomain {
   set -- $(for a in "$@"; do echo $a.app; done)
-  bundle exec cap "$@" deploy:began deploy:lock_migrate deploy:migrate deploy:finished 
+  cap "$@" deploy:began deploy:lock_migrate deploy:migrate deploy:finished 
 }
 
 require sub "$BASH_SOURCE" "$@"

data/libexec/aoh-proxy

@@ -40,12 +40,12 @@ function main {
   local ver_repo="$1"; shift
 
   cd $_AO_HOME
-  local git_url="$(ruby -ryaml -e 'puts YAML.load(File.read(ARGV[0]))[ARGV[1]]' $_AO_HOME/config/deploy.yml repository)"
+  local git_url="$(ryaml $_AO_HOME/config/deploy.yml repository)"
   local git_spec="$(git_branch_head "$ver_repo")"
 
   local pth_rvmrun="${_AO_RUBY_LOADER:-}"
-  : ${pth_rvmrun:=$(ruby -ryaml -e 'puts YAML.load(File.read(ARGV[0]))[ARGV[1]]' $_AO_HOME/config/deploy.yml ruby_loader)}
-  local nm_ruby="$(ruby -ryaml -e 'puts YAML.load(File.read(ARGV[0]))[ARGV[1]]' $_AO_HOME/config/deploy.yml app_ruby)"
+  : ${pth_rvmrun:=$(ryaml $_AO_HOME/config/deploy.yml ruby_loader)}
+  local nm_ruby="$(ryaml $_AO_HOME/config/deploy.yml app_ruby)"
 
   local tmp_remote="$(ssh $hst_gateway mktemp -t XXXXXXXXX)"
   scp -q $shome/sbin/remote-helper $hst_gateway:$tmp_remote

data/libexec/aoh-release

@@ -17,7 +17,7 @@ require 'ao'
 
 function aomain {
   set -- $(for a in "$@"; do echo $a.app; done)
-  bundle exec cap "$@" deploy:began deploy:lock deploy deploy:finished
+  cap "$@" deploy:began deploy:lock deploy deploy:finished
 }
 
 require sub "$BASH_SOURCE" "$@"

data/libexec/aoh-restart

@@ -17,7 +17,7 @@ require 'ao'
 
 function aomain {
   set -- $(for a in "$@"; do echo $a.app; done)
-  bundle exec cap "$@" deploy:began deploy:lock deploy:restart deploy:finished
+  cap "$@" deploy:began deploy:lock deploy:restart deploy:finished
 }
 
 require sub "$BASH_SOURCE" "$@"

data/libexec/aoh-rollback

@@ -17,7 +17,7 @@ require 'ao'
 
 function aomain {
   set -- $(for a in "$@"; do echo $a.app; done)
-  bundle exec cap "$@" deploy:began deploy:lock deploy:rollback deploy:finished
+  cap "$@" deploy:began deploy:lock deploy:rollback deploy:finished
 }
 
 require sub "$BASH_SOURCE" "$@"

data/libexec/aoh-shell

@@ -17,7 +17,7 @@ require 'ao'
 
 function aomain {
   set -- $(for a in "$@"; do echo $a.app; done)
-  bundle exec cap "$@" deploy:began shell deploy:finished
+  cap "$@" deploy:began shell deploy:finished
 }
 
 require sub "$BASH_SOURCE" "$@"

data/libexec/aoh-stage

@@ -16,7 +16,7 @@ require 'ao'
 
 function aomain {
   set -- $(for a in "$@"; do echo $a.app; done)
-  bundle exec cap "$@" deploy:began deploy:lock deploy:update_code deploy:symlink_next deploy:finished
+  cap "$@" deploy:began deploy:lock deploy:update_code deploy:symlink_next deploy:finished
 }
 
 require sub "$BASH_SOURCE" "$@"

data/libexec/aoh-task

@@ -18,7 +18,7 @@ require 'ao'
 function aomain {
   local nm_task=$1; shift
   set -- $(for a in "$@"; do echo $a.app; done)
-  bundle exec cap "$@" deploy:began deploy:lock_migrate deploy:migrate "$nm_task" deploy:finished
+  cap "$@" deploy:began deploy:lock_migrate deploy:migrate "$nm_task" deploy:finished
 }
 
 require sub "$BASH_SOURCE" "$@"

data/libexec/aoh-unlock

@@ -21,11 +21,11 @@ function aomain {
     compare|migrate)
       nm_lock="${1}"; shift
       set -- $(for a in "$@"; do echo $a.app; done)
-      bundle exec cap "$@" deploy:began "deploy:unlock_${nm_lock}" deploy:finished
+      cap "$@" deploy:began "deploy:unlock_${nm_lock}" deploy:finished
       ;;
     *)
       set -- $(for a in "$@"; do echo $a.app; done)
-      bundle exec cap "$@" deploy:began deploy:unlock deploy:finished
+      cap "$@" deploy:began deploy:unlock deploy:finished
       ;;
   esac
 }

data/libexec/aohelper

@@ -0,0 +1,14 @@
+function ryaml { 
+  ruby -ryaml -e 'def ps x; unless x.nil?; puts (x.class == String || x.class == Fixnum) ? x : x.to_yaml; end; end; ps ARGV[1..-1].inject(YAML.load(File.read(ARGV[0]))) {|acc, key| acc[acc.class == Array ? key.to_i : key] }' "$@" 2>&-
+}
+
+shome="$(cd -P -- "$(dirname -- "$BASH_SOURCE")/.." && pwd -P)"
+
+app_ruby="$(ryaml $shome/config/deploy.yml app_ruby)"
+ruby_loader="$(ryaml $shome/config/deploy.yml ruby_loader)"
+PATH="$PATH:/usr/local/rvm/bin:$HOME/.rvm/bin"
+
+if ! $ruby_loader $app_ruby bundle check 2>&- > /dev/null; then
+  $ruby_loader $app_ruby bundle install --local --quiet
+fi
+$ruby_loader $app_ruby bundle exec ao "${BASH_SOURCE##*/}" "$@"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: alpha_omega
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 1
   - 4
-  - 1
-  version: 1.4.1
+  - 2
+  version: 1.4.2
 platform: ruby
 authors: 
 - David Nghiem
@@ -134,6 +134,7 @@ files:
 - libexec/aoh-stage
 - libexec/aoh-task
 - libexec/aoh-unlock
+- libexec/aohelper
 - libexec/build
 - libexec/build-gem
 - libexec/bump