compat_resource 12.9.1 → 12.10.1

data/files/lib/chef_compat/monkeypatches/chef/resource_collection/resource_set.rb

@@ -0,0 +1,49 @@
+#
+# Author:: Tyler Ball (<tball@chef.io>)
+# Copyright:: Copyright 2014-2016, Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "chef/resource_collection/resource_list"
+require "chef/exceptions"
+
+module ChefCompat
+  module Monkeypatches
+    module Chef
+      module ResourceCollection
+        module ResourceSet
+          module DeleteResource
+            def delete(key)
+              raise ArgumentError, "Must pass a Chef::Resource or String to delete" unless key.is_a?(String) || key.is_a?(Chef::Resource)
+              key = key.to_s
+              res = @resources_by_key.delete(key)
+
+              if res == @resources_by_key.default
+                raise Chef::Exceptions::ResourceNotFound, "Cannot find a resource matching #{key} (did you define it first?)"
+              end
+              res
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+class Chef::ResourceCollection::ResourceSet
+  unless method_defined?(:delete)
+    prepend ChefCompat::Monkeypatches::Chef::ResourceCollection::ResourceSet::DeleteResource
+  end
+end

data/files/lib/chef_compat/monkeypatches/chef/run_context.rb

@@ -1,12 +1,77 @@
-require 'chef/resource'
-
-class Chef
-  class RunContext
-    if !method_defined?(:create_child)
-      def create_child
-        result = dup
-        result.resource_collection = Chef::ResourceCollection.new
-        result
+require 'chef/run_context'
+require 'chef_compat/monkeypatches/chef/resource_collection'
+
+if Gem::Requirement.new("< 12.10.24").satisfied_by?(Gem::Version.new(Chef::VERSION))
+  module ChefCompat
+    module Monkeypatches
+      module Chef
+        module RunContext
+          # for versions after we added intialize_child_state but before 12.10.24
+          def initialize_child_state(*args)
+            super
+            @resource_collection.run_context = self
+            @delayed_actions = []
+          end
+        end
+      end
+    end
+  end
+
+  class Chef
+    class RunContext
+      #
+      # NOTE:  The root run_context is created long before we start monkeying around
+      # with patching the class.  No child run context has been created yet.  This
+      # still patches the root run_context and implements the new behaviors on it.
+      #
+      # This does affect our ability to patch methods like #initialize, since the
+      # root has already been created and initialized, obviously.
+      #
+
+      unless method_defined?(:parent_run_context)
+        attr_accessor :parent_run_context
+      end
+
+      unless method_defined?(:delayed_actions)
+        def delayed_actions
+          @delayed_actions ||= []
+        end
+      end
+
+      unless method_defined?(:initialize_child_state)
+        #
+        # Copied verbatim from 12.10.24 Chef::RunContext
+        #
+        def initialize_child_state
+          @audits = {}
+          @resource_collection = Chef::ResourceCollection.new(self)
+          @before_notification_collection = Hash.new { |h, k| h[k] = [] }
+          @immediate_notification_collection = Hash.new { |h, k| h[k] = [] }
+          @delayed_notification_collection = Hash.new { |h, k| h[k] = [] }
+          @delayed_actions = []
+        end
+      else
+        prepend ChefCompat::Monkeypatches::Chef::RunContext
+      end
+
+      unless method_defined?(:add_delayed_action)
+        def add_delayed_action(notification)
+          if delayed_actions.any? { |existing_notification| existing_notification.duplicates?(notification) }
+            Chef::Log.info( "#{notification.notifying_resource} not queuing delayed action #{notification.action} on #{notification.resource}"\
+                           " (delayed), as it's already been queued")
+          else
+            delayed_actions << notification
+          end
+        end
+      end
+
+      unless method_defined?(:create_child)
+        def create_child
+          result = dup
+          result.parent_run_context = self
+          result.initialize_child_state
+          result
+        end
       end
     end
   end

data/files/lib/chef_compat/monkeypatches/chef/runner.rb

@@ -0,0 +1,60 @@
+#--
+# Author:: Adam Jacob (<adam@chef.io>)
+# Author:: Christopher Walters (<cw@chef.io>)
+# Author:: Tim Hinderliter (<tim@chef.io>)
+# Copyright:: Copyright 2008-2016, Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# minimal monkeypatch necessary to implement the notifcation features
+# of 12.10.x
+#
+# if before notifications are also pulled into this monkeypatch then it
+# may simply be easier to copy the entire Chef::Runner class from 12.10.24
+# into this file.
+#
+class Chef
+  # == Chef::Runner
+  # This class is responsible for executing the steps in a Chef run.
+  class Runner
+
+    def delayed_actions
+      @run_context.delayed_actions
+    end
+
+    # Determine the appropriate provider for the given resource, then
+    # execute it.
+    def run_action(resource, action, notification_type = nil, notifying_resource = nil)
+      # Actually run the action for realsies
+      resource.run_action(action, notification_type, notifying_resource)
+
+      # Execute any immediate and queue up any delayed notifications
+      # associated with the resource, but only if it was updated *this time*
+      # we ran an action on it.
+      if resource.updated_by_last_action?
+        run_context.immediate_notifications(resource).each do |notification|
+          Chef::Log.info("#{resource} sending #{notification.action} action to #{notification.resource} (immediate)")
+          run_action(notification.resource, notification.action, :immediate, resource)
+        end
+
+        run_context.delayed_notifications(resource).each do |notification|
+          # send the notification to the run_context of the receiving resource
+          notification.resource.run_context.add_delayed_action(notification)
+        end
+      end
+    end
+
+  end
+end

data/files/lib/compat_resource/version.rb

@@ -1,3 +1,3 @@
 module CompatResource
-  VERSION = '12.9.1'
+  VERSION = '12.10.1'
 end

data/files/spec/cookbook_spec.rb

@@ -17,11 +17,14 @@ describe "compat_resource cookbook" do
                  File.join(cookbooks_path, 'normal'))
     File.symlink(File.expand_path('../data/cookbooks/hybrid', __FILE__),
                  File.join(cookbooks_path, 'hybrid'))
+    File.symlink(File.expand_path('../data/cookbooks/notifications', __FILE__),
+                 File.join(cookbooks_path, 'notifications'))
   end
 
   require 'chef/mixin/shell_out'
   include Chef::Mixin::ShellOut
   before :all do
+    FileUtils.rm_f(File.expand_path('../data/Gemfile.lock', __FILE__))
     Bundler.with_clean_env do
       shell_out!("bundle install --gemfile #{File.expand_path('../data/Gemfile', __FILE__)}")
     end
@@ -34,6 +37,12 @@ describe "compat_resource cookbook" do
     end
   end
 
+  it "should handle new-style recursive notifications" do
+    result = run_chef("-o notifications")
+    puts result.stdout
+    puts result.stderr
+  end
+
   it "when chef-client runs the test recipe, it succeeds" do
     result = run_chef("-o test::test,test")
     puts result.stdout
@@ -61,7 +70,7 @@ describe "compat_resource cookbook" do
 #     -   set y to 4 \(default value\)
 # /)
   end
-  if Chef::VERSION.to_f <= 12.5
+  if Gem::Requirement.new("< 12.6").satisfied_by?(Gem::Version.new(Chef::VERSION))
     it "when chef-client tries to declare_resource with extra parameters, it fails" do
       expect {
         run_chef("-o normal::declare_resource")

data/files/spec/data/.bundle/config

@@ -0,0 +1 @@
+--- {}

data/files/spec/data/Gemfile.lock

@@ -1,12 +1,11 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    builder (3.2.2)
-    chef (12.3.0)
-      chef-zero (~> 4.1)
+    chef (12.0.3)
+      chef-zero (~> 3.2)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
-      ffi-yajl (>= 1.2, < 3.0)
+      ffi-yajl (~> 1.2)
       highline (~> 1.6, >= 1.6.9)
       mixlib-authentication (~> 1.3)
       mixlib-cli (~> 1.4)
@@ -18,18 +17,9 @@ GEM
       ohai (~> 8.0)
       plist (~> 3.1.0)
       pry (~> 0.9)
-      rspec-core (~> 3.2)
-      rspec-expectations (~> 3.2)
-      rspec-mocks (~> 3.2)
-      rspec_junit_formatter (~> 0.2.0)
-      serverspec (~> 2.7)
-      specinfra (~> 2.10)
-    chef-config (12.8.1)
-      mixlib-config (~> 2.0)
-      mixlib-shellout (~> 2.0)
-    chef-zero (4.5.0)
-      ffi-yajl (~> 2.2)
-      hashie (>= 2.0, < 4.0)
+    chef-zero (3.2.1)
+      ffi-yajl (~> 1.1)
+      hashie (~> 2.0)
       mixlib-log (~> 1.3)
       rack
       uuidtools (~> 2.1)
@@ -37,42 +27,40 @@ GEM
     diff-lcs (1.2.5)
     erubis (2.7.0)
     ffi (1.9.10)
-    ffi-yajl (2.2.3)
+    ffi-yajl (1.4.0)
+      ffi (~> 1.5)
       libyajl2 (~> 1.2)
-    hashie (3.4.3)
+    hashie (2.1.2)
     highline (1.7.8)
     ipaddress (0.8.3)
     libyajl2 (1.2.0)
     method_source (0.8.2)
+    mime-types (2.99.1)
     mixlib-authentication (1.4.0)
       mixlib-log
       rspec-core (~> 3.2)
       rspec-expectations (~> 3.2)
       rspec-mocks (~> 3.2)
-    mixlib-cli (1.5.0)
+    mixlib-cli (1.6.0)
     mixlib-config (2.2.1)
     mixlib-log (1.6.0)
     mixlib-shellout (2.2.6)
-    multi_json (1.11.2)
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
     net-ssh (2.9.4)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
     net-ssh-multi (1.2.1)
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
-    net-telnet (0.1.1)
-    ohai (8.12.1)
-      chef-config (>= 12.5.0.alpha.1, < 13)
+    ohai (8.4.0)
       ffi (~> 1.9)
-      ffi-yajl (~> 2.2)
+      ffi-yajl (>= 1.1, < 3.0)
       ipaddress
+      mime-types (~> 2.0)
       mixlib-cli
       mixlib-config (~> 2.0)
       mixlib-log
       mixlib-shellout (~> 2.0)
-      plist
+      rake (~> 10.1)
       systemu (~> 2.6.4)
       wmi-lite (~> 1.0)
     plist (3.1.0)
@@ -81,37 +69,17 @@ GEM
       method_source (~> 0.8.1)
       slop (~> 3.4)
     rack (1.6.4)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
+    rake (10.5.0)
     rspec-core (3.4.4)
       rspec-support (~> 3.4.0)
     rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
-    rspec-its (1.2.0)
-      rspec-core (>= 3.0.0)
-      rspec-expectations (>= 3.0.0)
     rspec-mocks (3.4.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    rspec_junit_formatter (0.2.3)
-      builder (< 4)
-      rspec-core (>= 2, < 4, != 2.12.0)
-    serverspec (2.31.0)
-      multi_json
-      rspec (~> 3.0)
-      rspec-its
-      specinfra (~> 2.53)
-    sfl (2.2)
     slop (3.6.0)
-    specinfra (2.54.1)
-      net-scp
-      net-ssh (>= 2.7, < 3.1)
-      net-telnet
-      sfl
     systemu (2.6.5)
     uuidtools (2.1.5)
     wmi-lite (1.0.0)
@@ -120,7 +88,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  chef (~> 12.3, < 12.4)
+  chef (~> 12.0.0)
 
 BUNDLED WITH
-   1.11.2
+   1.12.1

data/files/spec/data/config.rb

@@ -1,3 +1,3 @@
 local_mode true
 chef_repo_path File.dirname(__FILE__)
-log_level :debug
+#log_level :debug

data/files/spec/data/cookbooks/notifications/metadata.rb

@@ -0,0 +1,4 @@
+name "notifications"
+description "cookbook that depends on compat_resource"
+version "1.0.0"
+depends "compat_resource"

data/files/spec/data/cookbooks/notifications/recipes/default.rb

@@ -0,0 +1,5 @@
+log "recipe" do
+  action :nothing
+end
+
+resource "doit"

data/files/spec/data/cookbooks/notifications/resources/resource.rb

@@ -0,0 +1,8 @@
+provides :resource
+resource_name :resource
+
+action :create do
+  log "resource" do
+    notifies :write, "log[recipe]"
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: compat_resource
 version: !ruby/object:Gem::Version
-  version: 12.9.1
+  version: 12.10.1
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: files/bin
 cert_chain: []
-date: 2016-03-23 00:00:00.000000000 Z
+date: 2016-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -94,9 +94,13 @@ files:
 - files/lib/chef_compat/copied_from_chef.rb
 - files/lib/chef_compat/copied_from_chef/chef/constants.rb
 - files/lib/chef_compat/copied_from_chef/chef/delayed_evaluator.rb
+- files/lib/chef_compat/copied_from_chef/chef/dsl/core.rb
 - files/lib/chef_compat/copied_from_chef/chef/dsl/declare_resource.rb
 - files/lib/chef_compat/copied_from_chef/chef/dsl/recipe.rb
+- files/lib/chef_compat/copied_from_chef/chef/mixin/lazy_module_include.rb
+- files/lib/chef_compat/copied_from_chef/chef/mixin/notifying_block.rb
 - files/lib/chef_compat/copied_from_chef/chef/mixin/params_validate.rb
+- files/lib/chef_compat/copied_from_chef/chef/mixin/powershell_out.rb
 - files/lib/chef_compat/copied_from_chef/chef/mixin/properties.rb
 - files/lib/chef_compat/copied_from_chef/chef/property.rb
 - files/lib/chef_compat/copied_from_chef/chef/provider.rb
@@ -114,7 +118,11 @@ files:
 - files/lib/chef_compat/monkeypatches/chef/recipe.rb
 - files/lib/chef_compat/monkeypatches/chef/resource.rb
 - files/lib/chef_compat/monkeypatches/chef/resource/lwrp_base.rb
+- files/lib/chef_compat/monkeypatches/chef/resource_collection.rb
+- files/lib/chef_compat/monkeypatches/chef/resource_collection/resource_list.rb
+- files/lib/chef_compat/monkeypatches/chef/resource_collection/resource_set.rb
 - files/lib/chef_compat/monkeypatches/chef/run_context.rb
+- files/lib/chef_compat/monkeypatches/chef/runner.rb
 - files/lib/chef_compat/property.rb
 - files/lib/chef_compat/recipe.rb
 - files/lib/chef_compat/resource.rb
@@ -123,6 +131,7 @@ files:
 - files/lib/compat_resource/gemspec.rb
 - files/lib/compat_resource/version.rb
 - files/spec/cookbook_spec.rb
+- files/spec/data/.bundle/config
 - files/spec/data/Gemfile
 - files/spec/data/Gemfile.lock
 - files/spec/data/config.rb
@@ -141,6 +150,9 @@ files:
 - files/spec/data/cookbooks/normal/providers/resource.rb
 - files/spec/data/cookbooks/normal/recipes/declare_resource.rb
 - files/spec/data/cookbooks/normal/resources/resource.rb
+- files/spec/data/cookbooks/notifications/metadata.rb
+- files/spec/data/cookbooks/notifications/recipes/default.rb
+- files/spec/data/cookbooks/notifications/resources/resource.rb
 - files/spec/data/cookbooks/test/metadata.rb
 - files/spec/data/cookbooks/test/recipes/default.rb
 - files/spec/data/cookbooks/test/recipes/test.rb
@@ -166,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Bring some new features of Chef 12.5 to previous 12.X releases