rubix 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/rubix/monitors/cluster_monitor.rb

@@ -38,7 +38,7 @@ module Rubix
   # script.
   class ClusterMonitor < ChefMonitor
 
-    attr_reader :private_ips_by_cluster, :nodes_by_cluster
+    attr_reader :all_private_ips_by_cluster, :private_ips_by_cluster, :all_nodes_by_cluster, :nodes_by_cluster
 
     def initialize settings
       super(settings)
@@ -54,14 +54,23 @@ module Rubix
     end
 
     def group_nodes_by_cluster
-      @private_ips_by_cluster = {}
-      @nodes_by_cluster       = {}
+      @all_private_ips_by_cluster = {}
+      @private_ips_by_cluster     = {}
+      @all_nodes_by_cluster       = {}
+      @nodes_by_cluster           = {}
       matching_chef_nodes.first.each do |node|
-        @nodes_by_cluster[node['cluster_name']] ||= []
-        @nodes_by_cluster[node['cluster_name']] << node
+        @all_nodes_by_cluster[node['cluster_name']] ||= []
+        @nodes_by_cluster[node['cluster_name']]     ||= []
         
-        @private_ips_by_cluster[node['cluster_name']] ||= []
-        @private_ips_by_cluster[node['cluster_name']] << node['ipaddress']
+        @all_nodes_by_cluster[node['cluster_name']] << node
+        @nodes_by_cluster[node['cluster_name']]     << node unless %w[stopped].include?(node['state'])
+        
+        
+        @all_private_ips_by_cluster[node['cluster_name']] ||= []
+        @private_ips_by_cluster[node['cluster_name']]     ||= []
+        
+        @all_private_ips_by_cluster[node['cluster_name']] << node['ipaddress']
+        @private_ips_by_cluster[node['cluster_name']]     << node['ipaddress'] unless %w[stopped].include?(node['state'])
       end
     end
     

data/spec/rubix/monitors/chef_monitor_spec.rb

@@ -5,6 +5,7 @@ describe Rubix::ChefMonitor do
   before do
     @wrapper = Class.new(Rubix::ChefMonitor)
   end
+  
 
 end
   

data/spec/rubix/monitors/cluster_monitor_spec.rb

@@ -2,9 +2,33 @@ require 'spec_helper'
 
 describe Rubix::ClusterMonitor do
 
-  before do
-    @wrapper = Class.new(Rubix::ClusterMonitor)
+  def mock_chef_query nodes
+    query = mock("Chef::Search::Query")
+    require 'chef'
+    ::Chef::Search::Query.should_receive(:new).and_return(query)
+    query.should_receive(:search).and_return([nodes, nodes.size])
   end
   
+  it "should correctly carve up a group of nodes into clusters" do
+    mock_chef_query([
+                     { 'cluster_name' => 'foo', 'state' => 'started', 'ipaddress' => '123' },
+                     { 'cluster_name' => 'foo', 'state' => 'stopped', 'ipaddress' => '456' },
+                     { 'cluster_name' => 'bar', 'state' => 'started', 'ipaddress' => '789' },
+                     { 'cluster_name' => 'bar', 'state' => 'stopped', 'ipaddress' => '321' }
+                    ])
+    cm = Rubix::ClusterMonitor.new({})
+    cm.clusters.should include('foo', 'bar')
+    cm.private_ips_by_cluster.should == { 'foo' => ['123'], 'bar' => ['789'] }
+    cm.all_private_ips_by_cluster.should == { 'foo' => ['123', '456'], 'bar' => ['789', '321'] }
+
+    cm.nodes_by_cluster['foo'].size.should == 1
+    cm.nodes_by_cluster['bar'].size.should == 1
+
+    cm.all_nodes_by_cluster['foo'].size.should == 2
+    cm.all_nodes_by_cluster['bar'].size.should == 2
+    
+  end
+  
+  
 end
   

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Dhruv Bansal