Move LWRP class deprecation warning to const_missing

1 files changed, 11 insertions, 5 deletions

diff --git a/lib/chef/dsl/resources.rb b/lib/chef/dsl/resources.rb
index 482b14e3aa..4072ff2c89 100644
--- a/lib/chef/dsl/resources.rb
+++ b/lib/chef/dsl/resources.rb
@@ -8,14 +8,20 @@ class Chef
     # @api private
     module Resources
       def self.add_resource_dsl(dsl_name)
-        module_eval <<-EOM, __FILE__, __LINE__+1
-          def #{dsl_name}(name, created_at=nil, &block)
-            declare_resource(#{dsl_name.inspect}, name, created_at || caller[0], &block)
+        begin
+          module_eval(<<-EOM, __FILE__, __LINE__+1)
+            def #{dsl_name}(name, created_at=nil, &block)
+              declare_resource(#{dsl_name.inspect}, name, created_at || caller[0], &block)
+            end
+          EOM
+        rescue SyntaxError
+          define_method(dsl_name.to_sym) do |name, created_at=nil, &block|
+            declare_resource(dsl_name, name, created_at || caller[0], &block)
           end
-        EOM
+        end
       end
       def self.remove_resource_dsl(dsl_name)
-        remove_method dsl_name if method_defined?(dsl_name)
+        remove_method(dsl_name) if method_defined?(dsl_name)
       end
     end
   end