shadow_puppet 0.1.8 → 0.1.9

data/lib/shadow_puppet/manifest.rb

@@ -5,12 +5,8 @@ require 'active_support/core_ext/class/attribute_accessors'
 require 'active_support/core_ext/array'
 require 'active_support/inflector'
 require 'active_support/core_ext/hash/indifferent_access'
-require 'active_support/core_ext/hash/deep_merge'
 require 'active_support/core_ext/class/inheritable_attributes'
 require 'active_support/core_ext/duplicable'
-class Hash #:nodoc:
-  include ActiveSupport::CoreExtensions::Hash::DeepMerge
-end
 
 module ShadowPuppet
   # A Manifest is an executable collection of Puppet Resources[http://reductivelabs.com/trac/puppet/wiki/TypeReference].
@@ -156,10 +152,10 @@ module ShadowPuppet
     #   >> SampleManifest.configuration
     #   => {"name" => 'test'}
     #
-    # Subsequent calls to configure perform a <tt>deep_merge</tt> of the
+    # Subsequent calls to configure perform a merge of the
     # provided <tt>hash</tt> into the pre-existing configuration
     def self.configure(hash)
-      write_inheritable_attribute(:configuration, configuration.deep_merge(hash))
+      write_inheritable_attribute(:configuration, configuration.merge(hash))
     end
     class << self
       alias_method :configuration=, :configure

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shadow_puppet
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors: 
 - Jesse Newland