railsmachine-shadow_puppet 0.1.14 → 0.1.15

data/lib/shadow_puppet.rb

@@ -1,3 +1,6 @@
+require 'puppet'
+require 'configatron'
+require 'erb'
 require File.join(File.dirname(__FILE__) + '/shadow_puppet', 'core_ext.rb')
 require File.join(File.dirname(__FILE__) + '/shadow_puppet', 'manifest.rb')
 

data/lib/shadow_puppet/core_ext.rb

@@ -1,24 +1,3 @@
 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/class/inheritable_attributes'
-require 'active_support/core_ext/duplicable'
-class Hash #:nodoc:
-  include ActiveSupport::CoreExtensions::Hash::IndifferentAccess
-
-  # Returns a new hash with +self+ and +other_hash+ merged recursively.
-  def deep_merge(other_hash)
-    self.merge(other_hash) do |key, oldval, newval|
-      oldval = oldval.to_hash if oldval.respond_to?(:to_hash)
-      newval = newval.to_hash if newval.respond_to?(:to_hash)
-      oldval.class.to_s == 'Hash' && newval.class.to_s == 'Hash' ? oldval.deep_merge(newval) : newval
-    end
-  end
-
-  # Returns a new hash with +self+ and +other_hash+ merged recursively.
-  # Modifies the receiver in place.
-  def deep_merge!(other_hash)
-    replace(deep_merge(other_hash))
-  end
-end
+require 'active_support/inflector'

data/lib/shadow_puppet/manifest.rb

@@ -1,6 +1,3 @@
-require 'puppet'
-require 'erb'
-
 module ShadowPuppet
   # A Manifest is an executable collection of Puppet Resources[http://reductivelabs.com/trac/puppet/wiki/TypeReference].
   #
@@ -114,13 +111,13 @@ module ShadowPuppet
       return nil if methods.nil? || methods == []
       options = methods.extract_options!
       methods.each do |meth|
-        options = self.configuration[meth.to_sym] if options == {}
+        options = configatron.send(meth.to_sym) if options == {}
         options ||= {}
         recipes << [meth.to_sym, options]
       end
     end
 
-    # A HashWithIndifferentAccess describing any configuration that has been
+    # A hash describing any configuration that has been
     # performed on the class. Modify this hash by calling configure:
     #
     #   class SampleManifest < ShadowPuppet::Manifest
@@ -133,7 +130,7 @@ module ShadowPuppet
     # Subclasses of the Manifest class properly inherit the parent classes'
     # configuration.
     def self.configuration
-      read_inheritable_attribute(:configuration) || write_inheritable_attribute(:configuration, HashWithIndifferentAccess.new)
+      configatron
     end
 
     # Access to the configuration of the creating class.
@@ -156,11 +153,7 @@ module ShadowPuppet
     # Subsequent calls to configure perform a deep_merge of the
     # provided <tt>hash</tt> into the pre-existing configuration
     def self.configure(hash)
-      hash ||= HashWithIndifferentAccess.new
-      write_inheritable_attribute(:configuration, hash.deep_merge(configuration))
-    end
-    class << self
-      alias_method :configuration=, :configure
+      configatron.configure_from_hash(hash)
     end
 
     # Define configuration on this manifest's creating class. This is useful
@@ -338,4 +331,4 @@ end
 
 Dir.glob(File.join(File.dirname(__FILE__), '..', 'facts', '*.rb')).each do |fact|
   require fact
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: railsmachine-shadow_puppet
 version: !ruby/object:Gem::Version 
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors: 
 - Jesse Newland
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-04 00:00:00 -08:00
+date: 2009-03-06 00:00:00 -08:00
 default_executable: shadow_puppet
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,6 +62,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.0.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: configatron
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.2.2
+    version: 
 description: A Ruby Puppet DSL
 email: 
 - jesse@railsmachine.com