poise 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 805b189d8f29b6d7fcdcd5e189a24e525a755f96
-  data.tar.gz: ae33e8ec60d4d947811f35211ce3eecc69712dd8
+  metadata.gz: 07fe35f3e4e7b7f5761c1c1225a0dccd578d3a78
+  data.tar.gz: d0b820b837c47bedf72a1cb095e9249d4a415fb3
 SHA512:
-  metadata.gz: eb2351eab975e312a23c039dd12c3b18dd4fc76307cb08c92d10702e317d935fa515d7928e0733188b03be2157779d1be8adf74c62f7f13f766927e96db726c8
-  data.tar.gz: dedd4fe5fdb0f15f0eb50402309ad51513b9663fd38c13dddbdb4891cbb62396d0d04c25201571769531aa638dc87ab7527dbd7a13e05bc2acc6f68f1601dd48
+  metadata.gz: 73711a21746f13d0bcbfd2042596fc2829c28a8e089608368839b632b5bf19306843fed59162764f18fa624cf84d485c8ee43522f9eb42d97bf8c7b58ecfdb91
+  data.tar.gz: e937e4a3c327f7be9395fd6497b0d1f2f0fc9af3094242858db89ad85cdd1afa6094e7328e0b543e6615321417a827805368582f4c274cd3023dd519dbc03c2a

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v2.2.1
+
+* Fixed delayed notifications inside `notifying_block`.
+* Default actions as expected within LWRPs.
+
 ## v2.2.0
 
 * Compatibility with Chef 12.4.1 and Chefspec 4.3.0.

data/lib/poise/helpers/lwrp_polyfill.rb

@@ -62,7 +62,15 @@ module Poise
               @default_action = name
               actions(*name)
             end
-            @default_action || ( respond_to?(:superclass) && superclass != Chef::Resource && superclass.respond_to?(:default_action) && superclass.default_action ) || (actions.first && [actions.first]) || [:nothing]
+            if @default_action
+              @default_action
+            elsif respond_to?(:superclass) && superclass != Chef::Resource && superclass.respond_to?(:default_action) && Array(superclass.default_action) != %i{nothing}
+              superclass.default_action
+            elsif first_non_nothing = actions.find {|action| action != :nothing }
+              [first_non_nothing]
+            else
+              %i{nothing}
+            end
           end
 
           # @overload actions()

data/lib/poise/helpers/subcontext_block.rb

@@ -43,6 +43,8 @@ module Poise
         end
         # Create the subcollection.
         sub_run_context.resource_collection = Poise::Subcontext::ResourceCollection.new(parent_context.resource_collection)
+        # Create an accessor for the parent run context.
+        sub_run_context.define_singleton_method(:parent_run_context) { parent_context }
 
         # Declare sub-resources within the sub-run-context. Since they
         # are declared here, they do not pollute the parent run-context.

data/lib/poise/subcontext/runner.rb

@@ -36,8 +36,8 @@ module Poise
         # ever fire because the superclass re-raises if there is an error.
         return super if error
         delayed_actions.each do |notification|
-          notifications = run_context.delayed_notifications(@resource)
-          if run_context.delayed_notifications(@resource).any? { |existing_notification| existing_notification.duplicates?(notification) }
+          notifications = run_context.parent_run_context.delayed_notifications(@resource)
+          if notifications.any? { |existing_notification| existing_notification.duplicates?(notification) }
               Chef::Log.info( "#{@resource} not queuing delayed action #{notification.action} on #{notification.resource}"\
                               " (delayed), as it's already been queued")
           else

data/lib/poise/version.rb

@@ -16,5 +16,5 @@
 
 
 module Poise
-  VERSION = '2.2.0'
+  VERSION = '2.2.1'
 end

data/test/spec/helpers/lwrp_polyfill_spec.rb

@@ -15,6 +15,8 @@
 #
 
 require 'spec_helper'
+require 'chef/provider/lwrp_base'
+require 'chef/resource/lwrp_base'
 
 describe Poise::Helpers::LWRPPolyfill do
   describe Poise::Helpers::LWRPPolyfill::Resource do
@@ -156,4 +158,20 @@ describe Poise::Helpers::LWRPPolyfill do
       it { is_expected.to run_ruby_block('test') }
     end # /describe Chef::DSL::Recipe include
   end # /describe Poise::Helpers::LWRPPolyfill::Provider
+
+  context 'inside LWRPBase' do
+    resource(:poise_test, parent: Chef::Resource::LWRPBase, auto: false) do
+      include described_class
+      actions(:run)
+    end
+    provider(:poise_test, parent: Chef::Provider::LWRPBase, auto: false) do
+      include described_class
+      action(:run) { }
+    end
+
+    describe '#default_action' do
+      subject { resource(:poise_test).default_action }
+      it { is_expected.to eq %i{run} }
+    end # /describe #default_action
+  end # /context inside LWRPBase
 end

data/test/spec/helpers/notifying_block_spec.rb

@@ -123,4 +123,35 @@ describe Poise::Helpers::NotifyingBlock do
 
     it { is_expected.to_not run_ruby_block('test') }
   end # /describe regression test for picking up sibling notifications outside the subcontext for resources with matching name
+
+  describe 'delayed notifications' do
+    provider(:poise_test) do
+      include Poise::Helpers::LWRPPolyfill
+      include described_class
+
+      def action_run
+        notifying_block do
+          ruby_block 'one' do
+            action :nothing
+            block { node.run_state[:things] << 'one' }
+          end
+
+          ruby_block 'two' do
+            block { node.run_state[:things] << 'two' }
+            notifies :run, 'ruby_block[one]'
+          end
+        end
+      end
+    end
+    recipe(subject: false) do
+      node.run_state[:things] = []
+      poise_test 'test'
+    end
+    subject { chef_run.node.run_state[:things] }
+
+    # The important test.
+    it { is_expected.to include 'one' }
+    # Sanity check for my harness.
+    it { is_expected.to include 'two' }
+  end # /describe delayed notifications
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: poise
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Noah Kantrowitz