alpha_omega 1.1.7 → 1.1.9

data/VERSION

@@ -1 +1 @@
-1.1.7
+1.1.9

data/lib/alpha_omega/deploy.rb

@@ -649,8 +649,10 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
   after "deploy:build", "assets:build"
 
   on :exit do
-    logger.important "uploading deploy logs: #{log_path}/#{application}-#{ENV["AO_USER"]}.log-#{Time.now.strftime('%Y%m%d-%H%M')}"
-    put full_log, "#{log_path}/#{application}-#{ENV["AO_USER"]}.log-#{Time.now.strftime('%Y%m%d-%H%M')}"
+    unless ENV['LOCAL_ONLY'] && !ENV['LOCAL_ONLY'].empty?
+      logger.important "uploading deploy logs: #{log_path}/#{application}-#{ENV["AO_USER"]}.log-#{Time.now.strftime('%Y%m%d-%H%M')}"
+      put full_log, "#{log_path}/#{application}-#{ENV["AO_USER"]}.log-#{Time.now.strftime('%Y%m%d-%H%M')}"
+    end
   end
 
 end # Capistrano::Configuratioy

data/lib/alpha_omega/utils.rb

@@ -6,6 +6,7 @@ $this_pod = nil
 $this_host = nil
 $opsdb = nil
 $pods_config = nil
+$magic_prefix = "eea914aaa8dde6fdae29242b1084a2b0415eefaf"
 
 module AlphaOmega
   def self.node_defaults(node, env_pod, node_name)
@@ -60,8 +61,11 @@ module AlphaOmega
 
   def self.default_pods_tasks
     Proc.new do |config, pod_name, pod, this_node, &node_filter|
-      config.task "#{pod_name}" do # task pod1
-        set :current_pod, pod_name
+      %w(app echo yaml).each do |tsuffix|
+        # each pod task sets the pod context for host/group tasks
+        config.task "#{pod_name}.#{tsuffix}" do # task pod1
+          set :current_pod, pod_name
+        end
       end
 
       node_dna = { }
@@ -75,7 +79,7 @@ module AlphaOmega
           next nil unless cap_roles
           config.set :dna, node_dna[remote_name]
 
-          config.task "#{task_name}.#{pod_name}" do # task host.pod1
+          config.task "#{task_name}.#{pod_name}.app" do # task host.pod1.app
             cap_roles.each do |cap_role, cap_preds|
               if $this_host["local_pods"] && $this_host["local_pods"].member?(node["env_pod"])
                 role cap_role, node["node_name"], cap_preds
@@ -85,20 +89,35 @@ module AlphaOmega
             end
           end
         
-          config.task "#{task_name}" do # task host -> host.current_pod
-            config.after "#{task_name}", "#{task_name}.#{current_pod}"
+          config.task "#{task_name}.#{pod_name}.echo" do # task host.pod1.echo
+            puts "#{$magic_prefix} #{remote_name}"
+          end
+        
+          config.task "#{task_name}.#{pod_name}.yaml" do # task host.pod1.yaml
+            StringIO.new({ remote_name => n }.to_yaml).lines.to_a[1..-1].each {|l| puts "#{$magic_prefix} #{l}" }
+          end
+        
+          %w(app echo yaml).each do |tsuffix|
+            config.task "#{task_name}.#{tsuffix}" do # task host -> host.current_pod
+              config.after "#{task_name}.#{tsuffix}", "#{task_name}.#{current_pod}.#{tsuffix}"
+            end
           end
 
           n
         end
 
       self.what_groups hosts do |task_name, nodes|
-        nodes.keys.sort.each do |remote_name|
-          config.after "#{task_name}.#{pod_name}", "#{remote_name}"
-        end
+        %w(app echo yaml).each do |tsuffix|
+          config.task "#{task_name}.#{pod_name}.#{tsuffix}" do
+          end
 
-        config.task "#{task_name}" do
-          config.after "#{task_name}", "#{task_name}.#{current_pod}"
+          nodes.keys.sort.each do |remote_name|
+            config.after "#{task_name}.#{pod_name}.#{tsuffix}", "#{remote_name}.#{tsuffix}"
+          end
+
+          config.task "#{task_name}.#{tsuffix}" do
+            config.after "#{task_name}.#{tsuffix}", "#{task_name}.#{current_pod}.#{tsuffix}"
+          end
         end
       end
     end

data/libexec/ao-activate

@@ -16,6 +16,7 @@ source "$shome/sbin/_treadstone"
 
 # entry point
 function main {
+  set -- $(for a in "$@"; do echo $a.app; done)
   bundle exec cap "$@" deploy:lock deploy:symlink deploy:restart
 }
 

data/libexec/ao-build

@@ -16,6 +16,7 @@ source "$shome/sbin/_treadstone"
 
 # entry point
 function main {
+  set -- $(for a in "$@"; do echo $a.app; done)
   bundle exec cap "$@" deploy:lock deploy:build
 }
 

data/libexec/ao-check

@@ -16,6 +16,7 @@ source "$shome/sbin/_treadstone"
 
 # entry point
 function main {
+  set -- $(for a in "$@"; do echo $a.app; done)
   bundle exec cap "$@" deploy:lock deploy:check
 }
 

data/libexec/ao-compare

@@ -16,6 +16,7 @@ source "$shome/sbin/_treadstone"
 
 # entry point
 function main {
+  set -- $(for a in "$@"; do echo $a.app; done)
   bundle exec cap "$@" deploy:lock_compare deploy:compare
 }
 

data/libexec/ao-cook

@@ -16,6 +16,7 @@ source "$shome/sbin/_treadstone"
 
 # entry point
 function main {
+  set -- $(for a in "$@"; do echo $a.app; done)
   bundle exec cap "$@" deploy:lock deploy:cook
 }
 

data/libexec/ao-debug

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+#/ NAME
+#/     ao-debug -- same as ao-hosts with debugging left on
+#/
+#/ SYNOPSIS
+#/     ao debug [deploy_set...]
+
+# 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
+
+# entry point
+function main {
+  export LOCAL_ONLY=true
+  {
+    if [[ -n $1 ]]; then
+      set -- $(for a in "$@"; do echo $a.echo; done)
+      cap "$@"
+    fi
+  } 2>&1 | grep eea914aaa8dde6fdae29242b1084a2b0415eefaf | awk '{print $NF}' | sort -u
+}
+
+require 'sub' "$BASH_SOURCE" "$@"

data/libexec/ao-deploy

@@ -16,6 +16,7 @@ source "$shome/sbin/_treadstone"
 
 # entry point
 function main {
+  set -- $(for a in "$@"; do echo $a.app; done)
   bundle exec cap "$@" deploy:lock deploy
 }
 

data/libexec/ao-dist

@@ -16,6 +16,7 @@ source "$shome/sbin/_treadstone"
 
 # entry point
 function main {
+  set -- $(for a in "$@"; do echo $a.app; done)
   bundle exec cap "$@" deploy:lock deploy:dist
 }
 

data/libexec/ao-dna

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+#/ NAME
+#/     ao-dna -- dumps opsdb yaml
+#/
+#/ SYNOPSIS
+#/     ao dna [deploy_set...]
+
+# 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
+
+# entry point
+function main {
+  export LOCAL_ONLY=true
+  {
+    echo "eea914aaa8dde6fdae29242b1084a2b0415eefaf ---"
+    if [[ -n $1 ]]; then
+      set -- $(for a in "$@"; do echo $a.yaml; done)
+      cap "$@"
+    fi
+  } 2>&1 | grep eea914aaa8dde6fdae29242b1084a2b0415eefaf | sed 's#eea914aaa8dde6fdae29242b1084a2b0415eefaf ##'
+}
+
+require 'sub' "$BASH_SOURCE" "$@"

data/libexec/ao-hosts

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+#/ NAME
+#/     ao-hosts -- list of opsdb hosts filtered through Capfile
+#/
+#/ SYNOPSIS
+#/     ao hosts [deploy_set...]
+
+# 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
+
+# entry point
+function main {
+  export LOCAL_ONLY=true
+  {
+    if [[ -n $1 ]]; then
+      set -- $(for a in "$@"; do echo $a.echo; done)
+      cap "$@"
+    fi
+  } 2>&1 | grep eea914aaa8dde6fdae29242b1084a2b0415eefaf | awk '{print $NF}' | sort -u
+}
+
+require 'sub' "$BASH_SOURCE" "$@"

data/libexec/ao-lock

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

data/libexec/ao-migrate

@@ -16,6 +16,7 @@ source "$shome/sbin/_treadstone"
 
 # entry point
 function main {
+  set -- $(for a in "$@"; do echo $a.app; done)
   bundle exec cap "$@" deploy:lock_migrate deploy:migrate
 }
 

data/libexec/ao-plan

@@ -16,6 +16,7 @@ source "$shome/sbin/_treadstone"
 
 # entry point
 function main {
+  set -- $(for a in "$@"; do echo $a.app; done)
   bundle exec cap "$@" deploy:lock deploy:plan
 }
 

data/libexec/ao-release

@@ -16,6 +16,7 @@ source "$shome/sbin/_treadstone"
 
 # entry point
 function main {
+  set -- $(for a in "$@"; do echo $a.app; done)
   bundle exec cap "$@" deploy:lock deploy
 }
 

data/libexec/ao-restart

@@ -16,6 +16,7 @@ source "$shome/sbin/_treadstone"
 
 # entry point
 function main {
+  set -- $(for a in "$@"; do echo $a.app; done)
   bundle exec cap "$@" deploy:lock deploy:restart
 }
 

data/libexec/ao-rollback

@@ -16,6 +16,7 @@ source "$shome/sbin/_treadstone"
 
 # entry point
 function main {
+  set -- $(for a in "$@"; do echo $a.app; done)
   bundle exec cap "$@" deploy:lock deploy:rollback
 }
 

data/libexec/ao-shell

@@ -16,6 +16,7 @@ source "$shome/sbin/_treadstone"
 
 # entry point
 function main {
+  set -- $(for a in "$@"; do echo $a.app; done)
   bundle exec cap "$@" shell
 }
 

data/libexec/ao-stage

@@ -16,6 +16,7 @@ source "$shome/sbin/_treadstone"
 
 # entry point
 function main {
+  set -- $(for a in "$@"; do echo $a.app; done)
   bundle exec cap "$@" deploy:lock deploy:update_code deploy:symlink_next
 }
 

data/libexec/ao-task

@@ -17,6 +17,7 @@ source "$shome/sbin/_treadstone"
 # entry point
 function main {
   local nm_task=$1; shift
+  set -- $(for a in "$@"; do echo $a.app; done)
   bundle exec cap "$@" deploy:lock_migrate deploy:migrate "$nm_task"
 }
 

data/libexec/ao-unlock

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alpha_omega
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -110,8 +110,11 @@ files:
 - libexec/ao-check
 - libexec/ao-compare
 - libexec/ao-cook
+- libexec/ao-debug
 - libexec/ao-deploy
 - libexec/ao-dist
+- libexec/ao-dna
+- libexec/ao-hosts
 - libexec/ao-lock
 - libexec/ao-migrate
 - libexec/ao-plan