ironfan 4.1.1 → 4.2.0

data/VERSION

@@ -1 +1 @@
-4.1.1
+4.2.0

data/ironfan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ironfan"
-  s.version = "4.1.1"
+  s.version = "4.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infochimps"]
-  s.date = "2012-09-27"
+  s.date = "2012-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/chef/knife/cluster_show.rb

@@ -56,8 +56,12 @@ class Chef
     protected
 
       def dump_computer(computer)
+        header = "Computer #{computer.name} (#{computer.class})"
         with_verbosity 1 do
-          dump("Computer #{computer.name} (#{computer.class})", computer.to_wire)
+          Chef::Log.info(header)
+        end
+        with_verbosity 2 do
+          dump(header, computer.to_wire)
         end
       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
-      providers.each do |provider|
+      Ironfan.parallel(providers) do |provider|
         Ironfan.step cluster.name, "Loading #{provider.handle}", :cyan
         provider.load cluster
       end

data/lib/ironfan/provider/chef/client.rb

@@ -45,9 +45,8 @@ module Ironfan
         # Discovery
         #
         def self.load!(cluster=nil)
-          Ironfan.substep(cluster.name, "chef clients")
-          nameq = "name:#{cluster.name}-* OR clientname:#{cluster.name}-*"
-          ChefServer.search(:client, nameq) do |raw|
+          query = cluster && "name:#{cluster.name}-* OR clientname:#{cluster.name}-*"
+          ChefServer.search(:client, query) do |raw|
             next unless raw.present?
             client = register(raw)
             Chef::Log.debug("Loaded #{client}")

data/lib/ironfan/provider/chef/node.rb

@@ -88,8 +88,8 @@ module Ironfan
         # Discovery
         #
         def self.load!(cluster=nil)
-          Ironfan.substep(cluster.name, "nodes")
-          ChefServer.search(:node,"name:#{cluster.name}-*") do |raw|
+          query = cluster && "name:#{cluster.name}-*"
+          ChefServer.search(:node, query) do |raw|
             next unless raw.present?
             node = register(raw)
             Chef::Log.debug("Loaded #{node}")

data/lib/ironfan/provider/chef/role.rb

@@ -46,9 +46,9 @@ module Ironfan
         #
         # Discovery
         #
-        def self.load!(cluster)
-          Ironfan.substep(cluster.name, "roles")
-          ChefServer.search(:role,"name:#{cluster.name}_*") do |raw|
+        def self.load!(cluster=nil)
+          query = cluster && "name:#{cluster.name}-*"
+          ChefServer.search(:role,query) do |raw|
             next unless raw.present?
             role = register(raw)
             Chef::Log.debug("Loaded #{role}")

data/lib/ironfan/provider/ec2/ebs_volume.rb

@@ -49,7 +49,6 @@ module Ironfan
         # Discovery
         #
         def self.load!(cluster=nil)
-          Ironfan.substep(cluster.name, "volumes")
           Ec2.connection.volumes.each do |vol|
             next if vol.blank?
             ebs = EbsVolume.new(:adaptee => vol)

data/lib/ironfan/provider/ec2/key_pair.rb

@@ -33,7 +33,6 @@ module Ironfan
         # Discovery
         #
         def self.load!(cluster=nil)
-          Ironfan.substep(cluster && cluster.name, "keypairs")
           Ec2.connection.key_pairs.each do |keypair|
             register keypair unless keypair.blank?
             Chef::Log.debug("Loaded <%-15s %s>" % [handle, keypair.name])

data/lib/ironfan/provider/ec2/machine.rb

@@ -102,7 +102,6 @@ module Ironfan
         # Discovery
         #
         def self.load!(cluster=nil)
-          Ironfan.substep(cluster.name, "machines")
           Ec2.connection.servers.each do |fs|
             machine = new(:adaptee => fs)
             if recall? machine.name

data/lib/ironfan/provider/ec2/placement_group.rb

@@ -15,8 +15,7 @@ module Ironfan
           "<%-15s %-12s %-12s>" % [ self.class.handle, '', name ]
         end
 
-        def self.load!(cluster)
-          Ironfan.substep(cluster.name, "placement groups")
+        def self.load!(cluster=nil)
           result = Ec2.connection.describe_placement_groups
           result.body["placementGroupSet"].each do |group|
             register group unless group.blank?

data/lib/ironfan/provider/ec2/security_group.rb

@@ -24,8 +24,6 @@ module Ironfan
         # Discovery
         #
         def self.load!(cluster=nil)
-          Ironfan.substep(cluster.name, "security groups")
-
           Ec2.connection.security_groups.each do |raw|
             next if raw.blank?
             sg = SecurityGroup.new(:adaptee => raw)

data/lib/ironfan/provider.rb

@@ -25,7 +25,12 @@ module Ironfan
     # Discovery
     #
     def self.load(cluster)
-      resources.each {|r| r.load! cluster }
+      Ironfan.parallel (resources) do |r|
+        type = r.resource_type.to_s
+        Ironfan.substep(cluster.name, "loading #{type}s")
+        r.load! cluster
+        Ironfan.substep(cluster.name, "loaded #{type}s")
+      end
     end
 
     def self.validate(computers)

data/spec/ironfan/cluster_spec.rb

@@ -3,21 +3,23 @@ require 'spec_helper'
 require 'ironfan'
 
 describe Ironfan::Dsl::Cluster do
-  describe 'run lists' do
-    subject do
-      Ironfan.cluster 'foo' do
-        environment :dev
-        
-        role :systemwide
-        
-        facet :bar do
-          instances 1
-          role :nfs_client, :first
-        end
-      end
+  subject do
+    Ironfan.cluster 'foo' do
+      environment :dev
+
+      role :generic
+
+      role :is_last, :last
+      role :is_first, :first
     end
-    
-    its(:environment) { should eql :dev }
-    its(:run_list) { should eql ["role[systemwide]"] }
   end
+
+  its(:environment) { should eql :dev }
+
+  its(:run_list) { should eql [
+    "role[is_first]",
+    "role[generic]",
+    "role[is_last]"
+    ]
+  }
 end

metadata

@@ -2,7 +2,7 @@
 name: ironfan
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 4.1.1
+  version: 4.2.0
 platform: ruby
 authors: 
 - Infochimps
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-27 00:00:00 Z
+date: 2012-09-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: chef
@@ -229,7 +229,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 481284130132022925
+      hash: 2633727153528237962
       segments: 
       - 0
       version: "0"