puppet 0.18.4 → 0.22.4

data/lib/puppet/type/pfile/group.rb

@@ -1,12 +1,18 @@
 # Manage file group ownership.
 module Puppet
-    Puppet.type(:file).newstate(:group) do
+    Puppet.type(:file).newproperty(:group) do
         require 'etc'
         desc "Which group should own the file.  Argument can be either group
             name or group ID."
         @event = :file_changed
 
         def id2name(id)
+            if id > 70000
+                return nil
+            end
+            if id.is_a?(Symbol)
+                return id.to_s
+            end
             begin
                 group = Etc.getgrgid(id)
             rescue ArgumentError
@@ -38,6 +44,19 @@ module Puppet
         end
 
         def retrieve
+            if self.should
+                @should = @should.collect do |val|
+                    unless val.is_a?(Integer)
+                        if tmp = validgroup?(val)
+                            val = tmp
+                        else
+                            raise "Could not find group %s" % val
+                        end
+                    else
+                        val
+                    end
+                end
+            end
             stat = @parent.stat(false)
 
             unless stat
@@ -54,31 +73,19 @@ module Puppet
             self.is = stat.gid
         end
 
-        # Determine if the group is valid, and if so, return the UID
+        # Determine if the group is valid, and if so, return the GID
         def validgroup?(value)
             if value =~ /^\d+$/
                 value = value.to_i
             end
-
-            if value = Puppet::Util.gid(value)
-                return value
+        
+            if gid = Puppet::Util.gid(value)
+                return gid
             else
                 return false
             end
         end
 
-        munge do |value|
-            method = nil
-            gid = nil
-            gname = nil
-
-            if val = validgroup?(value)
-                return val
-            else
-                return value
-            end
-        end
-
         # Normal users will only be able to manage certain groups.  Right now,
         # we'll just let it fail, but we should probably set things up so
         # that users get warned if they try to change to an unacceptable group.
@@ -116,4 +123,4 @@ module Puppet
     end
 end
 
-# $Id: group.rb 1384 2006-07-11 16:53:59Z luke $
+# $Id: group.rb 2169 2007-02-07 06:47:10Z luke $

data/lib/puppet/type/pfile/mode.rb

@@ -2,7 +2,7 @@
 # for specification (e.g., u+rwx, or -0011), but for now only supports
 # specifying the full mode.
 module Puppet
-    Puppet.type(:file).newstate(:mode) do
+    Puppet.type(:file).newproperty(:mode) do
         require 'etc'
         desc "Mode the file should be.  Currently relatively limited:
             you must specify the exact mode the file should be."
@@ -39,18 +39,20 @@ module Puppet
             # octal, yet the number can only be specified as a string right now
             value = should
             if value.is_a?(String)
-                unless value =~ /^[0-9]+$/
+                unless value =~ /^\d+$/
                     raise Puppet::Error, "File modes can only be numbers, not %s" %
                         value.inspect
                 end
+                # Make sure our number looks like octal.
                 unless value =~ /^0/
                     value = "0" + value
                 end
+                old = value
                 begin
                     value = Integer(value)
                 rescue ArgumentError => detail
                     raise Puppet::DevError, "Could not convert %s to integer" %
-                        value.inspect
+                        old.inspect
                 end
             end
 
@@ -129,6 +131,7 @@ module Puppet
             rescue => detail
                 error = Puppet::Error.new("failed to chmod %s: %s" %
                     [@parent[:path], detail.message])
+                error.set_backtrace detail.backtrace
                 raise error
             end
             return :file_changed
@@ -136,4 +139,4 @@ module Puppet
     end
 end
 
-# $Id: mode.rb 1056 2006-04-03 18:05:58Z luke $
+# $Id: mode.rb 2273 2007-03-08 17:35:18Z luke $

data/lib/puppet/type/pfile/{uid.rb → owner.rb}

@@ -1,5 +1,5 @@
 module Puppet
-    Puppet.type(:file).newstate(:owner) do
+    Puppet.type(:file).newproperty(:owner) do
         require 'etc'
         desc "To whom the file should belong.  Argument can be user name or
             user ID."
@@ -9,6 +9,9 @@ module Puppet
             if id.is_a?(Symbol)
                 return id.to_s
             end
+            if id > 70000
+                return nil
+            end
             begin
                 user = Etc.getpwuid(id)
             rescue TypeError
@@ -80,6 +83,20 @@ module Puppet
         end
 
         def retrieve
+            if self.should
+                @should = @should.collect do |val|
+                    unless val.is_a?(Integer)
+                        if tmp = validuser?(val)
+                            val = tmp
+                        else
+                            raise "Could not find user %s" % val
+                        end
+                    else
+                        val
+                    end
+                end
+            end
+            
             unless stat = @parent.stat(false)
                 @is = :absent
                 return
@@ -99,25 +116,12 @@ module Puppet
             # it's an OS X bug, since it shows up in perl, too.
             if @is > 120000
                 self.warning "current state is silly: %s" % @is
-                @is = :absent
-            end
-        end
-
-        # If we're not root, we can check the values but we cannot change
-        # them.  We can't really do any processing here, because users
-        # might not exist yet.  FIXME There's still a bit of a problem here
-        # if the user's UID changes at run time, but we're just going to
-        # have to be okay with that for now, unfortunately.
-        munge do |value|
-            if tmp = self.validuser?(value)
-                return tmp
-            else
-                return value
+                @is = :silly
             end
         end
 
         def sync
-            unless Process.uid == 0
+            unless Puppet::Util::SUIDManager.uid == 0
                 unless defined? @@notifieduid
                     self.notice "Cannot manage ownership unless running as root"
                     #@parent.delete(self.name)
@@ -167,4 +171,4 @@ module Puppet
     end
 end
 
-# $Id: uid.rb 994 2006-03-08 22:57:21Z luke $
+# $Id: owner.rb 2178 2007-02-07 23:56:59Z luke $

data/lib/puppet/type/pfile/source.rb

@@ -1,9 +1,10 @@
-require 'puppet/server/fileserver'
-
 module Puppet
-    # Copy files from a local or remote source.
-    Puppet.type(:file).newstate(:source) do
-        PINPARAMS = Puppet::Server::FileServer::CHECKPARAMS
+    # Copy files from a local or remote source.  This state *only* does any work
+    # when the remote file is an actual file; in that case, this state copies
+    # the file down.  If the remote file is a dir or a link or whatever, then
+    # this state, during retrieval, modifies the appropriate other states
+    # so that things get taken care of appropriately.
+    Puppet.type(:file).newproperty(:source) do
 
         attr_accessor :source, :local
         desc "Copy a file over the current file.  Uses ``checksum`` to
@@ -14,7 +15,7 @@ module Puppet
             This is one of the primary mechanisms for getting content into
             applications that Puppet does not directly support and is very
             useful for those configuration files that don't change much across
-            sytems.  For instance:
+            sytems.  For instance::
 
                 class sendmail {
                     file { \"/etc/mail/sendmail.cf\":
@@ -22,15 +23,59 @@ module Puppet
                     }
                 }
             
-            See the [fileserver docs][] for information on how to configure
+            See the `FileServingConfiguration fileserver configuration documentation`:trac: for information on how to configure
             and use file services within Puppet.
 
+            If you specify multiple file sources for a file, then the first
+            source that exists will be used.  This allows you to specify
+            what amount to search paths for files::
 
-            [fileserver docs]: fsconfigref.html
-
-            "
+                file { \"/path/to/my/file\":
+                    source => [
+                        \"/nfs/files/file.$host\",
+                        \"/nfs/files/file.$operatingsystem\",
+                        \"/nfs/files/file\"
+                    ]
+                }
+            
+            This will use the first found file as the source.
+            
+            You cannot currently copy links using this mechanism; set ``links``
+            to ``follow`` if any remote sources are links."
 
         uncheckable
+        
+        validate do |source|
+            unless @parent.uri2obj(source)
+                raise Puppet::Error, "Invalid source %s" % source
+            end
+        end
+            
+        munge do |source|
+            # if source.is_a? Symbol
+            #     return source
+            # end
+
+            # Remove any trailing slashes
+            source.sub(/\/$/, '')
+        end
+        
+        def change_to_s
+            should = "{md5}" + @stats[:checksum]
+            if @parent.is(:ensure) == :absent
+                return "creating from source %s with contents %s" % [@source, @stats[:checksum]]
+            else
+                return "replacing from source %s with contents %s" % [@source, @stats[:checksum]]
+            end
+        end
+        
+        def checksum
+            if defined?(@stats)
+                @stats[:checksum]
+            else
+                nil
+            end
+        end
 
         # Ask the file server to describe our file.
         def describe(source)
@@ -39,14 +84,14 @@ module Puppet
 
             begin
                 desc = server.describe(path, @parent[:links])
-            rescue NetworkClientError => detail
+            rescue Puppet::Network::XMLRPCClientError => detail
                 self.err "Could not describe %s: %s" %
                     [path, detail]
                 return nil
             end
 
             args = {}
-            PINPARAMS.zip(
+            pinparams.zip(
                 desc.split("\t")
             ).each { |param, value|
                 if value =~ /^[0-9]+$/
@@ -58,38 +103,64 @@ module Puppet
             }
 
             # we can't manage ownership as root, so don't even try
-            unless Process.uid == 0
+            unless Puppet::Util::SUIDManager.uid == 0
                 args.delete(:owner)
             end
 
-            if args.empty?
+            if args.empty? or (args[:type] == "link" and @parent[:links] == :ignore)
                 return nil
             else
                 return args
             end
         end
+        
+        # Have we successfully described the remote source?
+        def described?
+            ! @stats.nil? and ! @stats[:type].nil? and @is != :notdescribed
+        end
+        
+        # Use the info we get from describe() to check if we're in sync.
+        def insync?
+            unless described?
+                info "No specified sources exist"
+                return true
+            end
+            
+            if @is == :nocopy
+                return true
+            end
+            
+            # the only thing this actual state can do is copy files around.  Therefore,
+            # only pay attention if the remote is a file.
+            unless @stats[:type] == "file" 
+                return true
+            end
+            
+            if @parent.is(:ensure) != :absent and ! @parent.replace?
+                return true
+            end
+            # Now, we just check to see if the checksums are the same
+            return @parent.is(:checksum) == @stats[:checksum]
+        end
 
+        def pinparams
+            Puppet::Network::Handler.handler(:fileserver).params
+        end
+        
         # This basically calls describe() on our file, and then sets all
         # of the local states appropriately.  If the remote file is a normal
         # file then we set it to copy; if it's a directory, then we just mark
         # that the local directory should be created.
         def retrieve(remote = true)
             sum = nil
-
-            unless defined? @shouldorig
-                raise Puppet::DevError, "No sources defined for %s" %
-                    @parent.name
-            end
-
-            @source = nil unless defined? @source
+            @source = nil
 
             # This is set to false by the File#retrieve function on the second
             # retrieve, so that we do not do two describes.
             if remote
-                @source = nil
                 # Find the first source that exists.  @shouldorig contains
                 # the sources as specified by the user.
-                @shouldorig.each { |source|
+                @should.each { |source|
                     if @stats = self.describe(source)
                         @source = source
                         break
@@ -99,63 +170,20 @@ module Puppet
 
             if @stats.nil? or @stats[:type].nil?
                 @is = :notdescribed
-                @source = nil
                 return nil
             end
-
-            # If we're a normal file, then set things up to copy the file down.
+            
             case @stats[:type]
-            when "file":
-                if sum = @parent.state(:checksum)
-                    if sum.is
-                        if sum.is == :absent
-                            sum.retrieve(true)
-                        end
-                        @is = sum.is
-                    else
-                        @is = :absent
-                    end
-                else
-                    self.info "File does not have checksum"
-                    @is = :absent
-                end
-
-                @should = [@stats[:checksum]]
-            # If we're a directory, then do not copy anything, and instead just
-            # create the directory using the 'create' state.
-            when "directory":
-                if state = @parent.state(:ensure)
-                    unless state.should == "directory"
-                        state.should = "directory"
-                    end
-                else
-                    @parent[:ensure] = "directory"
-                    @parent.state(:ensure).retrieve
-                end
-                # we'll let the :ensure state do our work
-                @should.clear
-                @is = true
-            when "link":
-                case @parent[:links]
-                when :ignore
-                    @is = :nocopy
-                    @should = [:nocopy]
-                    self.info "Ignoring link %s" % @source
-                    return
-                when :follow
-                    @stats = self.describe(source, :follow)
-                    if @stats.empty?
-                        raise Puppet::Error, "Could not follow link %s" % @source
-                    end
-                when :copy
-                    raise Puppet::Error, "Cannot copy links yet"
+            when "directory", "file":
+                unless @parent.deleting?
+                    @parent[:ensure] = @stats[:type]
                 end
             else
                 self.info @stats.inspect
                 self.err "Cannot use files of type %s as sources" %
                     @stats[:type]
-                @should = [:nocopy]
                 @is = :nocopy
+                return
             end
 
             # Take each of the stats and set them as states on the local file
@@ -167,61 +195,32 @@ module Puppet
                 # was the stat already specified, or should the value
                 # be inherited from the source?
                 unless @parent.argument?(stat)
-                    if state = @parent.state(stat)
-                        state.should = value
-                    else
-                        @parent[stat] = value
-                    end
-                #else
-                #    @parent.info "Already specified %s" % stat
+                    @parent[stat] = value
+                    @parent.property(stat).retrieve
                 end
             }
+            
+            @is = @stats[:checksum]
         end
+        
+        def should
+            @should
+        end
+        
+        # Make sure we're also checking the checksum
+        def should=(value)
+            super
 
-        # The special thing here is that we need to make sure that 'should'
-        # is only set for files, not directories.  The processing we're doing
-        # here doesn't really matter, because the @should values will be
-        # overridden when we 'retrieve'.
-        munge do |source|
-            if source.is_a? Symbol
-                return source
-            end
-
-            # Remove any trailing slashes
-            source.sub!(/\/$/, '')
-            unless @parent.uri2obj(source)
-                raise Puppet::Error, "Invalid source %s" % source
-            end
-
-            if ! defined? @stats or @stats.nil?
-                # stupid hack for now; it'll get overriden
-                return source
-            else
-                if @stats[:type] == "directory"
-                    @is = true
-                    return nil
-                else
-                    return source
-                end
+            checks = (pinparams + [:ensure])
+            checks.delete(:checksum)
+            
+            @parent[:check] = checks
+            unless @parent.property(:checksum)
+                @parent[:checksum] = :md5
             end
         end
 
         def sync
-            if @is == :notdescribed
-                self.retrieve # try again
-                if @is == :notdescribed
-                    @parent.log "Could not retreive information on %s" %
-                        @parent.name
-                    return nil
-                end
-                if @is == @should
-                    return nil
-                end
-            end
-
-            case @stats[:type]
-            when "link":
-            end
             unless @stats[:type] == "file"
                 #if @stats[:type] == "directory"
                         #[@parent.name, @is.inspect, @should.inspect]
@@ -230,15 +229,11 @@ module Puppet
                     @parent[:path]
             end
 
-            unless defined? @source
-                raise Puppet::DevError, "Somehow source is still undefined"
-            end
-
             sourceobj, path = @parent.uri2obj(@source)
 
             begin
                 contents = sourceobj.server.retrieve(path, @parent[:links])
-            rescue NetworkClientError => detail
+            rescue Puppet::Network::XMLRPCClientError => detail
                 self.err "Could not retrieve %s: %s" %
                     [path, detail]
                 return nil
@@ -267,4 +262,4 @@ module Puppet
     end
 end
 
-# $Id: source.rb 1300 2006-06-19 19:12:54Z luke $
+# $Id: source.rb 2409 2007-04-24 06:20:21Z luke $