railsmachine-shadow_puppet 0.1.8 → 0.1.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/lib/shadow_puppet/manifest.rb +2 -6
- metadata +1 -1
|
@@ -5,12 +5,8 @@ require 'active_support/core_ext/class/attribute_accessors'
|
|
|
5
5
|
require 'active_support/core_ext/array'
|
|
6
6
|
require 'active_support/inflector'
|
|
7
7
|
require 'active_support/core_ext/hash/indifferent_access'
|
|
8
|
-
require 'active_support/core_ext/hash/deep_merge'
|
|
9
8
|
require 'active_support/core_ext/class/inheritable_attributes'
|
|
10
9
|
require 'active_support/core_ext/duplicable'
|
|
11
|
-
class Hash #:nodoc:
|
|
12
|
-
include ActiveSupport::CoreExtensions::Hash::DeepMerge
|
|
13
|
-
end
|
|
14
10
|
|
|
15
11
|
module ShadowPuppet
|
|
16
12
|
# A Manifest is an executable collection of Puppet Resources[http://reductivelabs.com/trac/puppet/wiki/TypeReference].
|
|
@@ -156,10 +152,10 @@ module ShadowPuppet
|
|
|
156
152
|
# >> SampleManifest.configuration
|
|
157
153
|
# => {"name" => 'test'}
|
|
158
154
|
#
|
|
159
|
-
# Subsequent calls to configure perform a
|
|
155
|
+
# Subsequent calls to configure perform a merge of the
|
|
160
156
|
# provided <tt>hash</tt> into the pre-existing configuration
|
|
161
157
|
def self.configure(hash)
|
|
162
|
-
write_inheritable_attribute(:configuration, configuration.
|
|
158
|
+
write_inheritable_attribute(:configuration, configuration.merge(hash))
|
|
163
159
|
end
|
|
164
160
|
class << self
|
|
165
161
|
alias_method :configuration=, :configure
|