puppet 0.22.4 → 0.23.0

data/lib/puppet/type/mount.rb

@@ -1,5 +1,3 @@
-require 'puppet/type/parsedtype'
-
 module Puppet
     # We want the mount to refresh when it changes.
     newtype(:mount, :self_refresh => true) do
@@ -43,7 +41,8 @@ module Puppet
 
             newvalue(:mounted, :event => :mount_mounted) do
                 # Create the mount point if it does not already exist.
-                if self.is == :absent or self.is.nil?
+                current_value = self.retrieve
+                if current_value.nil?  or current_value == :absent 
                     provider.create
                 end
 
@@ -52,24 +51,26 @@ module Puppet
             end
 
             def retrieve
-                if provider.mounted?
-                    @is = :mounted
-                else
-                    @is = super()
-                end
+                return provider.mounted? ? :mounted : super()
             end
 
             def syncothers
                 # We have to flush any changes to disk.
-                oos = @parent.send(:properties).find_all do |prop|
+                currentvalues = @resource.retrieve
+                oos = @resource.send(:properties).find_all do |prop|
+                    unless currentvalues.include?(prop)
+                        raise Puppet::DevError, 
+                          "Parent has property %s but it doesn't appear in the current vallues",
+                          [prop.name]
+                    end
                     if prop.name == :ensure
                         false
                     else
-                        ! prop.insync?
+                        ! prop.insync?(currentvalues[prop])
                     end
                 end.each { |prop| prop.sync }.length
                 if oos > 0
-                    @parent.flush
+                    @resource.flush
                 end
             end
         end
@@ -90,7 +91,7 @@ module Puppet
             # Default to the device but with "dsk" replaced with "rdsk".
             defaultto do
                 if Facter["operatingsystem"].value == "Solaris"
-                    device = @parent.value(:device)
+                    device = @resource.value(:device)
                     if device =~ %r{/dsk/}
                         device.sub(%r{/dsk/}, "/rdsk/")
                     else
@@ -114,6 +115,12 @@ module Puppet
 
         newproperty(:pass) do
             desc "The pass in which the mount is checked."
+
+            defaultto {
+                if @resource.managed?
+                    0
+                end
+            }
         end
 
         newproperty(:atboot) do
@@ -124,14 +131,20 @@ module Puppet
         newproperty(:dump) do
             desc "Whether to dump the mount.  Not all platforms
                 support this."
+
+            defaultto {
+                if @resource.managed?
+                    0
+                end
+            }
         end
 
         newproperty(:target) do
             desc "The file in which to store the mount table.  Only used by
                 those providers that write to disk (i.e., not NetInfo)."
 
-            defaultto { if @parent.class.defaultprovider.ancestors.include?(Puppet::Provider::ParsedFile)
-                    @parent.class.defaultprovider.default_target
+            defaultto { if @resource.class.defaultprovider.ancestors.include?(Puppet::Provider::ParsedFile)
+                    @resource.class.defaultprovider.default_target
                 else
                     nil
                 end
@@ -149,7 +162,7 @@ module Puppet
 
             def value=(value)
                 warning "'path' is deprecated for mounts.  Please use 'name'."
-                @parent[:name] = value
+                @resource[:name] = value
                 super
             end
         end
@@ -162,7 +175,7 @@ module Puppet
             newvalues(:true, :false)
             defaultto do
                 case Facter.value(:operatingsystem)
-                when "Darwin", "FreeBSD": false
+                when "FreeBSD": false
                 else
                     true
                 end
@@ -186,4 +199,4 @@ module Puppet
     end
 end
 
-# $Id: mount.rb 2183 2007-02-11 23:50:15Z luke $
+# $Id: mount.rb 2563 2007-06-11 22:30:00Z luke $

data/lib/puppet/type/notify.rb

@@ -9,11 +9,11 @@ module Puppet
         newproperty(:message) do
             desc "The message to be sent to the log."
             def sync
-                case @parent["withpath"]
+                case @resource["withpath"]
                 when :true:
-                    log(self.should)
+                    send(@resource[:loglevel], self.should)
                 else  
-                    Puppet.send(@parent[:loglevel], self.should)
+                    Puppet.send(@resource[:loglevel], self.should)
                 end
                 return
             end
@@ -22,16 +22,15 @@ module Puppet
                 return
             end
 
-            def insync?
+            def insync?(is)
                 false
             end
 
-            defaultto { @parent[:name] }
+            defaultto { @resource[:name] }
         end
 
         newparam(:withpath) do 
-            desc "Whether to not to show the full object path.  Sends the
-                message at the current loglevel."
+            desc "Whether to not to show the full object path."
             defaultto :false
 
             newvalues(:true, :false) 
@@ -44,4 +43,4 @@ module Puppet
     end
 end
 
-# $Id: notify.rb 2317 2007-03-19 17:42:17Z luke $
+# $Id: notify.rb 2525 2007-05-18 03:34:37Z luke $

data/lib/puppet/type/package.rb

@@ -34,6 +34,10 @@ module Puppet
                 existing configuration files.  This feature is thus destructive
                 and should be used with the utmost care.",
             :methods => [:purge]
+        feature :versionable, "The provider is capable of interrogating the
+                package database for installed version(s), and can select
+                which out of a set of available versions of a package to
+                install if asked."
 
         ensurable do
             desc "What state the package should be in.
@@ -59,7 +63,7 @@ module Puppet
                 unless provider.purgeable?
                     self.fail(
                         "Package provider %s does not purging" %
-                        @parent[:provider]
+                        @resource[:provider]
                     )
                 end
                 provider.purge
@@ -72,14 +76,14 @@ module Puppet
                 unless provider.upgradeable?
                     self.fail(
                         "Package provider %s does not support specifying 'latest'" %
-                        @parent[:provider]
+                        @resource[:provider]
                     )
                 end
 
                 # Because yum always exits with a 0 exit code, there's a retrieve
                 # in the "install" method.  So, check the current state now,
                 # to compare against later.
-                current = self.is
+                current = self.retrieve
                 begin
                     provider.update
                 rescue => detail
@@ -94,10 +98,10 @@ module Puppet
             end
 
             newvalue(/./) do
-                unless provider.versionable?
+                unless provider.class.versionable?
                     self.fail(
                         "Package provider %s does not support specifying versions" %
-                        @parent[:provider]
+                        @resource[:provider]
                      )
                 end
                 begin
@@ -106,7 +110,7 @@ module Puppet
                     self.fail "Could not update: %s" % detail
                 end
 
-                if self.is == :absent
+                if self.retrieve == :absent
                     :package_installed
                 else
                     :package_changed
@@ -118,7 +122,7 @@ module Puppet
 
             # Override the parent method, because we've got all kinds of
             # funky definitions of 'in sync'.
-            def insync?
+            def insync?(is)
                 @should ||= []
 
                 @latest = nil unless defined? @latest
@@ -128,19 +132,19 @@ module Puppet
                 @should.each { |should|
                     case should
                     when :present
-                        unless @is == :absent
+                        unless is == :absent
                             return true
                         end
                     when :latest
                         # Short-circuit packages that are not present
-                        if @is == :absent
+                        if is == :absent
                             return false
                         end
 
                         unless provider.respond_to?(:latest)
                             self.fail(
                                 "Package type %s does not support specifying 'latest'" %
-                                @parent[:provider]
+                                @resource[:provider]
                             )
                         end
 
@@ -152,11 +156,13 @@ module Puppet
                                 @latest = provider.latest
                                 @lateststamp = Time.now.to_i
                             rescue => detail
-                                self.fail "Could not get latest version: %s" % detail
+                                error = Puppet::Error.new("Could not get latest version: %s" % detail.to_s)
+                                error.set_backtrace(detail.backtrace)
+                                raise error
                             end
                         end
 
-                        case @is
+                        case is
                         when @latest:
                             return true
                         when :present:
@@ -164,14 +170,14 @@ module Puppet
                             # that can't query versions.
                             return true
                         else
-                            self.debug "@is is %s, latest %s is %s" %
-                                [@is.inspect, @parent.name, @latest.inspect]
+                            self.debug "is is %s, latest %s is %s" %
+                                [is.inspect, @resource.name, @latest.inspect]
                         end
                     when :absent
-                        if @is == :absent
+                        if is == :absent or is == :purged
                             return true
                         end
-                    when @is
+                    when is
                         return true
                     end
                 }
@@ -181,15 +187,15 @@ module Puppet
 
             # This retrieves the current state. LAK: I think this method is unused.
             def retrieve
-                @is = @parent.retrieve
+                return @resource.retrieve
             end
 
             # Provide a bit more information when logging upgrades.
-            def should_to_s
+            def should_to_s(newvalue = @should)
                 if @latest
                     @latest.to_s
                 else
-                    super
+                    super(newvalue)
                 end
             end
         end
@@ -258,9 +264,9 @@ module Puppet
 
             munge do |value|
                 warning "'type' is deprecated; use 'provider' instead"
-                @parent[:provider] = value
+                @resource[:provider] = value
 
-                @parent[:provider]
+                @resource[:provider]
             end
         end
 
@@ -355,23 +361,6 @@ module Puppet
             return object
         end
 
-        # List all package instances
-        def self.list
-            # XXX For now, just list the default provider, but we should list
-            # all suitables or something, but we need to not list a parent
-            # type if a child type gets listed.
-            #suitableprovider.each do |provider|
-            #    p provider.name
-            #    provider.list
-            #end
-
-            defaultprovider.list
-
-            self.collect do |pkg|
-                pkg
-            end
-        end
-
         # Iterate across all packages of a given type and mark them absent
         # if they are not in the list
         def self.markabsent(pkgtype, packages)
@@ -379,7 +368,7 @@ module Puppet
             self.each do |pkg|
                 next unless packages[:provider] == pkgtype
                 unless packages.include? pkg
-                    pkg.is = [:ensure, :absent] 
+                    pkg.provider.send(:ensure, :absent)
                 end
             end
         end
@@ -394,70 +383,45 @@ module Puppet
         # The 'query' method returns a hash of info if the package
         # exists and returns nil if it does not.
         def exists?
-            @provider.query
+            @provider.get(:ensure) != :absent
         end
 
         # okay, there are two ways that a package could be created...
         # either through the language, in which case the hash's values should
         # be set in 'should', or through comparing against the system, in which
         # case the hash's values should be set in 'is'
-        def initialize(hash)
+        def initialize(params)
             self.initvars
-            type = nil
+            provider = nil
             [:provider, "use"].each { |label|
-                if hash.include?(label)
-                    type = hash[label]
-                    hash.delete(label)
+                if params.include?(label)
+                    provider = params[label]
+                    params.delete(label)
                 end
             }
-            if type
-                self[:provider] = type
+            if provider
+                self[:provider] = provider
             else
                 self.setdefaults(:provider)
             end
 
-            super
+            super(params)
 
             unless @parameters.include?(:provider)
-                raise Puppet::DevError, "No package type set"
+                raise Puppet::DevError, "No package provider set"
             end
         end
 
         def retrieve
-            # If the package is installed, then retrieve all of the information
-            # about it and set it appropriately.
-            if hash = @provider.query
-                if hash == :listed # Mmmm, hackalicious
-                    return
+            @provider.properties.inject({}) do |props, ary|
+                name, value = ary
+                if prop = @parameters[name]
+                    props[prop] = value
                 end
-                hash.each { |param, value|
-                    unless self.class.validattr?(param)
-                        hash.delete(param)
-                    end
-                }
-
-                setparams(hash)
-            else
-                # Else just mark all of the properties absent.
-                self.class.validproperties.each { |name|
-                    self.is = [name, :absent]
-                }
+                props
             end
         end
-
-        # Set all of the params' "is" value.  Most are parameters, but some
-        # are properties.
-        def setparams(hash)
-            # Everything on packages is a parameter except :ensure
-            hash.each { |param, value|
-                if self.class.attrtype(param) == :property
-                    self.is = [param, value]
-                else
-                    self[param] = value
-                end
-            }
-        end
     end # Puppet.type(:package)
 end
 
-# $Id: package.rb 2430 2007-04-30 15:19:23Z luke $
+# $Id: package.rb 2620 2007-06-18 21:55:05Z luke $

data/lib/puppet/type/pfile.rb

@@ -96,16 +96,16 @@ module Puppet
                     # we have to do it after all of the objects
                     # have been instantiated.
                     if bucketobj = Puppet::Type.type(:filebucket)[value]
-                        @parent.bucket = bucketobj.bucket
+                        @resource.bucket = bucketobj.bucket
                         bucketobj.title
                     else
                         # Set it to the string; finish() turns it into a
                         # filebucket.
-                        @parent.bucket = value
+                        @resource.bucket = value
                         value
                     end
                 when Puppet::Network::Client.client(:Dipper):
-                    @parent.bucket = value
+                    @resource.bucket = value
                     value.name
                 else
                     self.fail "Invalid backup type %s" %
@@ -259,7 +259,7 @@ module Puppet
         end
 
         # List files, but only one level deep.
-        def self.list(base = "/")
+        def self.instances(base = "/")
             unless FileTest.directory?(base)
                 return []
             end
@@ -823,22 +823,21 @@ module Puppet
         def retrieve
             unless stat = self.stat(true)
                 self.debug "File does not exist"
-                properties().each { |property|
-                    property.is = :absent
-                }
-                
                 # If the file doesn't exist but we have a source, then call
                 # retrieve on that property
+
+                propertyvalues = properties().inject({}) { |hash, property|
+                                     hash[property] = :absent
+                                     hash
+                                  }
+
                 if @parameters.include?(:source)
-                    @parameters[:source].retrieve
+                    propertyvalues[:source] = @parameters[:source].retrieve
                 end
-
-                return
+                return propertyvalues
             end
 
-            properties().each { |property|
-                property.retrieve
-            }
+            return currentpropvalues()
         end
 
         # This recurses against the remote source and makes sure the local
@@ -929,8 +928,8 @@ module Puppet
                 else
                     # If they didn't pass in a sum, then tell checksum to
                     # figure it out.
-                    @parameters[:checksum].retrieve
-                    @parameters[:checksum].checksum = @parameters[:checksum].is
+                    currentvalue = @parameters[:checksum].retrieve
+                    @parameters[:checksum].checksum = currentvalue
                 end
             end
         end
@@ -969,7 +968,7 @@ module Puppet
         # We have to hack this just a little bit, because otherwise we'll get
         # an error when the target and the contents are created as properties on
         # the far side.
-        def to_trans
+        def to_trans(retrieve = true)
             obj = super
             if obj[:target] == :notlink
                 obj.delete(:target)
@@ -977,6 +976,18 @@ module Puppet
             obj
         end
 
+        def localfileserver
+            unless defined? @@localfileserver
+                args = {
+                    :Local => true,
+                    :Mount => { "/" => "localhost" },
+                    :Config => false
+                }
+                @@localfileserver = Puppet::Network::Handler.handler(:fileserver).new(args)
+            end
+            @@localfileserver
+        end
+
         def uri2obj(source)
             sourceobj = FileSource.new
             path = nil
@@ -997,25 +1008,24 @@ module Puppet
 
             case uri.scheme
             when "file":
-                unless defined? @@localfileserver
-                    @@localfileserver = Puppet::Network::Handler.handler(:fileserver).new(
-                        :Local => true,
-                        :Mount => { "/" => "localhost" },
-                        :Config => false
-                    )
-                    #@@localfileserver.mount("/", "localhost")
-                end
-                sourceobj.server = @@localfileserver
+                sourceobj.server = localfileserver
                 path = "/localhost" + uri.path
             when "puppet":
-                args = { :Server => uri.host }
-                if uri.port
-                    args[:Port] = uri.port
-                end
-                # FIXME We should cache a copy of this server
-                #sourceobj.server = Puppet::Network::NetworkClient.new(args)
+                # FIXME: We should cache clients by uri.host + uri.port
+                # not by the full source path
                 unless @clients.include?(source)
-                    @clients[source] = Puppet::Network::Client.file.new(args)
+                    host = uri.host
+                    host ||= Puppet[:server] unless Puppet[:name] == "puppet"
+                    if host.nil?
+                        server = localfileserver
+                    else
+                        args = { :Server => host }
+                        if uri.port
+                            args[:Port] = uri.port
+                        end
+                        server = Puppet::Network::Client.file.new(args)
+                    end
+                    @clients[source] = server
                 end
                 sourceobj.server = @clients[source]
 
@@ -1028,7 +1038,7 @@ module Puppet
                     self.fail "Invalid source path %s" % tmp
                 end
             else
-                self.fail "Got other recursive file proto %s from %s" %
+                self.fail "Got other URL type '%s' from %s" %
                         [uri.scheme, source]
             end
 
@@ -1118,7 +1128,7 @@ module Puppet
 
         # Override the parent method, because we don't want to generate changes
         # when the file is missing and there is no 'ensure' state.
-        def propertychanges
+        def propertychanges(currentvalues)
             unless self.stat
                 found = false
                 ([:ensure] + CREATORS).each do |prop|
@@ -1137,14 +1147,13 @@ module Puppet
         # There are some cases where all of the work does not get done on
         # file creation/modification, so we have to do some extra checking.
         def property_fix
-            self.each do |thing|
-                next unless thing.is_a? Puppet::Property
+            properties.each do |thing|
                 next unless [:mode, :owner, :group].include?(thing.name)
 
                 # Make sure we get a new stat objct
                 self.stat(true)
-                thing.retrieve
-                unless thing.insync?
+                currentvalue = thing.retrieve
+                unless thing.insync?(currentvalue)
                     thing.sync
                 end
             end
@@ -1159,7 +1168,7 @@ module Puppet
 
     # We put all of the properties in separate files, because there are so many
     # of them.  The order these are loaded is important, because it determines
-    # the order they are in the property list.
+    # the order they are in the property lit.
     require 'puppet/type/pfile/checksum'
     require 'puppet/type/pfile/content'     # can create the file
     require 'puppet/type/pfile/source'      # can create the file
@@ -1170,4 +1179,4 @@ module Puppet
     require 'puppet/type/pfile/mode'
     require 'puppet/type/pfile/type'
 end
-# $Id: pfile.rb 2436 2007-04-30 17:29:02Z luke $
+# $Id: pfile.rb 2610 2007-06-18 19:29:56Z lutter $