diff options
| -rw-r--r-- | lib/chef/dsl.rb | 1 | ||||
| -rw-r--r-- | lib/chef/dsl/registry_helper.rb (renamed from lib/chef/mixin/registry_helper.rb) | 2 | ||||
| -rw-r--r-- | lib/chef/recipe.rb | 4 | ||||
| -rw-r--r-- | lib/chef/resource.rb | 4 |
4 files changed, 6 insertions, 5 deletions
diff --git a/lib/chef/dsl.rb b/lib/chef/dsl.rb index 74244fafbb..7717d99113 100644 --- a/lib/chef/dsl.rb +++ b/lib/chef/dsl.rb @@ -3,3 +3,4 @@ require 'chef/dsl/platform_introspection' require 'chef/dsl/data_query' require 'chef/dsl/include_recipe' require 'chef/dsl/include_attribute' +require 'chef/dsl/registry_helper' diff --git a/lib/chef/mixin/registry_helper.rb b/lib/chef/dsl/registry_helper.rb index 02a672b6f1..934f5298e0 100644 --- a/lib/chef/mixin/registry_helper.rb +++ b/lib/chef/dsl/registry_helper.rb @@ -25,7 +25,7 @@ # # class Chef - module Mixin + module DSL module RegistryHelper # the registry instance is cheap to build and throwing it away ensures we # don't carry any state (e.g. magic 32-bit/64-bit settings) between calls diff --git a/lib/chef/recipe.rb b/lib/chef/recipe.rb index 3571d1eb34..6ea69360b8 100644 --- a/lib/chef/recipe.rb +++ b/lib/chef/recipe.rb @@ -22,11 +22,11 @@ require 'chef/dsl/recipe' require 'chef/dsl/data_query' require 'chef/dsl/platform_introspection' require 'chef/dsl/include_recipe' +require 'chef/dsl/registry_helper' require 'chef/mixin/from_file' require 'chef/mixin/deprecation' -require 'chef/mixin/registry_helper' class Chef # == Chef::Recipe @@ -37,10 +37,10 @@ class Chef include Chef::DSL::PlatformIntrospection include Chef::DSL::IncludeRecipe include Chef::DSL::Recipe + include Chef::DSL::RegistryHelper include Chef::Mixin::FromFile include Chef::Mixin::Deprecation - include Chef::Mixin::RegistryHelper attr_accessor :cookbook_name, :recipe_name, :recipe, :params, :run_context diff --git a/lib/chef/resource.rb b/lib/chef/resource.rb index c9737cf79a..095a07c2e0 100644 --- a/lib/chef/resource.rb +++ b/lib/chef/resource.rb @@ -20,6 +20,7 @@ require 'chef/mixin/params_validate' require 'chef/mixin/check_helper' require 'chef/dsl/platform_introspection' +require 'chef/dsl/registry_helper' require 'chef/mixin/convert_to_class_name' require 'chef/resource/conditional' require 'chef/resource_collection' @@ -27,7 +28,6 @@ require 'chef/resource_platform_map' require 'chef/node' require 'chef/mixin/deprecation' -require 'chef/mixin/registry_helper' class Chef class Resource @@ -123,9 +123,9 @@ F include Chef::Mixin::CheckHelper include Chef::Mixin::ParamsValidate include Chef::DSL::PlatformIntrospection + include Chef::DSL::RegistryHelper include Chef::Mixin::ConvertToClassName include Chef::Mixin::Deprecation - include Chef::Mixin::RegistryHelper extend Chef::Mixin::ConvertToClassName |