compat_resource 12.5.14 → 12.5.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2dc72a948f1cb7b4ae30ace971a375f319ef8d4
-  data.tar.gz: 7b4d49278d4c10aec56e7e5dd89ca94ad7dfc551
+  metadata.gz: f6db2428a9f97eb486526016e223b22e7d9aeb90
+  data.tar.gz: a68c64f80db32ae72d7e8ab455714696930fed20
 SHA512:
-  metadata.gz: 59b1fc8b98642673dc507e80e3931d24c4c8edc52fbbba39353e6a004dbac177799c3b8b2d108e6ee7ab19eef734eb5974b91bcf78b04ea4ae93d176124b57c9
-  data.tar.gz: 0ef0958d11750723c38094733724a82bc3bfa7c381ad4d475e2fd703360dd725f7d760a2668a1a7c17b56fadb9f73e1946a04db4675086df29256156093b5f88
+  metadata.gz: 2192e789fc249938436c3c2e21de729794d4340bf62e11ee0a500b32b69b8820f5d40d7ed54462d834a8f786c396cdc45c0624954b433c7c07dc744871e00e04
+  data.tar.gz: 8deb65e3e46dda8f5dab098a79930a30e9cd62456863bc83639449c3d5106bbc02ca90162f9f7d18da703a22c4f22dceed22a7f89fda3a7fabd86a75ba11ce25

data/Rakefile

@@ -13,10 +13,21 @@ task default: :spec
 #
 # "rake update" updates the copied_from_chef files so we can grab bugfixes or new features
 #
-CHEF_FILES = %w(chef/constants chef/delayed_evaluator chef/property
-                chef/resource chef/resource/action_class chef/provider
-                chef/mixin/params_validate chef/mixin/properties)
-SPEC_FILES = %w(unit/mixin/properties_spec.rb
+CHEF_FILES = %w(
+                chef/constants
+                chef/delayed_evaluator
+                chef/dsl/declare_resource
+                chef/dsl/recipe
+                chef/mixin/params_validate
+                chef/mixin/properties
+                chef/property
+                chef/provider
+                chef/resource
+                chef/resource_builder
+                chef/resource/action_class
+              )
+SPEC_FILES = %w(
+                unit/mixin/properties_spec.rb
                 unit/property_spec.rb
                 unit/property/state_spec.rb
                 unit/property/validation_spec.rb
@@ -33,6 +44,7 @@ KEEP_FUNCTIONS = {
     resource_name self.use_automatic_resource_name
 
     identity state state_for_resource_reporter property_is_set reset_property
+    to_hash
     self.properties self.state_properties self.state_attr
     self.identity_properties self.identity_property self.identity_attrs
     self.property self.property_type
@@ -47,17 +59,21 @@ KEEP_FUNCTIONS = {
   'chef/provider' => %w(
     initialize
     converge_if_changed
+    compile_and_converge_action
+    action
     self.use_inline_resources
     self.include_resource_dsl
     self.include_resource_dsl_module
   ),
+  'chef/dsl/recipe' => %w(),
 }
 KEEP_INCLUDES = {
   'chef/resource' => %w(Chef::Mixin::ParamsValidate Chef::Mixin::Properties),
-  'chef/provider' => [],
+  'chef/provider' => %w(Chef::DSL::Recipe::FullDSL),
+  'chef/dsl/recipe' => %w(Chef::DSL::DeclareResource Chef::DSL::Recipe),
 }
 KEEP_CLASSES = {
-  'chef/provider' => %w(Chef::Provider)
+  'chef/provider' => %w(Chef::Provider Chef::Provider::InlineResources Chef::Provider::InlineResources::ClassMethods)
 }
 SKIP_LINES = {
   'chef/dsl/recipe' => [ /include Chef::Mixin::PowershellOut/ ]
@@ -150,11 +166,14 @@ task :update do
           line = "#{indent}#{type}#{space}#{class_name} < (defined?(#{original_class}) ? #{original_class} : #{superclass_name})"
         else
           # Modules have a harder time of it because of self methods
-          line += "#{indent}  if defined?(#{original_class})\n"
-          line += "#{indent}    require 'chef_compat/delegating_class'\n"
-          line += "#{indent}    extend DelegatingClass\n"
-          line += "#{indent}    @delegates_to = #{original_class}\n"
-          line += "#{indent}  end"
+          line += <<-EOM
+#{indent}  if defined?(#{original_class})
+#{indent}    include #{original_class}
+#{indent}    @delegates_to = #{original_class}
+#{indent}    require 'chef_compat/delegating_class'
+#{indent}    extend DelegatingClass
+#{indent}  end
+EOM
         end
 
       # If we're not in a class we care about, don't print stuff
@@ -163,7 +182,7 @@ task :update do
       end
 
       # Modify requires to overridden files to bring in the local version
-      if line =~ /\A(\s*require\s*['"])(.+)(['"]\s*)$/
+      if line =~ /\A(\s*require\s*['"])([^'"]+)(['"].*)/
         if CHEF_FILES.include?($2)
           line = "#{$1}chef_compat/copied_from_chef/#{$2}#{$3}"
         else

data/files/lib/chef_compat.rb

@@ -1,7 +1,34 @@
-require 'chef_compat/version'
-require 'chef_compat/resource'
-require 'chef_compat/property'
-require 'chef_compat/mixin/properties'
 
-module ChefCompat
+if Gem::Requirement.new(">= 12.0").satisfied_by?(Gem::Version.new(Chef::VERSION))
+
+  require 'chef_compat/version'
+  require 'chef_compat/resource'
+  require 'chef_compat/property'
+  require 'chef_compat/mixin/properties'
+
+  module ChefCompat
+  end
+
+else
+
+  class Chef
+    class Resource
+      def self.property(args, &block)
+        raise_chef_11_error
+      end
+
+      def self.resource_name(args, &block)
+        raise_chef_11_error
+      end
+
+      def self.action(args, &block)
+        raise_chef_11_error
+      end
+
+      def self.raise_chef_11_error
+        raise "This resource is written with Chef 12.5 custom resources, and requires at least Chef 12.0 used with the compat_resource cookbook, it will not work with Chef 11.x clients, and those users must pin their cookbooks to older versions or upgrade."
+      end
+    end
+  end
+
 end

data/files/lib/chef_compat/copied_from_chef.rb

@@ -1,2 +1,16 @@
-# Because resource does not include chef/provider, we have to do it here
-require 'chef_compat/copied_from_chef/chef/provider'
+module ChefCompat
+  module CopiedFromChef
+    # This patch to ActionClass is necessary for the include to work
+    require 'chef/resource'
+    class Chef < ::Chef
+      class Resource < ::Chef::Resource
+        module ActionClass
+          def self.use_inline_resources
+          end
+          def self.include_resource_dsl(include_resource_dsl)
+          end
+        end
+      end
+    end
+  end
+end

data/files/lib/chef_compat/copied_from_chef/chef/dsl/declare_resource.rb

@@ -0,0 +1,126 @@
+require 'chef_compat/copied_from_chef'
+class Chef
+module ::ChefCompat
+module CopiedFromChef
+#--
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Christopher Walters (<cw@opscode.com>)
+# Copyright:: Copyright (c) 2008, 2009-2015 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.
+#
+
+
+class Chef < (defined?(::Chef) ? ::Chef : Object)
+  module DSL
+    if defined?(::Chef::DSL)
+      include ::Chef::DSL
+      @delegates_to = ::Chef::DSL
+      require 'chef_compat/delegating_class'
+      extend DelegatingClass
+    end
+    module DeclareResource
+      if defined?(::Chef::DSL::DeclareResource)
+        include ::Chef::DSL::DeclareResource
+        @delegates_to = ::Chef::DSL::DeclareResource
+        require 'chef_compat/delegating_class'
+        extend DelegatingClass
+      end
+
+      #
+      # Instantiates a resource (via #build_resource), then adds it to the
+      # resource collection. Note that resource classes are looked up directly,
+      # so this will create the resource you intended even if the method name
+      # corresponding to that resource has been overridden.
+      #
+      # @param type [Symbol] The type of resource (e.g. `:file` or `:package`)
+      # @param name [String] The name of the resource (e.g. '/x/y.txt' or 'apache2')
+      # @param created_at [String] The caller of the resource.  Use `caller[0]`
+      #   to get the caller of your function.  Defaults to the caller of this
+      #   function.
+      # @param resource_attrs_block A block that lets you set attributes of the
+      #   resource (it is instance_eval'd on the resource instance).
+      #
+      # @return [Chef::Resource] The new resource.
+      #
+      # @example
+      #   declare_resource(:file, '/x/y.txy', caller[0]) do
+      #     action :delete
+      #   end
+      #   # Equivalent to
+      #   file '/x/y.txt' do
+      #     action :delete
+      #   end
+      #
+      def declare_resource(type, name, created_at=nil, run_context: self.run_context, create_if_missing: false, &resource_attrs_block)
+        created_at ||= caller[0]
+
+        if create_if_missing
+          begin
+            resource = run_context.resource_collection.find(type => name)
+            return resource
+          rescue Chef::Exceptions::ResourceNotFound
+          end
+        end
+
+        resource = build_resource(type, name, created_at, &resource_attrs_block)
+
+        run_context.resource_collection.insert(resource, resource_type: type, instance_name: name)
+        resource
+      end
+
+      #
+      # Instantiate a resource of the given +type+ with the given +name+ and
+      # attributes as given in the +resource_attrs_block+.
+      #
+      # The resource is NOT added to the resource collection.
+      #
+      # @param type [Symbol] The type of resource (e.g. `:file` or `:package`)
+      # @param name [String] The name of the resource (e.g. '/x/y.txt' or 'apache2')
+      # @param created_at [String] The caller of the resource.  Use `caller[0]`
+      #   to get the caller of your function.  Defaults to the caller of this
+      #   function.
+      # @param resource_attrs_block A block that lets you set attributes of the
+      #   resource (it is instance_eval'd on the resource instance).
+      #
+      # @return [Chef::Resource] The new resource.
+      #
+      # @example
+      #   build_resource(:file, '/x/y.txy', caller[0]) do
+      #     action :delete
+      #   end
+      #
+      def build_resource(type, name, created_at=nil, run_context: self.run_context, &resource_attrs_block)
+        created_at ||= caller[0]
+        Thread.exclusive do
+          require 'chef_compat/copied_from_chef/chef/resource_builder' unless defined?(Chef::ResourceBuilder)
+        end
+
+        Chef::ResourceBuilder.new(
+          type:                type,
+          name:                name,
+          created_at:          created_at,
+          params:              @params,
+          run_context:         run_context,
+          cookbook_name:       cookbook_name,
+          recipe_name:         recipe_name,
+          enclosing_provider:  self.is_a?(Chef::Provider) ? self :  nil
+        ).build(&resource_attrs_block)
+      end
+    end
+  end
+end
+end
+end
+end

data/files/lib/chef_compat/copied_from_chef/chef/dsl/recipe.rb

@@ -0,0 +1,37 @@
+require 'chef_compat/copied_from_chef'
+class Chef
+module ::ChefCompat
+module CopiedFromChef
+require 'chef_compat/copied_from_chef/chef/dsl/declare_resource'
+class Chef < (defined?(::Chef) ? ::Chef : Object)
+  module DSL
+    if defined?(::Chef::DSL)
+      include ::Chef::DSL
+      @delegates_to = ::Chef::DSL
+      require 'chef_compat/delegating_class'
+      extend DelegatingClass
+    end
+    module Recipe
+      if defined?(::Chef::DSL::Recipe)
+        include ::Chef::DSL::Recipe
+        @delegates_to = ::Chef::DSL::Recipe
+        require 'chef_compat/delegating_class'
+        extend DelegatingClass
+      end
+      include Chef::DSL::DeclareResource
+      module FullDSL
+        if defined?(::Chef::DSL::Recipe::FullDSL)
+          include ::Chef::DSL::Recipe::FullDSL
+          @delegates_to = ::Chef::DSL::Recipe::FullDSL
+          require 'chef_compat/delegating_class'
+          extend DelegatingClass
+        end
+        include Chef::DSL::Recipe
+      end
+    end
+  end
+end
+require 'chef_compat/copied_from_chef/chef/resource'
+end
+end
+end

data/files/lib/chef_compat/copied_from_chef/chef/mixin/params_validate.rb

@@ -26,15 +26,17 @@ require 'chef_compat/copied_from_chef/chef/delayed_evaluator'
 class Chef < (defined?(::Chef) ? ::Chef : Object)
   module Mixin
     if defined?(::Chef::Mixin)
+      include ::Chef::Mixin
+      @delegates_to = ::Chef::Mixin
       require 'chef_compat/delegating_class'
       extend DelegatingClass
-      @delegates_to = ::Chef::Mixin
     end
     module ParamsValidate
       if defined?(::Chef::Mixin::ParamsValidate)
+        include ::Chef::Mixin::ParamsValidate
+        @delegates_to = ::Chef::Mixin::ParamsValidate
         require 'chef_compat/delegating_class'
         extend DelegatingClass
-        @delegates_to = ::Chef::Mixin::ParamsValidate
       end
 
       # Takes a hash of options, along with a map to validate them.  Returns the original

data/files/lib/chef_compat/copied_from_chef/chef/mixin/properties.rb

@@ -9,21 +9,24 @@ require 'chef_compat/copied_from_chef/chef/property'
 class Chef < (defined?(::Chef) ? ::Chef : Object)
   module Mixin
     if defined?(::Chef::Mixin)
+      include ::Chef::Mixin
+      @delegates_to = ::Chef::Mixin
       require 'chef_compat/delegating_class'
       extend DelegatingClass
-      @delegates_to = ::Chef::Mixin
     end
     module Properties
       if defined?(::Chef::Mixin::Properties)
+        include ::Chef::Mixin::Properties
+        @delegates_to = ::Chef::Mixin::Properties
         require 'chef_compat/delegating_class'
         extend DelegatingClass
-        @delegates_to = ::Chef::Mixin::Properties
       end
       module ClassMethods
         if defined?(::Chef::Mixin::Properties::ClassMethods)
+          include ::Chef::Mixin::Properties::ClassMethods
+          @delegates_to = ::Chef::Mixin::Properties::ClassMethods
           require 'chef_compat/delegating_class'
           extend DelegatingClass
-          @delegates_to = ::Chef::Mixin::Properties::ClassMethods
         end
         #
         # The list of properties defined on this resource.

data/files/lib/chef_compat/copied_from_chef/chef/provider.rb

@@ -4,6 +4,7 @@ module ::ChefCompat
 module CopiedFromChef
 class Chef < (defined?(::Chef) ? ::Chef : Object)
   class Provider < (defined?(::Chef::Provider) ? ::Chef::Provider : Object)
+    attr_accessor :action
     def initialize(new_resource, run_context)
 super if defined?(::Chef::Provider)
       @new_resource = new_resource
@@ -109,6 +110,50 @@ super if defined?(::Chef::Provider)
       extend InlineResources::ClassMethods
       include InlineResources
     end
+    module InlineResources
+      if defined?(::Chef::Provider::InlineResources)
+        include ::Chef::Provider::InlineResources
+        @delegates_to = ::Chef::Provider::InlineResources
+        require 'chef_compat/delegating_class'
+        extend DelegatingClass
+      end
+      def compile_and_converge_action(&block)
+        old_run_context = run_context
+        @run_context = run_context.create_child
+        return_value = instance_eval(&block)
+        Chef::Runner.new(run_context).converge
+        return_value
+      ensure
+        if run_context.resource_collection.any? { |r| r.updated? }
+          new_resource.updated_by_last_action(true)
+        end
+        @run_context = old_run_context
+      end
+      module ClassMethods
+        if defined?(::Chef::Provider::InlineResources::ClassMethods)
+          include ::Chef::Provider::InlineResources::ClassMethods
+          @delegates_to = ::Chef::Provider::InlineResources::ClassMethods
+          require 'chef_compat/delegating_class'
+          extend DelegatingClass
+        end
+        def action(name, &block)
+          # We need the block directly in a method so that `super` works
+          define_method("compile_action_#{name}", &block)
+          # We try hard to use `def` because define_method doesn't show the method name in the stack.
+          begin
+            class_eval <<-EOM
+              def action_#{name}
+                compile_and_converge_action { compile_action_#{name} }
+              end
+            EOM
+          rescue SyntaxError
+            define_method("action_#{name}") { send("compile_action_#{name}") }
+          end
+        end
+      end
+      require 'chef_compat/copied_from_chef/chef/dsl/recipe'
+      include Chef::DSL::Recipe::FullDSL
+    end
     protected
   end
 end

data/files/lib/chef_compat/copied_from_chef/chef/resource.rb

@@ -3,6 +3,7 @@ class Chef
 module ::ChefCompat
 module CopiedFromChef
 require 'chef_compat/copied_from_chef/chef/resource/action_class'
+require 'chef_compat/copied_from_chef/chef/provider'
 require 'chef_compat/copied_from_chef/chef/mixin/properties'
 class Chef < (defined?(::Chef) ? ::Chef : Object)
   class Resource < (defined?(::Chef::Resource) ? ::Chef::Resource : Object)
@@ -72,6 +73,20 @@ super if defined?(::Chef::Resource)
       return result.values.first if identity_properties.size == 1
       result
     end
+    def to_hash
+      # Grab all current state, then any other ivars (backcompat)
+      result = {}
+      self.class.state_properties.each do |p|
+        result[p.name] = p.get(self)
+      end
+      safe_ivars = instance_variables.map { |ivar| ivar.to_sym } - FORBIDDEN_IVARS
+      safe_ivars.each do |iv|
+        key = iv.to_s.sub(/^@/,'').to_sym
+        next if result.has_key?(key)
+        result[key] = instance_variable_get(iv)
+      end
+      result
+    end
     def self.identity_property(name=nil)
       result = identity_properties(*Array(name))
       if result.size > 1

data/files/lib/chef_compat/copied_from_chef/chef/resource/action_class.rb

@@ -25,9 +25,10 @@ class Chef < (defined?(::Chef) ? ::Chef : Object)
   class Resource < (defined?(::Chef::Resource) ? ::Chef::Resource : Object)
     module ActionClass
       if defined?(::Chef::Resource::ActionClass)
+        include ::Chef::Resource::ActionClass
+        @delegates_to = ::Chef::Resource::ActionClass
         require 'chef_compat/delegating_class'
         extend DelegatingClass
-        @delegates_to = ::Chef::Resource::ActionClass
       end
       #
       # If load_current_value! is defined on the resource, use that.
@@ -72,9 +73,10 @@ class Chef < (defined?(::Chef) ? ::Chef : Object)
 
       module ClassMethods
         if defined?(::Chef::Resource::ActionClass::ClassMethods)
+          include ::Chef::Resource::ActionClass::ClassMethods
+          @delegates_to = ::Chef::Resource::ActionClass::ClassMethods
           require 'chef_compat/delegating_class'
           extend DelegatingClass
-          @delegates_to = ::Chef::Resource::ActionClass::ClassMethods
         end
         #
         # The Chef::Resource class this ActionClass was declared against.

data/files/lib/chef_compat/copied_from_chef/chef/resource_builder.rb

@@ -0,0 +1,150 @@
+require 'chef_compat/copied_from_chef'
+class Chef
+module ::ChefCompat
+module CopiedFromChef
+#
+# Author:: Lamont Granquist (<lamont@chef.io>)
+# Copyright:: Copyright (c) 2015-2015 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.
+#
+
+# NOTE: this was extracted from the Recipe DSL mixin, relevant specs are in spec/unit/recipe_spec.rb
+
+class Chef < (defined?(::Chef) ? ::Chef : Object)
+  class ResourceBuilder < (defined?(::Chef::ResourceBuilder) ? ::Chef::ResourceBuilder : Object)
+    attr_reader :type
+    attr_reader :name
+    attr_reader :created_at
+    attr_reader :params
+    attr_reader :run_context
+    attr_reader :cookbook_name
+    attr_reader :recipe_name
+    attr_reader :enclosing_provider
+    attr_reader :resource
+
+    # FIXME (ruby-2.1 syntax): most of these are mandatory
+    def initialize(type:nil, name:nil, created_at: nil, params: nil, run_context: nil, cookbook_name: nil, recipe_name: nil, enclosing_provider: nil)
+super if defined?(::Chef::ResourceBuilder)
+      @type               = type
+      @name               = name
+      @created_at         = created_at
+      @params             = params
+      @run_context        = run_context
+      @cookbook_name      = cookbook_name
+      @recipe_name        = recipe_name
+      @enclosing_provider = enclosing_provider
+    end
+
+    def build(&block)
+      raise ArgumentError, "You must supply a name when declaring a #{type} resource" if name.nil?
+
+      @resource = resource_class.new(name, run_context)
+      if resource.resource_name.nil?
+        raise Chef::Exceptions::InvalidResourceSpecification, "#{resource}.resource_name is `nil`!  Did you forget to put `provides :blah` or `resource_name :blah` in your resource class?"
+      end
+      resource.source_line = created_at
+      resource.declared_type = type
+
+      # If we have a resource like this one, we want to steal its state
+      # This behavior is very counter-intuitive and should be removed.
+      # See CHEF-3694, https://tickets.opscode.com/browse/CHEF-3694
+      # Moved to this location to resolve CHEF-5052, https://tickets.opscode.com/browse/CHEF-5052
+      if prior_resource
+        resource.load_from(prior_resource)
+      end
+
+      resource.cookbook_name = cookbook_name
+      resource.recipe_name = recipe_name
+      # Determine whether this resource is being created in the context of an enclosing Provider
+      resource.enclosing_provider = enclosing_provider
+
+      # XXX: this is required for definition params inside of the scope of a
+      # subresource to work correctly.
+      resource.params = params
+
+      # Evaluate resource attribute DSL
+      resource.instance_eval(&block) if block_given?
+
+      # emit a cloned resource warning if it is warranted
+      if prior_resource
+        if is_trivial_resource?(prior_resource) && identicalish_resources?(prior_resource, resource)
+          emit_harmless_cloning_debug
+        else
+          emit_cloned_resource_warning
+        end
+      end
+
+      # Run optional resource hook
+      resource.after_created
+
+      resource
+    end
+
+    private
+
+    def resource_class
+      # Checks the new platform => short_name => resource mapping initially
+      # then fall back to the older approach (Chef::Resource.const_get) for
+      # backward compatibility
+      @resource_class ||= Chef::Resource.resource_for_node(type, run_context.node)
+    end
+
+    def is_trivial_resource?(resource)
+      identicalish_resources?(resource_class.new(name, run_context), resource)
+    end
+
+    # this is an equality test specific to checking for 3694 cloning warnings
+    def identicalish_resources?(first, second)
+      skipped_ivars = [ :@source_line, :@cookbook_name, :@recipe_name, :@params, :@elapsed_time, :@declared_type ]
+      checked_ivars = ( first.instance_variables | second.instance_variables ) - skipped_ivars
+      non_matching_ivars = checked_ivars.reject do |iv|
+        if iv == :@action && ( [first.instance_variable_get(iv)].flatten == [:nothing] || [second.instance_variable_get(iv)].flatten == [:nothing] )
+          # :nothing action on either side of the comparison always matches
+          true
+        else
+          first.instance_variable_get(iv) == second.instance_variable_get(iv)
+        end
+      end
+      Chef::Log.debug("ivars which did not match with the prior resource: #{non_matching_ivars}")
+      non_matching_ivars.empty?
+    end
+
+    def emit_cloned_resource_warning
+      Chef::Log.warn("Cloning resource attributes for #{resource} from prior resource (CHEF-3694)")
+      Chef::Log.warn("Previous #{prior_resource}: #{prior_resource.source_line}") if prior_resource.source_line
+      Chef::Log.warn("Current  #{resource}: #{resource.source_line}") if resource.source_line
+    end
+
+    def emit_harmless_cloning_debug
+      Chef::Log.debug("Harmless resource cloning from #{prior_resource}:#{prior_resource.source_line} to #{resource}:#{resource.source_line}")
+    end
+
+    def prior_resource
+      @prior_resource ||=
+        begin
+          key = "#{type}[#{name}]"
+          prior_resource = run_context.resource_collection.lookup(key)
+        rescue Chef::Exceptions::ResourceNotFound
+          nil
+        end
+    end
+
+  end
+end
+
+require 'chef_compat/copied_from_chef/chef/resource'
+end
+end
+end

data/files/lib/chef_compat/monkeypatches.rb

@@ -1,5 +1,7 @@
 require 'chef_compat/monkeypatches/chef'
+require 'chef_compat/monkeypatches/chef/recipe'
 require 'chef_compat/monkeypatches/chef/resource'
 require 'chef_compat/monkeypatches/chef/provider'
 require 'chef_compat/monkeypatches/chef/resource/lwrp_base'
 require 'chef_compat/monkeypatches/chef/exceptions'
+require 'chef_compat/monkeypatches/chef/run_context'

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

@@ -0,0 +1,18 @@
+require 'chef/recipe'
+require 'chef_compat/recipe'
+
+class Chef::Recipe
+  # If the cookbook depends on compat_resource, create a ChefCompat::Recipe object
+  # instead of Chef::Recipe, for the extra goodies.
+  def self.new(cookbook_name, recipe_name, run_context)
+    if run_context &&
+      run_context.cookbook_collection &&
+      run_context.cookbook_collection[cookbook_name] &&
+      run_context.cookbook_collection[cookbook_name].metadata.dependencies.has_key?('compat_resource') &&
+       self != ::ChefCompat::Recipe
+      ::ChefCompat::Recipe.new(cookbook_name, recipe_name, run_context)
+    else
+      super
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+require 'chef/resource'
+
+class Chef
+  class RunContext
+    if !method_defined?(:create_child)
+      def create_child
+        result = dup
+        result.resource_collection = Chef::ResourceCollection.new
+        result
+      end
+    end
+  end
+end

data/files/lib/chef_compat/recipe.rb

@@ -0,0 +1,8 @@
+require 'chef/recipe'
+require 'chef_compat/copied_from_chef/chef/dsl/recipe'
+
+module ChefCompat
+  class Recipe < Chef::Recipe
+    include ChefCompat::CopiedFromChef::Chef::DSL::Recipe::FullDSL
+  end
+end

data/files/lib/chef_compat/version.rb

@@ -1,3 +1,3 @@
 module ChefCompat
-  VERSION = '12.5.14' if !defined?(VERSION)
+  VERSION = '12.5.15' if !defined?(VERSION)
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: compat_resource
 version: !ruby/object:Gem::Version
-  version: 12.5.14
+  version: 12.5.15
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-04 00:00:00.000000000 Z
+date: 2015-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cheffish
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: stove
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Bring some new features of Chef 12.5 to previous 12.X releases
@@ -86,33 +86,39 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE
-- README.md
 - CHANGELOG.md
 - Gemfile
+- LICENSE
+- README.md
 - Rakefile
+- files/lib/chef_compat.rb
+- 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/declare_resource.rb
+- files/lib/chef_compat/copied_from_chef/chef/dsl/recipe.rb
 - files/lib/chef_compat/copied_from_chef/chef/mixin/params_validate.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
-- files/lib/chef_compat/copied_from_chef/chef/resource/action_class.rb
 - files/lib/chef_compat/copied_from_chef/chef/resource.rb
-- files/lib/chef_compat/copied_from_chef.rb
+- files/lib/chef_compat/copied_from_chef/chef/resource/action_class.rb
+- files/lib/chef_compat/copied_from_chef/chef/resource_builder.rb
 - files/lib/chef_compat/delegating_class.rb
 - files/lib/chef_compat/mixin/properties.rb
+- files/lib/chef_compat/monkeypatches.rb
+- files/lib/chef_compat/monkeypatches/chef.rb
 - files/lib/chef_compat/monkeypatches/chef/exceptions.rb
 - files/lib/chef_compat/monkeypatches/chef/provider.rb
-- files/lib/chef_compat/monkeypatches/chef/resource/lwrp_base.rb
+- files/lib/chef_compat/monkeypatches/chef/recipe.rb
 - files/lib/chef_compat/monkeypatches/chef/resource.rb
-- files/lib/chef_compat/monkeypatches/chef.rb
-- files/lib/chef_compat/monkeypatches.rb
+- files/lib/chef_compat/monkeypatches/chef/resource/lwrp_base.rb
+- files/lib/chef_compat/monkeypatches/chef/run_context.rb
 - files/lib/chef_compat/property.rb
-- files/lib/chef_compat/resource/lwrp_base.rb
+- files/lib/chef_compat/recipe.rb
 - files/lib/chef_compat/resource.rb
+- files/lib/chef_compat/resource/lwrp_base.rb
 - files/lib/chef_compat/version.rb
-- files/lib/chef_compat.rb
 homepage: http://chef.io
 licenses:
 - Apache 2.0
@@ -123,17 +129,17 @@ require_paths:
 - files/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Bring some new features of Chef 12.5 to previous 12.X releases