poise 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24a33545417d1c2279589178dd1c1d628230c846
-  data.tar.gz: f9a198a9b68372bed52ca682a73a7e631d44f895
+  metadata.gz: 4fb584605a370cd20300d0456630ffe8a0d5351a
+  data.tar.gz: 7df0b817befc116a8cb5e8729ee604707771ae1b
 SHA512:
-  metadata.gz: a1a53efeb9ec2e84598b091e95ee2e08ef5060783ed7c5d4c465aa811eefb6353f22553b93f3b34dc82b5752f5ca3258b04141742b50dfa7956c1239059678e7
-  data.tar.gz: fbb24556681ffb951dac32d19b879f760cf54bfb7abcda44cf429149d0415343fa780103f4e15e0d26c0352ea37849acf226796cd541d68d827a814ffd4b84c8
+  metadata.gz: fc97265d1907474050c72893815a35c1b20a31dbd1740bdb8d05ab70a60fb9e28dc0850a1afc52ad4202a49834c99580c2f139e8133cbcc5401af01c7c47aff9
+  data.tar.gz: d4c49153950ba2736fba3d4f24054543edd4cf2c464205a40a73dca08257288ce8de497db11b8025da080cb76c76cedafb56dd320d6e367eab1e508b065aadd8

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v2.3.2
+
+* Improve handling of deeply nested subresources.
+
 ## v2.3.1
 
 * Ensure a container with a parent link to its own type doesn't use self as the

data/lib/poise/helpers/subresources/container.rb

@@ -40,10 +40,12 @@ module Poise
         include Chef::DSL::Recipe
 
         attr_reader :subresources
+        attr_reader :subcontexts
 
         def initialize(*args)
           super
           @subresources = NoPrintingResourceCollection.new
+          @subcontexts = []
         end
 
         def after_created
@@ -74,12 +76,18 @@ module Poise
               # Step back so we re-run the "current" resource, which is now the
               # container.
               collection.iterator.skip_back
+              Chef::Log.debug("Collection: #{@run_context.resource_collection.map(&:to_s).join(', ')}")
             end
             @run_context.resource_collection.insert(order_fixer)
-            @subresources.each do |r|
-              Chef::Log.debug("   * #{r}")
-              @run_context.resource_collection.insert(r)
+            @subcontexts.each do |ctx|
+              ctx.resource_collection.each do |r|
+                Chef::Log.debug("   * #{r}")
+                # Fix the subresource to use the outer run context.
+                r.run_context = @run_context
+                @run_context.resource_collection.insert(r)
+              end
             end
+            Chef::Log.debug("Collection: #{@run_context.resource_collection.map(&:to_s).join(', ')}")
           end
         end
 
@@ -93,7 +101,7 @@ module Poise
           created_at ||= caller[0]
           # Run this inside a subcontext to avoid adding to the current resource collection.
           # It will end up added later, indirected via @subresources to ensure ordering.
-          subcontext_block do
+          @subcontexts << subcontext_block do
             namespace = if self.class.container_namespace == true
               # If the value is true, use the name of the container resource.
               self.name
@@ -184,6 +192,7 @@ module Poise
           def included(klass)
             super
             klass.extend(ClassMethods)
+            klass.const_get(:HIDDEN_IVARS) << :@subcontexts
           end
         end
 

data/lib/poise/utils.rb

@@ -161,6 +161,11 @@ module Poise
     # @param args [Array<Object>] Arguments to check.
     # @return [void]
     def check_block_arity!(block, args)
+      # Convert the block to a lambda-style proc. You can't make this shit up.
+      obj = Object.new
+      obj.define_singleton_method(:block, &block)
+      block  = obj.method(:block).to_proc
+      # Check
       required_args = block.arity < 0 ? ~block.arity : block.arity
       if args.length < required_args || (block.arity >= 0 && args.length > block.arity)
         raise ArgumentError.new("wrong number of arguments (#{args.length} for #{required_args}#{block.arity < 0 ? '+' : ''})")

data/lib/poise/version.rb

@@ -16,5 +16,5 @@
 
 
 module Poise
-  VERSION = '2.3.1'
+  VERSION = '2.3.2'
 end

data/test/spec/helpers/inversion_spec.rb

@@ -15,6 +15,7 @@
 #
 
 require 'spec_helper'
+require 'chef/provider_resolver'
 
 describe Poise::Helpers::Inversion do
   describe Poise::Helpers::Inversion::Resource do

data/test/spec/helpers/subresources/container_spec.rb

@@ -224,4 +224,66 @@ describe Poise::Helpers::Subresources::Container do
     it { is_expected.to run_poise_sub('test') }
     it { is_expected.to run_inner('test::one') }
   end # /describe subclassing a container
+
+  describe 'triple nesting' do
+    resource(:poise_grandparent) do
+      include described_class
+      attr_accessor :order
+    end
+    provider(:poise_grandparent) do
+      def action_run
+        new_resource.order = (node.run_state[:order] += 1)
+      end
+    end
+    resource(:poise_parent) do
+      include described_class
+      include Poise::Helpers::Subresources::Child
+      parent_type :poise_grandparent
+      attr_accessor :order
+    end
+    provider(:poise_parent) do
+      def action_run
+        new_resource.order = (node.run_state[:order] += 1)
+      end
+    end
+    resource(:poise_child) do
+      include described_class
+      include Poise::Helpers::Subresources::Child
+      parent_type :poise_parent
+      attr_accessor :order
+    end
+    provider(:poise_child) do
+      def action_run
+        new_resource.order = (node.run_state[:order] += 1)
+      end
+    end
+
+    context 'nested' do
+      recipe do
+        node.run_state[:order] = 0
+        poise_grandparent 'one' do
+          poise_parent 'two' do
+            poise_child 'three'
+          end
+        end
+      end
+
+      it { is_expected.to run_poise_grandparent('one').with(order: 1) }
+      it { is_expected.to run_poise_parent('one::two').with(parent: chef_run.poise_grandparent('one'), order: 2) }
+      it { is_expected.to run_poise_child('one::two::three').with(parent: chef_run.poise_parent('one::two'), order: 3) }
+    end # /context nested
+
+    context 'un-nested' do
+      recipe do
+        node.run_state[:order] = 0
+        poise_grandparent 'one'
+        poise_parent 'two'
+        poise_child 'three'
+      end
+
+      it { is_expected.to run_poise_grandparent('one').with(order: 1) }
+      it { is_expected.to run_poise_parent('two').with(parent: chef_run.poise_grandparent('one'), order: 2) }
+      it { is_expected.to run_poise_child('three').with(parent: chef_run.poise_parent('two'), order: 3) }
+    end # /context un-nested
+  end # /describe triple nesting
 end

data/test/spec/utils_spec.rb

@@ -380,5 +380,21 @@ describe Poise::Utils do
         it { expect { subject }.to_not raise_error }
       end # /context with 2 arguments
     end # /context with a negative arity
+
+    context 'with **' do
+      let(:block) do
+        proc {|a, **b| nil }
+      end
+
+      context 'with 0 arguments' do
+        let(:args) { [] }
+        it { expect { subject }.to raise_error ArgumentError, /wrong number of arguments \(0 for 1\+\)/ }
+      end # /context with 0 arguments
+
+      context 'with 1 argument' do
+        let(:args) { [1] }
+        it { expect { subject }.to_not raise_error }
+      end # /context with 1 argument
+    end # /context with **
   end # /describe .check_block_arity!
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poise
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-24 00:00:00.000000000 Z
+date: 2015-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: halite