poise 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9346bbce570e141a731a72396f1d1ce0e6da5bae
-  data.tar.gz: 5a0d996080b83353b59eee2484b657613472d12c
+  metadata.gz: 24a33545417d1c2279589178dd1c1d628230c846
+  data.tar.gz: f9a198a9b68372bed52ca682a73a7e631d44f895
 SHA512:
-  metadata.gz: f53889732b8ffe28dd15938fcb24d87686e4dfc984b3b44807fdbffe3412e0dce62263efa200faf3617f7bfe9beb4b6873a4121d2fbee92adf7477452110e735
-  data.tar.gz: d06c1b67c3bb6fd46edc21794cd1e28af06d89938e973da7dddeccf1f0eced60ef32295d14b78e6d927e4d8299dbdbdebd49b24c27308097746563b7b880ba32
+  metadata.gz: a1a53efeb9ec2e84598b091e95ee2e08ef5060783ed7c5d4c465aa811eefb6353f22553b93f3b34dc82b5752f5ca3258b04141742b50dfa7956c1239059678e7
+  data.tar.gz: fbb24556681ffb951dac32d19b879f760cf54bfb7abcda44cf429149d0415343fa780103f4e15e0d26c0352ea37849acf226796cd541d68d827a814ffd4b84c8

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## v2.3.1
+
+* Ensure a container with a parent link to its own type doesn't use self as the
+  default parent.
+* Improve handling of `load_current_resource` in providers that call it via
+  `super`.
+
 ## v2.3.0
 
 * New helper: `ResourceSubclass`, a helper for subclassing a resource while

data/lib/poise/helpers/lwrp_polyfill.rb

@@ -129,6 +129,17 @@ module Poise
 
       # Helper to handle load_current_resource for direct subclasses of Provider
       module Provider
+        module LoadCurrentResource
+          def load_current_resource
+            @current_resource = if new_resource
+              new_resource.class.new(new_resource.name, run_context)
+            else
+              # Better than nothing, subclass can overwrite anyway.
+              Chef::Resource.new(nil, run_context)
+            end
+          end
+        end
+
         # @!classmethods
         module ClassMethods
           def included(klass)
@@ -137,20 +148,11 @@ module Poise
 
             # Mask Chef::Provider#load_current_resource because it throws NotImplementedError.
             if klass.is_a?(Class) && klass.superclass == Chef::Provider
-              klass.class_exec do
-                def load_current_resource
-                  @current_resource = if new_resource
-                    new_resource.class.new(new_resource.name, run_context)
-                  else
-                    # Better than nothing, subclass can overwrite anyway.
-                    Chef::Resource.new(nil, run_context)
-                  end
-                end
-              end
+              klass.send(:include, LoadCurrentResource)
             end
 
             # Reinstate the Chef DSL, removed in Chef 12.
-            klass.class_exec { include Chef::DSL::Recipe }
+            klass.send(:include, Chef::DSL::Recipe)
           end
         end
 

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

@@ -92,7 +92,7 @@ module Poise
             val = args.first
             if val.nil?
               # Unsetting the parent.
-              parent = nil
+              parent = parent_ref = nil
             else
               if val.is_a?(String) && !val.include?('[')
                 raise Poise::Error.new("Cannot use a string #{name} without defining a parent type") if parent_type == Chef::Resource
@@ -117,8 +117,8 @@ module Poise
               if !parent.is_a?(parent_type)
                 raise Poise::Error.new("Parent resource is not an instance of #{parent_type.name}: #{val.inspect}")
               end
+              parent_ref = ParentRef.new(parent)
             end
-            parent_ref = ParentRef.new(parent)
           elsif !parent_ref || !parent_ref.resource
             if parent_default
               parent = if parent_default.is_a?(Chef::DelayedEvaluator)
@@ -127,11 +127,14 @@ module Poise
                 parent_default
               end
             end
-            if !parent && parent_auto
+            # The @parent_ref means we won't run this if we previously set
+            # ParentRef.new(nil). This means auto-lookup only happens during
+            # after_created.
+            if !parent && !parent_ref && parent_auto
               # Automatic sibling lookup for sequential composition.
               # Find the last instance of the parent class as the default parent.
               # This is super flaky and should only be a last resort.
-              parent = Poise::Helpers::Subresources::DefaultContainers.find(parent_type, run_context)
+              parent = Poise::Helpers::Subresources::DefaultContainers.find(parent_type, run_context, self_resource: self)
             end
             # Can't find a valid parent, if it wasn't optional raise an error.
             raise Poise::Error.new("No #{name} found for #{self}") unless parent || parent_optional

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

@@ -47,10 +47,10 @@ module Poise
         # @param klass [Class] Resource class to search for.
         # @param run_context [Chef::RunContext] Context of the current run.
         # @return [Chef::Resource]
-        def self.find(klass, run_context)
+        def self.find(klass, run_context, self_resource: nil)
           CONTAINER_MUTEX.synchronize do
             containers(run_context).reverse_each do |resource|
-              return resource if resource.is_a?(klass)
+              return resource if resource.is_a?(klass) && (!self_resource || self_resource != resource)
             end
             # Nothing found.
             nil

data/lib/poise/version.rb

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

data/test/spec/helpers/lwrp_polyfill_spec.rb

@@ -149,6 +149,18 @@ describe Poise::Helpers::LWRPPolyfill do
         it { is_expected.to be_a Chef::Resource }
         it { is_expected.to_not be_a resource(:poise_test) }
       end # context with no new_resource
+
+      context 'calling super' do
+        provider(:poise_test, auto: false) do
+          include described_class
+          def load_current_resource
+            super.tap do |current_resource|
+              current_resource.name('other')
+            end
+          end
+        end
+        its(:name) { is_expected.to eq 'other' }
+      end # /context calling super
     end # /describe load_current_resource override
 
     describe 'Chef::DSL::Recipe include' do

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

@@ -333,6 +333,23 @@ describe Poise::Helpers::Subresources::Child do
 
       it { expect { subject }.to raise_error Poise::Error }
     end # /context setting the parent to itself
+
+    context 'when possibly setting to self via default' do
+      resource(:poise_test) do
+        include described_class
+        include Poise::Helpers::ResourceName
+        include Poise::Helpers::Subresources::Container
+        parent_type :poise_test
+        parent_optional true
+      end
+      recipe do
+        poise_test 'one'
+        poise_test 'two'
+      end
+
+      it { is_expected.to run_poise_test('one').with(parent: nil) }
+      it { is_expected.to run_poise_test('two').with(parent: chef_run.poise_test('one')) }
+    end # /context when possibly setting to self via default
   end # /describe #parent
 
   describe '.parent_type' do

metadata

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