railsmachine-shadow_puppet 0.1.12 → 0.1.13

data/lib/shadow_puppet.rb

@@ -1,3 +1,4 @@
+require File.join(File.dirname(__FILE__) + '/shadow_puppet', 'core_ext.rb')
 require File.join(File.dirname(__FILE__) + '/shadow_puppet', 'manifest.rb')
 
 class ShadowPuppet::Manifest::Setup < ShadowPuppet::Manifest
@@ -5,17 +6,20 @@ class ShadowPuppet::Manifest::Setup < ShadowPuppet::Manifest
 
   def setup_directories()
     if Process.uid == 0
-      file "/var/puppet",
+      file "/var/shadow_puppet",
+        :ensure => "directory",
+        :backup => false
+      file "/etc/shadow_puppet",
         :ensure => "directory",
         :backup => false
     else
-      file ENV["HOME"] + "/.puppet",
+      file ENV["HOME"] + "/.shadow_puppet",
         :ensure => "directory",
         :backup => false
-      file ENV["HOME"] + "/.puppet/var",
+      file ENV["HOME"] + "/.shadow_puppet/var",
         :ensure   => "directory",
         :backup   => false,
-        :require  => file(ENV["HOME"] + "/.puppet")
+        :require  => file(ENV["HOME"] + "/.shadow_puppet")
     end
   end
 end

data/lib/shadow_puppet/manifest.rb

@@ -1,15 +1,5 @@
 require 'puppet'
 require 'erb'
-gem "activesupport"
-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
-end
 
 module ShadowPuppet
   # A Manifest is an executable collection of Puppet Resources[http://reductivelabs.com/trac/puppet/wiki/TypeReference].
@@ -94,9 +84,12 @@ module ShadowPuppet
     # config hash, which is immediately passed on to the configure
     # method
     def initialize(config = {})
-      unless Process.uid == 0
-          Puppet[:confdir] = File.expand_path("~/.puppet")
-          Puppet[:vardir] = File.expand_path("~/.puppet/var")
+      if Process.uid == 0
+        Puppet[:confdir] = File.expand_path("/etc/shadow_puppet")
+        Puppet[:vardir] = File.expand_path("/var/shadow_puppet")
+      else
+        Puppet[:confdir] = File.expand_path("~/.shadow_puppet")
+        Puppet[:vardir] = File.expand_path("~/.shadow_puppet/var")
       end
       Puppet[:user] = Process.uid
       Puppet[:group] = Process.gid
@@ -112,12 +105,17 @@ module ShadowPuppet
     # Declares that the named method or methods will be called whenever
     # execute is called on an instance of this class. If the last argument is
     # a Hash, this hash is passed as an argument to all provided methods.
+    # If no options hash is provided, each method is passed the contents of
+    # <tt>configuration[method]</tt>.
+    #
     # Subclasses of the Manifest class properly inherit the parent classes'
     # calls to recipe.
     def self.recipe(*methods)
       return nil if methods.nil? || methods == []
       options = methods.extract_options!
       methods.each do |meth|
+        options = self.configuration[meth.to_sym] if options == {}
+        options ||= {}
         recipes << [meth.to_sym, options]
       end
     end
@@ -155,10 +153,11 @@ module ShadowPuppet
     #   >> SampleManifest.configuration
     #   => {"name" => 'test'}
     #
-    # Subsequent calls to configure perform a merge of the
+    # Subsequent calls to configure perform a deep_merge of the
     # provided <tt>hash</tt> into the pre-existing configuration
     def self.configure(hash)
-      write_inheritable_attribute(:configuration, configuration.merge(hash))
+      hash ||= HashWithIndifferentAccess.new
+      write_inheritable_attribute(:configuration, hash.deep_merge(configuration))
     end
     class << self
       alias_method :configuration=, :configure

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: railsmachine-shadow_puppet
 version: !ruby/object:Gem::Version 
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors: 
 - Jesse Newland
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-27 00:00:00 -08:00
+date: 2009-03-04 00:00:00 -08:00
 default_executable: shadow_puppet
 dependencies: 
 - !ruby/object:Gem::Dependency