summaryrefslogtreecommitdiff
path: root/lib/chef/dsl
diff options
context:
space:
mode:
authorJohn Keiser <john@johnkeiser.com>2015-07-29 15:31:36 -0600
committerJohn Keiser <john@johnkeiser.com>2015-07-31 12:42:28 -0600
commit05c59d70345598da5bb0e7ccc2f4ebaf85adcb73 (patch)
treeb9054251567a2ecff2b810b1d9cac55f486d8d69 /lib/chef/dsl
parent6aa94e70cde907e9c890307a82fb50af3d46f9df (diff)
downloadchef-05c59d70345598da5bb0e7ccc2f4ebaf85adcb73.tar.gz
Add current_value_does_not_exist! API, pretty up the output
Diffstat (limited to 'lib/chef/dsl')
-rw-r--r--lib/chef/dsl/recipe.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/chef/dsl/recipe.rb b/lib/chef/dsl/recipe.rb
index d00d0df247..29cfcd478c 100644
--- a/lib/chef/dsl/recipe.rb
+++ b/lib/chef/dsl/recipe.rb
@@ -19,12 +19,10 @@
require 'chef/mixin/convert_to_class_name'
require 'chef/exceptions'
-require 'chef/resource_builder'
require 'chef/mixin/shell_out'
require 'chef/mixin/powershell_out'
require 'chef/dsl/resources'
require 'chef/dsl/definitions'
-require 'chef/resource'
class Chef
module DSL
@@ -198,6 +196,10 @@ class Chef
end
end
+# Avoid circular references for things that are only used in instance methods
+require 'chef/resource_builder'
+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'