ironfan 4.12.1 → 4.12.2

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v4.12.2
+* REALM discovery aids cleanup: see https://github.com/infochimps-labs/ironfan/pull/310 for details
+
 # v4.12.1
 * REALM discovery aids: see https://github.com/infochimps-labs/ironfan/pull/309 for details
 

data/VERSION

@@ -1 +1 @@
-4.12.1
+4.12.2

data/ironfan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ironfan"
-  s.version = "4.12.1"
+  s.version = "4.12.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infochimps"]
-  s.date = "2013-09-26"
+  s.date = "2013-09-29"
   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

@@ -7,10 +7,8 @@ module Ironfan
       def initialize(attrs={},&block)
         super
         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)
+        self.realm_name         attrs[:owner].name unless attrs[:owner].nil?
+        self.cluster_names      attrs[:owner].cluster_names unless attrs[:owner].nil?
       end
 
       # Utility method to reference all servers from constituent facets
@@ -20,8 +18,9 @@ module Ironfan
         result
       end
 
-      def cluster_name()        name;   end
+      def cluster_name
+        name
+      end
     end
-
   end
 end

data/lib/ironfan/dsl/compute.rb

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

data/lib/ironfan/dsl/facet.rb

@@ -7,7 +7,9 @@ module Ironfan
       field      :cluster_name, String
 
       def initialize(attrs={},&block)
-        self.cluster_name       = attrs[:owner].name unless attrs[:owner].nil?
+        self.cluster_names      attrs[:owner].cluster_names unless attrs[:owner].nil?
+        self.realm_name         attrs[:owner].realm_name unless attrs[:owner].nil?
+        self.cluster_name       = attrs[:owner].cluster_name unless attrs[:owner].nil?
         self.name               = attrs[:name] unless attrs[:name].nil?
         self.facet_role         Ironfan::Dsl::Role.new(:name => "#{full_name}-facet")
         super
@@ -15,8 +17,6 @@ module Ironfan
       end
 
       def full_name()           "#{cluster_name}-#{name}";      end
-
     end
-
   end
-end
+end

data/lib/ironfan/dsl/realm.rb

@@ -7,26 +7,28 @@ module Ironfan
       magic :cluster_suffixes,    Whatever
 
       def initialize(attrs={},&block)
-        cluster_names OpenStruct.new
-        cluster_suffixes OpenStruct.new
+        cluster_names({})
+        realm_name attrs[:name] if attrs[:name]
         super
       end
 
       def cluster(label, attrs={},&blk)
         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 = Ironfan::Dsl::Cluster.new(name: new_name, owner: self, cluster_names: cluster_names)
+        cluster_names[label] = new_name
         cluster.receive!(attrs, &blk)
         super(new_name, cluster)
       end
 
-      def realm_name()        name;   end
+      def cluster_name suffix
+        clusters.fetch([realm_name, suffix.to_s].join('_').to_sym).name.to_sym
+      end
+      
+      def cluster_suffix suffix
+        clusters.
+          fetch([realm_name, suffix.to_s].join('_').to_sym).name.to_s.
+          gsub(/^#{realm_name}_/, '').to_sym
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ironfan
 version: !ruby/object:Gem::Version
-  version: 4.12.1
+  version: 4.12.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-26 00:00:00.000000000 Z
+date: 2013-09-29 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: 3895515305460381618
+      hash: 4472391313830122724
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: