alpha_omega 1.5.6 → 1.5.7

data/VERSION

@@ -1 +1 @@
-1.5.6
+1.5.7

data/libexec/_sub

@@ -1,17 +1,10 @@
 #!/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"
     export _SUB_ARGS="$@"
@@ -28,26 +21,18 @@ function sub {
 
       if [[ -x "$sub_cmd" ]]; then
         shift
-        exec ${ruby_loader}"$sub_cmd" "$@"
+        exec "$sub_cmd" "$@"
       fi
     fi
   fi
 
   if [[ -x "$bsource_cmd" && "$bsource_cmd" != "$bsource" ]]; then
-    exec ${ruby_loader}"$bsource_cmd" "$@"
+    exec "$bsource_cmd" "$@"
   else
     main "$@"
   fi
 }
 
-if [[ "$_AO_HOME/config/deploy.yml" ]]; then
-  export _JASON_RUBY="$(ryaml "$_AO_HOME/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/libexec/aoh-init

@@ -20,22 +20,7 @@ function main {
 
   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 --path vendor/bundle
-fi
-${dollar}ruby_loader ${dollar}app_ruby bundle exec ao "${dollar}{BASH_SOURCE##*/}" "${dollar}@"
-EOF
+    cp -f "$shome/libexec/aohelper.template" "libexec/aohelper"
     chmod 755 "libexec/aohelper"
 
     for nm_cmd in activate check compare debug deploy dna hosts lock migrate proxy release restart rollback shell stage unlock signoff; do

data/libexec/aohelper

@@ -1,14 +1,30 @@
+#!/bin/bash
+
+shome="$(cd -P -- "$(dirname -- "$BASH_SOURCE")/.." && pwd -P)"
+
 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)"
+function main {
+  local app_ruby="$(ryaml $shome/config/deploy.yml app_ruby)"
+  local ruby_loader="$(ryaml $shome/config/deploy.yml ruby_loader)"
+  local ruby_runner="$ruby_loader $app_ruby"
+  PATH="$PATH:/usr/local/rvm/bin:$HOME/.rvm/bin"
+
+  if [[ "$ruby_loader" = "rvm-exec" ]]; then
+    local pth_rvm="$(type -f $ruby_loader 2>&- | awk '{print $3}')"
+    if [[ -x "$pth_rvm" ]]; then
+      true
+    else
+      ruby_runner=""
+    fi
+  fi
 
-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_runner bundle check 2>&- > /dev/null; then
+    $ruby_runner bundle install --local --quiet --path vendor/bundle
+  fi
+  $ruby_runner bundle exec ao "${BASH_SOURCE##*/}" "$@"
+}
 
-if ! $ruby_loader $app_ruby bundle check 2>&- > /dev/null; then
-  $ruby_loader $app_ruby bundle install --local --quiet --path vendor/bundle
-fi
-$ruby_loader $app_ruby bundle exec ao "${BASH_SOURCE##*/}" "$@"
+main "$@"

data/libexec/aohelper.template

@@ -0,0 +1,30 @@
+#!/bin/bash
+
+shome="$(cd -P -- "$(dirname -- "$BASH_SOURCE")/.." && pwd -P)"
+
+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>&-
+}
+
+function main {
+  local app_ruby="$(ryaml $shome/config/deploy.yml app_ruby)"
+  local ruby_loader="$(ryaml $shome/config/deploy.yml ruby_loader)"
+  local ruby_runner="$ruby_loader $app_ruby"
+  PATH="$PATH:/usr/local/rvm/bin:$HOME/.rvm/bin"
+
+  if [[ "$ruby_loader" = "rvm-exec" ]]; then
+    local pth_rvm="$(type -f $ruby_loader 2>&- | awk '{print $3}')"
+    if [[ -x "$pth_rvm" ]]; then
+      true
+    else
+      ruby_runner=""
+    fi
+  fi
+
+  if ! $ruby_runner bundle check 2>&- > /dev/null; then
+    $ruby_runner bundle install --local --quiet --path vendor/bundle
+  fi
+  $ruby_runner bundle exec ao "${BASH_SOURCE##*/}" "$@"
+}
+
+main "$@"

metadata

@@ -1,104 +1,106 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: alpha_omega
-version: !ruby/object:Gem::Version 
-  hash: 15
+version: !ruby/object:Gem::Version
+  version: 1.5.7
   prerelease: 
-  segments: 
-  - 1
-  - 5
-  - 6
-  version: 1.5.6
 platform: ruby
-authors: 
+authors:
 - David Nghiem
 - Tom Bombadil
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-31 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-31 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: deep_merge
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: deep_merge
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: capistrano
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: capistrano
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: capistrano_colors
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: capistrano_colors
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: capistrano-log_with_awesome
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: capistrano-log_with_awesome
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Common reciples for persistent capistrano releases
-email: 
+email:
 - nghidav@gmail.com
 - amanibhavam@destructuring.org
-executables: 
+executables:
 - ao
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - LICENSE
 - VERSION
 - README.mkd
@@ -137,6 +139,7 @@ files:
 - libexec/aoh-task
 - libexec/aoh-unlock
 - libexec/aohelper
+- libexec/aohelper.template
 - libexec/build
 - libexec/build-gem
 - libexec/bump
@@ -194,36 +197,26 @@ files:
 - bin/ao
 homepage: https://github.com/destructuring/alpha_omega
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: alpha_omega capistrano recipes
 test_files: []
-