compat_resource 12.5.15 → 12.5.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6db2428a9f97eb486526016e223b22e7d9aeb90
-  data.tar.gz: a68c64f80db32ae72d7e8ab455714696930fed20
+  metadata.gz: ddf050dc8fb238c52f37f1c06e6a2ea64e6493a5
+  data.tar.gz: d21c2b0fef0a359ebc8fc73741f75dadfbd09d62
 SHA512:
-  metadata.gz: 2192e789fc249938436c3c2e21de729794d4340bf62e11ee0a500b32b69b8820f5d40d7ed54462d834a8f786c396cdc45c0624954b433c7c07dc744871e00e04
-  data.tar.gz: 8deb65e3e46dda8f5dab098a79930a30e9cd62456863bc83639449c3d5106bbc02ca90162f9f7d18da703a22c4f22dceed22a7f89fda3a7fabd86a75ba11ce25
+  metadata.gz: cf527c7f4d1517a875faea9a0c1099de51f07d66c91f42f862777c4a21bb264dc32f88471fcd41ae79019347644b1e7ab9ca03f2be259545078314def84ff20a
+  data.tar.gz: cd579dfb6b9911995ce2082f6299f5d60602f7339b004de9bfeaf96195796ccb82bc085462afcfa2076137158674ab2fb94d925e3cdf4d4f5b03ae7d3d2617dd

data/Rakefile

@@ -166,14 +166,7 @@ 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 += <<-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
+          line += "#{indent}  CopiedFromChef.extend_chef_module(#{original_class}, self) if defined?(#{original_class})"
         end
 
       # If we're not in a class we care about, don't print stuff

data/files/lib/chef_compat/copied_from_chef.rb

@@ -1,6 +1,19 @@
 module ChefCompat
   module CopiedFromChef
-    # This patch to ActionClass is necessary for the include to work
+    def self.extend_chef_module(chef_module, target)
+      target.instance_eval do
+        include chef_module
+        @chef_module = chef_module
+        def self.method_missing(name, *args, &block)
+          @chef_module.send(name, *args, &block)
+        end
+        def self.const_missing(name)
+          @chef_module.const_get(name)
+        end
+      end
+    end
+
+    # This patch to CopiedFromChef's ActionClass is necessary for the include to work
     require 'chef/resource'
     class Chef < ::Chef
       class Resource < ::Chef::Resource

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

@@ -24,19 +24,9 @@ module CopiedFromChef
 
 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
+    CopiedFromChef.extend_chef_module(::Chef::DSL, self) if defined?(::Chef::DSL)
     module DeclareResource
-      if defined?(::Chef::DSL::DeclareResource)
-        include ::Chef::DSL::DeclareResource
-        @delegates_to = ::Chef::DSL::DeclareResource
-        require 'chef_compat/delegating_class'
-        extend DelegatingClass
-      end
+      CopiedFromChef.extend_chef_module(::Chef::DSL::DeclareResource, self) if defined?(::Chef::DSL::DeclareResource)
 
       #
       # Instantiates a resource (via #build_resource), then adds it to the

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

@@ -5,27 +5,12 @@ 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
+    CopiedFromChef.extend_chef_module(::Chef::DSL, self) if defined?(::Chef::DSL)
     module Recipe
-      if defined?(::Chef::DSL::Recipe)
-        include ::Chef::DSL::Recipe
-        @delegates_to = ::Chef::DSL::Recipe
-        require 'chef_compat/delegating_class'
-        extend DelegatingClass
-      end
+      CopiedFromChef.extend_chef_module(::Chef::DSL::Recipe, self) if defined?(::Chef::DSL::Recipe)
       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
+        CopiedFromChef.extend_chef_module(::Chef::DSL::Recipe::FullDSL, self) if defined?(::Chef::DSL::Recipe::FullDSL)
         include Chef::DSL::Recipe
       end
     end

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

@@ -25,19 +25,9 @@ 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
-    end
+    CopiedFromChef.extend_chef_module(::Chef::Mixin, self) if defined?(::Chef::Mixin)
     module ParamsValidate
-      if defined?(::Chef::Mixin::ParamsValidate)
-        include ::Chef::Mixin::ParamsValidate
-        @delegates_to = ::Chef::Mixin::ParamsValidate
-        require 'chef_compat/delegating_class'
-        extend DelegatingClass
-      end
+      CopiedFromChef.extend_chef_module(::Chef::Mixin::ParamsValidate, self) if defined?(::Chef::Mixin::ParamsValidate)
 
       # Takes a hash of options, along with a map to validate them.  Returns the original
       # options hash, plus any changes that might have been made (through things like setting

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

@@ -8,26 +8,11 @@ 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
-    end
+    CopiedFromChef.extend_chef_module(::Chef::Mixin, self) if defined?(::Chef::Mixin)
     module Properties
-      if defined?(::Chef::Mixin::Properties)
-        include ::Chef::Mixin::Properties
-        @delegates_to = ::Chef::Mixin::Properties
-        require 'chef_compat/delegating_class'
-        extend DelegatingClass
-      end
+      CopiedFromChef.extend_chef_module(::Chef::Mixin::Properties, self) if defined?(::Chef::Mixin::Properties)
       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
-        end
+        CopiedFromChef.extend_chef_module(::Chef::Mixin::Properties::ClassMethods, self) if defined?(::Chef::Mixin::Properties::ClassMethods)
         #
         # The list of properties defined on this resource.
         #

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

@@ -111,12 +111,7 @@ super if defined?(::Chef::Provider)
       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
+      CopiedFromChef.extend_chef_module(::Chef::Provider::InlineResources, self) if defined?(::Chef::Provider::InlineResources)
       def compile_and_converge_action(&block)
         old_run_context = run_context
         @run_context = run_context.create_child
@@ -130,12 +125,7 @@ super if defined?(::Chef::Provider)
         @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
+        CopiedFromChef.extend_chef_module(::Chef::Provider::InlineResources::ClassMethods, self) if defined?(::Chef::Provider::InlineResources::ClassMethods)
         def action(name, &block)
           # We need the block directly in a method so that `super` works
           define_method("compile_action_#{name}", &block)

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

@@ -24,12 +24,7 @@ module CopiedFromChef
 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
-      end
+      CopiedFromChef.extend_chef_module(::Chef::Resource::ActionClass, self) if defined?(::Chef::Resource::ActionClass)
       #
       # If load_current_value! is defined on the resource, use that.
       #
@@ -72,12 +67,7 @@ class Chef < (defined?(::Chef) ? ::Chef : Object)
       end
 
       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
-        end
+        CopiedFromChef.extend_chef_module(::Chef::Resource::ActionClass::ClassMethods, self) if defined?(::Chef::Resource::ActionClass::ClassMethods)
         #
         # The Chef::Resource class this ActionClass was declared against.
         #

data/files/lib/chef_compat/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: compat_resource
 version: !ruby/object:Gem::Version
-  version: 12.5.15
+  version: 12.5.16
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-08 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -104,7 +104,6 @@ files:
 - files/lib/chef_compat/copied_from_chef/chef/resource.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

data/files/lib/chef_compat/delegating_class.rb

@@ -1,10 +0,0 @@
-module ChefCompat
-  module DelegatingClass
-    def method_missing(name, *args, &block)
-      @delegates_to.send(name, *args, &block)
-    end
-    def const_missing(name)
-      @delegates_to.const_get(name)
-    end
-  end
-end