classify_cluster 0.3.9 → 0.4.0

data/lib/classify_cluster/base.rb

@@ -1,7 +1,13 @@
 module ClassifyCluster
   class Base
     def self.default_config_file
-      File.join('/etc', 'cluster.rb')
+      cluster_rb = File.join('/etc', 'cluster.rb')
+      cluster_yml = File.join('/etc', 'cluster.yml')
+      if !File.exists?(cluster_rb) && File.exists?(cluster_yml)
+        cluster_yml
+      else
+        cluster_rb
+      end
     end
   end
 end

data/lib/classify_cluster/configurator/configuration.rb

@@ -1,10 +1,42 @@
+require 'yaml'
 module ClassifyCluster
   module Configurator
     class Configuration
       attr_reader :clusters
       def initialize(config_path)
         @clusters = {}
-        eval File.open(config_path).read
+        case File.extname(config_path)
+        when ".rb"
+          eval File.open(config_path).read
+        when ".yml"
+          config = YAML.load_file(config_path)
+          config.each_pair do |cluster_name, cluster_values|
+            cluster(cluster_name) do |cluster|
+              cluster_values['klasses'].each do |klass|
+                cluster.klass klass
+              end
+              cluster_values['variables'].each_pair do |variable_name, variable_value|
+                cluster.variable variable_name, variable_value
+              end
+              cluster_values['nodes'].each do |node_values|
+                cluster.node(node_values['hostname'], node_values['ip_address']) do |node|
+                  node_values['roles'].each_pair do |role_name, role_values|
+                    options={}
+                    options['primary'] = true if role_values.delete('primary')
+                    options['backup'] = true if role_values.delete('backup')
+                    options['master'] = true if role_values.delete('master')
+                    options['node'] = true if role_values.delete('node')
+                    node.role(role_name, options) do |role|
+                      role_values.each_pair do |role_value_name, role_value|
+                        role.variable role_value_name, role_value
+                      end
+                    end
+                  end
+                end
+              end
+            end
+          end
+        end
       end
       
       def cluster(cluster_name, &block)

data/lib/classify_cluster/version.rb

@@ -1,3 +1,3 @@
 module ClassifyCluster
-  VERSION = "0.3.9"
+  VERSION = "0.4.0"
 end

data/lib/classify_cluster/writers/puppet.rb

@@ -47,7 +47,7 @@ module ClassifyCluster
       end
       private
       def self.output(string, options={})
-        options.reverse_merge! :indent => 0
+        options = {:indent => 0}.merge(options)
         %Q%#{("\s" * 2) * options[:indent]}#{string}\n%
       end
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: classify_cluster
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
-  - 9
-  version: 0.3.9
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Sean Cashin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-08 00:00:00 -08:00
+date: 2011-03-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency