puppet 0.18.4 → 0.22.4

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

@@ -3,9 +3,14 @@
 # This state never actually modifies the system, it only notices when the system
 # changes on its own.
 module Puppet
-    Puppet.type(:file).newstate(:checksum) do
-        desc "How to check whether a file has changed.  **md5**/*lite-md5*/
-            *time*/*mtime*"
+    Puppet.type(:file).newproperty(:checksum) do
+        desc "How to check whether a file has changed.  This state is used internally
+            for file copying, but it can also be used to monitor files somewhat
+            like Tripwire without managing the file contents in any way.  You can
+            specify that a file's checksum should be monitored and then subscribe to
+            the file from another object and receive events to signify
+            checksum changes, for instance."
+
         @event = :file_changed
 
         @unmanaged = true
@@ -24,6 +29,8 @@ module Puppet
 
         str = @validtypes.join("|")
 
+        # This is here because Puppet sets this internally, using
+        # {md5}......
         newvalue(/^\{#{str}\}/) do
             handlesum()
         end
@@ -33,50 +40,75 @@ module Puppet
             :nochange
         end
 
-        # Convert from the sum type to the stored checksum.
+        # If they pass us a sum type, behave normally, but if they pass
+        # us a sum type + sum, stick the sum in the cache.
         munge do |value|
-            unless defined? @checktypes
-                @checktypes = []
-            end
-
             if value =~ /^\{(\w+)\}(.+)$/
-                @checktypes << $1
-                #return $2
-                return value
+                type = symbolize($1)
+                sum = $2
+                cache(type, sum)
+                return type
             else
                 if FileTest.directory?(@parent[:path])
-                    value = "time"
+                    return :time
+                else
+                    return symbolize(value)
                 end
-                value = super(value)
-                @checktypes << value
-                return getcachedsum()
             end
         end
 
-        def checktype
-            @checktypes[0]
+        # Store the checksum in the data cache, or retrieve it if only the
+        # sum type is provided.
+        def cache(type, sum = nil)
+            unless type
+                raise ArgumentError, "A type must be specified to cache a checksum"
+            end
+            type = symbolize(type)
+            unless state = @parent.cached(:checksums) 
+                self.debug "Initializing checksum hash"
+                state = {}
+                @parent.cache(:checksums, state)
+            end
+
+            if sum
+                unless sum =~ /\{\w+\}/
+                    sum = "{%s}%s" % [type, sum]
+                end
+                state[type] = sum
+            else
+                return state[type]
+            end
         end
 
         # Because source and content and whomever else need to set the checksum
         # and do the updating, we provide a simple mechanism for doing so.
         def checksum=(value)
             @is = value
-            @should = [value]
+            munge(@should)
             self.updatesum
         end
 
+        def checktype
+            self.should || :md5
+        end
+
         # Checksums need to invert how changes are printed.
         def change_to_s
             begin
                 if @is == :absent
                     return "defined '%s' as '%s'" %
-                        [self.name, self.should_to_s]
+                        [self.name, self.currentsum]
                 elsif self.should == :absent
                     return "undefined %s from '%s'" %
                         [self.name, self.is_to_s]
                 else
-                    return "%s changed '%s' to '%s'" %
-                        [self.name, self.should_to_s, self.is_to_s]
+                    if defined? @cached and @cached
+                        return "%s changed '%s' to '%s'" %
+                            [self.name, @cached, self.is_to_s]
+                    else
+                        return "%s changed '%s' to '%s'" %
+                            [self.name, self.currentsum, self.is_to_s]
+                    end
                 end
             rescue Puppet::Error, Puppet::DevError
                 raise
@@ -86,6 +118,11 @@ module Puppet
             end
         end
 
+        def currentsum
+            #"{%s}%s" % [self.should, cache(self.should)]
+            cache(checktype())
+        end
+
         # Retrieve the cached sum
         def getcachedsum
             hash = nil
@@ -94,11 +131,7 @@ module Puppet
                 @parent.cache(:checksums, hash)
             end
 
-            sumtype = @checktypes[0]
-
-            #unless state
-            #    self.devfail "Did not get state back from Storage"
-            #end
+            sumtype = self.should
 
             if hash.include?(sumtype)
                 #self.notice "Found checksum %s for %s" %
@@ -126,14 +159,10 @@ module Puppet
             checktype = checktype.intern if checktype.is_a? String
             case checktype
             when :md5, :md5lite:
-                unless FileTest.file?(@parent[:path])
-                    @parent.info "Cannot MD5 sum directory %s" %
-                        @parent[:path]
-
-                    @should = [nil]
-                    @is = nil
-                    #@parent.delete(self[:path])
-                    return
+                if ! FileTest.file?(@parent[:path])
+                    @parent.debug "Cannot MD5 sum %s; using mtime" %
+                        [@parent.stat.ftype]
+                    sum = @parent.stat.mtime.to_s
                 else
                     begin
                         File.open(@parent[:path]) { |file|
@@ -158,7 +187,7 @@ module Puppet
                             @parent[:path]
                         @parent.delete(self.class.name)
                     rescue => detail
-                        self.notice "Cannot checksum %s: %s" %
+                        self.notice "Cannot checksum: %s" %
                             detail
                         @parent.delete(self.class.name)
                     end
@@ -174,7 +203,6 @@ module Puppet
             end
 
             return "{#{checktype}}" + sum.to_s
-            #return sum.to_s
         end
 
         # At this point, we don't actually modify the system, we modify
@@ -183,7 +211,7 @@ module Puppet
         def handlesum
             if @is.nil?
                 raise Puppet::Error, "Checksum state for %s is somehow nil" %
-                    @parent.name
+                    @parent.title
             end
 
             if @is == :absent
@@ -201,7 +229,7 @@ module Puppet
                 if @is == :absent
                     # if they're copying, then we won't worry about the file
                     # not existing yet
-                    unless @parent.state(:source)
+                    unless @parent.property(:source)
                         self.warning(
                             "File %s does not exist -- cannot checksum" %
                             @parent[:path]
@@ -219,6 +247,17 @@ module Puppet
             end
         end
 
+        def insync?
+            @should = [checktype]
+            if cache(checktype())
+                return @is == currentsum()
+            else
+                # If there's no cached sum, then we don't want to generate
+                # an event.
+                return true
+            end
+        end
+
         # Even though they can specify multiple checksums, the insync?
         # mechanism can really only test against one, so we'll just retrieve
         # the first specified sum type.
@@ -229,10 +268,6 @@ module Puppet
                 return @is
             end
 
-            unless defined? @checktypes
-                @checktypes = ["md5"]
-            end
-
             stat = nil
             unless stat = @parent.stat
                 self.is = :absent
@@ -242,29 +277,18 @@ module Puppet
             if stat.ftype == "link" and @parent[:links] != :follow
                 self.debug "Not checksumming symlink"
                 #@parent.delete(:checksum)
-                self.is = self.should
+                self.is = self.currentsum
                 return
             end
 
-            if stat.ftype == "directory" and @checktypes[0] =~ /md5/
-                @checktypes = ["time"]
-            end
-
             # Just use the first allowed check type
-            @is = getsum(@checktypes[0])
-
-            # @should should always be set, so if it's not set at all, we
-            # know we haven't looked in the cache yet.
-            unless defined? @should and ! @should.nil?
-                @should = [getcachedsum()]
-            end
+            @is = getsum(checktype())
 
-            # If there is no should defined, then store the current value
-            # into the 'should' value, so that we're not marked as being
+            # If there is no sum defined, then store the current value
+            # into the cache, so that we're not marked as being
             # out of sync.  We don't want to generate an event the first
             # time we get a sum.
-            if @should == [:nosum]
-                @should = [@is]
+            unless cache(checktype())
                 # FIXME we should support an updatechecksums-like mechanism
                 self.updatesum
             end
@@ -275,39 +299,42 @@ module Puppet
         # Store the new sum to the state db.
         def updatesum
             result = false
-            state = nil
-            unless state = @parent.cached(:checksums) 
-                self.debug "Initializing checksum hash for %s" % @parent.name
-                state = {}
-                @parent.cache(:checksums, state)
-            end
 
             if @is.is_a?(Symbol)
-                error = Puppet::Error.new("%s has invalid checksum" %
-                    @parent.name)
-                raise error
+                raise Puppet::Error, "%s has invalid checksum" % @parent.title
             end
 
             # if we're replacing, vs. updating
-            if state.include?(@checktypes[0])
-                unless defined? @should
-                    raise Puppet::Error.new(
-                        ("@should is not initialized for %s, even though we " +
-                        "found a checksum") % @parent[:path]
-                    )
+            if sum = cache(checktype())
+                # unless defined? @should
+                #     raise Puppet::Error.new(
+                #         ("@should is not initialized for %s, even though we " +
+                #         "found a checksum") % @parent[:path]
+                #     )
+                # end
+                
+                if @is == sum
+                    return false
                 end
+
+                #if cache(self.should) == @is
+                #    raise Puppet::Error, "Got told to update same sum twice"
+                #end
                 self.debug "Replacing %s checksum %s with %s" %
-                    [@parent.name, state[@checktypes[0]],@is]
+                    [@parent.title, sum, @is]
                 #@parent.debug "@is: %s; @should: %s" % [@is,@should]
                 result = true
             else
                 @parent.debug "Creating checksum %s" % @is
                 result = false
             end
-            state[@checktypes[0]] = @is
+
+            # Cache the sum so the log message can be right if possible.
+            @cached = sum
+            cache(checktype(), @is)
             return result
         end
     end
 end
 
-# $Id: checksum.rb 1147 2006-04-28 17:19:45Z luke $
+# $Id: checksum.rb 2169 2007-02-07 06:47:10Z luke $

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

@@ -1,9 +1,9 @@
 module Puppet
-    Puppet.type(:file).newstate(:content) do
-        desc "Specify the contents of a file as a string.  Newlines, tabs, and spaces
-            can be specified using the escaped syntax (e.g., \\n for a newline).  The
-            primary purpose of this parameter is to provide a kind of limited
-            templating:
+    Puppet.type(:file).newproperty(:content) do
+        desc "Specify the contents of a file as a string.  Newlines, tabs, and
+            spaces can be specified using the escaped syntax (e.g., \\n for a
+            newline).  The primary purpose of this parameter is to provide a
+            kind of limited templating::
 
                 define resolve(nameserver1, nameserver2, domain, search) {
                     $str = \"search $search
@@ -17,11 +17,17 @@ module Puppet
                     }
                 }
             
-            Yes, it's very primitive, and it's useless for larger files, but it
-            is mostly meant as a stopgap measure for simple cases."
+            This attribute is especially useful when used with
+            `PuppetTemplating templating`:trac:."
 
         def change_to_s
-            "synced"
+            should = "{md5}" + Digest::MD5.hexdigest(self.should)
+            if @is == :absent
+                return "created file with contents %s" % should
+            else
+                is = "{md5}" + Digest::MD5.hexdigest(@is)
+                return "changed file contents from %s to %s" % [is, should]
+            end
         end
 
         # We should probably take advantage of existing md5 sums if they're there,
@@ -49,7 +55,7 @@ module Puppet
             rescue => detail
                 @is = nil
                 raise Puppet::Error, "Could not read %s: %s" %
-                    [@parent.name, detail]
+                    [@parent.title, detail]
             end
         end
 
@@ -67,4 +73,4 @@ module Puppet
     end
 end
 
-# $Id: content.rb 1300 2006-06-19 19:12:54Z luke $
+# $Id: content.rb 2408 2007-04-24 02:41:16Z luke $

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

@@ -2,19 +2,21 @@ module Puppet
     Puppet.type(:file).ensurable do
         require 'etc'
         desc "Whether to create files that don't currently exist.
-            Possible values are *absent*, *present* (equivalent to *file*),
-            *file*, and *directory*.  Specifying 'absent' will delete the file,
-            although currently this will not recursively delete directories.
+            Possible values are *absent*, *present* (equivalent to ``exists`` in
+            most file tests -- will match any form of file existence, and if the
+            file is missing will create an empty file), *file*, and
+            *directory*.  Specifying ``absent`` will delete the file, although
+            currently this will not recursively delete directories.
 
             Anything other than those values will be considered to be a symlink.
-            For instance, the following text creates a link:
+            For instance, the following text creates a link::
                 
                 # Useful on solaris
                 file { \"/etc/inetd.conf\":
                     ensure => \"/etc/inet/inetd.conf\"
                 }
             
-            You can make relative links:
+            You can make relative links::
                 
                 # Useful on solaris
                 file { \"/etc/inetd.conf\":
@@ -30,7 +32,7 @@ module Puppet
             with directories corresponding to each directory
             and links corresponding to each file."
 
-        # Most 'ensure' states have a default, but with files we, um, don't.
+        # Most 'ensure' properties have a default, but with files we, um, don't.
         nodefault
 
         newvalue(:absent) do
@@ -41,8 +43,8 @@ module Puppet
 
         newvalue(:file) do
             # Make sure we're not managing the content some other way
-            if state = @parent.state(:content) or state = @parent.state(:source)
-                state.sync
+            if property = (@parent.property(:content) || @parent.property(:source))
+                property.sync
             else
                 @parent.write(false) { |f| f.flush }
                 mode = @parent.should(:mode)
@@ -50,7 +52,12 @@ module Puppet
             return :file_created
         end
 
-        aliasvalue(:present, :file)
+        #aliasvalue(:present, :file)
+        newvalue(:present) do
+            # Make a file if they want something, but this will match almost
+            # anything.
+            set_file
+        end
 
         newvalue(:directory) do
             mode = @parent.should(:mode)
@@ -60,7 +67,7 @@ module Puppet
                     "Cannot create %s; parent directory %s does not exist" %
                         [@parent[:path], parent]
             end
-            Puppet::Util.asuser(@parent.asuser()) {
+            @parent.write_if_writable(parent) do
                 if mode
                     Puppet::Util.withumask(000) do
                         Dir.mkdir(@parent[:path],mode)
@@ -68,22 +75,18 @@ module Puppet
                 else
                     Dir.mkdir(@parent[:path])
                 end
-            }
+            end
+            @parent.send(:property_fix)
             @parent.setchecksum
             return :directory_created
         end
 
 
         newvalue(:link) do
-            if state = @parent.state(:target)
-                state.retrieve
+            if property = @parent.property(:target)
+                property.retrieve
 
-                if state.linkmaker
-                    self.set_directory
-                    return :directory_created
-                else
-                    return state.mklink
-                end
+                return property.mklink
             else
                 self.fail "Cannot create a symlink without a target"
             end
@@ -105,6 +108,14 @@ module Puppet
             return :link
         end
 
+        def change_to_s
+            if property = (@parent.property(:content) || @parent.property(:source)) and ! property.insync?
+                return property.change_to_s
+            else
+                super
+            end
+        end
+
         # Check that we can actually create anything
         def check
             basedir = File.dirname(@parent[:path])
@@ -112,11 +123,25 @@ module Puppet
             if ! FileTest.exists?(basedir)
                 raise Puppet::Error,
                     "Can not create %s; parent directory does not exist" %
-                    @parent.name
+                    @parent.title
             elsif ! FileTest.directory?(basedir)
                 raise Puppet::Error,
                     "Can not create %s; %s is not a directory" %
-                    [@parent.name, dirname]
+                    [@parent.title, dirname]
+            end
+        end
+
+        # We have to treat :present specially, because it works with any
+        # type of file.
+        def insync?
+            if self.should == :present
+                if @is.nil? or @is == :absent
+                    return false
+                else
+                    return true
+                end
+            else
+                return super
             end
         end
 
@@ -133,23 +158,16 @@ module Puppet
         end
 
         def sync
-            event = super
-
-            # There are some cases where all of the work does not get done on
-            # file creation, so we have to do some extra checking.
-            @parent.each do |thing|
-                next unless thing.is_a? Puppet::State
-                next if thing == self
-
-                thing.retrieve
-                unless thing.insync?
-                    thing.sync
-                end
+            @parent.remove_existing(self.should)
+            if self.should == :absent
+                return :file_removed
             end
 
+            event = super
+
             return event
         end
     end
 end
 
-# $Id: ensure.rb 1300 2006-06-19 19:12:54Z luke $
+# $Id: ensure.rb 2408 2007-04-24 02:41:16Z luke $