puppet 0.22.4 → 0.23.0

data/lib/puppet/util/config_store.rb

@@ -0,0 +1,61 @@
+module Puppet::Util
+    # The abstract base class for client configuration storage.
+    class ConfigStore
+        extend Puppet::Util
+        extend Puppet::Util::Docs
+        extend Puppet::Util::ClassGen
+
+        @loader = Puppet::Util::Autoload.new(self, "puppet/config_stores")
+        @stores = {}
+
+        # Add a new report type.
+        def self.newstore(name, options = {}, &block)
+            klass = genclass(name,
+                :block => block,
+                :prefix => "ConfigStore",
+                :hash => @stores,
+                :attributes => options
+            )
+        end
+
+        # Remove a store; really only used for testing.
+        def self.rmstore(name)
+            rmclass(name, :hash => @stores)
+        end
+
+        # Load a store.
+        def self.store(name)
+            name = symbolize(name)
+            unless @stores.include? name
+                if @loader.load(name)
+                    unless @stores.include? name
+                        Puppet.warning(
+                            "Loaded report file for %s but report was not defined" %
+                            name
+                        )
+                        return nil
+                    end
+                else
+                    return nil
+                end
+            end
+            @stores[name]
+        end
+
+        # Retrieve the config for a client.
+        def get(client)
+            raise Puppet::DevError, "%s has not overridden get" % self.class.name
+        end
+
+        # Store the config for a client.
+        def store(client, config)
+            raise Puppet::DevError, "%s has not overridden store" % self.class.name
+        end
+
+        def collect_exported(client, conditions)
+            raise Puppet::DevError, "%s has not overridden collect_exported" % self.class.name
+        end   
+          
+    end
+end
+

data/lib/puppet/util/fact_store.rb

@@ -0,0 +1,60 @@
+# Created on 2007-05-02
+# Copyright Luke Kanies
+
+module Puppet::Util
+    # The abstract base class for client fact storage.
+    class FactStore
+        extend Puppet::Util
+        extend Puppet::Util::Docs
+        extend Puppet::Util::ClassGen
+
+        @loader = Puppet::Util::Autoload.new(self, "puppet/fact_stores")
+        @stores = {}
+
+        # Add a new report type.
+        def self.newstore(name, options = {}, &block)
+            klass = genclass(name,
+                :block => block,
+                :prefix => "FactStore",
+                :hash => @stores,
+                :attributes => options
+            )
+        end
+
+        # Remove a store; really only used for testing.
+        def self.rmstore(name)
+            rmclass(name, :hash => @stores)
+        end
+
+        # Load a store.
+        def self.store(name)
+            name = symbolize(name)
+            unless @stores.include? name
+                if @loader.load(name)
+                    unless @stores.include? name
+                        Puppet.warning(
+                            "Loaded report file for %s but report was not defined" %
+                            name
+                        )
+                        return nil
+                    end
+                else
+                    return nil
+                end
+            end
+            @stores[name]
+        end
+
+        # Retrieve the facts for a node.
+        def get(node)
+            raise Puppet::DevError, "%s has not overridden get" % self.class.name
+        end
+
+        # Set the facts for a node.
+        def set(node, facts)
+            raise Puppet::DevError, "%s has not overridden set" % self.class.name
+        end
+    end
+end
+
+# $Id: fact_store.rb 2457 2007-05-03 05:24:13Z luke $

data/lib/puppet/util/instance_loader.rb

@@ -0,0 +1,74 @@
+require 'puppet/util/autoload'
+require 'puppet/util'
+
+# A module that can easily autoload things for us.  Uses an instance
+# of Puppet::Util::Autoload
+module Puppet::Util::InstanceLoader
+    include Puppet::Util
+    # Define a new type of autoloading.
+    def autoload(type, path, options = {})
+        @autoloaders ||= {}
+        @instances ||= {}
+        type = symbolize(type)
+        @instances[type] = {}
+        @autoloaders[type] = Puppet::Util::Autoload.new(self, path, options)
+
+        # Now define our new simple methods
+        unless respond_to?(type)
+            meta_def(type) do |name|
+                loaded_instance(type, name)
+            end
+        end
+    end
+
+    # Return a list of the names of all instances
+    def loaded_instances(type)
+        @instances[type].keys
+    end
+
+    # Collect the docs for all of our instances.
+    def instance_docs(type)
+        docs = ""
+
+        # 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)
+            docs += "%s\n%s\n" % [name, "-" * name.to_s.length]
+
+            docs += Puppet::Util::Docs.scrub(mod.doc) + "\n\n"
+        end
+
+        docs
+    end
+
+    # Return the instance hash for our type.
+    def instance_hash(type)
+        @instances[symbolize(type)]
+    end
+
+    # Return the Autoload object for a given type.
+    def instance_loader(type)
+        @autoloaders[symbolize(type)]
+    end
+
+    # Retrieve an alread-loaded instance, or attempt to load our instance.
+    def loaded_instance(type, name)
+        name = symbolize(name)
+        instances = instance_hash(type)
+        unless instances.include? name
+            if instance_loader(type).load(name)
+                unless instances.include? name
+                    Puppet.warning(
+                        "Loaded %s file for %s but %s was not defined" % [type, name, type]
+                    )
+                    return nil
+                end
+            else
+                return nil
+            end
+        end
+        instances[name]
+    end
+end
+
+# $Id: instance_loader.rb 2476 2007-05-07 18:59:40Z luke $

data/lib/puppet/util/loadedfile.rb

@@ -12,16 +12,13 @@ module Puppet
         # have to depend on the granularity of the filesystem.
         attr_writer :tstamp
 
-        Puppet.config.setdefaults(:puppet,
-            :filetimeout => [ 15,
-                "The minimum time to wait between checking for updates in
-                configuration files."
-            ]
-        )
-
         # Determine whether the file has changed and thus whether it should
         # be reparsed.
         def changed?
+            # Allow the timeout to be disabled entirely.
+            if Puppet[:filetimeout] < 0
+                return true
+            end
             tmp = stamp()
 
             # We use a different internal variable than the stamp method
@@ -68,4 +65,4 @@ module Puppet
     end
 end
 
-# $Id: loadedfile.rb 2178 2007-02-07 23:56:59Z luke $
+# $Id: loadedfile.rb 2629 2007-06-19 22:18:55Z luke $

data/lib/puppet/util/metric.rb

@@ -3,23 +3,12 @@ require 'puppet'
 
 # A class for handling metrics.  This is currently ridiculously hackish.
 class Puppet::Util::Metric
-    Puppet.config.setdefaults("metrics",
-        :rrddir => {:default => "$vardir/rrd",
-            :owner => "$user",
-            :group => "$group",
-            :desc => "The directory where RRD database files are stored.
-                Directories for each reporting host will be created under
-                this directory."
-        },
-        :rrdgraph => [false, "Whether RRD information should be graphed."],
-        :rrdinterval => ["$runinterval", "How often RRD should expect data.
-            This should match how often the hosts report back to the server."]
-    )
     
     # Load the library as a feature, so we can test its presence.
-    Puppet.features.add :rrd, :libs => 'RRD'
+    Puppet.features.add :rrd, :libs => 'RRDtool'
 
     attr_accessor :type, :name, :value, :label
+    attr_writer :values
 
     attr_writer :basedir
 
@@ -36,12 +25,8 @@ class Puppet::Util::Metric
 
         start ||= Time.now.to_i - 5
 
-        path = self.path
-        args = [
-            path,
-            "--start", start,
-            "--step", Puppet[:rrdinterval]
-        ]
+        @rrd = RRDtool.new(self.path)
+        args = [] 
 
         values.each { |value|
             # the 7200 is the heartbeat -- this means that any data that isn't
@@ -51,14 +36,14 @@ class Puppet::Util::Metric
         args.push "RRA:AVERAGE:0.5:1:300"
 
         begin
-            RRD.create(*args)
+            @rrd.create( Puppet[:rrdinterval].to_i, start, args)
         rescue => detail
             raise "Could not create RRD file %s: %s" % [path,detail]
         end
     end
 
     def dump
-        puts RRD.info(self.path)
+        puts @rrd.info
     end
 
     def graph(range = nil)
@@ -68,7 +53,7 @@ class Puppet::Util::Metric
         end
 
         unit = 60 * 60 * 24
-        colorstack = %w{#ff0000 #00ff00 #0000ff #099000 #000990 #f00990 #0f0f0f}
+        colorstack = %w{#00ff00 #ff0000 #0000ff #ffff00 #ff99ff #ff9966 #66ffff #990000 #099000 #000990 #f00990 #0f0f0f #555555 #333333 #ffffff}
 
         {:daily => unit, :weekly => unit * 7, :monthly => unit * 30, :yearly => unit * 365}.each do |name, time|
             file = self.path.sub(/\.rrd$/, "-%s.png" % name)
@@ -97,7 +82,8 @@ class Puppet::Util::Metric
             end
 
             begin
-                RRD.graph(*args)
+                #Puppet.warning "args = #{args}"
+                RRDtool.graph( args )
             rescue => detail
                 Puppet.err "Failed to graph %s: %s" % [self.name,detail]
             end
@@ -136,14 +122,20 @@ class Puppet::Util::Metric
             self.create(time - 5)
         end
 
+        @rrd ||= RRDtool.new(self.path)
+
         # XXX this is not terribly error-resistant
         args = [time]
+        temps = []
         values.each { |value|
+            #Puppet.warning "value[0]: #{value[0]}; value[1]: #{value[1]}; value[2]: #{value[2]}; "
             args.push value[2]
+            temps.push value[0]
         }
         arg = args.join(":")
+        template = temps.join(":")
         begin
-            RRD.update(self.path,arg)
+            @rrd.update( template, [ arg ] )
             #system("rrdtool updatev %s '%s'" % [self.path, arg])
         rescue => detail
             raise Puppet::Error, "Failed to update %s: %s" % [self.name,detail]
@@ -157,4 +149,4 @@ end
 
 Puppet::Metric = Puppet::Util::Metric
 
-# $Id: metric.rb 2339 2007-03-21 18:32:09Z luke $
+# $Id: metric.rb 2584 2007-06-14 14:23:58Z luke $

data/lib/puppet/util/posix.rb

@@ -1,8 +1,13 @@
 # Utility methods for interacting with POSIX objects; mostly user and group
 module Puppet::Util::POSIX
+
     # Retrieve a field from a POSIX Etc object.  The id can be either an integer
-    # or a name.  This only works for users and groups.
-    def get_posix_field(space, field, id)
+    # or a name.  This only works for users and groups.  It's also broken on
+    # some platforms, unfortunately.
+    def old_get_posix_field(space, field, id)
+        unless id
+            raise ArgumentError, "Did not get id"
+        end
         if id =~ /^\d+$/
             id = Integer(id)
         end
@@ -24,8 +29,35 @@ module Puppet::Util::POSIX
             return nil
         end
     end
+
+    # A degenerate method of retrieving name/id mappings.  The job of this method is
+    # to find a specific entry and then return a given field from that entry.
+    def get_posix_field(type, field, id)
+        idmethod = idfield(type)
+        integer = false
+        if id =~ /^\d+$/
+            id = Integer(id)
+        end
+        if id.is_a?(Integer)
+            integer = true
+            if id > 1000000
+                Puppet.err "Tried to get %s field for silly id %s" % [field, id]
+                return nil
+            end
+        end
+
+        Etc.send(type) do |object|
+            if integer and object.send(idmethod) == id
+                return object.send(field)
+            elsif object.name == id
+                return object.send(field)
+            end
+        end
+        return nil
+    end
     
     # Look in memory for an already-managed type and use its info if available.
+    # Currently unused.
     def get_provider_value(type, field, id)
         unless typeklass = Puppet::Type.type(type)
             raise ArgumentError, "Invalid type %s" % type
@@ -37,7 +69,7 @@ module Puppet::Util::POSIX
         obj = typeklass.find { |obj|
             if id =~ /^\d+$/
                 obj.should(chkfield).to_s == id ||
-                    obj.is(chkfield).to_s == id
+                    obj.provider.send(chkfield) == id
             else 
                 obj[:name] == id
             end                    
@@ -67,7 +99,7 @@ module Puppet::Util::POSIX
     def idfield(space)
         case Puppet::Util.symbolize(space)
         when :gr, :group: return :gid
-        when :pw, :user: return :uid
+        when :pw, :user, :passwd: return :uid
         else
             raise ArgumentError.new("Can only handle users and groups")
         end
@@ -75,13 +107,13 @@ module Puppet::Util::POSIX
     
     # Get the GID of a given group, provided either a GID or a name
     def gid(group)
-        get_provider_value(:group, :gid, group) or get_posix_field(:gr, :gid, group)
+        get_posix_field(:group, :gid, group)
     end
 
     # Get the UID of a given user, whether a UID or name is provided
     def uid(user)
-        get_provider_value(:user, :uid, user) or get_posix_field(:pw, :uid, user)
+        get_posix_field(:passwd, :uid, user)
     end
 end
 
-# $Id: posix.rb 2052 2007-01-05 17:09:04Z luke $
+# $Id: posix.rb 2598 2007-06-17 23:11:14Z luke $

data/lib/puppet/util/provider_features.rb

@@ -100,6 +100,12 @@ module Puppet::Util::ProviderFeatures
         str
     end
 
+    # Return a list of features.
+    def features
+        @features ||= {}
+        @features.keys
+    end
+
     # Generate a module that sets up the boolean methods to test for given
     # features.
     def feature_module
@@ -162,9 +168,11 @@ module Puppet::Util::ProviderFeatures
                     @declared_features << name
                 end
             end
+            # Aaah, grammatical correctness
+            @feature_module.send(:alias_method, :has_feature, :has_features)
         end
         @feature_module
     end
 end
 
-# $Id: provider_features.rb 2413 2007-04-25 20:04:59Z luke $
+# $Id: provider_features.rb 2542 2007-05-30 20:36:29Z mpalmer $

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

@@ -37,6 +37,21 @@ module Puppet::Util::CollectionMerger
             send(collection).delete(object)
         end
     end
+    
+    def ar_hash_merge(db_hash, mem_hash, args)
+        (db_hash.keys | mem_hash.keys).each do |key|
+            if (db_hash[key] && mem_hash[key])
+                # in both, update value
+                args[:modify].call(db_hash[key], mem_hash[key])
+            elsif (db_hash[key])
+                # in db, not memory, delete from database
+                args[:delete].call(db_hash[key])
+            else
+                # in mem, not in db, insert into the database
+                args[:create].call(key, mem_hash[key])
+            end
+        end
+    end
 end
 
-# $Id: collection_merger.rb 2350 2007-03-24 21:24:29Z luke $
+# $Id: collection_merger.rb 2565 2007-06-12 00:31:16Z ballman $