alpha_omega 0.0.51 → 0.0.52

data/lib/alpha_omega/utils.rb

@@ -27,19 +27,44 @@ module AlphaOmega
     end
   end
 
-  def self.what_hosts (nodes_spec)
+  def self.what_pods (node_home)
+    pods = { 
+      "default" => {
+        "nodes_spec" => "#{node_home}/nodes/*.json",
+        "node_suffix" => ""
+      }
+    }
+
+    yield "default", pods["default"]
+
+    this_host = Socket.gethostname.chomp.split(".")[0]
+    this_node = JSON.load(File.read("#{node_home}/nodes/#{this_host}.json"))
+    (this_node["pods"] || []).each do |pod_name|
+      pods[pod_name] = { 
+        "nodes_spec" => "#{node_home}/pods/#{pod_name}/*.json",
+        "node_suffix" => ".#{pod_name}"
+      }
+
+      yield pod_name, pods[pod_name]
+    end
+
+    pods
+  end
+
+  def self.what_hosts (pod)
     # load all the nodes and define cap tasks
     nodes = {}
 
-    Dir[nodes_spec].each do |fname|
-      nm_node = File.basename(fname, ".json")
+    Dir[pod["node_spec"]].each do |fname|
+      node_name = File.basename(fname, ".json")
 
       node = JSON.parse(IO.read(fname))
-      node[:node_name] = nm_node
+      node["node_name"] = node_name
+      node["pod_context"] = pod
 
-      nodes[nm_node] = node
+      nodes[node_name] = node
 
-      yield node if node[:node_name] && node["public_ip"] # TODO is the :node_name test necessary?
+      yield node_name, "#{node_name}#{pod["node_suffix"]}", node unless node["virtual"]
     end
 
     nodes
@@ -50,19 +75,16 @@ module AlphaOmega
     # generalize groups
     cap_groups = {}
 
-    nodes.each do |nm_node, node|
-      %w(chef_group cap_group).each do |nm_group| # TODO get rid of chef_group
-        if node.member?(nm_group) && !node["ignore"]
-          node[nm_group].each do |g|
-            cap_groups[g] ||= {}
-            cap_groups[g][nm_node] = node
-          end
-        end
+    nodes.each do |node_name, node|
+      remote_name = "#{node_name}#{node["pod_context"]["node_suffix"]}"
+      node["cap_group"].each do |g|
+        cap_groups[g] ||= {}
+        cap_groups[g][remote_name] = node
       end
     end
 
-    cap_groups.each do |nm_group, group|
-      yield nm_group, group
+    cap_groups.each do |group_name, nodes|
+      yield group_name, nodes
     end
 
     cap_groups

data/lib/alpha_omega/version.rb

@@ -1,3 +1,3 @@
 module AlphaOmega
-  Version = "0.0.51"
+  Version = "0.0.52"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: alpha_omega
 version: !ruby/object:Gem::Version 
-  hash: 121
-  prerelease: false
+  hash: 119
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 51
-  version: 0.0.51
+  - 52
+  version: 0.0.52
 platform: ruby
 authors: 
 - David Nghiem
@@ -16,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-31 00:00:00 -07:00
-default_executable: 
+date: 2011-08-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: grit
@@ -118,28 +117,27 @@ files:
 - README.mkd
 - Procfile.rb
 - libexec/compare
-- libexec/deploy
-- libexec/major
-- libexec/patch
 - libexec/rollback
 - libexec/shell
+- libexec/major
+- libexec/patch
+- libexec/deploy
 - libexec/stage
-- lib/alpha_omega/deploy/dependencies.rb
-- lib/alpha_omega/deploy/local_dependency.rb
+- lib/alpha_omega/version.rb
+- lib/alpha_omega/deploy.rb
+- lib/alpha_omega/utils.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/strategy.rb
+- lib/alpha_omega/deploy/dependencies.rb
 - lib/alpha_omega/deploy/scm.rb
+- lib/alpha_omega/deploy/strategy/remote.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/strategy.rb
 - lib/alpha_omega/deploy/templates/maintenance.rhtml
-- lib/alpha_omega/deploy.rb
-- lib/alpha_omega/utils.rb
-- lib/alpha_omega/version.rb
+- lib/alpha_omega/deploy/local_dependency.rb
+- lib/alpha_omega/deploy/scm/git.rb
+- lib/alpha_omega/deploy/scm/base.rb
 - bin/deploy
-has_rdoc: true
 homepage: https://github.com/HeSYINUvSBZfxqA/alpha_omega
 licenses: []
 
@@ -169,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: alpha_omega capistrano recipes