ironfan 4.12.0 → 4.12.1

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v4.12.1
+* REALM discovery aids: see https://github.com/infochimps-labs/ironfan/pull/309 for details
+
 # v4.12.0
 * Added realms (supra-cluster scoping): see https://github.com/infochimps-labs/ironfan/pull/308 for details
 

data/VERSION

@@ -1 +1 @@
-4.12.0
+4.12.1

data/ironfan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ironfan"
-  s.version = "4.12.0"
+  s.version = "4.12.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infochimps"]
-  s.date = "2013-09-24"
+  s.date = "2013-09-26"
   s.description = "Ironfan allows you to orchestrate not just systems but clusters of machines. It includes a powerful layer on top of knife and a collection of cloud cookbooks."
   s.email = "coders@infochimps.com"
   s.extra_rdoc_files = [

data/lib/ironfan/dsl/cluster.rb

@@ -9,6 +9,10 @@ module Ironfan
         self.cluster_role       Ironfan::Dsl::Role.new(:name => "#{attrs[:name]}-cluster")
       end
 
+      def facet(name,attrs={},&block)
+        super(name,attrs.merge(cluster_names: cluster_names),&block)
+      end
+
       # Utility method to reference all servers from constituent facets
       def servers
         result = Gorillib::ModelCollection.new(:item_type => Ironfan::Dsl::Server, :key_method => :full_name)

data/lib/ironfan/dsl/compute.rb

@@ -27,6 +27,8 @@ module Ironfan
       member     :cluster_role, Ironfan::Dsl::Role
       member     :facet_role,   Ironfan::Dsl::Role
 
+      magic      :cluster_names, Whatever
+
       def initialize(attrs={},&block)
         self.underlay   = attrs[:owner] if attrs[:owner]
         super

data/lib/ironfan/dsl/realm.rb

@@ -4,19 +4,29 @@ module Ironfan
     class Realm < Ironfan::Dsl::Compute
       collection :clusters,       Ironfan::Dsl::Cluster,   :resolver => :deep_resolve
 
+      magic :cluster_suffixes,    Whatever
+
       def initialize(attrs={},&block)
+        cluster_names OpenStruct.new
+        cluster_suffixes OpenStruct.new
         super
       end
 
       def cluster(label, attrs={},&blk)
-        new_name = [realm_name, label].join '_'
-        cluster = Ironfan::Dsl::Cluster.new(name: new_name)
+        new_name = [realm_name, label].join('_').to_sym
+        cluster = Ironfan::Dsl::Cluster.new(name: new_name, cluster_names: OpenStruct.new)
+        cluster_names.new_ostruct_member label
+        cluster_names.send "#{label}=", new_name
+        cluster_suffixes.new_ostruct_member label
+        cluster_suffixes.send "#{label}=", label
+        (clusters.keys.map{|k| clusters[k]} << cluster).each do |cl|
+          cl.cluster_names cluster_names
+        end
         cluster.receive!(attrs, &blk)
         super(new_name, cluster)
       end
 
       def realm_name()        name;   end
     end
-
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ironfan
 version: !ruby/object:Gem::Version
-  version: 4.12.0
+  version: 4.12.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-24 00:00:00.000000000 Z
+date: 2013-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -382,7 +382,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1961603152383725034
+      hash: 3895515305460381618
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: