classify_cluster 0.0.2 → 0.0.3

data/examples/cluster.rb

@@ -2,23 +2,20 @@ cluster_common = %w{ ntp conary sysstat }
 onpremise_common = %w{ sudo cron monit::disabled }
 
 cluster :"appliance-cluster" do |cluster|
-  common_classes = cluster_common + onpremise_common
-  common_variables = {}
-  common_resources = {}
-  cluster.node :mylittlewebserver do |node|
-    common_classes.each do |common_class|
-      node.klass common_class
-    end
-    common_variables.each_pair do |key, value|
-      node.variable key, value
-    end
-    common_resources.each_pair do |key, value|
-      node.resource do |resource|
-        resource.type value[:type]
-        resource.name key
-        resource.options value[:options]
-      end
+  (cluster_common + onpremise_common).each do |common_class|
+    cluster.klass common_class
+  end
+  {}.each_pair do |key, value|
+    cluster.variable key, value
+  end
+  {}.each_pair do |key, value|
+    cluster.resource do |resource|
+      resource.type value[:type]
+      resource.name key
+      resource.options value[:options]
     end
+  end
+  cluster.node :"example.com" do |node|
     node.klass "webserver"
     node.variable :appservers, ['123.456.28.1']
     node.role do |role|

data/lib/classify_cluster/configurator/cluster.rb

@@ -1,7 +1,7 @@
 module ClassifyCluster
   module Configurator
     class Cluster
-      attr_reader :nodes, :name
+      attr_reader :nodes, :name, :classes, :variables, :resources
       def initialize(*args, &block)
         @nodes = {}
         @name = args.first
@@ -14,6 +14,15 @@ module ClassifyCluster
       def node(node_name, &block)
         @nodes[node_name] = ClassifyCluster::Configurator::Node.new(node_name, &block)
       end
+      def variable(name, value)
+        @variables[name] = value
+      end
+      def resource(&block)
+        @resources << ClassifyCluster::Configurator::Resource.new(&block)
+      end
+      def klass(name)
+        @classes << name
+      end
     end
   end
 end

data/lib/classify_cluster/configurator/node.rb

@@ -39,39 +39,5 @@ module ClassifyCluster
         @classes << name
       end
     end
-    class Resource
-      attr_reader :type, :name, :options
-      def initialize(*args, &block)
-        @options = {}
-        block.call self
-      end
-      def type(value = nil)
-        return @type unless value
-        @type = value
-      end
-      def name(value = nil)
-        return @name unless value
-        @name = value
-      end
-      def options(value = nil)
-        return @options unless value
-        @options = value
-      end
-    end
-    class Role
-      attr_reader :type, :options
-      def initialize(*args, &block)
-        @options = {}
-        block.call self
-      end
-      def type(value = nil)
-        return @type unless value
-        @type = value
-      end
-      def options(value = nil)
-        return @options unless value
-        @options = value
-      end
-    end
   end
 end

data/lib/classify_cluster/version.rb

@@ -1,3 +1,3 @@
 module ClassifyCluster
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/classify_cluster/writers/capistrano.rb

@@ -3,6 +3,9 @@ module ClassifyCluster
     class Capistrano
       def self.export!(capistrano_configurator, cluster, config_file=ClassifyCluster::Base.default_config_file)
         config = ClassifyCluster::Configurator::Configuration.new(config_file).clusters[cluster]
+        config.variables.each_pair do |name, value|
+          capistrano_configurator.set("puppet-#{name}".to_sym, value)
+        end
         config.nodes.each_pair do |name, node|
           roles = node.roles
           next if roles.empty?

data/lib/classify_cluster/writers/puppet.rb

@@ -9,9 +9,21 @@ module ClassifyCluster
           File.open(File.join(export_to_folder, "#{cluster.name}.pp"), 'w') do |file|
             cluster.nodes.each_pair do |fqdn, node|
               file.write(output(%Q%node "#{node.default? ? 'default' : node.fqdn}" {%))
+              cluster.variables.each_pair do |key, value|
+                file.write(output("$#{key}=#{value.inspect}", :indent => 1))
+              end
               node.variables.each_pair do |key, value|
                 file.write(output("$#{key}=#{value.inspect}", :indent => 1))
               end
+              cluster.resources.each do |resource|
+                file.write(output("#{resource.type} { #{resource.name.inspect}:", :indent => 1))
+                count = 0
+                resource.options.each_pair do |key, value|
+                  file.write(output("#{key} => #{value.inspect}#{"," if count >= resource.options.size}", :indent => 2))
+                  count += 1
+                end
+                file.write(output("}", :indent => 1))
+              end
               node.resources.each do |resource|
                 file.write(output("#{resource.type} { #{resource.name.inspect}:", :indent => 1))
                 count = 0
@@ -21,6 +33,9 @@ module ClassifyCluster
                 end
                 file.write(output("}", :indent => 1))
               end
+              cluster.classes.each do |klass|
+                file.write(output("include #{klass}", :indent => 1))
+              end
               node.classes.each do |klass|
                 file.write(output("include #{klass}", :indent => 1))
               end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: classify_cluster
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Sean Cashin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-26 00:00:00 -07:00
+date: 2010-11-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency