puppet 0.23.0 → 0.23.1

data/lib/puppet/metatype/evaluation.rb

@@ -96,6 +96,15 @@ class Puppet::Type
                    prophash
                }
     end
+
+    # Are we running in noop mode?
+    def noop?
+        @noop || Puppet[:noop]
+    end
+
+    def noop
+        noop?
+    end
      
     # Retrieve the changes associated with all of the properties.
     def propertychanges(currentvalues)
@@ -144,4 +153,4 @@ class Puppet::Type
     end
 end
 
-# $Id: evaluation.rb 2488 2007-05-09 12:30:03Z ballman $
+# $Id: evaluation.rb 2678 2007-07-11 19:30:42Z luke $

data/lib/puppet/metatype/instances.rb

@@ -1,3 +1,5 @@
+require 'puppet/transportable'
+
 class Puppet::Type
     # Make 'new' private, so people have to use create instead.
     class << self
@@ -89,7 +91,7 @@ class Puppet::Type
         # If we're the base class, then pass the info on appropriately
         if self == Puppet::Type
             type = nil
-            if hash.is_a? TransObject
+            if hash.is_a? Puppet::TransObject
                 type = hash.type
             else
                 # If we're using the type to determine object type, then delete it
@@ -116,7 +118,7 @@ class Puppet::Type
         end
 
         name = nil
-        unless hash.is_a? TransObject
+        unless hash.is_a? Puppet::TransObject
             hash = self.hash2trans(hash)
         end
 
@@ -182,13 +184,22 @@ class Puppet::Type
     end
 
     # remove a specified object
-    def self.delete(object)
+    def self.delete(resource)
         return unless defined? @objects
-        if @objects.include?(object.title)
-            @objects.delete(object.title)
+        if @objects.include?(resource.title)
+            @objects.delete(resource.title)
         end
-        if @aliases.include?(object.title)
-            @aliases.delete(object.title)
+        if @aliases.include?(resource.title)
+            @aliases.delete(resource.title)
+        end
+        if @aliases.has_value?(resource)
+            names = []
+            @aliases.each do |name, otherres|
+                if otherres == resource
+                    names << name
+                end
+            end
+            names.each { |name| @aliases.delete(name) }
         end
     end
 
@@ -236,7 +247,7 @@ class Puppet::Type
         end
         # okay, now make a transobject out of hash
         begin
-            trans = TransObject.new(title, self.name.to_s)
+            trans = Puppet::TransObject.new(title, self.name.to_s)
             hash.each { |param, value|
                 trans[param] = value
             }
@@ -255,17 +266,30 @@ class Puppet::Type
         end
 
         # Put the default provider first, then the rest of the suitable providers.
-        packages = {}
+        provider_instances = {}
         providers_by_source.collect do |provider|
             provider.instances.collect do |instance|
-                if other = packages[instance.name]
-                    Puppet.warning "Package %s found in both %s and %s; skipping the %s version" %
-                        [instance.name, other.class.name, instance.class.name, instance.class.name]
+                # First try to get the resource if it already exists
+                if resource = self[instance.name] and resource.provider.class != instance.class
+                    # Skip instances that map to a managed resource with a different provider
                     next
                 end
-                packages[instance.name] = instance
 
-                create(:name => instance.name, :provider => instance, :check => :all)
+                # We always want to use the "first" provider instance we find, unless the resource
+                # is already managed and has a different provider set
+                if other = provider_instances[instance.name]
+                    Puppet.warning "%s %s found in both %s and %s; skipping the %s version" %
+                        [self.name.to_s.capitalize, instance.name, other.class.name, instance.class.name, instance.class.name]
+                    next
+                end
+                provider_instances[instance.name] = instance
+
+                if resource
+                    resource.provider = instance
+                    resource
+                else
+                    create(:name => instance.name, :provider => instance, :check => :all)
+                end
             end
         end.flatten.compact
     end
@@ -292,4 +316,4 @@ class Puppet::Type
     end
 end
 
-# $Id: instances.rb 2555 2007-06-08 17:20:00Z luke $
+# $Id: instances.rb 2718 2007-07-19 22:12:51Z luke $

data/lib/puppet/metatype/manager.rb

@@ -29,30 +29,6 @@ module Manager
         typeloader.loadall
     end
 
-    # Do an on-demand plugin load
-    def loadplugin(name)
-        paths = Puppet[:pluginpath].split(":")
-        unless paths.include?(Puppet[:plugindest])
-            Puppet.notice "Adding plugin destination %s to plugin search path" %
-                Puppet[:plugindest]
-            Puppet[:pluginpath] += ":" + Puppet[:plugindest]
-        end
-        paths.each do |dir|
-            file = ::File.join(dir, name.to_s + ".rb")
-            if FileTest.exists?(file)
-                begin
-                    load file
-                    Puppet.info "loaded %s" % file
-                    return true
-                rescue LoadError => detail
-                    Puppet.info "Could not load plugin %s: %s" %
-                        [file, detail]
-                    return false
-                end
-            end
-        end
-    end
-
     # Define a new type.
     def newtype(name, options = {}, &block)
         # Handle backward compatibility
@@ -144,9 +120,6 @@ module Manager
                 unless @types.include? name
                     Puppet.warning "Loaded puppet/type/#{name} but no class was created"
                 end
-            else
-                # If we can't load it from there, try loading it as a plugin.
-                loadplugin(name)
             end
 
             return @types[name]
@@ -166,4 +139,4 @@ module Manager
 end
 end
 
-# $Id: manager.rb 2178 2007-02-07 23:56:59Z luke $
+# $Id: manager.rb 2680 2007-07-12 04:27:04Z luke $

data/lib/puppet/metatype/metaparams.rb

@@ -38,14 +38,6 @@ class Puppet::Type
 
             The creation of the schedule object does not need to appear in the
             configuration before objects that use it."
-
-        munge do |name|
-            if schedule = Puppet.type(:schedule)[name]
-                return schedule
-            else
-                return name
-            end
-        end
     end
 
     newmetaparam(:check) do
@@ -59,7 +51,14 @@ class Puppet::Type
         munge do |args|
             # If they've specified all, collect all known properties
             if args == :all
-                args = @resource.class.properties.collect do |property|
+                args = @resource.class.properties.find_all do |property|
+                    # Only get properties supported by our provider
+                    if @resource.provider
+                        @resource.provider.class.supports_parameter?(property)
+                    else
+                        true
+                    end
+                end.collect do |property|
                     property.name
                 end
             end
@@ -214,10 +213,10 @@ class Puppet::Type
     end
 
     newmetaparam(:tag) do
-        desc "Add the specified tags to the associated element.  While all elements
+        desc "Add the specified tags to the associated resource.  While all resources
             are automatically tagged with as much information as possible
-            (e.g., each class and component containing the element), it can
-            be useful to add your own tags to a given element.
+            (e.g., each class and definition containing the resource), it can
+            be useful to add your own tags to a given resource.
 
             Tags are currently useful for things like applying a subset of a
             host's configuration::
@@ -329,11 +328,16 @@ class Puppet::Type
                 file { \"/usr/local/scripts/myscript\":
                     source => \"puppet://server/module/myscript\",
                     mode => 755,
-                    require => file[\"/usr/local/scripts\"]
+                    require => File[\"/usr/local/scripts\"]
                 }
 
+            Multiple dependencies can be specified by providing a comma-seperated list
+            of resources, enclosed in square brackets::
+
+                require => [ File[\"/usr/local\"], File[\"/usr/local/scripts\"] ]
+
             Note that Puppet will autorequire everything that it can, and
-            there are hooks in place so that it's easy for elements to add new
+            there are hooks in place so that it's easy for resources to add new
             ways to autorequire objects, so if you think Puppet could be
             smarter here, let us know.
 
@@ -342,7 +346,7 @@ class Puppet::Type
             automatically realize that the parent directory should be created
             before the script is pulled down.
             
-            Currently, exec elements will autorequire their CWD (if it is
+            Currently, exec resources will autorequire their CWD (if it is
             specified) plus any fully qualified paths that appear in the
             command.   For instance, if you had an ``exec`` command that ran
             the ``myscript`` mentioned above, the above code that pulls the
@@ -410,4 +414,4 @@ class Puppet::Type
     end
 end # Puppet::Type
 
-# $Id: metaparams.rb 2591 2007-06-15 19:49:26Z luke $
+# $Id: metaparams.rb 2684 2007-07-12 16:39:47Z luke $

data/lib/puppet/metatype/providers.rb

@@ -1,3 +1,4 @@
+require 'puppet/provider'
 require 'puppet/util/provider_features'
 class Puppet::Type
     # Add the feature handling module.
@@ -113,6 +114,11 @@ class Puppet::Type
     def self.provide(name, options = {}, &block)
         name = Puppet::Util.symbolize(name)
 
+        if obj = @providers[name]
+            Puppet.debug "Reloading %s %s provider" % [name, self.name]
+            unprovide(name)
+        end
+
         parent = if pname = options[:parent]
             options.delete(:parent)
             if pname.is_a? Class
@@ -127,7 +133,7 @@ class Puppet::Type
                 end
             end
         else
-            Puppet::Type::Provider
+            Puppet::Provider
         end
 
         options[:resource_type] ||= self
@@ -244,4 +250,4 @@ class Puppet::Type
     end
 end
 
-# $Id: providers.rb 2552 2007-06-05 01:17:00Z luke $
+# $Id: providers.rb 2714 2007-07-19 18:12:20Z luke $

data/lib/puppet/metatype/schedules.rb

@@ -3,32 +3,27 @@ class Puppet::Type
     # the instantiation phase, so that the schedule can be anywhere in the
     # file.
     def schedule
-
-        # If we've already set the schedule, then just move on
-        return if self[:schedule].is_a?(Puppet.type(:schedule))
-
-        return unless self[:schedule]
-
-        # Schedules don't need to be scheduled
-        #return if self.is_a?(Puppet.type(:schedule))
-
-        # Nor do components
-        #return if self.is_a?(Puppet.type(:component))
-
-        if sched = Puppet.type(:schedule)[self[:schedule]]
-            self[:schedule] = sched
-        else
-            self.fail "Could not find schedule %s" % self[:schedule]
+        unless defined? @schedule
+            if name = self[:schedule]
+                if sched = Puppet.type(:schedule)[name]
+                    @schedule = sched
+                else
+                    self.fail "Could not find schedule %s" % name
+                end
+            else
+                @schedule = nil
+            end
         end
+        @schedule
     end
 
     # Check whether we are scheduled to run right now or not.
     def scheduled?
         return true if Puppet[:ignoreschedules]
-        return true unless schedule = self[:schedule]
+        return true unless schedule = self.schedule
 
         # We use 'checked' here instead of 'synced' because otherwise we'll
-        # end up checking most elements most times, because they will generally
+        # end up checking most resources most times, because they will generally
         # have been synced a long time ago (e.g., a file only gets updated
         # once a month on the server and its schedule is daily; the last sync time
         # will have been a month ago, so we'd end up checking every run).
@@ -36,4 +31,4 @@ class Puppet::Type
     end
 end
 
-# $Id: schedules.rb 1762 2006-10-10 20:59:10Z luke $
+# $Id: schedules.rb 2665 2007-07-09 21:32:33Z luke $

data/lib/puppet/{modules.rb → module.rb}

@@ -111,3 +111,5 @@ class Puppet::Module
 
     private :initialize
 end
+
+# $Id: module.rb 2655 2007-07-06 22:22:10Z luke $

data/lib/puppet/network/authstore.rb

@@ -68,6 +68,10 @@ module Puppet
             @declarations = []
         end
 
+        def to_s
+            "authstore"
+        end
+
         private
 
         # Store the results of a pattern into our hash.  Basically just
@@ -290,4 +294,4 @@ module Puppet
     end
 end
 
-# $Id: authstore.rb 2262 2007-03-08 00:16:53Z luke $
+# $Id: authstore.rb 2673 2007-07-10 19:26:36Z luke $

data/lib/puppet/network/client/dipper.rb

@@ -19,7 +19,7 @@ class Puppet::Network::Client::Dipper < Puppet::Network::Client
     # Back up a file to our bucket
     def backup(file)
         unless FileTest.exists?(file)
-            raise(BucketError, "File %s does not exist" % file)
+            raise(ArgumentError, "File %s does not exist" % file)
         end
         contents = ::File.read(file)
         unless local?
@@ -78,4 +78,4 @@ class Puppet::Network::Client::Dipper < Puppet::Network::Client
     end
 end
 
-# $Id: dipper.rb 2348 2007-03-24 21:16:20Z luke $
+# $Id: dipper.rb 2679 2007-07-11 20:23:49Z luke $

data/lib/puppet/network/client/master.rb

@@ -175,7 +175,10 @@ class Puppet::Network::Client::Master < Puppet::Network::Client
     def getconfig
         dostorage()
 
-        facts = self.class.facts
+        facts = nil
+        Puppet::Util.benchmark(:debug, "Retrieved facts") do
+            facts = self.class.facts
+        end
 
         if self.objects or FileTest.exists?(self.cachefile)
             if self.fresh?(facts)
@@ -300,8 +303,12 @@ class Puppet::Network::Client::Master < Puppet::Network::Client
                     lockfile.lockfile
             else
                 got_lock = true
-                @configtime = thinmark do
-                    self.getconfig
+                begin
+                    @configtime = thinmark do
+                        self.getconfig
+                    end
+                rescue => detail
+                    Puppet.err "Could not retrieve configuration: %s" % detail
                 end
 
                 if defined? @objects and @objects
@@ -450,18 +457,20 @@ class Puppet::Network::Client::Master < Puppet::Network::Client
     # Retrieve the plugins from the central server.  We only have to load the
     # changed plugins, because Puppet::Type loads plugins on demand.
     def self.getplugins
-        path = Puppet[:pluginpath].split(":")
         download(:dest => Puppet[:plugindest], :source => Puppet[:pluginsource],
             :ignore => Puppet[:pluginsignore], :name => "plugin") do |object|
 
-            next unless path.include?(::File.dirname(object[:path]))
+            next if FileTest.directory?(object[:path])
+            path = object[:path].sub(Puppet[:plugindest], '').sub(/^\/+/, '')
+            unless Puppet::Util::Autoload.loaded?(path)
+                next
+            end
 
             begin
-                Puppet.info "Reloading plugin %s" %
-                    ::File.basename(::File.basename(object[:path])).sub(".rb",'')
+                Puppet.info "Reloading downloaded file %s" % path
                 load object[:path]
             rescue => detail
-                Puppet.warning "Could not reload plugin %s: %s" %
+                Puppet.warning "Could not reload downloaded file %s: %s" %
                     [object[:path], detail]
             end
         end
@@ -683,4 +692,4 @@ class Puppet::Network::Client::Master < Puppet::Network::Client
     end
 end
 
-# $Id: master.rb 2602 2007-06-18 15:35:57Z luke $
+# $Id: master.rb 2671 2007-07-10 19:25:32Z luke $

data/lib/puppet/network/handler/fileserver.rb

@@ -393,7 +393,7 @@ class Puppet::Network::Handler
 
                 mod = Puppet::Module::find(tmp)
                 if mod
-                    mount = @mounts[MODULES].copy(mod, mod.files)
+                    mount = @mounts[MODULES].copy(mod.name, mod.files)
                 else
                     unless mount = @mounts[tmp]
                         raise FileServerError, "Fileserver module '%s' not mounted" % tmp
@@ -456,7 +456,6 @@ class Puppet::Network::Handler
                     sync.synchronize(Sync::EX) do
                         @@files[path] = data
                         data[:loaded_obj] = Puppet::Util::LoadedFile.new(path)
-                        Puppet.notice "Initializing values for %s" % path
                         data[:values] = properties(obj)
                         return data[:values]
                     end
@@ -469,13 +468,11 @@ class Puppet::Network::Handler
 
                 if changed
                     sync.synchronize(Sync::EX) do
-                        Puppet.notice "Getting values for %s" % path
                         data[:values] = properties(obj)
                         return data[:values]
                     end
                 else
                     sync.synchronize(Sync::SH) do
-                        Puppet.info "Using cached values for %s" % path
                         return data[:values]
                     end
                 end
@@ -635,7 +632,7 @@ class Puppet::Network::Handler
             end
 
             def to_s
-                "mount[#{@name}]"
+                "mount[%s]" % @name
             end
 
             # Verify our configuration is valid.  This should really check to
@@ -660,4 +657,4 @@ class Puppet::Network::Handler
     end
 end
 
-# $Id: fileserver.rb 2629 2007-06-19 22:18:55Z luke $
+# $Id: fileserver.rb 2653 2007-07-06 00:54:51Z luke $