railsmachine-shadow_puppet 0.1.17 → 0.3.0

data/lib/shadow_puppet.rb

@@ -1,5 +1,4 @@
 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

@@ -3,8 +3,22 @@ require 'active_support/core_ext/array'
 require 'active_support/inflector'
 require 'active_support/core_ext/class/inheritable_attributes'
 require 'active_support/core_ext/duplicable'
-class Configatron::Store
-  def to_s
-    ''
+class Hash #:nodoc:
+  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.is_a?(Hash) && newval.is_a?(Hash) ? oldval.deep_merge(newval) : newval
+    end
+  end
+  def deep_merge!(other_hash)
+    replace(deep_merge(other_hash))
+  end
+  def deep_symbolize_keys
+    self.inject({}) { |result, (key, value)|
+      value = value.deep_symbolize_keys if value.is_a?(Hash)
+      result[(key.to_sym rescue key) || key] = value
+      result
+    }
   end
 end

data/lib/shadow_puppet/manifest.rb

@@ -76,8 +76,8 @@ module ShadowPuppet
     class_inheritable_accessor :recipes
     write_inheritable_attribute(:recipes, [])
     attr_reader :puppet_resources
-    class_inheritable_accessor :__configatron__
-    write_inheritable_attribute(:__configatron__, Configatron::Store.new)
+    class_inheritable_accessor :__config__
+    write_inheritable_attribute(:__config__, Hash.new)
 
     # Initialize a new instance of this manifest. This can take a
     # config hash, which is immediately passed on to the configure
@@ -113,20 +113,12 @@ module ShadowPuppet
       return nil if methods.nil? || methods == []
       options = methods.extract_options!
       methods.each do |meth|
-        options = configatron.send(meth.to_sym) if options == {}
+        options = configuration[meth.to_sym] if options == {}
         options ||= {}
         recipes << [meth.to_sym, options]
       end
     end
 
-    def self.configatron
-      __configatron__
-    end
-
-    def configatron
-      self.class.__configatron__
-    end
-
     # A hash describing any configuration that has been
     # performed on the class. Modify this hash by calling configure:
     #
@@ -135,15 +127,24 @@ module ShadowPuppet
     #   end
     #
     #   >> SampleManifest.configuration
-    #   => {"name" => 'test'}
+    #   => {:name => 'test'}
+    #
+    # All keys on this hash are coerced into symbols for ease of access.
     #
     # Subclasses of the Manifest class properly inherit the parent classes'
     # configuration.
     def self.configuration
-      configatron.to_hash
+      __config__.deep_symbolize_keys
     end
 
-    # Access to the configuration of the creating class.
+    # Access to the configuration of the class of this instance.
+    #
+    #   class SampleManifest < ShadowPuppet::Manifest
+    #     configure(:name => 'test')
+    #   end
+    #
+    #   @manifest = SampleManifest.new
+    #   @manifest.configuration[:name] => "test"
     def configuration
       self.class.configuration
     end
@@ -151,24 +152,32 @@ module ShadowPuppet
     # Define configuration on this manifest. This is useful for storing things
     # such as hostnames, password, or usernames that may change between
     # different implementations of a shared manifest. Access this hash by
-    # calling configuration:
+    # calling <tt>configuration</tt>:
     #
     #   class SampleManifest < ShadowPuppet::Manifest
-    #     configure(:name => 'test')
+    #     configure('name' => 'test')
     #   end
     #
     #   >> SampleManifest.configuration
-    #   => {"name" => 'test'}
+    #   => {:name => 'test'}
+    #
+    # All keys on this hash are coerced into symbols for ease of access.
     #
-    # Subsequent calls to configure perform a deep_merge of the
-    # provided <tt>hash</tt> into the pre-existing configuration
+    # Subsequent calls to configure perform a deep_merge of the provided
+    # <tt>hash</tt> into the pre-existing configuration.
     def self.configure(hash)
-      __configatron__.configure_from_hash(hash)
+      __config__.deep_merge!(hash)
     end
 
-    # Define configuration on this manifest's creating class. This is useful
-    # for storing things such as hostnames, password, or usernames that may
-    # change between different implementations of a shared manifest.
+    # Update the configuration of this manifest instance's class.
+    #
+    #   class SampleManifest < ShadowPuppet::Manifest
+    #     configure({})
+    #   end
+    #
+    #   @manifest = SampleManifest.new
+    #   @manifest.configure(:name => "test")
+    #   @manifest.configuration[:name] => "test"
     def configure(hash)
       self.class.configure(hash)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: railsmachine-shadow_puppet
 version: !ruby/object:Gem::Version 
-  version: 0.1.17
+  version: 0.3.0
 platform: ruby
 authors: 
 - Jesse Newland
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-06 00:00:00 -08:00
+date: 2009-03-12 00:00:00 -07:00
 default_executable: shadow_puppet
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,16 +62,6 @@ 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