alpha_omega 0.0.95 → 0.0.96

data/lib/alpha_omega/utils.rb

@@ -64,13 +64,13 @@ module AlphaOmega
 
   def self.default_pods_tasks
     Proc.new do |config, pod_name, pod, mix_pods, pods_config, opsdb, this_pod, this_node, &node_filter|
-      [ "", ".echo", ".yaml" ].each do |tsuffix|
+      %w(app echo yaml).each do |tsuffix|
          # world task accumulates all.* after tasks
-        config.task "world#{tsuffix}" do # task world
+        config.task "world.#{tsuffix}" do # task world
         end
 
         # each pod task sets the pod context for host/group tasks
-        config.task "#{pod_name}#{tsuffix}" do # task default, pod1
+        config.task "#{pod_name}.#{tsuffix}" do # task default, pod1
           set :current_pod, pod_name
         end
       end
@@ -83,7 +83,7 @@ module AlphaOmega
           node_dna[remote_name].deep_merge!(n)
 
           if node_filter.nil? || node_filter.call(this_node, n)
-            config.task "#{task_name}.#{pod_name}" do # task host.default, host.pod1
+            config.task "#{task_name}.#{pod_name}.app" do # task host.default.app, host.pod1.app
               role :app, remote_name
               set :dna, node_dna[remote_name]
             end
@@ -93,12 +93,12 @@ module AlphaOmega
             end
           
             config.task "#{task_name}.#{pod_name}.yaml" do # task host.default.yaml, host.pod1..yaml
-              StringIO.new({ remote_name => n }.to_yaml).lines.each {|l| puts "#{AlphaOmega.magic_prefix} #{l}" }
+              StringIO.new({ remote_name => n }.to_yaml).lines.to_a[1..-1].each {|l| puts "#{AlphaOmega.magic_prefix} #{l}" }
             end
           
-            [ "", ".echo", ".yaml" ].each do |tsuffix|
-              config.task "#{task_name}#{tsuffix}" do # task host -> host.current_pod
-                after "#{task_name}#{tsuffix}", "#{task_name}.#{current_pod}#{tsuffix}"
+            %w(app echo yaml).each do |tsuffix|
+              config.task "#{task_name}.#{tsuffix}" do # task host -> host.current_pod
+                after "#{task_name}.#{tsuffix}", "#{task_name}.#{current_pod}.#{tsuffix}"
               end
             end
 
@@ -111,15 +111,15 @@ module AlphaOmega
       AlphaOmega.what_groups hosts do |task_name, nodes|
         if task_name == "all"
           # simulate all podXX all
-          [ "", ".echo", ".yaml" ].each do |tsuffix|
+          %w(app echo yaml).each do |tsuffix|
             unless pod_name == "default"
-              config.after "world#{tsuffix}", "#{pod_name}#{tsuffix}"
+              config.after "world.#{tsuffix}", "#{pod_name}.#{tsuffix}"
             end
-            config.after "world#{tsuffix}", "#{task_name}#{tsuffix}"
+            config.after "world.#{tsuffix}", "#{task_name}.#{tsuffix}"
           end
         end
 
-        config.task "#{task_name}.#{pod_name}" do
+        config.task "#{task_name}.#{pod_name}.app" do
           unless mix_pods
             if last_pod && last_pod != pod_name
               puts "ERROR: cannot call tasks that mix different dc_env (last pod = #{last_pod}, current pod = #{pod_name})"
@@ -162,9 +162,9 @@ module AlphaOmega
           end
         end
 
-        [ "", ".echo", ".yaml" ].each do |tsuffix|
-          config.task "#{task_name}#{tsuffix}" do
-            after "#{task_name}#{tsuffix}", "#{task_name}.#{current_pod}#{tsuffix}"
+        %w(app echo yaml).each do |tsuffix|
+          config.task "#{task_name}.#{tsuffix}" do
+            after "#{task_name}.#{tsuffix}", "#{task_name}.#{current_pod}.#{tsuffix}"
           end
         end
       end

data/lib/alpha_omega/version.rb

@@ -1,3 +1,3 @@
 module AlphaOmega
-  Version = "0.0.95"
+  Version = "0.0.96"
 end

data/libexec/build

@@ -11,50 +11,6 @@ if ! echo "$hst_this" | egrep -q "^(admin|develop)"; then
 fi
 
 case "$(basename $0)" in
-  deploy|release)
-    bundle exec cap "$@" deploy
-    ;;
-
-  rollback)
-    bundle exec cap "$@" deploy:rollback
-    ;;
-
-  stage)
-    bundle exec cap "$@" deploy:update_code
-    ;;
-
-  compare)
-    bundle exec cap "$@" deploy:compare
-    ;;
-
-  restart)
-    bundle exec cap "$@" deploy:restart
-    ;;
-
-  restart)
-    bundle exec cap "$@" deploy:restart
-    ;;
-
-  build)
-    bundle exec cap "$@" deploy:build
-    ;;
-
-  dist)
-    bundle exec cap "$@" deploy:dist
-    ;;
-
-  config)
-    bundle exec cap "$@" deploy:config
-    ;;
-
-  invoke)
-    bundle exec cap "$@" invoke
-    ;;
-
-  shell)
-    bundle exec cap "$@" shell
-    ;;
-
   hosts)
     export LOCAL_ONLY=true
 
@@ -72,7 +28,55 @@ case "$(basename $0)" in
     ;;
 
   *)
-    bundle exec cap "$@"
-    ;;
+    set $(for a in "$@"; do echo $a.app; done)
+    case "$(basename $0)" in
+      deploy|release)
+        bundle exec cap "$@" deploy
+        ;;
+
+      rollback)
+        bundle exec cap "$@" deploy:rollback
+        ;;
+
+      stage)
+        bundle exec cap "$@" deploy:update_code
+        ;;
+
+      compare)
+        bundle exec cap "$@" deploy:compare
+        ;;
+
+      restart)
+        bundle exec cap "$@" deploy:restart
+        ;;
+
+      restart)
+        bundle exec cap "$@" deploy:restart
+        ;;
+
+      build)
+        bundle exec cap "$@" deploy:build
+        ;;
+
+      dist)
+        bundle exec cap "$@" deploy:dist
+        ;;
+
+      config)
+        bundle exec cap "$@" deploy:config
+        ;;
+
+      invoke)
+        bundle exec cap "$@" invoke
+        ;;
+
+      shell)
+        bundle exec cap "$@" shell
+        ;;
+
+      *)
+        bundle exec cap "$@"
+        ;;
+  esac
 esac
 

data/libexec/check

@@ -11,50 +11,6 @@ if ! echo "$hst_this" | egrep -q "^(admin|develop)"; then
 fi
 
 case "$(basename $0)" in
-  deploy|release)
-    bundle exec cap "$@" deploy
-    ;;
-
-  rollback)
-    bundle exec cap "$@" deploy:rollback
-    ;;
-
-  stage)
-    bundle exec cap "$@" deploy:update_code
-    ;;
-
-  compare)
-    bundle exec cap "$@" deploy:compare
-    ;;
-
-  restart)
-    bundle exec cap "$@" deploy:restart
-    ;;
-
-  restart)
-    bundle exec cap "$@" deploy:restart
-    ;;
-
-  build)
-    bundle exec cap "$@" deploy:build
-    ;;
-
-  dist)
-    bundle exec cap "$@" deploy:dist
-    ;;
-
-  config)
-    bundle exec cap "$@" deploy:config
-    ;;
-
-  invoke)
-    bundle exec cap "$@" invoke
-    ;;
-
-  shell)
-    bundle exec cap "$@" shell
-    ;;
-
   hosts)
     export LOCAL_ONLY=true
 
@@ -72,7 +28,55 @@ case "$(basename $0)" in
     ;;
 
   *)
-    bundle exec cap "$@"
-    ;;
+    set $(for a in "$@"; do echo $a.app; done)
+    case "$(basename $0)" in
+      deploy|release)
+        bundle exec cap "$@" deploy
+        ;;
+
+      rollback)
+        bundle exec cap "$@" deploy:rollback
+        ;;
+
+      stage)
+        bundle exec cap "$@" deploy:update_code
+        ;;
+
+      compare)
+        bundle exec cap "$@" deploy:compare
+        ;;
+
+      restart)
+        bundle exec cap "$@" deploy:restart
+        ;;
+
+      restart)
+        bundle exec cap "$@" deploy:restart
+        ;;
+
+      build)
+        bundle exec cap "$@" deploy:build
+        ;;
+
+      dist)
+        bundle exec cap "$@" deploy:dist
+        ;;
+
+      config)
+        bundle exec cap "$@" deploy:config
+        ;;
+
+      invoke)
+        bundle exec cap "$@" invoke
+        ;;
+
+      shell)
+        bundle exec cap "$@" shell
+        ;;
+
+      *)
+        bundle exec cap "$@"
+        ;;
+  esac
 esac
 

data/libexec/compare

@@ -11,50 +11,6 @@ if ! echo "$hst_this" | egrep -q "^(admin|develop)"; then
 fi
 
 case "$(basename $0)" in
-  deploy|release)
-    bundle exec cap "$@" deploy
-    ;;
-
-  rollback)
-    bundle exec cap "$@" deploy:rollback
-    ;;
-
-  stage)
-    bundle exec cap "$@" deploy:update_code
-    ;;
-
-  compare)
-    bundle exec cap "$@" deploy:compare
-    ;;
-
-  restart)
-    bundle exec cap "$@" deploy:restart
-    ;;
-
-  restart)
-    bundle exec cap "$@" deploy:restart
-    ;;
-
-  build)
-    bundle exec cap "$@" deploy:build
-    ;;
-
-  dist)
-    bundle exec cap "$@" deploy:dist
-    ;;
-
-  config)
-    bundle exec cap "$@" deploy:config
-    ;;
-
-  invoke)
-    bundle exec cap "$@" invoke
-    ;;
-
-  shell)
-    bundle exec cap "$@" shell
-    ;;
-
   hosts)
     export LOCAL_ONLY=true
 
@@ -72,7 +28,55 @@ case "$(basename $0)" in
     ;;
 
   *)
-    bundle exec cap "$@"
-    ;;
+    set $(for a in "$@"; do echo $a.app; done)
+    case "$(basename $0)" in
+      deploy|release)
+        bundle exec cap "$@" deploy
+        ;;
+
+      rollback)
+        bundle exec cap "$@" deploy:rollback
+        ;;
+
+      stage)
+        bundle exec cap "$@" deploy:update_code
+        ;;
+
+      compare)
+        bundle exec cap "$@" deploy:compare
+        ;;
+
+      restart)
+        bundle exec cap "$@" deploy:restart
+        ;;
+
+      restart)
+        bundle exec cap "$@" deploy:restart
+        ;;
+
+      build)
+        bundle exec cap "$@" deploy:build
+        ;;
+
+      dist)
+        bundle exec cap "$@" deploy:dist
+        ;;
+
+      config)
+        bundle exec cap "$@" deploy:config
+        ;;
+
+      invoke)
+        bundle exec cap "$@" invoke
+        ;;
+
+      shell)
+        bundle exec cap "$@" shell
+        ;;
+
+      *)
+        bundle exec cap "$@"
+        ;;
+  esac
 esac
 

data/libexec/config

@@ -11,50 +11,6 @@ if ! echo "$hst_this" | egrep -q "^(admin|develop)"; then
 fi
 
 case "$(basename $0)" in
-  deploy|release)
-    bundle exec cap "$@" deploy
-    ;;
-
-  rollback)
-    bundle exec cap "$@" deploy:rollback
-    ;;
-
-  stage)
-    bundle exec cap "$@" deploy:update_code
-    ;;
-
-  compare)
-    bundle exec cap "$@" deploy:compare
-    ;;
-
-  restart)
-    bundle exec cap "$@" deploy:restart
-    ;;
-
-  restart)
-    bundle exec cap "$@" deploy:restart
-    ;;
-
-  build)
-    bundle exec cap "$@" deploy:build
-    ;;
-
-  dist)
-    bundle exec cap "$@" deploy:dist
-    ;;
-
-  config)
-    bundle exec cap "$@" deploy:config
-    ;;
-
-  invoke)
-    bundle exec cap "$@" invoke
-    ;;
-
-  shell)
-    bundle exec cap "$@" shell
-    ;;
-
   hosts)
     export LOCAL_ONLY=true
 
@@ -72,7 +28,55 @@ case "$(basename $0)" in
     ;;
 
   *)
-    bundle exec cap "$@"
-    ;;
+    set $(for a in "$@"; do echo $a.app; done)
+    case "$(basename $0)" in
+      deploy|release)
+        bundle exec cap "$@" deploy
+        ;;
+
+      rollback)
+        bundle exec cap "$@" deploy:rollback
+        ;;
+
+      stage)
+        bundle exec cap "$@" deploy:update_code
+        ;;
+
+      compare)
+        bundle exec cap "$@" deploy:compare
+        ;;
+
+      restart)
+        bundle exec cap "$@" deploy:restart
+        ;;
+
+      restart)
+        bundle exec cap "$@" deploy:restart
+        ;;
+
+      build)
+        bundle exec cap "$@" deploy:build
+        ;;
+
+      dist)
+        bundle exec cap "$@" deploy:dist
+        ;;
+
+      config)
+        bundle exec cap "$@" deploy:config
+        ;;
+
+      invoke)
+        bundle exec cap "$@" invoke
+        ;;
+
+      shell)
+        bundle exec cap "$@" shell
+        ;;
+
+      *)
+        bundle exec cap "$@"
+        ;;
+  esac
 esac