alpha_omega 1.3.38 → 1.3.39

data/VERSION

@@ -1 +1 @@
-1.3.38
+1.3.39

data/lib/alpha_omega/deploy.rb

@@ -58,7 +58,10 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
   _cset :last_pod, nil
   _cset :success, false
 
-  _cset (:figlet) { [%x(which figlet).strip].reject {|f| !(File.executable? f)}.first || echo }
+  _cset (:figlet) { 
+    fig = %x(which figlet).strip].reject {|f| !(File.executable? f)}.first
+    fig ? "#{fig} -w 200" : "echo"
+  }
 
   # =========================================================================
   # services, logs
@@ -131,7 +134,7 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
     unless releases.empty?
       w = current_workarea
       workarea = releases[((releases.index(w)?releases.index(w):-1)+1)%releases.length]
-      system "#{figlet} -w 200 on #{workarea}"
+      system "#{figlet} on #{workarea}"
       workarea
     else
       ""
@@ -358,7 +361,7 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
           run "mv -T #{previous_path}.new #{previous_path}"
         end
 
-        system "#{figlet} -w 200 #{current_release_name} activated"
+        system "#{figlet} #{current_release_name} activated"
       end
     end
 
@@ -435,12 +438,12 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
       DESC
       task :revision do
         if previous_release
-          system "#{figlet} -w 200 on #{previous_release_name}"
+          system "#{figlet} on #{previous_release_name}"
           run "rm -f #{previous_path} #{next_path}"
           run "ln -nfs #{previous_release} #{current_path}.new"
           run "mv -T #{current_path}.new #{current_path}"
         else
-          system "#{figlet} -w 200 failed to rollback"
+          system "#{figlet} failed to rollback"
           abort "could not rollback the code because there is no prior release"
         end
       end
@@ -584,7 +587,10 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
       end
 
       if want_unlock
-        at_exit { self.unlock; }
+        at_exit { 
+          self.unlock; 
+          self.successful;
+        }
       end
 
       run "echo #{epoch} #{ENV['_AO_DEPLOYER']} > #{lock_path}"
@@ -620,13 +626,16 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
       end
     end
 
-    task :successful, :only => { :primary => true } do
-      set :success, true
-      run_locally"#{figlet} success | perl -pe 's{( +)}{chr(46) x length($1)}e'"
+    task :successful
+      if success
+        system "#{figlet} success"
+      else
+        system "#{figlet} failed"
+      end
     end
 
     task :finished do
-      successful
+      set :success, true
     end
   end # :deploy
 end # Capistrano::Configuration

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/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: 87
+  hash: 85
   prerelease: 
   segments: 
   - 1
   - 3
-  - 38
-  version: 1.3.38
+  - 39
+  version: 1.3.39
 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