ironfan 4.11.5 → 4.12.0

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v4.12.0
+* Added realms (supra-cluster scoping): see https://github.com/infochimps-labs/ironfan/pull/308 for details
+
 # v4.11.5
 * Update ELB creation code to reflect new SSLNegotiationPolicyType behaviors (thanks @nickmarden)
 

data/VERSION

@@ -1 +1 @@
-4.11.5
+4.12.0

data/ironfan.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "ironfan"
-  s.version = "4.11.5"
+  s.version = "4.12.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infochimps"]
@@ -71,6 +71,7 @@ Gem::Specification.new do |s|
     "lib/ironfan/dsl/ec2.rb",
     "lib/ironfan/dsl/facet.rb",
     "lib/ironfan/dsl/rds.rb",
+    "lib/ironfan/dsl/realm.rb",
     "lib/ironfan/dsl/role.rb",
     "lib/ironfan/dsl/server.rb",
     "lib/ironfan/dsl/virtualbox.rb",

data/lib/ironfan/dsl/cluster.rb

@@ -20,4 +20,4 @@ module Ironfan
     end
 
   end
-end
+end

data/lib/ironfan/dsl/realm.rb

@@ -0,0 +1,22 @@
+module Ironfan
+  class Dsl
+
+    class Realm < Ironfan::Dsl::Compute
+      collection :clusters,       Ironfan::Dsl::Cluster,   :resolver => :deep_resolve
+
+      def initialize(attrs={},&block)
+        super
+      end
+
+      def cluster(label, attrs={},&blk)
+        new_name = [realm_name, label].join '_'
+        cluster = Ironfan::Dsl::Cluster.new(name: new_name)
+        cluster.receive!(attrs, &blk)
+        super(new_name, cluster)
+      end
+
+      def realm_name()        name;   end
+    end
+
+  end
+end

data/lib/ironfan/requirements.rb

@@ -13,6 +13,7 @@ require 'ironfan/dsl/compute'
 require 'ironfan/dsl/server'
 require 'ironfan/dsl/facet'
 require 'ironfan/dsl/cluster'
+require 'ironfan/dsl/realm'
 
 require 'ironfan/dsl/role'
 require 'ironfan/dsl/volume'

data/lib/ironfan.rb

@@ -2,6 +2,7 @@ require 'ironfan/requirements'
 
 module Ironfan
   @@clusters ||= Hash.new
+  @@realms ||= Hash.new
 
   # path to search for cluster definition files
   def self.cluster_path
@@ -18,6 +19,12 @@ module Ironfan
     @@clusters
   end
 
+  #
+  # Delegates
+  def self.realms
+    @@realms
+  end
+
   def self.ui=(ui) @ui = ui ; end
   def self.ui()    @ui      ; end
 
@@ -72,6 +79,18 @@ module Ironfan
     end
   end
 
+  def self.realm(name, attrs={}, &block)
+    name = name.to_sym
+    if @@realms[name] and attrs.empty? and not block_given?
+      return @@realms[name]
+    else
+      rlm = Ironfan::Dsl::Realm.new(:name => name)
+      rlm.receive!(attrs, &block)
+      rlm.clusters.keys.each{|k| @@clusters[k.to_sym] = rlm.clusters[k].resolve}
+      @@realms[name] = rlm
+    end
+  end
+
   #
   # Return cluster if it's defined. Otherwise, search Ironfan.cluster_path
   # for an eponymous file, load it, and return the cluster it defines.
@@ -85,12 +104,14 @@ module Ironfan
     raise ArgumentError, "Please supply a cluster name" if name.to_s.empty?
     return @@clusters[name] if @@clusters[name]
 
-    cluster_file = cluster_filenames[name] or raise("Couldn't find a definition for #{name} in cluster_path: #{cluster_path.inspect}")
-
-    Chef::Log.info("Loading cluster #{cluster_file}")
+    cluster_path.each do |cp_dir|
+      Dir[ File.join(cp_dir, '*.rb') ].each do |filename|
+        Chef::Log.info("Loading cluster file #{filename}")
+        require filename
+      end
+    end
 
-    require cluster_file
-    unless @@clusters[name] then  die("#{cluster_file} was supposed to have the definition for the #{name} cluster, but didn't") end
+    unless @@clusters[name] then  die("Couldn't find a cluster definition for #{name} in #{cluster_path}") end
 
     @@clusters[name]
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ironfan
 version: !ruby/object:Gem::Version
-  version: 4.11.5
+  version: 4.12.0
   prerelease: 
 platform: ruby
 authors:
@@ -282,6 +282,7 @@ files:
 - lib/ironfan/dsl/ec2.rb
 - lib/ironfan/dsl/facet.rb
 - lib/ironfan/dsl/rds.rb
+- lib/ironfan/dsl/realm.rb
 - lib/ironfan/dsl/role.rb
 - lib/ironfan/dsl/server.rb
 - lib/ironfan/dsl/virtualbox.rb
@@ -381,7 +382,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2976122810145852585
+      hash: -1961603152383725034
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: