alpha_omega 1.2.1 → 1.3.1

data/{sbin → libexec}/_jason

@@ -51,19 +51,23 @@ function __MAN__ {
 #     raw ronn-style Markdown
 #     MAN
 function display_man {
-  awk '/^__MAN__/,/^MAN$/ {print}' <"$shome/sbin/$(basename -- "$0")" | tail -n +2 | egrep -v '^MAN$'
+  awk '/^__MAN__/,/^MAN$/ {print}' <"$0" | tail -n +2 | egrep -v '^MAN$'
 }
 
 function display_synopsis {
-  awk '/^#/ && !/^#!/ { print } /^[^#]/ || /^$/ { exit }' <"$shome/sbin/$(basename -- "$0")" | cut -c3-
+  awk '/^#/ && !/^#!/ { print } /^[^#]/ || /^$/ { exit }' <"$0" | cut -c3-
 }
 
 function which_library {
   local library="$1"; shift
-  if [[ -r "$shome/sbin/_$library" ]]; then
-    echo "$shome/sbin/_$library"
+  if [[ -r "$shome/bin/_$library" ]]; then
+    echo "$shome/bin/_$library"
+  elif [[ -r "$shome/libexec/_$library" ]]; then
+    echo "$shome/libexec/_$library"
   elif [[ -r "$shome/.$library/bin/_profile" ]]; then
     echo "$shome/.$library/bin/_profile"
+  elif [[ -r "$shome/.$library/libexec/_profile" ]]; then
+    echo "$shome/.$library/libexec/_profile"
   elif [[ -r "$shome/.$library/.profile" ]]; then
     echo "$shome/.$library/.profile"
   else
@@ -72,6 +76,8 @@ function which_library {
       local nm_right="${library##*/}"
       if [[ -r "$shome/.$nm_library/bin/_$nm_right" ]]; then
         echo "$shome/.$nm_library/bin/_$nm_right"
+      elif [[ -r "$shome/.$nm_library/libexec/_$nm_right" ]]; then
+        echo "$shome/.$nm_library/libexec/_$nm_right"
       fi
     fi
   fi
@@ -90,35 +96,21 @@ function require {
 
 function parse_command_line {
   if [[ "$FLAGS_SUB" = "$FLAGS_TRUE" && "$@" > 0 ]]; then
-    local argv
-    declare -a argv
-
-    local argc="0"
-    local arg
-    local passthrough=
-    for arg in "$@"; do
-      if [[ -z "$passthrough" && ! "$arg" =~ ^- ]]; then
-        argv[argc]="--"
-        argc="$((argc + 1))"
-        passthrough=1
-      fi
-
-      argv[argc]="$arg"
-      argc="$((argc + 1))"
-    done
-
-    set -- "${argv[@]}"
+    export POSIXLY_CORRECT=1
   fi
 
   if ! FLAGS "$@"; then
-  if [[ "$flags_error" = "help requested" ]]; then
+    unset POSIXLY_CORRECT
+    if [[ "$flags_error" = "help requested" ]]; then
       echo ""
-    display_help
-    exit 0
-  fi
+      display_help
+      exit 0
+    fi
     
     return 4
   fi
+
+  unset POSIXLY_CORRECT
   return 0
 }
 
@@ -166,7 +158,7 @@ function _main {
 
   configure_logging
   
-  PATH="$shome/sbin:$PATH"
+  PATH="$shome/bin:$PATH"
 }
 
 _main "$@"

data/{sbin → libexec}/_meat

@@ -51,19 +51,23 @@ function __MAN__ {
 #     raw ronn-style Markdown
 #     MAN
 function display_man {
-  awk '/^__MAN__/,/^MAN$/ {print}' <"$shome/sbin/$(basename -- "$0")" | tail -n +2 | egrep -v '^MAN$'
+  awk '/^__MAN__/,/^MAN$/ {print}' <"$0" | tail -n +2 | egrep -v '^MAN$'
 }
 
 function display_synopsis {
-  awk '/^#/ && !/^#!/ { print } /^[^#]/ || /^$/ { exit }' <"$shome/sbin/$(basename -- "$0")" | cut -c3-
+  awk '/^#/ && !/^#!/ { print } /^[^#]/ || /^$/ { exit }' <"$0" | cut -c3-
 }
 
 function which_library {
   local library="$1"; shift
-  if [[ -r "$shome/sbin/_$library" ]]; then
-    echo "$shome/sbin/_$library"
+  if [[ -r "$shome/bin/_$library" ]]; then
+    echo "$shome/bin/_$library"
+  elif [[ -r "$shome/libexec/_$library" ]]; then
+    echo "$shome/libexec/_$library"
   elif [[ -r "$shome/.$library/bin/_profile" ]]; then
     echo "$shome/.$library/bin/_profile"
+  elif [[ -r "$shome/.$library/libexec/_profile" ]]; then
+    echo "$shome/.$library/libexec/_profile"
   elif [[ -r "$shome/.$library/.profile" ]]; then
     echo "$shome/.$library/.profile"
   else
@@ -72,6 +76,8 @@ function which_library {
       local nm_right="${library##*/}"
       if [[ -r "$shome/.$nm_library/bin/_$nm_right" ]]; then
         echo "$shome/.$nm_library/bin/_$nm_right"
+      elif [[ -r "$shome/.$nm_library/libexec/_$nm_right" ]]; then
+        echo "$shome/.$nm_library/libexec/_$nm_right"
       fi
     fi
   fi
@@ -90,35 +96,21 @@ function require {
 
 function parse_command_line {
   if [[ "$FLAGS_SUB" = "$FLAGS_TRUE" && "$@" > 0 ]]; then
-    local argv
-    declare -a argv
-
-    local argc="0"
-    local arg
-    local passthrough=
-    for arg in "$@"; do
-      if [[ -z "$passthrough" && ! "$arg" =~ ^- ]]; then
-        argv[argc]="--"
-        argc="$((argc + 1))"
-        passthrough=1
-      fi
-
-      argv[argc]="$arg"
-      argc="$((argc + 1))"
-    done
-
-    set -- "${argv[@]}"
+    export POSIXLY_CORRECT=1
   fi
 
   if ! FLAGS "$@"; then
-  if [[ "$flags_error" = "help requested" ]]; then
+    unset POSIXLY_CORRECT
+    if [[ "$flags_error" = "help requested" ]]; then
       echo ""
-    display_help
-    exit 0
-  fi
+      display_help
+      exit 0
+    fi
     
     return 4
   fi
+
+  unset POSIXLY_CORRECT
   return 0
 }
 
@@ -166,7 +158,7 @@ function _main {
 
   configure_logging
   
-  PATH="$shome/sbin:$PATH"
+  PATH="$shome/bin:$PATH"
 }
 
 _main "$@"

data/{sbin → libexec}/_prime

@@ -4,5 +4,5 @@ if [[ -z "${shome:-}" ]]; then
   shome="$(cd -P -- "$(dirname -- "${BASH_SOURCE}")/.." && pwd -P)"
 fi
 
-source "$shome/sbin/_jason"
+source "$shome/libexec/_jason"
 set -fue

data/{sbin → libexec}/_sub

@@ -1,10 +1,17 @@
 #!/bin/bash
 
+: ${_JASON_RUBY:=}
+
 function sub {
   local bsource="$1"; shift
   local sub_base="$(basename "$bsource")"
   local bsource_cmd="$shome/libexec/${sub_base}"
 
+  local ruby_loader=
+  if [[ -n "$_JASON_RUBY" ]]; then
+    ruby_loader="rvm-exec $_JASON_RUBY "
+  fi
+
   if [[ "$bsource_cmd" = "$bsource" ]]; then
     FLAGS_SUB="$FLAGS_TRUE"
     parse_command_line "$@" || exit $?
@@ -20,18 +27,26 @@ function sub {
 
       if [[ -x "$sub_cmd" ]]; then
         shift
-        exec "$sub_cmd" "$@"
+        exec ${ruby_loader}"$sub_cmd" "$@"
       fi
     fi
   fi
- 
+
   if [[ -x "$bsource_cmd" && "$bsource_cmd" != "$bsource" ]]; then
-    exec "$bsource_cmd" "$@"
+    exec ${ruby_loader}"$bsource_cmd" "$@"
   else
     main "$@"
   fi
 }
 
+if [[ "$shome/config/deploy.yml" ]]; then
+  export _JASON_RUBY="$(ryaml "$shome/config/deploy.yml" "app_ruby")"
+fi
+
+if [[ ! -x "$(which rvm-exec 2>&1 || true)" ]]; then
+  PATH="$PATH:$HOME/.rvm/bin:/usr/local/rvm/bin"
+fi
+
 if [[ "$#" > 0 ]]; then
   sub "$@"  
 fi

data/{sbin → libexec}/_treadstone

@@ -4,5 +4,5 @@ if [[ -z "${shome:-}" ]]; then
   shome="$(cd -P -- "$(dirname -- "${BASH_SOURCE}")/.." && pwd -P)"
 fi
 
-source "$shome/sbin/_jason"
+source "$shome/libexec/_jason"
 set -fue

data/{sbin/ao → libexec/aoh}

@@ -1,15 +1,15 @@
 #!/bin/bash
 
 #/ NAME
-#/     jason -- uses the jason bourne lib
+#/     aoh -- ao-helper subbed script
 #/
 #/ SYNOPSIS
-#/     jason
+#/     aoh <ao_command>
 
 # figure out the project root under which bin, lib live
 shome="$(cd -P -- "$(dirname -- "$BASH_SOURCE")/.." && pwd -P)"
 
 # load a jason bourne library
-source "$shome/sbin/_treadstone"
+source "$shome/libexec/_treadstone"
 
 require 'sub' "$BASH_SOURCE" "$@"

data/libexec/aoh-activate

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+#/ NAME
+#/     activate -- 
+#/
+#/ SYNOPSIS
+#/     
+#/     activate
+
+# figure out the project root under which bin, lib live
+shome="$(cd -P -- "$(dirname -- "$BASH_SOURCE")/.." && pwd -P)"
+
+# load a jason bourne library
+source "$shome/libexec/_treadstone"
+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
+}
+
+require sub "$BASH_SOURCE" "$@"

data/libexec/aoh-check

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+#/ NAME
+#/     check --
+#/
+#/ SYNOPSIS
+#/     
+#/     check
+#/
+
+# figure out the project root under which bin, lib live
+shome="$(cd -P -- "$(dirname -- "$BASH_SOURCE")/.." && pwd -P)"
+
+# load a jason bourne library
+source "$shome/libexec/_treadstone"
+require 'ao'
+
+function aomain {
+  set -- $(for a in "$@"; do echo $a.app; done)
+  bundle exec cap "$@" deploy:began deploy:lock deploy:check deploy:finished
+}
+
+require sub "$BASH_SOURCE" "$@"

data/libexec/aoh-compare

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+#/ NAME
+#/     compare --
+#/
+#/ SYNOPSIS
+#/     
+#/     compare
+#/
+
+# figure out the project root under which bin, lib live
+shome="$(cd -P -- "$(dirname -- "$BASH_SOURCE")/.." && pwd -P)"
+
+# load a jason bourne library
+source "$shome/libexec/_treadstone"
+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
+}
+
+require sub "$BASH_SOURCE" "$@"

data/libexec/aoh-debug

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+#/ NAME
+#/     debug --
+#/
+#/ SYNOPSIS
+#/     
+#/     debug
+
+# figure out the project root under which bin, lib live
+shome="$(cd -P -- "$(dirname -- "$BASH_SOURCE")/.." && pwd -P)"
+
+# load a jason bourne library
+source "$shome/libexec/_treadstone"
+require 'ao'
+
+function aomain {
+  export LOCAL_ONLY=true
+  set -- $(for a in "$@"; do echo $a.echo; done)
+  bundle exec cap "$@" deploy:began deploy:finished
+}
+
+require sub "$BASH_SOURCE" "$@"

data/libexec/aoh-deploy

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+#/ NAME
+#/     deploy --
+#/
+#/ SYNOPSIS
+#/     
+#/     deploy
+
+# figure out the project root under which bin, lib live
+shome="$(cd -P -- "$(dirname -- "$BASH_SOURCE")/.." && pwd -P)"
+
+# load a jason bourne library
+source "$shome/libexec/_treadstone"
+require 'ao'
+
+function aomain {
+  set -- $(for a in "$@"; do echo $a.app; done)
+  bundle exec cap "$@" deploy:began deploy:lock deploy deploy:finished
+}
+
+require sub "$BASH_SOURCE" "$@"

data/libexec/aoh-dist

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+#/ NAME
+#/     dist --
+#/
+#/ SYNOPSIS
+#/     
+#/     dist
+#/
+
+# figure out the project root under which bin, lib live
+shome="$(cd -P -- "$(dirname -- "$BASH_SOURCE")/.." && pwd -P)"
+
+# load a jason bourne library
+source "$shome/libexec/_treadstone"
+require 'ao'
+
+function aomain {
+  set -- $(for a in "$@"; do echo $a.app; done)
+  bundle exec cap "$@" deploy:began deploy:lock deploy:dist deploy:finished
+}
+
+require sub "$BASH_SOURCE" "$@"

data/libexec/{ao-dna → aoh-dna}

@@ -1,29 +1,27 @@
 #!/bin/bash
 
 #/ NAME
-#/     ao-dna -- dumps opsdb yaml
+#/     dna --
 #/
 #/ SYNOPSIS
-#/     ao dna [deploy_set...]
+#/     
+#/     dna
+#/
 
 # figure out the project root under which bin, lib live
 shome="$(cd -P -- "$(dirname -- "$BASH_SOURCE")/.." && pwd -P)"
 
 # load a jason bourne library
-source "$shome/sbin/_treadstone"
-
-# parse the command-line
+source "$shome/libexec/_treadstone"
+require 'ao'
 
-# entry point
-function main {
+function aomain {
   export LOCAL_ONLY=true
   {
+    set -- $(for a in "$@"; do echo $a.yaml; done)
     echo "eea914aaa8dde6fdae29242b1084a2b0415eefaf ---"
-    if [[ -n $1 ]]; then
-      set -- $(for a in "$@"; do echo $a.yaml; done)
-      cap "$@"
-    fi
+    bundle exec cap "$@" deploy:began deploy:finished
   } 2>&1 | grep eea914aaa8dde6fdae29242b1084a2b0415eefaf | sed 's#eea914aaa8dde6fdae29242b1084a2b0415eefaf ##'
 }
 
-require 'sub' "$BASH_SOURCE" "$@"
+require sub "$BASH_SOURCE" "$@"