ironfan 4.2.0 → 4.2.1

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# v4.2.1: @nickmarden rocks the house
+* More correct merging of cluster and facet objects, with specs
+* Circumvent memory bloat by resolving just once
+
+# v4.2.0:
+* providers now load in parallel
+* substeps announcements for load are now done in provider, not individual resources
+* only dump computers full information on -VV
+* more cleanup of new specs
+
 # v4.1.1: fixing 'rake spec'
 * Remove all defunct tests and start fresh (fixes #137)
 * Failing spec for #158 

data/VERSION

@@ -1 +1 @@
-4.2.0
+4.2.1

data/ironfan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ironfan"
-  s.version = "4.2.0"
+  s.version = "4.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infochimps"]
-  s.date = "2012-09-29"
+  s.date = "2012-10-01"
   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 = [
@@ -85,6 +85,7 @@ Gem::Specification.new do |s|
     "lib/ironfan/provider/virtualbox/machine.rb",
     "lib/ironfan/requirements.rb",
     "spec/ironfan/cluster_spec.rb",
+    "spec/ironfan/ec2/cloud_provider_spec.rb",
     "spec/ironfan/ec2/security_group_spec.rb",
     "spec/spec_helper.rb",
     "spec/spec_helper/dummy_chef.rb",
@@ -96,7 +97,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.24"
   s.summary = "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.test_files = ["spec/spec_helper/dummy_chef.rb", "spec/ironfan/cluster_spec.rb", "spec/ironfan/ec2/security_group_spec.rb", "spec/spec_helper.rb", "spec/test_config.rb"]
+  s.test_files = ["spec/spec_helper/dummy_chef.rb", "spec/ironfan/cluster_spec.rb", "spec/ironfan/ec2/cloud_provider_spec.rb", "spec/ironfan/ec2/security_group_spec.rb", "spec/spec_helper.rb", "spec/test_config.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/gorillib/resolution.rb

@@ -19,6 +19,28 @@ module Gorillib
     Field.class_eval do
       field :resolver, Symbol, :default => :read_set_or_underlay_attribute
     end
+
+    # Modifies the Gorillib metaprogramming to handle deep recursion on
+    # Gorillib::Model collections which would prefer to handle arbitrarily
+    # complex resolution requirements via their (custom) receive! method
+    module ClassMethods
+      def define_collection_receiver(field)
+       collection_field_name = field.name; collection_type = field.type
+        # @param  [Array[Object],Hash[Object]] the collection to merge
+        # @return [Gorillib::Collection] the updated collection
+        define_meta_module_method("receive_#{collection_field_name}", true) do |coll, &block|
+          begin
+            existing = read_attribute(collection_field_name)
+            if existing and (not collection_type.native?(coll) or existing.respond_to?(:receive!))
+              existing.receive!(coll, &block)
+            else
+              write_attribute(collection_field_name, coll)
+            end
+          rescue StandardError => err ; err.polish("#{self.class} #{collection_field_name} collection on #{args}'") rescue nil ; raise ; end
+        end
+      end
+    end
+
   end
 
   # The attribute :underlay provides an object (preferably another
@@ -50,6 +72,14 @@ module Gorillib
       result
     end
 
+    def resolve!
+      resolved = resolve
+      self.class.fields.each do |field_name, field|
+        write_attribute(field_name, resolved.send(field_name.to_sym))
+      end
+      self
+    end
+
     def deep_resolve(field_name)
       temp = read_set_or_underlay_attribute(field_name)
       return if temp.nil?
@@ -106,7 +136,7 @@ module Gorillib
 
     def read_underlay_attribute(field_name)
       return if underlay.nil?
-      underlay.read_resolved_attribute(field_name)
+      Gorillib.deep_copy(underlay.read_resolved_attribute(field_name))
     end
 
     def read_set_or_underlay_attribute(field_name)

data/lib/ironfan/broker.rb

@@ -13,7 +13,7 @@ module Ironfan
     #   corresponding to
     def discover!(cluster)
       # Get fully resolved servers, and build Computers using them
-      computers = Computers.new(:cluster => cluster.resolve)
+      computers = Computers.new(:cluster => cluster)
       #
       providers = computers.map{|c| c.providers.values }.flatten.uniq
       Ironfan.parallel(providers) do |provider|

data/lib/ironfan/dsl/cluster.rb

@@ -7,12 +7,6 @@ module Ironfan
       def initialize(attrs={},&block)
         super
         self.cluster_role       Ironfan::Dsl::Role.new(:name => "#{attrs[:name]}_cluster")
-        self.expand_servers!
-      end
-
-      def expand_servers!
-        facets.each {|facet| facet.expand_servers! }
-        servers
       end
 
       # Utility method to reference all servers from constituent facets

data/lib/ironfan/dsl/facet.rb

@@ -11,14 +11,11 @@ module Ironfan
         self.name               = attrs[:name] unless attrs[:name].nil?
         self.facet_role         Ironfan::Dsl::Role.new(:name => fullname.sub('-','_'))
         super
+        for i in 0 .. instances-1; server(i); end
       end
 
       def fullname()            "#{cluster_name}-#{name}";      end
 
-      def expand_servers!
-        for i in 0..(instances-1) do server(i); end
-      end
-
     end
 
   end

data/lib/ironfan.rb

@@ -15,7 +15,7 @@ module Ironfan
   #
   # Delegates
   def self.clusters
-    Chef::Config[:clusters] ||= Hash.new
+    @@clusters
   end
 
   def self.ui=(ui) @ui = ui ; end
@@ -61,10 +61,15 @@ module Ironfan
   #
   def self.cluster(name, attrs={}, &block)
     name = name.to_sym
-
-    cl = ( @@clusters[name] ||= Ironfan::Dsl::Cluster.new({:name => name}) )
-    cl.receive!(attrs, &block)
-    cl
+    # If this is being called as Ironfan.cluster('foo') with no additional arguments,
+    # return the cached cluster object if it exists
+    if @@clusters[name] and attrs.empty? and not block_given?
+      return @@clusters[name]
+    else # Otherwise we're being asked to (re)initialize and cache a cluster definition
+      cl = Ironfan::Dsl::Cluster.new(:name => name)
+      cl.receive!(attrs, &block)
+      @@clusters[name] = cl.resolve
+    end
   end
 
   #
@@ -87,9 +92,6 @@ module Ironfan
     require cluster_file
     unless @@clusters[cluster] then  die("#{cluster_file} was supposed to have the definition for the #{cluster_name} cluster, but didn't") end
 
-    # Flesh out the expected servers listed in the facets
-    @@clusters[cluster].expand_servers!
-
     @@clusters[cluster]
   end
 

data/spec/ironfan/ec2/cloud_provider_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+require 'ironfan'
+
+describe Ironfan::Dsl::Cluster do
+  let (:cluster) do
+    Ironfan.cluster "sparky" do
+
+      cloud(:ec2) do
+        security_group(:ssh).authorize_port_range 22..22
+        flavor 't1.micro'
+      end
+
+      facet :web do
+        instances 3
+      end
+
+    end
+  end
+
+  describe 'web facet server resolution' do
+    before { @facet = cluster.facets.values.first }
+    subject { @facet }
+    its(:name) { should eql "web" }
+
+    it 'should have the right number of servers' do
+      @facet.servers.length.should == 3
+    end
+
+    it 'should have one cloud provider, EC2' do
+      @facet.servers[0].clouds.keys.should == [ :ec2 ]
+    end
+  end
+
+end

data/spec/ironfan/ec2/security_group_spec.rb

@@ -5,53 +5,106 @@ require 'ironfan'
 describe Ironfan::Dsl::Cluster do
   let (:cluster) do
     Ironfan.cluster "sparky" do
-      cloud(:ec2).security_group(:ssh).authorize_port_range 22..22
+
+      cloud(:ec2) do
+        security_group(:ssh).authorize_port_range 22..22
+        flavor 't1.micro'
+      end
+
       facet :web do
         cloud(:ec2).security_group("sparky-web").authorize_port_range(80)
+        cloud(:ec2).flavor 'm1.small'
       end
+
+      facet :mysql do
+        # My what a permissive database you have.
+        cloud(:ec2).security_group("sparky-mysql").authorize_port_range(3306)
+        cloud(:ec2).flavor 'm1.xlarge'
+      end
+
     end
   end
-    
+
   describe 'cluster definition' do
     subject { cluster }
-    
+
     its(:name) { should eql "sparky" }
     its(:environment) { should eql :_default }
     its(:run_list) { should eql [] }
-    
+
     describe 'facets' do
       before { @facets = cluster.facets }
       subject { @facets.values }
-      its(:length) { should eql 1 }
-      
+      its(:length) { should eql 2 }
+
       describe 'web facet' do
         before { @facet = @facets.values.first }
         subject { @facet }
         its(:name) { should eql "web" }
-        
+
+        it 'should have the correct flavor' do
+          @facet.cloud(:ec2).flavor.should  == 'm1.small'
+        end
+
+        it 'should have the right number of servers' do
+          @facet.servers.length.should == 1
+        end
+
         describe 'security groups' do
           before { @groups = @facet.clouds.values.first.security_groups.values }
           subject { @groups }
-          
+
           its(:length) { should eql 2 }
-          
+
           it 'authorizes ssh on port 22 from anywhere' do
-            ssh_auth = @groups.first
-            ssh_auth.range_authorizations.first.should eql [22..22, "0.0.0.0/0", "tcp"]
+            ssh_auth = @groups.detect { |g| g.name == 'ssh' }
+            ssh_auth.should_not be_nil
+            ssh_auth.range_authorizations.select { |g| g.eql? [22..22, "0.0.0.0/0", "tcp"] }.should_not be_empty
           end
-          
+
           it 'authorizes HTTP on port 80 from anywhere' do
-            http_auth = @groups.last
-            http_auth.range_authorizations.first.should eql [80..80, "0.0.0.0/0", "tcp"]
+            http_auth = @groups.detect { |g| g.name == 'sparky-web' }
+            http_auth.should_not be_nil
+            http_auth.range_authorizations.select { |g| g.eql? [80..80, "0.0.0.0/0", "tcp"] }.should_not be_empty
+          end
+
+        end
+      end
+
+      describe 'mysql facet' do
+        before { @facet = @facets.values.last }
+        subject { @facet }
+        its(:name) { should eql "mysql" }
+
+        it 'should have the correct flavor' do
+          @facet.cloud(:ec2).flavor.should  == 'm1.xlarge'
+        end
+
+        describe 'security groups' do
+          before { @groups = @facet.clouds.values.first.security_groups.values }
+          subject { @groups }
+
+          its(:length) { should eql 2 }
+
+          it 'authorizes ssh on port 22 from anywhere' do
+            ssh_auth = @groups.detect { |g| g.name == 'ssh' }
+            ssh_auth.should_not be_nil
           end
+
+          it 'authorizes MySQL on port 3306 from anywhere' do
+            mysql_auth = @groups.detect { |g| g.name == 'sparky-mysql' }
+            mysql_auth.should_not be_nil
+            mysql_auth.range_authorizations.select { |g| g.eql? [3306..3306, "0.0.0.0/0", "tcp"] }.should_not be_empty
+          end
+
         end
       end
-      
+
+
     end
-    
+
     describe 'clouds' do
-      
+
     end
   end
 end
-

metadata

@@ -2,7 +2,7 @@
 name: ironfan
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 4.2.0
+  version: 4.2.1
 platform: ruby
 authors: 
 - Infochimps
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-29 00:00:00 Z
+date: 2012-10-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: chef
@@ -211,6 +211,7 @@ files:
 - lib/ironfan/provider/virtualbox/machine.rb
 - lib/ironfan/requirements.rb
 - spec/ironfan/cluster_spec.rb
+- spec/ironfan/ec2/cloud_provider_spec.rb
 - spec/ironfan/ec2/security_group_spec.rb
 - spec/spec_helper.rb
 - spec/spec_helper/dummy_chef.rb
@@ -229,7 +230,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2633727153528237962
+      hash: -2791351356463943124
       segments: 
       - 0
       version: "0"
@@ -249,6 +250,7 @@ summary: Ironfan allows you to orchestrate not just systems but clusters of mach
 test_files: 
 - spec/spec_helper/dummy_chef.rb
 - spec/ironfan/cluster_spec.rb
+- spec/ironfan/ec2/cloud_provider_spec.rb
 - spec/ironfan/ec2/security_group_spec.rb
 - spec/spec_helper.rb
 - spec/test_config.rb