alpha_omega 0.0.96 → 0.0.97

data/lib/alpha_omega/utils.rb

@@ -63,7 +63,7 @@ module AlphaOmega
   end
 
   def self.default_pods_tasks
-    Proc.new do |config, pod_name, pod, mix_pods, pods_config, opsdb, this_pod, this_node, &node_filter|
+    Proc.new do |config, pod_name, pod, pods_config, opsdb, this_pod, this_node, &node_filter|
       %w(app echo yaml).each do |tsuffix|
          # world task accumulates all.* after tasks
         config.task "world.#{tsuffix}" do # task world
@@ -98,7 +98,7 @@ module AlphaOmega
           
             %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}"
+                config.after "#{task_name}.#{tsuffix}", "#{task_name}.#{current_pod}.#{tsuffix}"
               end
             end
 
@@ -113,67 +113,31 @@ module AlphaOmega
           # simulate all podXX all
           %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}" # podXX, hence the guard for default
             end
-            config.after "world.#{tsuffix}", "#{task_name}.#{tsuffix}"
+            config.after "world.#{tsuffix}", "#{task_name}.#{tsuffix}" # all
           end
         end
 
-        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})"
-              exit 1
-            end
+        %w(app echo yaml).each do |tsuffix|
+          config.task "#{task_name}.#{pod_name}.#{tsuffix}" do
           end
 
-          set :last_pod, pod_name
           nodes.keys.sort.each do |remote_name|
-            role :app, remote_name
-            set :dna, node_dna[remote_name]
+            config.after "#{task_name}.#{pod_name}.#{tsuffix}", "#{remote_name}.#{tsuffix}"
           end
-        end
 
-        config.task "#{task_name}.#{pod_name}.echo" 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})"
-              exit 1
-            end
-          end
-
-          set :last_pod, pod_name
-          nodes.keys.sort.each do |remote_name|
-            puts "#{AlphaOmega.magic_prefix} #{remote_name}"
-          end
-        end
-
-        config.task "#{task_name}.#{pod_name}.yaml" 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})"
-              exit 1
-            end
-          end
-
-          set :last_pod, pod_name
-          nodes.sort.each do |remote_name, node|
-            StringIO.new({ remote_name => node }.to_yaml).lines.each {|l| puts "#{AlphaOmega.magic_prefix} #{l}" }
-          end
-        end
-
-        %w(app echo yaml).each do |tsuffix|
           config.task "#{task_name}.#{tsuffix}" do
-            after "#{task_name}.#{tsuffix}", "#{task_name}.#{current_pod}.#{tsuffix}"
+            config.after "#{task_name}.#{tsuffix}", "#{task_name}.#{current_pod}.#{tsuffix}"
           end
         end
       end
     end
   end
 
-  def self.setup_pods (config, node_home, mix_pods = true, &node_filter)
+  def self.setup_pods (config, node_home, &node_filter)
     self.what_pods(config, node_home) do |config, pod_name, pod, pods_config, opsdb, this_pod, this_node| 
-      self.default_pods_tasks.call(config, pod_name, pod, mix_pods, pods_config, opsdb, this_pod, this_node, &node_filter) 
+      self.default_pods_tasks.call(config, pod_name, pod, pods_config, opsdb, this_pod, this_node, &node_filter) 
     end
   end
 

data/lib/alpha_omega/version.rb

@@ -1,3 +1,3 @@
 module AlphaOmega
-  Version = "0.0.96"
+  Version = File.read(File.expand_path('../../../VERSION',  __FILE__)).strip
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: alpha_omega
 version: !ruby/object:Gem::Version 
-  hash: 223
+  hash: 221
   prerelease: 
   segments: 
   - 0
   - 0
-  - 96
-  version: 0.0.96
+  - 97
+  version: 0.0.97
 platform: ruby
 authors: 
 - David Nghiem
@@ -16,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-31 00:00:00 +00:00
-default_executable: 
+date: 2011-08-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: grit
@@ -119,37 +118,36 @@ files:
 - LICENSE
 - README.mkd
 - Procfile.rb
-- libexec/proxy
 - libexec/build
-- libexec/restart
-- libexec/stage
-- libexec/rollback
+- libexec/check
 - libexec/compare
-- libexec/shell
-- libexec/deploy
 - libexec/config
+- libexec/deploy
+- libexec/dist
 - libexec/dna
-- libexec/check
-- libexec/invoke
 - libexec/hosts
+- libexec/invoke
+- libexec/proxy
 - libexec/release
-- libexec/dist
-- lib/alpha_omega/utils.rb
-- lib/alpha_omega/deploy.rb
-- lib/alpha_omega/version.rb
+- libexec/restart
+- libexec/rollback
+- libexec/shell
+- libexec/stage
+- lib/alpha_omega/deploy/dependencies.rb
 - lib/alpha_omega/deploy/local_dependency.rb
+- lib/alpha_omega/deploy/remote_dependency.rb
+- lib/alpha_omega/deploy/scm/base.rb
+- lib/alpha_omega/deploy/scm/git.rb
+- lib/alpha_omega/deploy/scm.rb
 - lib/alpha_omega/deploy/strategy/base.rb
 - lib/alpha_omega/deploy/strategy/checkout.rb
 - lib/alpha_omega/deploy/strategy/remote.rb
-- lib/alpha_omega/deploy/scm.rb
-- lib/alpha_omega/deploy/templates/maintenance.rhtml
 - lib/alpha_omega/deploy/strategy.rb
-- lib/alpha_omega/deploy/scm/base.rb
-- lib/alpha_omega/deploy/scm/git.rb
-- lib/alpha_omega/deploy/dependencies.rb
-- lib/alpha_omega/deploy/remote_dependency.rb
+- lib/alpha_omega/deploy/templates/maintenance.rhtml
+- lib/alpha_omega/deploy.rb
+- lib/alpha_omega/utils.rb
+- lib/alpha_omega/version.rb
 - bin/alpha_omega
-has_rdoc: true
 homepage: https://github.com/HeSYINUvSBZfxqA/alpha_omega
 licenses: []
 
@@ -179,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: alpha_omega capistrano recipes