ironfan 6.1.5 → 6.1.6

data/Rakefile

@@ -2,7 +2,7 @@ require 'bundler/gem_tasks'
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = 'spec/{ironfan,chef,ironfan/*}/*_spec.rb'
+  spec.pattern = 'spec/{gorillib,ironfan,chef,ironfan/*}/*_spec.rb'
 end
 
 desc 'Run RSpec code examples with SimpleCov'

data/lib/gorillib/resolution.rb

@@ -80,6 +80,12 @@ module Gorillib
       self
     end
 
+    # @param field_name [String or Symbol]
+    #
+    # This is one of two methods used to resolve Gorillib
+    # collections. (The other is merge_resolve.) It simply resolves
+    # the field and returns the result. In case the field is a
+    # gorillib collection, it resolves each item in the collection.
     def deep_resolve(field_name)
       temp = read_set_or_underlay_attribute(field_name)
       return if temp.nil?
@@ -87,7 +93,7 @@ module Gorillib
         result = temp.class.new
         temp.each_pair {|k,v| result[k] = resolve_value(v) }
       else
-        result = resolve_value(v)
+        result = resolve_value(result)
       end
       result
     end
@@ -98,6 +104,12 @@ module Gorillib
       deep_copy(value)
     end
 
+    # @param field_name [String or Symbol]
+    #
+    # This is one of two methods used to resolve Gorillib
+    # collections. (The other is deep_resolve.) It returns the result
+    # of merging the value of a field with the value of that field on
+    # the parent (underlay) of this object.
     def merge_resolve(field_name)
       field = self.class.fields[field_name] or return
       result = field.type.new
@@ -106,6 +118,20 @@ module Gorillib
       result
     end
 
+    # @param target [Gorillib::Model]
+    # @param value [Gorillib::Model]
+    #
+    # This method makes the assumption that target and value are both
+    # instances of either Gorillib::Model or
+    # Gorillib::Collection. They should be the same type.
+    #
+    # This method is called for its side-effects on the 'target'
+    # parameter.
+    #
+    # In case they are both models, target.receive!(value) is called.
+    #
+    # In case they are both collections, target[k].receive!(v) is
+    # called, for each k,v in value.
     def merge_values(target, value=nil)
       value ||= {}
       if target.is_a? Gorillib::Collection

data/lib/ironfan/dsl/ec2.rb

@@ -474,7 +474,7 @@ Chef::Config[:ec2_image_info].merge!({
   # Precise (Ubuntu 11.10)
   #
   %w[ us-east-1            32-bit  ebs             precise    ] => { :image_id => 'ami-3b4ff252', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-  %w[ us-east-1            64-bit  ebs             precise    ] => { :image_id => 'ami-3d4ff254', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+  %w[ us-east-1            64-bit  ebs             precise    ] => { :image_id => 'ami-5db4a934', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
   %w[ us-west-2            32-bit  ebs             precise    ] => { :image_id => 'ami-7cab224c', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
   %w[ us-west-2            64-bit  ebs             precise    ] => { :image_id => 'ami-7eab224e', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
   # # These images will only work once http://askubuntu.com/questions/209844/latest-ec2-ubuntu-instance-seems-broken is fixed

data/lib/ironfan/dsl/security_group.rb

@@ -5,7 +5,30 @@ module Ironfan
       field :group_authorized,        Array, :default => []
       field :group_authorized_by,     Array, :default => []
       field :range_authorizations,    Array, :default => []
-      
+
+      # This allows Gorillib resolution to merge-resolve a collection
+      # of security groups and properly merge authorizations.
+      def receive!(hsh, &blk)
+        if hsh.respond_to? :attributes
+          hsh = hsh.attributes
+        end
+        super(hsh.merge({
+              group_authorized: (
+                group_authorized +
+                hsh.delete(:group_authorized).to_a +
+                hsh.delete('group_authorized').to_a).uniq,
+              group_authorized_by: (
+                group_authorized_by +
+                hsh.delete(:group_authorized_by).to_a +
+                hsh.delete('group_authorized_by').to_a).uniq,
+              range_authorizations: (
+                range_authorizations +
+                hsh.delete(:range_authorizations).to_a +
+                hsh.delete('range_authorizations').to_a).uniq,
+            }),
+            &blk)
+      end
+
       def authorize_port_range(range, cidr_ip = '0.0.0.0/0', ip_protocol = 'tcp')
         range = (range .. range) if range.is_a?(Integer)
         range_authorizations << [range, cidr_ip, ip_protocol]

data/lib/ironfan/version.rb

@@ -1,3 +1,3 @@
 module Ironfan
-  VERSION = '6.1.5'
+  VERSION = '6.1.6'
 end

data/spec/gorillib/resolution_spec.rb

@@ -0,0 +1,202 @@
+require 'spec_helper'
+
+describe Ironfan::Dsl, resolution: true do
+  it 'merges collections' do
+    dmx = DMX.new do
+      mx :x1
+      dmx(:dmx) do
+        mx :x2
+      end
+    end
+
+    # This will deep-resolve the dmxs collection, which will
+    # merge-resolve the mxs collection.
+
+    dmx.resolve!
+    dmx.dmx(:dmx).mxs.keys.map(&:to_s).sort.should == %w[ x1 x2 ]
+  end
+
+  it 'deep resolves collections when requested' do
+    ddx = DDX.new do
+      dx :x1
+      ddx(:ddx) do
+        dx :x2
+      end
+    end
+
+    # This will deep-resolve the ddxs collection, which will
+    # deep-resolve the dxs collection. Because there is a dxs
+    # collection set, this will simply ignore the parent dxs
+    # collection.
+
+    ddx.resolve!
+    ddx.ddx(:ddx).dxs.keys.map(&:to_s).sort.should == %w[ x2 ]
+  end
+
+  it 'deep resolves collections when requested and no default is available' do
+    ddx = DDX.new do
+      dx :x1
+      ddx(:ddx) do
+      end
+    end
+
+    # This will deep-resolve the ddxs collection, which will
+    # deep-resolve the dxs collection. Because there is no dxs
+    # collection set,this will pull in the parent dxx collection.
+
+    ddx.resolve!
+    ddx.ddx(:ddx).dxs.keys.map(&:to_s).sort.should == %w[ x1 ]
+  end
+
+  it 'does not resolve when merging' do
+    mdx = MDX.new do
+      dx :x1
+      mdx(:mdx) do
+        dx :x2
+      end
+    end
+
+    # This will merge the mdxs collection with nothing.
+
+    mdx.resolve!
+    mdx.mdx(:mdx).dxs.keys.map(&:to_s).sort.should == %w[ x2 ]
+  end
+
+  it 'does not resolve when merging, not even merge resolve' do
+    mmx = MMX.new do
+      mx :x1
+      mmx(:mmx) do
+        mx :x2
+      end
+    end
+
+    # This will merge the mmxs collection with nothing. The mmxs
+    # collection will not be resolved, so its mxs collection will not
+    # be merged with its parent.
+
+    mmx.resolve!
+    mmx.mmx(:mmx).mxs.keys.map(&:to_s).sort.should == %w[ x2 ]
+  end
+
+  it 'does not merge when deep-resolving' do
+    ddmx = DDMX.new do
+      dmx :dmx do
+        mx :x1
+      end
+      ddmx(:ddmx) do
+        dmx :dmx do
+          mx :x2
+        end
+      end
+    end
+    ddmx.resolve!
+
+    # This is surprising behavior, but consistent with Ironfan's
+    # interface. Because the dmxs collection on the :ddmx object is
+    # deep-resolved rather than merge-resolved, its parent is ignored.
+
+    ddmx.ddmx(:ddmx).dmx(:dmx).mxs.keys.map(&:to_s).sort.should == %w[ x2 ]
+  end
+
+  it 'merges collections deeply' do
+    dmmx = DMMX.new do
+      mmx :mmx do
+        mx :x1
+      end
+      dmmx(:dmmx) do
+        mmx :mmx do
+          mx :x2
+        end
+      end
+    end
+    dmmx.resolve!
+
+    # Deep resolve at the top level causes the dmmxs collection to be
+    # resolved. It resolves all of its fields, including the mmx
+    # field, which is merge-resolved.
+
+    dmmx.dmmx(:dmmx).mmx(:mmx).mxs.keys.map(&:to_s).sort.should == %w[ x1 x2 ]
+  end
+
+  it 'does not merge collections very deeply' do
+    dmmmx = DMMMX.new do
+      mmmx :mmmx do
+        mmx :mmx do
+          mx :x1
+        end
+      end
+      dmmmx(:dmmmx) do
+        mmmx :mmmx do
+          mmx :mmx do
+            mx :x2
+          end
+        end
+      end
+    end
+    dmmmx.resolve!
+
+    # FIXME: Shouldn't this be both x1 and x2? I'm going to place this
+    # here to test the interface as it exists now.
+
+    dmmmx.dmmmx(:dmmmx).mmmx(:mmmx).mmx(:mmx).mxs.keys.map(&:to_s).sort.should == %w[ x2 ]
+  end
+
+  it 'ignores resolution strategies when merging' do
+    dmdx = DMDX.new do
+      mdx :mdx do
+        dx :x1
+      end
+      dmdx(:dmdx) do
+        mdx :mdx do
+          dx :x2
+        end
+      end
+    end
+    dmdx.resolve!
+
+    # Deep resolve at the top level causes the dmdxs collection to be
+    # resolved. It resolves all of its fields, including the mdx
+    # field, which is merge-resolved. Note that resolve! does the rest
+    # of the work: the merge_resolve method does not recursively
+    # resolve, so the dxs "deep resolve" resolution strategy is
+    # ignored.
+
+    dmdx.dmdx(:dmdx).mdx(:mdx).dxs.keys.map(&:to_s).sort.should == %w[ x1 x2 ]
+  end
+
+  it 'should not raise exceptions when deep-resolving non-collections' do
+    class Kablooey < Ironfan::Dsl
+      magic :foo, String, :resolver => :deep_resolve
+    end
+
+    Kablooey.new(foo: 'bar').resolve!
+  end
+
+  it 'may rely on receive! to do a somewhat deep merge, because it does' do
+    a = MX.new do
+      mx :one
+    end
+    b = MX.new do
+      mx :two
+    end
+
+    a.receive! b
+    a.mxs.keys.map(&:to_s).sort.should == %w[ one two ]
+  end
+
+  it 'does not rely on receive! to do a very deep merge, because it does not' do
+    a = MMX.new do
+      mmx :mmx do
+        mx :one
+      end
+    end
+    b = MMX.new do
+      mmx :mmx do
+        mx :two
+      end
+    end
+
+    a.receive! b
+    a.mmx(:mmx).mxs.keys.map(&:to_s).sort.should == %w[ two ]
+  end
+end

data/spec/ironfan/cluster_spec.rb

@@ -21,4 +21,52 @@ describe Ironfan::Dsl::Cluster do
     "role[is_last]"
     ]
   }
+
+  context 'when merging security groups' do
+    let (:secg) do
+      Ironfan.cluster :merge_sec_group do
+        security_group('s_cli').authorized_by_group('s_serv_cluster')
+        facet(:f) do
+          security_group('s_cli').authorized_by_group('s_serv_facet')
+        end
+      end
+    end
+
+    it 'merges all of its security groups appropriately' do
+      secg.
+        facet(:f).
+        security_group('s_cli').
+        group_authorized_by.sort.should == %w[ s_serv_cluster s_serv_facet ]
+    end
+  end
+
+  context 'when merging security groups' do
+    let (:cloud_secg) do
+      Ironfan::Dsl::Cluster.new(:merge_sec_group) do
+        cloud(:ec2).security_group('s_cli').authorized_by_group('s_serv_cluster')
+        facet(:f) do
+          cloud(:ec2).security_group('s_cli').authorized_by_group('s_serv_facet')
+        end
+      end.tap(&:resolve!)
+    end
+
+    it 'merges all of its cloud security groups appropriately' do
+      pending('fixes to apparent design flaw in Ironfan/Gorillib resolution')
+      cloud_secg.
+        facet(:f).
+        cloud(:ec2).
+        security_group('s_cli').
+        group_authorized_by.sort.should == %w[ s_serv_cluster s_serv_facet ]
+    end
+  end
+
+  context 'with security groups' do
+    let (:auth_a) { Ironfan::Dsl::SecurityGroup.new{ authorized_by_group('a') } }
+    let (:auth_b) { Ironfan::Dsl::SecurityGroup.new{ authorized_by_group('b') } }
+
+    it 'should correctly merge them' do
+      auth_a.receive!(auth_b)
+      auth_a.group_authorized_by.sort.should == %w[ a b ]
+    end
+  end
 end

data/spec/ironfan/ec2_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Ironfan::Dsl::Ec2 do
+  context 'with cloud-level security groups' do
+    let (:cloud_a) { Ironfan::Dsl::Ec2.new{ security_group('s').authorized_by_group('a') } }
+    let (:cloud_b) { Ironfan::Dsl::Ec2.new{ security_group('s').authorized_by_group('b') } }
+
+    it 'should correctly merge them' do
+      pending('fixes to apparent design bugs in Ironfan/Gorillib resolution')
+
+      cloud_a.receive! cloud_b
+      cloud_a.security_group('s').group_authorized_by.sort.should == %w[ a b ]
+    end
+  end
+end

data/spec/ironfan/security_group_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe Ironfan::Dsl::SecurityGroup do
+  context 'with security groups' do
+    let (:auth_a) { Ironfan::Dsl::SecurityGroup.new{ authorized_by_group('a') } }
+    let (:auth_b) { Ironfan::Dsl::SecurityGroup.new{ authorized_by_group('b') } }
+
+    it 'should correctly merge them' do
+      auth_a.receive!(auth_b)
+      auth_a.group_authorized_by.sort.should == %w[ a b ]
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -37,3 +37,5 @@ end
 require 'chef_zero/server'
 server = ChefZero::Server.new(port: 4000)
 server.start_background
+
+require_relative 'support/resolution'

data/spec/support/resolution.rb

@@ -0,0 +1,63 @@
+shared_context :resolution, resolution: true do
+  module ResolutionHelpers
+    def initialize(attrs = {}, &blk)
+      self.underlay = attrs.delete(:owner)
+      super(attrs, &blk)
+    end
+  end
+
+  class X < Ironfan::Dsl
+    include ResolutionHelpers
+    magic :name, Symbol
+    magic :dat, Integer
+  end
+
+  class MSym < Ironfan::Dsl
+    include ResolutionHelpers
+    magic :name, Symbol, :resolver => :merge_resolve, key_method: :name
+  end
+
+  class MX < X
+    collection :mxs, X, :resolver => :merge_resolve, key_method: :name
+  end
+
+  class DX < X
+    collection :dxs, X, :resolver => :deep_resolve, key_method: :name
+  end
+
+  class DMX < MX
+    collection :dmxs, MX, :resolver => :deep_resolve, key_method: :name
+  end
+
+  class DDX < DX
+    collection :ddxs, DX, :resolver => :deep_resolve, key_method: :name
+  end
+
+  class MDX < DX
+    collection :mdxs, DX, :resolver => :merge_resolve, key_method: :name
+  end
+
+  class MMX < MX
+    collection :mmxs, MX, :resolver => :merge_resolve, key_method: :name
+  end
+
+  class DDMX < DMX
+    collection :ddmxs, DMX, :resolver => :deep_resolve, key_method: :name
+  end
+
+  class DMMX < MMX
+    collection :dmmxs, MMX, :resolver => :deep_resolve, key_method: :name
+  end
+
+  class MMMX < MMX
+    collection :mmmxs, MMX, :resolver => :merge_resolve, key_method: :name
+  end
+
+  class DMDX < MDX
+    collection :dmdxs, MDX, :resolver => :deep_resolve, key_method: :name
+  end
+
+  class DMMMX < MMMX
+    collection :dmmmxs, MMMX, :resolver => :deep_resolve, key_method: :name
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ironfan
 version: !ruby/object:Gem::Version
-  version: 6.1.5
+  version: 6.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-24 00:00:00.000000000 Z
+date: 2014-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -271,6 +271,7 @@ files:
 - spec/fixtures/gunbai_slice.json
 - spec/fixtures/knife/knife.rb
 - spec/fixtures/realms/samurai.rb
+- spec/gorillib/resolution_spec.rb
 - spec/integration/minimal-chef-repo/chefignore
 - spec/integration/minimal-chef-repo/clusters/.gitkeep
 - spec/integration/minimal-chef-repo/config/.gitkeep
@@ -297,12 +298,15 @@ files:
 - spec/ironfan/ec2/cloud_provider_spec.rb
 - spec/ironfan/ec2/elb_spec.rb
 - spec/ironfan/ec2/security_group_spec.rb
+- spec/ironfan/ec2_spec.rb
 - spec/ironfan/manifest_spec.rb
 - spec/ironfan/plugin_spec.rb
 - spec/ironfan/realm_spec.rb
+- spec/ironfan/security_group_spec.rb
 - spec/spec_helper.rb
 - spec/support/dummy_chef.rb
 - spec/support/dummy_diff_drawer.rb
+- spec/support/resolution.rb
 homepage: http://infochimps.com/labs
 licenses:
 - apachev2
@@ -318,7 +322,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1549978331265274060
+      hash: 4249485048014092893
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -327,7 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1549978331265274060
+      hash: 4249485048014092893
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -342,6 +346,7 @@ test_files:
 - spec/fixtures/gunbai_slice.json
 - spec/fixtures/knife/knife.rb
 - spec/fixtures/realms/samurai.rb
+- spec/gorillib/resolution_spec.rb
 - spec/integration/minimal-chef-repo/chefignore
 - spec/integration/minimal-chef-repo/clusters/.gitkeep
 - spec/integration/minimal-chef-repo/config/.gitkeep
@@ -368,10 +373,13 @@ test_files:
 - spec/ironfan/ec2/cloud_provider_spec.rb
 - spec/ironfan/ec2/elb_spec.rb
 - spec/ironfan/ec2/security_group_spec.rb
+- spec/ironfan/ec2_spec.rb
 - spec/ironfan/manifest_spec.rb
 - spec/ironfan/plugin_spec.rb
 - spec/ironfan/realm_spec.rb
+- spec/ironfan/security_group_spec.rb
 - spec/spec_helper.rb
 - spec/support/dummy_chef.rb
 - spec/support/dummy_diff_drawer.rb
+- spec/support/resolution.rb
 has_rdoc: