remove dependency on Chef::Mixin::DeepMerge

4 files changed, 13 insertions, 5 deletions

diff --git a/lib/chef_zero.rb b/lib/chef_zero.rb
index d7acbae..5cfde98 100644
--- a/lib/chef_zero.rb
+++ b/lib/chef_zero.rb
@@ -1,4 +1,5 @@
 require 'solve'
+require 'chef_zero/core_ext'
 
 module ChefZero
   autoload :Log, 'chef_zero/log'
diff --git a/lib/chef_zero/core_ext.rb b/lib/chef_zero/core_ext.rb
new file mode 100644
index 0000000..9559798
--- /dev/null
+++ b/lib/chef_zero/core_ext.rb
@@ -0,0 +1,3 @@
+Dir["#{File.dirname(__FILE__)}/core_ext/*.rb"].sort.each do |path|
+  require "chef_zero/core_ext/#{File.basename(path, '.rb')}"
+end
diff --git a/lib/chef_zero/core_ext/hash.rb b/lib/chef_zero/core_ext/hash.rb
new file mode 100644
index 0000000..84abb97
--- /dev/null
+++ b/lib/chef_zero/core_ext/hash.rb
@@ -0,0 +1,5 @@
+require 'hashie'
+
+class Hash
+  include Hashie::Extensions::DeepMerge
+end
diff --git a/lib/chef_zero/endpoints/search_endpoint.rb b/lib/chef_zero/endpoints/search_endpoint.rb
index 8a66d9a..4440c7a 100644
--- a/lib/chef_zero/endpoints/search_endpoint.rb
+++ b/lib/chef_zero/endpoints/search_endpoint.rb
@@ -1,5 +1,4 @@
 require 'json'
-require 'chef/mixin/deep_merge'
 require 'chef_zero/endpoints/rest_object_endpoint'
 require 'chef_zero/data_normalizer'
 require 'chef_zero/rest_error_response'
@@ -64,10 +63,10 @@ module ChefZero
       def expand_for_indexing(value, index, id)
         if index == 'node'
           result = {}
-          Chef::Mixin::DeepMerge.deep_merge!(value['default'] || {}, result)
-          Chef::Mixin::DeepMerge.deep_merge!(value['normal'] || {}, result)
-          Chef::Mixin::DeepMerge.deep_merge!(value['override'] || {}, result)
-          Chef::Mixin::DeepMerge.deep_merge!(value['automatic'] || {}, result)
+          result.deep_merge!(value['default'] || {})
+          result.deep_merge!(value['normal'] || {})
+          result.deep_merge!(value['override'] || {})
+          result.deep_merge!(value['automatic'] || {})
           result['recipe'] = []
           result['role'] = []
           if value['run_list']