diff options
author | John Keiser <jkeiser@opscode.com> | 2014-04-23 19:22:21 -0700 |
---|---|---|
committer | John Keiser <jkeiser@opscode.com> | 2014-04-24 08:53:22 -0700 |
commit | a84653e5f57109e3ac153ef686c9230da19da21d (patch) | |
tree | 1e573c750649c05bc4e4aaf824d73d0fae2ac1be /lib/chef/dsl | |
parent | 57b259ee20c6d3f7a6b19b47955d7f669b457b88 (diff) | |
download | chef-a84653e5f57109e3ac153ef686c9230da19da21d.tar.gz |
Make it possible to include Chef::Provider / Chef::Resource
without circular dependencies or missing deps
Diffstat (limited to 'lib/chef/dsl')
-rw-r--r-- | lib/chef/dsl/recipe.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/chef/dsl/recipe.rb b/lib/chef/dsl/recipe.rb index ebf19c7f23..6846703f09 100644 --- a/lib/chef/dsl/recipe.rb +++ b/lib/chef/dsl/recipe.rb @@ -17,7 +17,6 @@ # limitations under the License. # -require 'chef/resource' require 'chef/resource_platform_map' require 'chef/mixin/convert_to_class_name' @@ -152,6 +151,10 @@ class Chef end end +# We require this at the BOTTOM of this file to avoid circular requires (it is used +# at runtime but not load time) +require 'chef/resource' + # **DEPRECATED** # This used to be part of chef/mixin/recipe_definition_dsl_core. Load the file to activate the deprecation code. require 'chef/mixin/recipe_definition_dsl_core' |