alpha_omega 1.3.12 → 1.3.14

data/VERSION

@@ -1 +1 @@
-1.3.12
+1.3.14

data/libexec/_ao

@@ -27,37 +27,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"
@@ -65,10 +65,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
@@ -101,59 +101,59 @@ 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" "$@"
-      fi
-      ;;
-  esac
+  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 [[ "$#" > 0 && "$1" == "production" ]]; then
+      aomain "$nm_pod" admin "$@"
+    else
+      aomain "$nm_pod" "$@"
+    fi
+  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/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 "$@"
+  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 "$@"
+    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 "$@" 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-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
 }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: alpha_omega
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 7
   prerelease: 
   segments: 
   - 1
   - 3
-  - 12
-  version: 1.3.12
+  - 14
+  version: 1.3.14
 platform: ruby
 authors: 
 - David Nghiem