ironfan 4.0.5 → 4.0.8

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v4.0.8:
+* Removed .delegates_to, .parallelize in favor of manual delegation (via .each) and .parallel, to remove assumption that calls must be in the context of the individual object (preparation for fixing bootstrapping)
+* Adding cluster and facet roles to server run list (fixes #160)
+* Fixed blocking bugs in launch (bad versions 4.0.6 & 4.0.7)
+
 # v4.0.5: security_group bug-fixes
 * Fix for snapshot_id setting in cluster DSL
 * Reinstated missing group_authorized capability

data/VERSION

@@ -1 +1 @@
-4.0.5
+4.0.8

data/ironfan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ironfan"
-  s.version = "4.0.5"
+  s.version = "4.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infochimps"]
-  s.date = "2012-09-18"
+  s.date = "2012-09-20"
   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/broker/computer.rb

@@ -51,7 +51,7 @@ module Ironfan
 
       def validate
         computer = self
-        Ironfan.delegate_to(chosen_resources) { validate_computer! computer }
+        chosen_resources.each {|r| r.validate_computer! computer }
       end
 
       #
@@ -131,8 +131,8 @@ module Ironfan
         values["Chef?"] =       "no"
         values["State"] =       "not running"
 
-        delegate_to([ server, node, machine ].compact) do
-          to_display style, values
+        [ server, node, machine ].compact.each do |part|
+          part.to_display style, values
         end
 
         if style == :expanded
@@ -228,34 +228,34 @@ module Ironfan
       # Discovery
       #
       def correlate
-        Ironfan.delegate_to(values)     { correlate }
+        values.each {|c| c.correlate }
       end
 
       def validate
         providers = values.map {|c| c.providers.values}.flatten
         computers = self
 
-        Ironfan.delegate_to(values)     { validate }
-        Ironfan.delegate_to(providers)  { validate computers }
+        values.each {|c| c.validate }
+        providers.each {|p| p.validate computers }
       end
 
       #
       # Manipulation
       #
       def kill(options={})
-        Ironfan.parallelize(values) { kill(options) }
+        Ironfan.parallel(values) {|c| c.kill(options) }
       end
       def launch
-        Ironfan.parallelize(values) { launch }
+        Ironfan.parallel(values) {|c| c. launch }
       end
       def save(options={})
-        Ironfan.parallelize(values) { save(options) }
+        Ironfan.parallel(values) {|c| c. save(options) }
       end
       def start
-        Ironfan.parallelize(values) { start }
+        Ironfan.parallel(values) {|c| c. start }
       end
       def stop
-        Ironfan.parallelize(values) { stop }
+        Ironfan.parallel(values) {|c| c. stop }
       end
 
       #

data/lib/ironfan/broker.rb

@@ -16,7 +16,7 @@ module Ironfan
       computers = Computers.new(:cluster => cluster.resolve)
       providers = computers.map{|c| c.providers.values}.flatten.uniq
 
-      delegate_to(providers) { load cluster }
+      providers.each {|p| p.load cluster }
       computers.correlate
       computers.validate
       computers

data/lib/ironfan/builder.rb

@@ -5,10 +5,6 @@ module Ironfan
 
     def self.ui() Ironfan.ui ; end
     def ui()      Ironfan.ui ; end
-
-    def delegate_to(*args,&block)
-      Ironfan.delegate_to(*args,&block)
-    end
   end
 
 end

data/lib/ironfan/dsl/server.rb

@@ -9,6 +9,9 @@ module Ironfan
         unless attrs[:owner].nil?
           self.cluster_name =   attrs[:owner].cluster_name
           self.facet_name =     attrs[:owner].name
+
+          self.role     "#{self.cluster_name}_cluster", :last
+          self.role     attrs[:owner].facet_role.name,  :last
         end
         super
       end

data/lib/ironfan/provider.rb

@@ -24,11 +24,11 @@ module Ironfan
     # Discovery
     #
     def self.load(cluster)
-      Ironfan.delegate_to(resources) { load! cluster }
+      resources.each {|r| r.load! cluster }
     end
 
     def self.validate(computers)
-      Ironfan.delegate_to(resources) { validate_resources! computers }
+      resources.each {|r| r.validate_resources! computers }
     end
 
 
@@ -119,13 +119,13 @@ module Ironfan
       # Create all things that aren't machines
       targets = resources.reject {|type| type < IaasProvider::Machine}
       computers.each do |computer|
-        delegate_to(targets) { create! computer }
+        targets.each {|r| r.create! computer }
       end
     end
 
     def save!(computers)
       computers.each do |computer|
-        delegate_to(resources) { save! computer }
+        targets.each {|r| r.save! computer }
       end
     end
 

data/lib/ironfan.rb

@@ -24,19 +24,13 @@ module Ironfan
   def self.chef_config=(cc) @chef_config = cc ; end
   def self.chef_config()    @chef_config      ; end
 
-  # simple delegation to multiple targets
-  def self.delegate_to(targets,options={},&block)
+  # execute against multiple targets in parallel
+  def self.parallel(targets,options={})
     raise 'missing block' unless block_given?
-    [targets].flatten.each {|target| target.instance_eval &block }
-  end
-
-  # delegate to multiple targets in parallel
-  def self.parallelize(targets,options={},&block)
-    raise 'missing block' unless block_given?
-    [targets].flatten.map do |t|
+    [targets].flatten.map do |target|
       sleep(0.1) # avoid hammering with simultaneous requests
-      Thread.new(t) {|t| t.instance_eval &block }
-    end.each(&:join)
+      Thread.new(target) {|target| yield target }
+    end.each(&:join) # wait for all the blocks to return
   end
 
   #

metadata

@@ -2,7 +2,7 @@
 name: ironfan
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 4.0.5
+  version: 4.0.8
 platform: ruby
 authors: 
 - Infochimps
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-18 00:00:00 Z
+date: 2012-09-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: chef
@@ -232,7 +232,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3351900580010290705
+      hash: -2934265328136200700
       segments: 
       - 0
       version: "0"