puppet 0.23.2 → 0.24.0

data/lib/puppet/util/graph.rb

@@ -36,4 +36,3 @@ module Puppet::Util::Graph
     end
 end
 
-# $Id: graph.rb 2009 2007-01-01 21:08:45Z luke $

data/lib/puppet/util/inifile.rb

@@ -206,4 +206,3 @@ module Puppet::Util::IniConfig
     end
 end
 
-# $Id: inifile.rb 2218 2007-02-21 17:14:26Z lutter $

data/lib/puppet/util/instance_loader.rb

@@ -5,8 +5,14 @@ require 'puppet/util'
 # of Puppet::Util::Autoload
 module Puppet::Util::InstanceLoader
     include Puppet::Util
+
+    # Are we instance-loading this type?
+    def instance_loading?(type)
+        defined?(@autoloaders) and @autoloaders.include?(symbolize(type))
+    end
+
     # Define a new type of autoloading.
-    def autoload(type, path, options = {})
+    def instance_load(type, path, options = {})
         @autoloaders ||= {}
         @instances ||= {}
         type = symbolize(type)
@@ -30,6 +36,9 @@ module Puppet::Util::InstanceLoader
     def instance_docs(type)
         docs = ""
 
+        # Load all instances.
+        instance_loader(type).loadall
+
         # Use this method so they all get loaded
         loaded_instances(type).sort { |a,b| a.to_s <=> b.to_s }.each do |name|
             mod = self.loaded_instance(name)
@@ -54,7 +63,7 @@ module Puppet::Util::InstanceLoader
     # Retrieve an alread-loaded instance, or attempt to load our instance.
     def loaded_instance(type, name)
         name = symbolize(name)
-        instances = instance_hash(type)
+        return nil unless instances = instance_hash(type)
         unless instances.include? name
             if instance_loader(type).load(name)
                 unless instances.include? name
@@ -70,5 +79,3 @@ module Puppet::Util::InstanceLoader
         instances[name]
     end
 end
-
-# $Id: instance_loader.rb 2476 2007-05-07 18:59:40Z luke $

data/lib/puppet/util/loadedfile.rb

@@ -65,4 +65,3 @@ module Puppet
     end
 end
 
-# $Id: loadedfile.rb 2629 2007-06-19 22:18:55Z luke $

data/lib/puppet/util/log.rb

@@ -546,4 +546,3 @@ class Puppet::Util::Log
 end
 Puppet::Log = Puppet::Util::Log
 
-# $Id: log.rb 2647 2007-07-04 22:25:23Z luke $

data/lib/puppet/util/log_paths.rb

@@ -13,4 +13,3 @@ module Puppet::Util::LogPaths
     end
 end
 
-# $Id: log_paths.rb 2647 2007-07-04 22:25:23Z luke $

data/lib/puppet/util/logging.rb

@@ -17,4 +17,3 @@ module Puppet::Util::Logging
     end
 end
 
-# $Id: logging.rb 2178 2007-02-07 23:56:59Z luke $

data/lib/puppet/util/metaid.rb

@@ -19,4 +19,3 @@ class Object
     end
 end
 
-# $Id: metaid.rb 1504 2006-08-28 16:30:49Z luke $

data/lib/puppet/util/methodhelper.rb

@@ -33,5 +33,3 @@ module Puppet::Util::MethodHelper
         end
     end
 end
-
-# $Id: methodhelper.rb 2281 2007-03-14 17:49:19Z luke $

data/lib/puppet/util/metric.rb

@@ -21,7 +21,7 @@ class Puppet::Util::Metric
     end
 
     def create(start = nil)
-        Puppet.config.use(:metrics)
+        Puppet.settings.use(:main, :metrics)
 
         start ||= Time.now.to_i - 5
 
@@ -149,4 +149,3 @@ end
 
 Puppet::Metric = Puppet::Util::Metric
 
-# $Id: metric.rb 2584 2007-06-14 14:23:58Z luke $

data/lib/puppet/util/plist.rb

@@ -21,4 +21,3 @@ module Plist
   VERSION = '3.0.0'
 end
 
-# $Id: plist.rb 1781 2006-10-16 01:01:35Z luke $

data/lib/puppet/util/plist/generator.rb

@@ -223,4 +223,3 @@ class Hash #:nodoc:
   include Plist::Emit
 end
 
-# $Id: generator.rb 1781 2006-10-16 01:01:35Z luke $

data/lib/puppet/util/plist/parser.rb

@@ -224,4 +224,3 @@ module Plist
   end
 end
 
-# $Id: parser.rb 1781 2006-10-16 01:01:35Z luke $

data/lib/puppet/util/posix.rb

@@ -53,6 +53,13 @@ module Puppet::Util::POSIX
                 return object.send(field)
             end
         end
+
+        # Apparently the group/passwd methods need to get reset; if we skip
+        # this call, then new users aren't found.
+        case type
+        when :passwd: Etc.send(:endpwent)
+        when :group: Etc.send(:endgrent)
+        end
         return nil
     end
     
@@ -116,4 +123,3 @@ module Puppet::Util::POSIX
     end
 end
 
-# $Id: posix.rb 2598 2007-06-17 23:11:14Z luke $

data/lib/puppet/util/provider_features.rb

@@ -55,9 +55,7 @@ module Puppet::Util::ProviderFeatures
     # required to determine if the feature is present.
     def feature(name, docs, hash = {})
         @features ||= {}
-        if @features.include?(name)
-            raise Puppet::DevError, "Feature %s is already defined" % name
-        end
+        raise(Puppet::DevError, "Feature %s is already defined" % name) if @features.include?(name)
         begin
             obj = ProviderFeature.new(name, docs, hash)
             @features[obj.name] = obj
@@ -133,7 +131,8 @@ module Puppet::Util::ProviderFeatures
                 }
             end
 
-            # Create a method that will list all functional features.
+            # Create a method that will determine if a provided list of
+            # features are satisfied by the curred provider.
             @feature_module.send(:define_method, :satisfies?) do |*needed|
                 ret = true
                 needed.flatten.each do |feature|
@@ -150,13 +149,7 @@ module Puppet::Util::ProviderFeatures
             @features.each do |name, feature|
                 method = name.to_s + "?"
                 @feature_module.send(:define_method, method) do
-                    if defined? @declared_features and @declared_features.include?(name)
-                        true
-                    elsif feature.available?(self)
-                        true
-                    else
-                        false
-                    end
+                    (is_a?(Class) ?  declared_feature?(name) : self.class.declared_feature?(name)) or feature.available?(self)
                 end
             end
 
@@ -173,6 +166,12 @@ module Puppet::Util::ProviderFeatures
         end
         @feature_module
     end
+
+    # Return the actual provider feature instance.  Really only used for testing.
+    def provider_feature(name)
+        return nil unless defined?(@features)
+
+        @features[name]
+    end
 end
 
-# $Id: provider_features.rb 2542 2007-05-30 20:36:29Z mpalmer $

data/lib/puppet/util/rails/collection_merger.rb

@@ -54,4 +54,3 @@ module Puppet::Util::CollectionMerger
     end
 end
 
-# $Id: collection_merger.rb 2565 2007-06-12 00:31:16Z ballman $

data/lib/puppet/util/reference.rb

@@ -7,7 +7,7 @@ class Puppet::Util::Reference
 
     extend Puppet::Util::InstanceLoader
 
-    autoload(:reference, 'puppet/reference')
+    instance_load(:reference, 'puppet/reference')
 
     def self.footer
         "\n\n----------------\n\n*This page autogenerated on %s*\n" % Time.now
@@ -143,7 +143,7 @@ class Puppet::Util::Reference
     def to_rest(withcontents = true)
         # First the header
         text = h(@title, 1)
-        text += "\n\n**This page is autogenerated; any changes will get overwritten**\n\n"
+        text += "\n\n**This page is autogenerated; any changes will get overwritten** *(last generated on #{Time.now.to_s})*\n\n"
         if withcontents
             text +=  ".. contents:: :depth: %s\n\n" % @depth
         end
@@ -186,4 +186,3 @@ class Puppet::Util::Reference
     end
 end
 
-# $Id: reference.rb 2636 2007-06-19 23:52:34Z luke $

data/lib/puppet/util/{config.rb → settings.rb}

@@ -1,98 +1,84 @@
 require 'puppet'
 require 'sync'
 require 'puppet/transportable'
+require 'getoptlong'
+
 
 # The class for handling configuration files.
-class Puppet::Util::Config
+class Puppet::Util::Settings
     include Enumerable
     include Puppet::Util
 
     @@sync = Sync.new
 
-    attr_reader :file, :timer
+    attr_accessor :file
+    attr_reader :timer
 
     # Retrieve a config value
     def [](param)
-        param = symbolize(param)
-
-        # Yay, recursion.
-        self.reparse() unless param == :filetimeout
-
-        # Cache the returned values; this method was taking close to
-        # 10% of the compile time.
-        unless @returned[param]
-            if @config.include?(param)
-                if @config[param]
-                    @returned[param] = @config[param].value
-                end
-            else
-                raise ArgumentError, "Undefined configuration parameter '%s'" % param
-            end
-        end
-
-        return @returned[param]
+        value(param)
     end
 
     # Set a config value.  This doesn't set the defaults, it sets the value itself.
     def []=(param, value)
         @@sync.synchronize do # yay, thread-safe
             param = symbolize(param)
-            unless @config.include?(param)
-                raise Puppet::Error,
+            unless element = @config[param]
+                raise ArgumentError,
                     "Attempt to assign a value to unknown configuration parameter %s" % param.inspect
             end
-            unless @order.include?(param)
-                @order << param
+            if element.respond_to?(:munge)
+                value = element.munge(value)
+            end
+            if element.respond_to?(:handle)
+                element.handle(value)
             end
-            @config[param].value = value
-            if @returned.include?(param)
-                @returned.delete(param)
+            # Reset the name, so it's looked up again.
+            if param == :name
+                @name = nil
             end
+            @values[:memory][param] = value
+            @cache.clear
         end
 
         return value
     end
 
     # A simplified equality operator.
-    def ==(other)
-        self.each { |myname, myobj|
-            unless other[myname] == myobj.value
-                return false
-            end
-        }
-
-        return true
-    end
+    # LAK: For some reason, this causes mocha to not be able to mock
+    # the 'value' method, and it's not used anywhere.
+#    def ==(other)
+#        self.each { |myname, myobj|
+#            unless other[myname] == value(myname)
+#                return false
+#            end
+#        }
+#
+#        return true
+#    end
 
     # Generate the list of valid arguments, in a format that GetoptLong can
     # understand, and add them to the passed option list.
     def addargs(options)
-        require 'getoptlong'
-
         # Hackish, but acceptable.  Copy the current ARGV for restarting.
         Puppet.args = ARGV.dup
 
         # Add all of the config parameters as valid options.
-        self.each { |param, obj|
-            if self.boolean?(param)
-                options << ["--#{param}", GetoptLong::NO_ARGUMENT]
-                options << ["--no-#{param}", GetoptLong::NO_ARGUMENT]
-            else
-                options << ["--#{param}", GetoptLong::REQUIRED_ARGUMENT]
-            end
+        self.each { |name, element|
+            element.getopt_args.each { |args| options << args }
         }
 
         return options
     end
 
-    # Turn the config into a transaction and apply it
+    # Turn the config into a Puppet configuration and apply it
     def apply
         trans = self.to_transportable
         begin
-            comp = trans.to_type
-            trans = comp.evaluate
-            trans.evaluate
-            comp.remove
+            config = trans.to_catalog
+            config.store_state = false
+            config.apply
+            config.clear
         rescue => detail
             if Puppet[:trace]
                 puts detail.backtrace
@@ -118,45 +104,69 @@ class Puppet::Util::Config
                 obj.clear
             end
         }
-        @returned.clear
+        @values.each do |name, values|
+            next if name == :cli and exceptcli
+            @values.delete(name) 
+        end
 
         # Don't clear the 'used' in this case, since it's a config file reparse,
         # and we want to retain this info.
         unless exceptcli
             @used = []
         end
+
+        @cache.clear
+
+        @name = nil
     end
 
     # This is mostly just used for testing.
     def clearused
-        @returned.clear
+        @cache.clear
         @used = []
     end
 
-    def each
-        @order.each { |name|
-            if @config.include?(name)
-                yield name, @config[name]
+    # Do variable interpolation on the value.
+    def convert(value)
+        return value unless value
+        return value unless value.is_a? String
+        newval = value.gsub(/\$(\w+)|\$\{(\w+)\}/) do |value|
+            varname = $2 || $1
+            if pval = self.value(varname)
+                pval
             else
-                raise Puppet::DevError, "%s is in the order but does not exist" % name
+                raise Puppet::DevError, "Could not find value for %s" % parent
             end
+        end
+
+        return newval
+    end
+
+    # Return a value's description.
+    def description(name)
+        if obj = @config[symbolize(name)]
+            obj.desc
+        else
+            nil
+        end
+    end
+
+    def each
+        @config.each { |name, object|
+            yield name, object
         }
     end
 
     # Iterate over each section name.
     def eachsection
         yielded = []
-        @order.each { |name|
-            if @config.include?(name)
-                section = @config[name].section
-                unless yielded.include? section
-                    yield section
-                    yielded << section
-                end
-            else
-                raise Puppet::DevError, "%s is in the order but does not exist" % name
+        @config.each do |name, object|
+            section = object.section
+            unless yielded.include? section
+                yield section
+                yielded << section
             end
-        }
+        end
     end
 
     # Return an object by name.
@@ -167,6 +177,7 @@ class Puppet::Util::Config
 
     # Handle a command-line argument.
     def handlearg(opt, value = nil)
+        @cache.clear
         value = munge_value(value) if value
         str = opt.sub(/^--/,'')
         bool = true
@@ -175,16 +186,13 @@ class Puppet::Util::Config
             str = newstr
             bool = false
         end
+        str = str.intern
         if self.valid?(str)
             if self.boolean?(str)
-                self[str] = bool
+                @values[:cli][str] = bool
             else
-                self[str] = value
+                @values[:cli][str] = value
             end
-
-            # Mark that this was set on the cli, so it's not overridden if the
-            # config gets reread.
-            @config[str.intern].setbycli = true
         else
             raise ArgumentError, "Invalid argument %s" % opt
         end
@@ -195,13 +203,42 @@ class Puppet::Util::Config
         @config.include?(name)
     end
 
+    # check to see if a short name is already defined
+    def shortinclude?(short)
+        short = short.intern if name.is_a? String
+        @shortnames.include?(short)
+    end
+
     # Create a new config object
     def initialize
-        @order = []
         @config = {}
+        @shortnames = {}
 
         @created = []
-        @returned = {}
+        @searchpath = nil
+
+        # Keep track of set values.
+        @values = Hash.new { |hash, key| hash[key] = {} }
+
+        # And keep a per-environment cache
+        @cache = Hash.new { |hash, key| hash[key] = {} }
+
+        # A central concept of a name.
+        @name = nil
+    end
+
+    # Return a given object's file metadata.
+    def metadata(param)
+        if obj = @config[symbolize(param)] and obj.is_a?(CFile)
+            return [:owner, :group, :mode].inject({}) do |meta, p|
+                if v = obj.send(p)
+                    meta[p] = v
+                end
+                meta
+            end
+        else
+            nil
+        end
     end
 
     # Make a directory with the appropriate user, group, and mode
@@ -221,28 +258,74 @@ class Puppet::Util::Config
         end
     end
 
+    # Figure out our name.
+    def name
+        unless @name
+            unless @config[:name]
+                return nil
+            end
+            searchpath.each do |source|
+                next if source == :name
+                break if @name = @values[source][:name]
+            end
+            unless @name
+                @name = convert(@config[:name].default).intern
+            end
+        end
+        @name
+    end
+
     # Return all of the parameters associated with a given section.
-    def params(section)
-        section = section.intern if section.is_a? String
-        @config.find_all { |name, obj|
-            obj.section == section
-        }.collect { |name, obj|
-            name
-        }
+    def params(section = nil)
+        if section
+            section = section.intern if section.is_a? String
+            @config.find_all { |name, obj|
+                obj.section == section
+            }.collect { |name, obj|
+                name
+            }
+        else
+            @config.keys
+        end
     end
 
     # Parse the configuration file.
     def parse(file)
-        configmap = parse_file(file)
+        clear(true)
 
-        # We know we want the 'main' section
-        if main = configmap[:main]
-            set_parameter_hash(main)
+        parse_file(file).each do |area, values|
+            @values[area] = values
         end
 
-        # Otherwise, we only want our named section
-        if @config.include?(:name) and named = configmap[symbolize(self[:name])]
-            set_parameter_hash(named)
+        # Determine our environment, if we have one.
+        if @config[:environment]
+            env = self.value(:environment).to_sym
+        else
+            env = "none"
+        end
+
+        # Call any hooks we should be calling.
+        settings_with_hooks.each do |setting|
+            each_source(env) do |source|
+                if value = @values[source][setting.name]
+                    # We still have to use value() to retrieve the value, since
+                    # we want the fully interpolated value, not $vardir/lib or whatever.
+                    # This results in extra work, but so few of the settings
+                    # will have associated hooks that it ends up being less work this
+                    # way overall.
+                    setting.handle(self.value(setting.name, env))
+                    break
+                end
+            end
+        end
+
+        # We have to do it in the reverse of the search path,
+        # because multiple sections could set the same value
+        # and I'm too lazy to only set the metadata once.
+        searchpath.reverse.each do |source|
+            if meta = @values[source][:_meta]
+                set_metadata(meta)
+            end
         end
     end
 
@@ -307,7 +390,8 @@ class Puppet::Util::Config
 
                     # If the parameter is valid, then set it.
                     if section == Puppet[:name] and @config.include?(var)
-                        @config[var].value = value
+                        #@config[var].value = value
+                        @values[:main][var] = value
                     end
                     next
                 end
@@ -316,7 +400,7 @@ class Puppet::Util::Config
                 # after cli arguments are handled.
                 unless @config.include?(var) and @config[var].setbycli
                     Puppet.debug "%s: Setting %s to '%s'" % [section, var, value]
-                    self[var] = value
+                    @values[:main][var] = value
                 end
                 @config[var].section = symbolize(section)
 
@@ -355,11 +439,12 @@ class Puppet::Util::Config
         hash[:parent] = self
         element = klass.new(hash)
 
-        @order << element.name
-
         return element
     end
 
+    # This has to be private, because it doesn't add the elements to @config
+    private :newelement
+
     # Iterate across all of the objects in a given section.
     def persection(section)
         section = symbolize(section)
@@ -391,6 +476,15 @@ class Puppet::Util::Config
         end
     end
 
+    # The order in which to search for values.
+    def searchpath(environment = nil)
+        if environment
+            [:cli, :memory, environment, :name, :main]
+        else
+            [:cli, :memory, :name, :main]
+        end
+    end
+
     # Get a list of objects per section
     def sectionlist
         sectionlist = []
@@ -407,59 +501,17 @@ class Puppet::Util::Config
     end
 
     # Convert a single section into transportable objects.
-    def section_to_transportable(section, done = nil, includefiles = true)
+    def section_to_transportable(section, done = nil)
         done ||= Hash.new { |hash, key| hash[key] = {} }
         objects = []
         persection(section) do |obj|
-            if @config[:mkusers] and @config[:mkusers].value
-                [:owner, :group].each do |attr|
-                    type = nil
-                    if attr == :owner
-                        type = :user
-                    else
-                        type = attr
-                    end
-                    # If a user and/or group is set, then make sure we're
-                    # managing that object
-                    if obj.respond_to? attr and name = obj.send(attr)
-                        # Skip root or wheel
-                        next if %w{root wheel}.include?(name.to_s)
-
-                        # Skip owners and groups we've already done, but tag
-                        # them with our section if necessary
-                        if done[type].include?(name)
-                            tags = done[type][name].tags
-                            unless tags.include?(section)
-                                done[type][name].tags = tags << section
-                            end
-                        elsif newobj = Puppet::Type.type(type)[name]
-                            unless newobj.property(:ensure)
-                                newobj[:ensure] = "present"
-                            end
-                            newobj.tag(section)
-                            if type == :user
-                                newobj[:comment] ||= "%s user" % name
-                            end
-                        else
-                            newobj = Puppet::TransObject.new(name, type.to_s)
-                            newobj.tags = ["puppet", "configuration", section]
-                            newobj[:ensure] = "present"
-                            if type == :user
-                                newobj[:comment] ||= "%s user" % name
-                            end
-                            # Set the group appropriately for the user
-                            if type == :user
-                                newobj[:gid] = Puppet[:group]
-                            end
-                            done[type][name] = newobj
-                            objects << newobj
-                        end
-                    end
-                end
+            if @config[:mkusers] and value(:mkusers)
+                objects += add_user_resources(section, obj, done)
             end
 
+            # Only files are convertable to transportable resources.
             if obj.respond_to? :to_transportable
-                next if obj.value =~ /^\/dev/
+                next if value(obj.name) =~ /^\/dev/
                 transobjects = obj.to_transportable
                 transobjects = [transobjects] unless transobjects.is_a? Array
                 transobjects.each do |trans|
@@ -475,7 +527,8 @@ class Puppet::Util::Config
         end
 
         bucket = Puppet::TransBucket.new
-        bucket.type = section
+        bucket.type = "Settings"
+        bucket.name = section
         bucket.push(*objects)
         bucket.keyword = "class"
 
@@ -486,8 +539,12 @@ class Puppet::Util::Config
     # pointless, but they help break things up a bit, anyway.
     def setdefaults(section, defs)
         section = symbolize(section)
+        call = []
         defs.each { |name, hash|
             if hash.is_a? Array
+                unless hash.length == 2
+                    raise ArgumentError, "Defaults specified as an array must contain only the default value and the decription"
+                end
                 tmp = hash
                 hash = {}
                 [:default, :desc].zip(tmp).each { |p,v| hash[p] = v }
@@ -497,10 +554,24 @@ class Puppet::Util::Config
             hash[:section] = section
             name = hash[:name]
             if @config.include?(name)
-                raise Puppet::Error, "Parameter %s is already defined" % name
+                raise ArgumentError, "Parameter %s is already defined" % name
             end
-            @config[name] = newelement(hash)
+            tryconfig = newelement(hash)
+            if short = tryconfig.short
+                if other = @shortnames[short]
+                    raise ArgumentError, "Parameter %s is already using short name '%s'" % [other.name, short]
+                end
+                @shortnames[short] = tryconfig
+            end
+            @config[name] = tryconfig
+
+            # Collect the settings that need to have their hooks called immediately.
+            # We have to collect them so that we can be sure we're fully initialized before
+            # the hook is called.
+            call << tryconfig if tryconfig.call_on_define
         }
+
+        call.each { |setting| setting.handle(self.value(setting.name)) }
     end
 
     # Create a timer to check whether the file should be reparsed.
@@ -517,12 +588,12 @@ class Puppet::Util::Config
     end
 
     # Convert our list of objects into a component that can be applied.
-    def to_component
+    def to_configuration
         transport = self.to_transportable
-        return transport.to_type
+        return transport.to_catalog
     end
 
-    # Convert our list of objects into a configuration file.
+    # Convert our list of config elements into a configuration file.
     def to_config
         str = %{The configuration file for #{Puppet[:name]}.  Note that this file
 is likely to have unused configuration parameters in it; any parameter that's
@@ -555,7 +626,7 @@ Generated on #{Time.now}.
     end
 
     # Convert our configuration into a list of transportable objects.
-    def to_transportable
+    def to_transportable(*sections)
         done = Hash.new { |hash, key|
             hash[key] = {}
         }
@@ -564,14 +635,20 @@ Generated on #{Time.now}.
         if defined? @file.file and @file.file
             topbucket.name = @file.file
         else
-            topbucket.name = "configtop"
+            topbucket.name = "top"
         end
-        topbucket.type = "puppetconfig"
+        topbucket.type = "Settings"
         topbucket.top = true
 
         # Now iterate over each section
-        eachsection do |section|
-            topbucket.push section_to_transportable(section, done)
+        if sections.empty?
+            eachsection do |section|
+                sections << section
+            end
+        end
+        sections.each do |section|
+            obj = section_to_transportable(section, done)
+            topbucket.push obj
         end
 
         topbucket
@@ -597,46 +674,19 @@ Generated on #{Time.now}.
                 @used = []
             end
 
-            runners = sections.collect { |s|
-                symbolize(s)
-            }.find_all { |s|
-                ! @used.include? s
-            }
-            return if runners.empty?
-
-            bucket = Puppet::TransBucket.new
-            bucket.type = "puppetconfig"
-            bucket.top = true
-
-            # Create a hash to keep track of what we've done so far.
-            @done = Hash.new { |hash, key| hash[key] = {} }
-            runners.each do |section|
-                bucket.push section_to_transportable(section, @done, false)
-            end
-
-            objects = bucket.to_type
+            bucket = to_transportable(*sections)
 
-            objects.finalize
-            tags = nil
-            if Puppet[:tags]
-                tags = Puppet[:tags]
-                Puppet[:tags] = ""
-            end
-            trans = objects.evaluate
-            trans.ignoretags = true
-            trans.configurator = true
-            trans.evaluate
-            if tags
-                Puppet[:tags] = tags
+            config = bucket.to_catalog
+            config.host_config = false
+            config.apply do |transaction|
+                if failures = transaction.any_failed?
+                    raise "Could not configure for running; got %s failure(s)" % failures
+                end
             end
+            config.clear
 
-            # Remove is a recursive process, so it's sufficient to just call
-            # it on the component.
-            objects.remove(true)
-
-            objects = nil
-
-            runners.each { |s| @used << s }
+            sections.each { |s| @used << s }
+            @used.uniq
         end
     end
 
@@ -645,6 +695,47 @@ Generated on #{Time.now}.
         @config.has_key?(param)
     end
 
+    # Find the correct value using our search path.  Optionally accept an environment
+    # in which to search before the other configuration sections.
+    def value(param, environment = nil)
+        param = symbolize(param)
+        environment = symbolize(environment) if environment
+
+        # Short circuit to nil for undefined parameters.
+        return nil unless @config.include?(param)
+
+        # Yay, recursion.
+        self.reparse() unless param == :filetimeout
+
+        # Check the cache first.  It needs to be a per-environment
+        # cache so that we don't spread values from one env
+        # to another.
+        if cached = @cache[environment||"none"][param]
+            return cached
+        end
+
+        # See if we can find it within our searchable list of values
+        val = nil
+        each_source(environment) do |source|
+            # Look for the value.  We have to test the hash for whether
+            # it exists, because the value might be false.
+            if @values[source].include?(param)
+                val = @values[source][param]
+                break
+            end
+        end
+
+        # If we didn't get a value, use the default
+        val = @config[param].default if val.nil?
+
+        # Convert it if necessary
+        val = convert(val)
+
+        # And cache it
+        @cache[environment||"none"][param] = val
+        return val
+    end
+
     # Open a file with the appropriate user, group, and mode
     def write(default, *args)
         obj = nil
@@ -671,7 +762,7 @@ Generated on #{Time.now}.
 
             args << mode
 
-            File.open(obj.value, *args) do |file|
+            File.open(value(obj.name), *args) do |file|
                 yield file
             end
         end
@@ -715,30 +806,87 @@ Generated on #{Time.now}.
 
     private
 
-    # Extra extra setting information for files.
+    # Create the transportable objects for users and groups.
+    def add_user_resources(section, obj, done)
+        resources = []
+        [:owner, :group].each do |attr|
+            type = nil
+            if attr == :owner
+                type = :user
+            else
+                type = attr
+            end
+            # If a user and/or group is set, then make sure we're
+            # managing that object
+            if obj.respond_to? attr and name = obj.send(attr)
+                # Skip root or wheel
+                next if %w{root wheel}.include?(name.to_s)
+
+                # Skip owners and groups we've already done, but tag
+                # them with our section if necessary
+                if done[type].include?(name)
+                    tags = done[type][name].tags
+                    unless tags.include?(section)
+                        done[type][name].tags = tags << section
+                    end
+                else
+                    newobj = Puppet::TransObject.new(name, type.to_s)
+                    newobj.tags = ["puppet", "configuration", section]
+                    newobj[:ensure] = :present
+                    if type == :user
+                        newobj[:comment] ||= "%s user" % name
+                    end
+                    # Set the group appropriately for the user
+                    if type == :user
+                        newobj[:gid] = Puppet[:group]
+                    end
+                    done[type][name] = newobj
+                    resources << newobj
+                end
+            end
+        end
+        resources
+    end
+
+    # Yield each search source in turn.
+    def each_source(environment)
+        searchpath(environment).each do |source|
+            # Modify the source as necessary.
+            source = self.name if source == :name
+            yield source
+        end
+    end
+
+    # Return all elements that have associated hooks; this is so
+    # we can call them after parsing the configuration file.
+    def settings_with_hooks
+        @config.values.find_all { |setting| setting.respond_to?(:handle) }
+    end
+
+    # Extract extra setting information for files.
     def extract_fileinfo(string)
-        paramregex = %r{(\w+)\s*=\s*([\w\d]+)}
         result = {}
-        string.scan(/\{\s*([^}]+)\s*\}/) do
+        value = string.sub(/\{\s*([^}]+)\s*\}/) do
             params = $1
             params.split(/\s*,\s*/).each do |str|
-                if str =~ /^\s*(\w+)\s*=\s*([\w\w]+)\s*$/
+                if str =~ /^\s*(\w+)\s*=\s*([\w\d]+)\s*$/
                     param, value = $1.intern, $2
                     result[param] = value
                     unless [:owner, :mode, :group].include?(param)
-                        raise Puppet::Error, "Invalid file option '%s'" % param
+                        raise ArgumentError, "Invalid file option '%s'" % param
                     end
 
                     if param == :mode and value !~ /^\d+$/
-                        raise Puppet::Error, "File modes must be numbers"
+                        raise ArgumentError, "File modes must be numbers"
                     end
                 else
-                    raise Puppet::Error, "Could not parse '%s'" % string
+                    raise ArgumentError, "Could not parse '%s'" % string
                 end
             end
-
-            return result
+            ''
         end
+        result[:value] = value.sub(/\s*$/, '')
+        return result
 
         return nil
     end
@@ -760,26 +908,12 @@ Generated on #{Time.now}.
     # support parsing old files with any section, or new files with just two
     # valid sections.
     def parse_file(file)
-        text = nil
-
-        if file.is_a? Puppet::Util::LoadedFile
-            @file = file
-        else
-            @file = Puppet::Util::LoadedFile.new(file)
-        end
+        text = read_file(file)
 
         # Create a timer so that this file will get checked automatically
         # and reparsed if necessary.
         settimer()
 
-        begin
-            text = File.read(@file.file)
-        rescue Errno::ENOENT
-            raise Puppet::Error, "No such file %s" % file
-        rescue Errno::EACCES
-            raise Puppet::Error, "Permission denied to file %s" % file
-        end
-
         result = Hash.new { |names, name|
             names[name] = {}
         }
@@ -792,13 +926,13 @@ Generated on #{Time.now}.
         text.split(/\n/).each { |line|
             count += 1
             case line
-            when /^\[(\w+)\]$/:
+            when /^\s*\[(\w+)\]$/:
                 section = $1.intern # Section names
                 # Add a meta section
                 result[section][:_meta] ||= {}
             when /^\s*#/: next # Skip comments
             when /^\s*$/: next # Skip blanks
-            when /^\s*(\w+)\s*=\s*(.+)$/: # settings
+            when /^\s*(\w+)\s*=\s*(.*)$/: # settings
                 var = $1.intern
 
                 # We don't want to munge modes, because they're specified in octal, so we'll
@@ -812,6 +946,8 @@ Generated on #{Time.now}.
                 # Check to see if this is a file argument and it has extra options
                 begin
                     if value.is_a?(String) and options = extract_fileinfo(value)
+                        value = options[:value]
+                        options.delete(:value)
                         result[section][:_meta][var] = options
                     end
                     result[section][var] = value
@@ -831,60 +967,55 @@ Generated on #{Time.now}.
         return result
     end
 
-    # Take all members of a hash and assign their values appropriately.
-    def set_parameter_hash(params)
-        params.each do |param, value|
-            next if param == :_meta
-            unless @config.include?(param)
-                Puppet.warning "Discarded unknown configuration parameter %s" % param
-                next
-            end
-            if @config[param].setbycli
-                Puppet.debug "Ignoring %s set by config file; overridden by cli" % param
-            else
-                self[param] = value
-            end
+    # Read the file in.
+    def read_file(file)
+        if file.is_a? Puppet::Util::LoadedFile
+            @file = file
+        else
+            @file = Puppet::Util::LoadedFile.new(file)
         end
 
-        if meta = params[:_meta]
-            meta.each do |var, values|
-                values.each do |param, value|
-                    @config[var].send(param.to_s + "=", value)
-                end
+        begin
+            return File.read(@file.file)
+        rescue Errno::ENOENT
+            raise ArgumentError, "No such file %s" % file
+        rescue Errno::EACCES
+            raise ArgumentError, "Permission denied to file %s" % file
+        end
+    end
+
+    # Set file metadata.
+    def set_metadata(meta)
+        meta.each do |var, values|
+            values.each do |param, value|
+                @config[var].send(param.to_s + "=", value)
             end
         end
     end
 
     # The base element type.
     class CElement
-        attr_accessor :name, :section, :default, :parent, :setbycli
-        attr_reader :desc
+        attr_accessor :name, :section, :default, :parent, :setbycli, :call_on_define
+        attr_reader :desc, :short
 
         # Unset any set value.
         def clear
             @value = nil
         end
 
-        # Do variable interpolation on the value.
-        def convert(value)
-            return value unless value
-            return value unless value.is_a? String
-            newval = value.gsub(/\$(\w+)|\$\{(\w+)\}/) do |value|
-                varname = $2 || $1
-                if pval = @parent[varname]
-                    pval
-                else
-                    raise Puppet::DevError, "Could not find value for %s" % parent
-                end
-            end
-
-            return newval
-        end
-
         def desc=(value)
             @desc = value.gsub(/^\s*/, '')
         end
 
+        # get the arguments in getopt format
+        def getopt_args
+            if short
+                [["--#{name}", "-#{short}", GetoptLong::REQUIRED_ARGUMENT]]
+            else
+                [["--#{name}", GetoptLong::REQUIRED_ARGUMENT]]
+            end
+        end
+
         def hook=(block)
             meta_def :handle, &block
         end
@@ -929,6 +1060,14 @@ Generated on #{Time.now}.
             end
         end
 
+        # short name for the celement
+        def short=(value)
+            if value.to_s.length != 1
+                raise ArgumentError, "Short names can only be one character."
+            end
+            @short = value.to_s
+        end
+
         # Convert the object to a config statement.
         def to_config
             str = @desc.gsub(/^/, "# ") + "\n"
@@ -938,13 +1077,13 @@ Generated on #{Time.now}.
                 str += "# The default value is '%s'.\n" % @default
             end
 
-            line = "%s = %s" % [@name, self.value]
-
             # If the value has not been overridden, then print it out commented
             # and unconverted, so it's clear that that's the default and how it
             # works.
-            if defined? @value and ! @value.nil?
-                line = "%s = %s" % [@name, self.value]
+            value = @parent.value(self.name)
+
+            if value != @default
+                line = "%s = %s" % [@name, value]
             else
                 line = "# %s = %s" % [@name, @default]
             end
@@ -956,37 +1095,7 @@ Generated on #{Time.now}.
 
         # Retrieves the value, or if it's not set, retrieves the default.
         def value
-            retval = nil
-            if defined? @value and ! @value.nil?
-                retval = @value
-            elsif defined? @default
-                retval = @default
-            else
-                return nil
-            end
-
-            if retval.is_a? String
-                return convert(retval)
-            else
-                return retval
-            end
-        end
-
-        # Set the value.
-        def value=(value)
-            if respond_to?(:validate)
-                validate(value)
-            end
-
-            if respond_to?(:munge)
-                @value = munge(value)
-            else
-                @value = value
-            end
-
-            if respond_to?(:handle)
-                handle(@value)
-            end
+            @parent.value(self.name)
         end
     end
 
@@ -997,7 +1106,7 @@ Generated on #{Time.now}.
 
         def group
             if defined? @group
-                return convert(@group)
+                return @parent.convert(@group)
             else
                 return nil
             end
@@ -1005,7 +1114,7 @@ Generated on #{Time.now}.
 
         def owner
             if defined? @owner
-                return convert(@owner)
+                return @parent.convert(@owner)
             else
                 return nil
             end
@@ -1014,6 +1123,11 @@ Generated on #{Time.now}.
         # Set the type appropriately.  Yep, a hack.  This supports either naming
         # the variable 'dir', or adding a slash at the end.
         def munge(value)
+            # If it's not a fully qualified path...
+            if value.is_a?(String) and value !~ /^\$/ and value !~ /^\//
+                # Make it one
+                value = File.join(Dir.getwd, value)
+            end
             if value.to_s =~ /\/$/
                 @type = :directory
                 return value.sub(/\/$/, '')
@@ -1023,7 +1137,7 @@ Generated on #{Time.now}.
 
         # Return the appropriate type.
         def type
-            value = self.value
+            value = @parent.value(self.name)
             if @name.to_s =~ /dir/
                 return :directory
             elsif value.to_s =~ /\/$/
@@ -1036,17 +1150,18 @@ Generated on #{Time.now}.
         end
 
         # Convert the object to a TransObject instance.
-        # FIXME There's no dependency system in place right now; if you use
-        # a section that requires another section, there's nothing done to
-        # correct that for you, at the moment.
         def to_transportable
             type = self.type
             return nil unless type
-            path = self.value.split(File::SEPARATOR)
+            path = @parent.value(self.name).split(File::SEPARATOR)
             path.shift # remove the leading nil
 
             objects = []
-            obj = Puppet::TransObject.new(self.value, "file")
+            path = self.value
+
+            # Skip plain files that don't exist, since we won't be managing them anyway.
+            return nil unless self.name.to_s =~ /dir$/ or File.exist?(path) or self.create
+            obj = Puppet::TransObject.new(path, "file")
 
             # Only create directories, or files that are specifically marked to
             # create.
@@ -1055,14 +1170,14 @@ Generated on #{Time.now}.
             end
             [:mode].each { |var|
                 if value = self.send(var)
-                    # Don't both converting the mode, since the file type
+                    # Don't bother converting the mode, since the file type
                     # can handle it any old way.
                     obj[var] = value
                 end
             }
 
             # Only chown or chgrp when root
-            if Puppet::Util::SUIDManager.uid == 0
+            if Puppet.features.root?
                 [:group, :owner].each { |var|
                     if value = self.send(var)
                         obj[var] = value
@@ -1092,7 +1207,7 @@ Generated on #{Time.now}.
                 name = $1
                 unless @parent.include?(name)
                     raise ArgumentError,
-                        "Configuration parameter '%s' is undefined" %
+                        "Settings parameter '%s' is undefined" %
                         name
                 end
             }
@@ -1101,16 +1216,25 @@ Generated on #{Time.now}.
 
     # A simple boolean.
     class CBoolean < CElement
+        # get the arguments in getopt format
+        def getopt_args
+            if short
+                [["--#{name}", "-#{short}", GetoptLong::NO_ARGUMENT],
+                 ["--no-#{name}", GetoptLong::NO_ARGUMENT]]
+            else
+                [["--#{name}", GetoptLong::NO_ARGUMENT],
+                 ["--no-#{name}", GetoptLong::NO_ARGUMENT]]
+            end
+        end
+
         def munge(value)
             case value
             when true, "true": return true
             when false, "false": return false
             else
-                raise Puppet::Error, "Invalid value '%s' for %s" %
+                raise ArgumentError, "Invalid value '%s' for %s" %
                     [value.inspect, @name]
             end
         end
     end
 end
-
-# $Id: config.rb 2743 2007-08-04 00:36:47Z luke $