diff options
author | Jay Mundrawala <jdmundrawala@gmail.com> | 2015-06-30 09:40:17 -0700 |
---|---|---|
committer | Jay Mundrawala <jdmundrawala@gmail.com> | 2015-06-30 11:50:38 -0700 |
commit | 1d25d780a69ebc118494939a8d315f6ec6d9ad3f (patch) | |
tree | af68f02e6d49d19d2d5c75774e72947fd1b288b1 /lib/chef/resource | |
parent | 480d18f26f17c289889ed65d3f8a50e5b336053f (diff) | |
download | chef-1d25d780a69ebc118494939a8d315f6ec6d9ad3f.tar.gz |
Revert "Merge pull request #3603 from chef/jdm/lwrp-base"
This reverts commit 27d8675ec1c80f1eb7ec57f7b6c854441bb395ee, reversing
changes made to 3501ba4020dc21377bc999e57e25eadb315ec783.
Diffstat (limited to 'lib/chef/resource')
-rw-r--r-- | lib/chef/resource/lwrp_base.rb | 57 |
1 files changed, 11 insertions, 46 deletions
diff --git a/lib/chef/resource/lwrp_base.rb b/lib/chef/resource/lwrp_base.rb index 424efa73d9..443e0ed819 100644 --- a/lib/chef/resource/lwrp_base.rb +++ b/lib/chef/resource/lwrp_base.rb @@ -52,52 +52,17 @@ class Chef resource_name = filename_to_qualified_string(cookbook_name, filename) # We load the class first to give it a chance to set its own name - deprecated_resource_class = Class.new(self).tap do |resource_class| - resource_class.resource_name(nil) - resource_class.run_context = run_context - resource_class.instance_eval do - define_method(:initialize) do |*args, &block| - Chef::Log::deprecation("Deprecated Thing") if chef_deprecated_access - super(*args, &block) - end - define_method(:chef_deprecated_access) do - true - end - end - - resource_class.class_from_file(filename) - - # Make a useful string for the class (rather than <Class:312894723894>) - resource_class.instance_eval do - define_singleton_method(:to_s) do - "LWRP resource #{resource_name} from cookbook #{cookbook_name}" - end - define_singleton_method(:inspect) { to_s } - end - end - - resource_class = Class.new(deprecated_resource_class).tap do |resource_class| - resource_class.resource_name(resource_name.to_sym) - resource_class.run_context = run_context - resource_class.instance_eval do - define_method(:chef_deprecated_access) do - false - end - end - resource_class.class_eval do - define_singleton_method(:===) do |instance| - super(instance) || instance.class <= deprecated_resource_class - end - end - end - - deprecated_resource_class.class_eval do - define_method(:kind_of?) do |klass| - super(klass) || klass == resource_class - end - define_method(:is_a?) do |klass| - super(klass) || klass == resource_class + resource_class = Class.new(self) + resource_class.resource_name resource_name.to_sym + resource_class.run_context = run_context + resource_class.class_from_file(filename) + + # Make a useful string for the class (rather than <Class:312894723894>) + resource_class.instance_eval do + define_singleton_method(:to_s) do + "LWRP resource #{resource_name} from cookbook #{cookbook_name}" end + define_singleton_method(:inspect) { to_s } end Chef::Log.debug("Loaded contents of #{filename} into resource #{resource_name} (#{resource_class})") @@ -105,7 +70,7 @@ class Chef LWRPBase.loaded_lwrps[filename] = true # Create the deprecated Chef::Resource::LwrpFoo class - Chef::Resource.register_deprecated_lwrp_class(deprecated_resource_class, convert_to_class_name(resource_name)) + Chef::Resource.register_deprecated_lwrp_class(resource_class, convert_to_class_name(resource_name)) resource_class end |