puppet 0.22.4 → 0.23.0

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

@@ -26,20 +26,19 @@ module Puppet
         end
 
         # We want to print names, not numbers
-        def is_to_s
-            if @is.is_a? Integer
-                id2name(@is) || @is
+        def is_to_s(currentvalue)
+            if currentvalue.is_a? Integer
+                id2name(currentvalue) || currentvalue
             else
-                return @is.to_s
+                return currentvalue.to_s
             end
         end
 
-        def should_to_s
-            should = self.should
-            if should.is_a? Integer
-                id2name(should) || should
+        def should_to_s(newvalue = @should)
+            if newvalue.is_a? Integer
+                id2name(newvalue) || newalue
             else
-                return should.to_s
+                return newvalue.to_s
             end
         end
 
@@ -57,20 +56,20 @@ module Puppet
                     end
                 end
             end
-            stat = @parent.stat(false)
+            stat = @resource.stat(false)
 
             unless stat
-                self.is = :absent
-                return
+                return :absent
             end
 
             # Set our method appropriately, depending on links.
-            if stat.ftype == "link" and @parent[:links] != :follow
+            if stat.ftype == "link" and @resource[:links] != :follow
                 @method = :lchown
             else
                 @method = :chown
             end
-            self.is = stat.gid
+
+            return stat.gid
         end
 
         # Determine if the group is valid, and if so, return the GID
@@ -90,17 +89,13 @@ module Puppet
         # 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.
         def sync
-            if @is == :absent
-                @parent.stat(true)
-                self.retrieve
+            unless @resource.stat(false)
+                stat = @resource.stat(true)
+                currentvalue = self.retrieve
 
-                if @is == :absent
+                unless stat
                     self.debug "File '%s' does not exist; cannot chgrp" %
-                        @parent[:path]
-                    return nil
-                end
-
-                if self.insync?
+                        @resource[:path]
                     return nil
                 end
             end
@@ -112,10 +107,10 @@ module Puppet
 
             begin
                 # set owner to nil so it's ignored
-                File.send(@method,nil,gid,@parent[:path])
+                File.send(@method,nil,gid,@resource[:path])
             rescue => detail
                 error = Puppet::Error.new( "failed to chgrp %s to %s: %s" %
-                    [@parent[:path], self.should, detail.message])
+                    [@resource[:path], self.should, detail.message])
                 raise error
             end
             return :file_changed
@@ -123,4 +118,4 @@ module Puppet
     end
 end
 
-# $Id: group.rb 2169 2007-02-07 06:47:10Z luke $
+# $Id: group.rb 2500 2007-05-09 22:05:32Z luke $

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

@@ -10,27 +10,27 @@ module Puppet
 
         # Our modes are octal, so make sure they print correctly.  Other
         # valid values are symbols, basically
-        def is_to_s
-            case @is
+        def is_to_s(currentvalue)
+            case currentvalue
             when Integer
-                return "%o" % @is
+                return "%o" % currentvalue
             when Symbol
-                return @is
+                return currentvalue
             else
-                raise Puppet::DevError, "Invalid 'is' value for mode: %s" %
-                    @is.inspect
+                raise Puppet::DevError, "Invalid current value for mode: %s" %
+                    currentvalue.inspect
             end
         end
 
-        def should_to_s
-            case self.should
+        def should_to_s(newvalue = @should)
+            case newvalue
             when Integer
-                return "%o" % self.should
+                return "%o" % newvalue
             when Symbol
-                return self.should
+                return newvalue
             else
                 raise Puppet::DevError, "Invalid 'should' value for mode: %s" %
-                    self.should.inspect
+                    newvalue.inspect
             end
         end
 
@@ -62,7 +62,7 @@ module Puppet
         # If we're a directory, we need to be executable for all cases
         # that are readable.  This should probably be selectable, but eh.
         def dirmask(value)
-            if FileTest.directory?(@parent[:path])
+            if FileTest.directory?(@resource[:path])
                 if value & 0400 != 0
                     value |= 0100
                 end
@@ -77,12 +77,12 @@ module Puppet
             return value
         end
 
-        def insync?
-            if stat = @parent.stat and stat.ftype == "link" and @parent[:links] != :follow
+        def insync?(currentvalue)
+            if stat = @resource.stat and stat.ftype == "link" and @resource[:links] != :follow
                 self.debug "Not managing symlink mode"
                 return true
             else
-                return super
+                return super(currentvalue)
             end
         end
 
@@ -90,31 +90,24 @@ module Puppet
             # If we're not following links and we're a link, then we just turn
             # off mode management entirely.
 
-            if stat = @parent.stat(false)
-                self.is = stat.mode & 007777
+            if stat = @resource.stat(false)
                 unless defined? @fixed
                     if defined? @should and @should
                         @should = @should.collect { |s| self.dirmask(s) }
                     end
                 end
+                return stat.mode & 007777
             else
-                self.is = :absent
+                return :absent
             end
-
-            #self.debug "chmod state is %o" % self.is
         end
 
         def sync
-            if @is == :absent
-                @parent.stat(true)
-                self.retrieve
-                if @is == :absent
-                    self.debug "File does not exist; cannot set mode"
-                    return nil
-                end
+            unless @resource.stat(false)
+                stat = @resource.stat(true)
 
-                if self.insync?
-                    # we're already in sync
+                unless stat
+                    self.debug "File does not exist; cannot set mode"
                     return nil
                 end
             end
@@ -127,10 +120,10 @@ module Puppet
             end
 
             begin
-                File.chmod(mode,@parent[:path])
+                File.chmod(mode, @resource[:path])
             rescue => detail
                 error = Puppet::Error.new("failed to chmod %s: %s" %
-                    [@parent[:path], detail.message])
+                    [@resource[:path], detail.message])
                 error.set_backtrace detail.backtrace
                 raise error
             end
@@ -139,4 +132,4 @@ module Puppet
     end
 end
 
-# $Id: mode.rb 2273 2007-03-08 17:35:18Z luke $
+# $Id: mode.rb 2500 2007-05-09 22:05:32Z luke $

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

@@ -64,21 +64,21 @@ module Puppet
         end
 
         # We want to print names, not numbers
-        def is_to_s
-            id2name(@is) || @is
+        def is_to_s(currentvalue)
+            id2name(currentvalue) || currentvalue
         end
 
-        def should_to_s
-            case self.should
+        def should_to_s(newvalue = @should)
+            case newvalue
             when Symbol
-                self.should.to_s
+                newvalue.to_s
             when Integer
-                id2name(self.should) || self.should
+                id2name(newvalue) || newvalue
             when String
-                self.should
+                newvalue
             else
                 raise Puppet::DevError, "Invalid uid type %s(%s)" %
-                    [self.should.class, self.should]
+                    [newvalue.class, newvalue]
             end
         end
 
@@ -97,34 +97,35 @@ module Puppet
                 end
             end
             
-            unless stat = @parent.stat(false)
-                @is = :absent
-                return
+            unless stat = @resource.stat(false)
+                return :absent
             end
 
             # Set our method appropriately, depending on links.
-            if stat.ftype == "link" and @parent[:links] != :follow
+            if stat.ftype == "link" and @resource[:links] != :follow
                 @method = :lchown
             else
                 @method = :chown
             end
 
-            self.is = stat.uid
-
+            currentvalue = stat.uid
+            
             # On OS X, files that are owned by -2 get returned as really
             # large UIDs instead of negative ones.  This isn't a Ruby bug,
             # 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 = :silly
+            if currentvalue > 120000
+                self.warning "current state is silly: %s" % currentvalue
+                currentvalue = :silly
             end
+
+            return currentvalue
         end
 
         def sync
             unless Puppet::Util::SUIDManager.uid == 0
                 unless defined? @@notifieduid
                     self.notice "Cannot manage ownership unless running as root"
-                    #@parent.delete(self.name)
+                    #@resource.delete(self.name)
                     @@notifieduid = true
                 end
                 return nil
@@ -146,21 +147,16 @@ module Puppet
                 return nil
             end
 
-            if @is == :absent
-                @parent.stat(true)
-                self.retrieve
-                if @is == :absent
+            unless @resource.stat(false)
+                unless @resource.stat(true)
                     self.debug "File does not exist; cannot set owner"
                     return nil
                 end
-                if self.insync?
-                    return nil
-                end
                 #self.debug "%s: after refresh, is '%s'" % [self.class.name,@is]
             end
 
             begin
-                File.send(@method, user, nil, @parent[:path])
+                File.send(@method, user, nil, @resource[:path])
             rescue => detail
                 raise Puppet::Error, "Failed to set owner to '%s': %s" %
                     [user, detail]
@@ -171,4 +167,4 @@ module Puppet
     end
 end
 
-# $Id: owner.rb 2178 2007-02-07 23:56:59Z luke $
+# $Id: owner.rb 2501 2007-05-09 23:08:42Z luke $

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

@@ -22,7 +22,16 @@ module Puppet
                         source => \"puppet://server/module/sendmail.cf\"
                     }
                 }
-            
+
+            Currently, only the ``puppet`` scheme is supported for source 
+            URL's. Puppet will connect to the file server running on 
+            ``server`` to retrieve the contents of the file. If the 
+            ``server`` part is empty, the behavior of the command-line 
+            interpreter (``puppet``) and the client demon (``puppetd``) differs
+            slightly: ``puppet`` will look such a file up on the module path
+            on the local host, whereas ``puppetd`` will connect to the 
+            puppet server that it received the manifest from.
+     
             See the `FileServingConfiguration fileserver configuration documentation`:trac: for information on how to configure
             and use file services within Puppet.
 
@@ -46,7 +55,7 @@ module Puppet
         uncheckable
         
         validate do |source|
-            unless @parent.uri2obj(source)
+            unless @resource.uri2obj(source)
                 raise Puppet::Error, "Invalid source %s" % source
             end
         end
@@ -60,9 +69,9 @@ module Puppet
             source.sub(/\/$/, '')
         end
         
-        def change_to_s
-            should = "{md5}" + @stats[:checksum]
-            if @parent.is(:ensure) == :absent
+        def change_to_s(currentvalue, newvalue)
+            # newvalue = "{md5}" + @stats[:checksum]
+            if @resource.property(:ensure).retrieve == :absent
                 return "creating from source %s with contents %s" % [@source, @stats[:checksum]]
             else
                 return "replacing from source %s with contents %s" % [@source, @stats[:checksum]]
@@ -79,11 +88,11 @@ module Puppet
 
         # Ask the file server to describe our file.
         def describe(source)
-            sourceobj, path = @parent.uri2obj(source)
+            sourceobj, path = @resource.uri2obj(source)
             server = sourceobj.server
 
             begin
-                desc = server.describe(path, @parent[:links])
+                desc = server.describe(path, @resource[:links])
             rescue Puppet::Network::XMLRPCClientError => detail
                 self.err "Could not describe %s: %s" %
                     [path, detail]
@@ -107,7 +116,7 @@ module Puppet
                 args.delete(:owner)
             end
 
-            if args.empty? or (args[:type] == "link" and @parent[:links] == :ignore)
+            if args.empty? or (args[:type] == "link" and @resource[:links] == :ignore)
                 return nil
             else
                 return args
@@ -116,17 +125,17 @@ module Puppet
         
         # Have we successfully described the remote source?
         def described?
-            ! @stats.nil? and ! @stats[:type].nil? and @is != :notdescribed
+            ! @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?
+        def insync?(currentvalue)
             unless described?
                 info "No specified sources exist"
                 return true
             end
             
-            if @is == :nocopy
+            if currentvalue == :nocopy
                 return true
             end
             
@@ -136,11 +145,14 @@ module Puppet
                 return true
             end
             
-            if @parent.is(:ensure) != :absent and ! @parent.replace?
+            #FIXARB: Inefficient?  Needed to call retrieve on parent's ensure and checksum
+            parentensure = @resource.property(:ensure).retrieve
+            if parentensure != :absent and ! @resource.replace?
                 return true
             end
             # Now, we just check to see if the checksums are the same
-            return @parent.is(:checksum) == @stats[:checksum]
+            parentchecksum = @resource.property(:checksum).retrieve
+            return (!parentchecksum.nil? and (parentchecksum == @stats[:checksum]))
         end
 
         def pinparams
@@ -169,21 +181,19 @@ module Puppet
             end
 
             if @stats.nil? or @stats[:type].nil?
-                @is = :notdescribed
-                return nil
+                return nil # :notdescribed
             end
             
             case @stats[:type]
             when "directory", "file":
-                unless @parent.deleting?
-                    @parent[:ensure] = @stats[:type]
+                unless @resource.deleting?
+                    @resource[:ensure] = @stats[:type]
                 end
             else
                 self.info @stats.inspect
                 self.err "Cannot use files of type %s as sources" %
                     @stats[:type]
-                @is = :nocopy
-                return
+                return :nocopy
             end
 
             # Take each of the stats and set them as states on the local file
@@ -194,13 +204,12 @@ module Puppet
 
                 # was the stat already specified, or should the value
                 # be inherited from the source?
-                unless @parent.argument?(stat)
-                    @parent[stat] = value
-                    @parent.property(stat).retrieve
+                unless @resource.argument?(stat)
+                    @resource[stat] = value
                 end
             }
             
-            @is = @stats[:checksum]
+            return @stats[:checksum]
         end
         
         def should
@@ -214,25 +223,25 @@ module Puppet
             checks = (pinparams + [:ensure])
             checks.delete(:checksum)
             
-            @parent[:check] = checks
-            unless @parent.property(:checksum)
-                @parent[:checksum] = :md5
+            @resource[:check] = checks
+            unless @resource.property(:checksum)
+                @resource[:checksum] = :md5
             end
         end
 
         def sync
             unless @stats[:type] == "file"
                 #if @stats[:type] == "directory"
-                        #[@parent.name, @is.inspect, @should.inspect]
+                        #[@resource.name, @should.inspect]
                 #end
                 raise Puppet::DevError, "Got told to copy non-file %s" %
-                    @parent[:path]
+                    @resource[:path]
             end
 
-            sourceobj, path = @parent.uri2obj(@source)
+            sourceobj, path = @resource.uri2obj(@source)
 
             begin
-                contents = sourceobj.server.retrieve(path, @parent[:links])
+                contents = sourceobj.server.retrieve(path, @resource[:links])
             rescue Puppet::Network::XMLRPCClientError => detail
                 self.err "Could not retrieve %s: %s" %
                     [path, detail]
@@ -249,9 +258,9 @@ module Puppet
                 self.notice "Could not retrieve contents for %s" %
                     @source
             end
-            exists = File.exists?(@parent[:path])
+            exists = File.exists?(@resource[:path])
 
-            @parent.write { |f| f.print contents }
+            @resource.write { |f| f.print contents }
 
             if exists
                 return :file_changed
@@ -262,4 +271,4 @@ module Puppet
     end
 end
 
-# $Id: source.rb 2409 2007-04-24 06:20:21Z luke $
+# $Id: source.rb 2610 2007-06-18 19:29:56Z lutter $