puppet 0.23.2 → 0.24.0

data/lib/puppet/type/sshkey.rb

@@ -72,4 +72,3 @@ module Puppet
     end
 end
 
-# $Id: sshkey.rb 2500 2007-05-09 22:05:32Z luke $

data/lib/puppet/type/tidy.rb

@@ -1,7 +1,3 @@
-
-require 'etc'
-require 'puppet/type/pfile'
-
 module Puppet
     newtype(:tidy, Puppet.type(:file)) do
         @doc = "Remove unwanted files based on specific criteria.  Multiple
@@ -14,11 +10,17 @@ module Puppet
             isnamevar
         end
 
+        newparam(:matches) do
+            desc "One or more file glob patterns, which restrict the list of
+                files to be tidied to those whose basenames match at least one
+                of the patterns specified.  Multiple patterns can be specified
+                using an array."
+        end
+
         copyparam(Puppet.type(:file), :backup)
         
         newproperty(:ensure) do
             desc "An internal attribute used to determine which files should be removed."
-            require 'etc'
 
             @nodoc = true
             
@@ -47,6 +49,14 @@ module Puppet
                     end
                 else
                     @out = []
+                    if @resource[:matches]
+                        basename = File.basename(@resource[:path])
+                        flags = File::FNM_DOTMATCH | File::FNM_PATHNAME
+                        unless @resource[:matches].any? {|pattern| File.fnmatch(pattern, basename, flags) }
+                            self.debug "No patterns specified match basename, skipping"
+                            return true
+                        end
+                    end
                     TATTRS.each do |param|
                         if property = @resource.property(param)
                             self.debug "No is value for %s", [param] if is[property].nil?
@@ -139,7 +149,6 @@ module Puppet
                     type = @resource[:type] || :atime
                 end
                 
-                #return Integer(Time.now - stat.send(type))
                 return stat.send(type).to_i
             end
 
@@ -292,4 +301,3 @@ module Puppet
     end
 end
 
-# $Id: tidy.rb 2647 2007-07-04 22:25:23Z luke $

data/lib/puppet/type/user.rb

@@ -343,4 +343,3 @@ module Puppet
     end
 end
 
-# $Id: user.rb 2665 2007-07-09 21:32:33Z luke $

data/lib/puppet/type/zone.rb

@@ -400,4 +400,3 @@ end
     end
 end
 
-# $Id: zone.rb 2576 2007-06-14 03:39:00Z luke $

data/lib/puppet/util.rb

@@ -201,7 +201,7 @@ module Util
             raise Puppet::DevError, "Failed to provide level to :benchmark"
         end
 
-        unless object.respond_to? level
+        unless level == :none or object.respond_to? level
             raise Puppet::DevError, "Benchmarked object does not respond to %s" % level
         end
 
@@ -461,4 +461,3 @@ require 'puppet/util/logging'
 require 'puppet/util/package'
 require 'puppet/util/warnings'
 
-# $Id: util.rb 2717 2007-07-19 20:02:26Z luke $

data/lib/puppet/util/autoload.rb

@@ -3,7 +3,7 @@ class Puppet::Util::Autoload
     include Puppet::Util
 
     @autoloaders = {}
-    @loaded = {}
+    @loaded = []
 
     class << self
         attr_reader :autoloaders
@@ -13,12 +13,6 @@ class Puppet::Util::Autoload
     # Send [], []=, and :clear to the @autloaders hash
     Puppet::Util.classproxy self, :autoloaders, "[]", "[]="
 
-    # Clear the list of autoloaders and loaded files.
-    def self.clear
-        @autoloaders.clear
-        @loaded.clear
-    end
-
     # List all loaded files.
     def self.list_loaded
         @loaded.sort { |a,b| a[0] <=> b[0] }.collect do |path, hash|
@@ -27,15 +21,20 @@ class Puppet::Util::Autoload
     end
 
     # Has a given path been loaded?  This is used for testing whether a
-    # changed file should be loaded or just ignored.
+    # changed file should be loaded or just ignored.  This is only
+    # used in network/client/master, when downloading plugins, to
+    # see if a given plugin is currently loaded and thus should be
+    # reloaded.
     def self.loaded?(path)
         path = path.to_s.sub(/\.rb$/, '')
-        @loaded[path]
+        @loaded.include?(path)
     end
 
-    # Save the fact that a given path has been loaded
-    def self.loaded(path, file, loader)
-        @loaded[path] = {:file => file, :autoloader => loader}
+    # Save the fact that a given path has been loaded.  This is so
+    # we can load downloaded plugins if they've already been loaded
+    # into memory.
+    def self.loaded(file)
+        @loaded << file unless @loaded.include?(file)
     end
 
     attr_accessor :object, :path, :objwarn, :wrap
@@ -94,7 +93,7 @@ class Puppet::Util::Autoload
     # Mark the named object as loaded.  Note that this supports unqualified
     # queries, while we store the result as a qualified query in the class.
     def loaded(name, file)
-        self.class.loaded(File.join(@path, name.to_s), file, object)
+        self.class.loaded(File.join(@path, name.to_s))
     end
 
     # Indicate whether the specfied plugin has been loaded.
@@ -108,16 +107,11 @@ class Puppet::Util::Autoload
         # Load every instance of everything we can find.
         eachdir do |dir|
             Dir.glob("#{dir}/*.rb").each do |file|
-                # Load here, rather than require, so that facts
-                # can be reloaded.  This has some short-comings, I
-                # believe, but it works as long as real classes
-                # aren't used.
                 name = File.basename(file).sub(".rb", '').intern
                 next if loaded?(name)
-                next if $".include?(File.join(@path, name.to_s + ".rb"))
-                filepath = File.join(@path, name.to_s + ".rb")
+                rubypath = File.join(@path, name.to_s)
                 begin
-                    Kernel.require file
+                    Kernel.require rubypath
                     loaded(name, file)
                 rescue => detail
                     if Puppet[:trace]
@@ -141,8 +135,12 @@ class Puppet::Util::Autoload
 
     # The list of directories to search through for loadable plugins.
     def searchpath
-        [Puppet[:libdir], $:].flatten
+        # JJM: Search for optional lib directories in each module bundle.
+        module_lib_dirs = Puppet[:modulepath].split(":").collect do |d|
+            Dir.glob("%s/*/lib" % d).select do |f|
+                FileTest.directory?(f) 
+            end
+        end.flatten
+        [module_lib_dirs, Puppet[:libdir], $:].flatten
     end
 end
-
-# $Id: autoload.rb 2668 2007-07-10 04:00:28Z luke $

data/lib/puppet/util/checksums.rb

@@ -0,0 +1,37 @@
+module Puppet::Util::Checksums
+    def md5(content)
+        require 'digest/md5'
+        Digest::MD5.hexdigest(content)
+    end
+
+    def md5_file(filename)
+        require 'digest/md5'
+
+        incr_digest = Digest::MD5.new()
+        File.open(filename, 'r') do |file|
+            file.each_line do |line|
+                incr_digest << line
+            end
+        end
+
+        return incr_digest.hexdigest
+    end
+
+    def sha1(content)
+        require 'digest/sha1'
+        Digest::SHA1.hexdigest(content)
+    end
+
+    def sha1_file(filename)
+        require 'digest/sha1'
+
+        incr_digest = Digest::SHA1.new()
+        File.open(filename, 'r') do |file|
+            file.each_line do |line|
+                incr_digest << line
+            end
+        end
+
+        return incr_digest.hexdigest
+    end
+end

data/lib/puppet/util/classgen.rb

@@ -205,4 +205,3 @@ module Puppet::Util::ClassGen
     end
 end
 
-# $Id: classgen.rb 1856 2006-11-11 07:40:16Z luke $

data/lib/puppet/util/diff.rb

@@ -0,0 +1,71 @@
+# Provide a diff between two strings.
+module Puppet::Util::Diff
+    include Puppet::Util
+    require 'tempfile'
+
+    def diff(old, new)
+        command = [Puppet[:diff]]
+        if args = Puppet[:diff_args] and args != ""
+            command << args
+        end
+        command << old << new
+        execute(command, :failonfail => false)
+    end
+
+    module_function :diff
+
+    # return diff string of two input strings
+    # format defaults to unified
+    # context defaults to 3 lines
+    def lcs_diff(data_old, data_new, format=:unified, context_lines=3)
+        unless Puppet.features.diff?
+            Puppet.warning "Cannot provide diff without the diff/lcs Ruby library"
+            return ""
+        end
+        data_old = data_old.split(/\n/).map! { |e| e.chomp }
+        data_new = data_new.split(/\n/).map! { |e| e.chomp }
+
+        output = ""
+
+        diffs = Diff::LCS.diff(data_old, data_new)
+        return output if diffs.empty?
+
+        oldhunk = hunk = nil
+        file_length_difference = 0
+
+        diffs.each do |piece|
+            begin
+                hunk = Diff::LCS::Hunk.new(data_old, data_new, piece, 
+                                           context_lines, 
+                                           file_length_difference)
+                file_length_difference = hunk.file_length_difference
+            next unless oldhunk
+            # Hunks may overlap, which is why we need to be careful when our
+            # diff includes lines of context. Otherwise, we might print
+            # redundant lines.
+            if (context_lines > 0) and hunk.overlaps?(oldhunk)
+                hunk.unshift(oldhunk)
+            else
+                output << oldhunk.diff(format)
+            end
+            ensure
+                oldhunk = hunk
+                output << "\n"
+            end
+        end
+
+        # Handle the last remaining hunk
+        output << oldhunk.diff(format) << "\n"
+    end
+
+    def string_file_diff(path, string)
+        require 'tempfile'
+        tempfile = Tempfile.new("puppet-diffing")
+        tempfile.open
+        tempfile.print string
+        tempfile.close
+        print diff(path, tempfile.path)
+        tempfile.delete
+    end
+end
+

data/lib/puppet/util/docs.rb

@@ -14,9 +14,11 @@ module Puppet::Util::Docs
         meta_def method, &block
     end
 
+    attr_writer :doc
+
     # Generate the full doc string.
     def doc
-        extra = methods.find_all { |m| m.to_s =~ /^dochook_.+/ }.collect { |m|
+        extra = methods.find_all { |m| m.to_s =~ /^dochook_.+/ }.sort.collect { |m|
             self.send(m)
         }.join("  ")
 
@@ -67,6 +69,11 @@ module Puppet::Util::Docs
         str + "\n"
     end
 
+    attr_reader :nodoc
+    def nodoc?
+        nodoc
+    end
+
     # Pad a field with spaces
     def pad(value, length)
         value.to_s + (" " * (length - value.to_s.length))
@@ -101,4 +108,3 @@ module Puppet::Util::Docs
     module_function :scrub
 end
 
-# $Id: docs.rb 2408 2007-04-24 02:41:16Z luke $

data/lib/puppet/util/errors.rb

@@ -52,4 +52,3 @@ module Puppet::Util::Errors
     end
 end
 
-# $Id: errors.rb 1739 2006-10-06 03:13:15Z luke $

data/lib/puppet/util/execution.rb

@@ -19,4 +19,3 @@ module Puppet::Util::Execution
     end
 end
 
-# $Id: execution.rb 1568 2006-09-05 23:20:45Z luke $

data/lib/puppet/util/fact_store.rb

@@ -57,4 +57,3 @@ module Puppet::Util
     end
 end
 
-# $Id: fact_store.rb 2457 2007-05-03 05:24:13Z luke $

data/lib/puppet/util/feature.rb

@@ -16,8 +16,7 @@ class Puppet::Util::Feature
         if self.class.respond_to?(method)
             raise ArgumentError, "Feature %s is already defined" % name
         end
-        
-        result = true
+
         if block_given?
             begin
                 result = yield
@@ -25,33 +24,21 @@ class Puppet::Util::Feature
                 warn "Failed to load feature test for %s: %s" % [name, detail]
                 result = false
             end
-        end
-        
-        if ary = options[:libs]
-            ary = [ary] unless ary.is_a?(Array)
-            
-            ary.each do |lib|
-                unless lib.is_a?(String)
-                    raise ArgumentError, "Libraries must be passed as strings not %s" % lib.class
-                end
-            
-                begin
-                    require lib
-                rescue Exception
-                    Puppet.debug "Failed to load library '%s' for feature '%s'" % [lib, name]
-                    result = false
-                end
-            end
+            @results[name] = result
         end
         
         meta_def(method) do
-            result
+            unless @results.include?(name)
+                @results[name] = test(name, options)
+            end
+            @results[name]
         end
     end
     
     # Create a new feature collection.
     def initialize(path)
         @path = path
+        @results = {}
         @loader = Puppet::Util::Autoload.new(self, @path)
     end
     
@@ -71,6 +58,28 @@ class Puppet::Util::Feature
             return false
         end
     end
-end
 
-# $Id: feature.rb 2178 2007-02-07 23:56:59Z luke $
+    # Actually test whether the feature is present.  We only want to test when
+    # someone asks for the feature, so we don't unnecessarily load
+    # files.
+    def test(name, options)
+        result = true
+        if ary = options[:libs]
+            ary = [ary] unless ary.is_a?(Array)
+            
+            ary.each do |lib|
+                unless lib.is_a?(String)
+                    raise ArgumentError, "Libraries must be passed as strings not %s" % lib.class
+                end
+            
+                begin
+                    require lib
+                rescue Exception
+                    Puppet.debug "Failed to load library '%s' for feature '%s'" % [lib, name]
+                    result = false
+                end
+            end
+        end
+        result
+    end
+end

data/lib/puppet/util/fileparsing.rb

@@ -268,7 +268,9 @@ module Puppet::Util::FileParsing
 
     # Define a new type of record.  These lines get split into hashes.  Valid
     # options are:
-    # * <tt>:absent</tt>: What to use when a field is absent.  Defaults to "".
+    # * <tt>:absent</tt>: What to use as value within a line, when a field is
+    #   absent.  Note that in the record object, the literal :absent symbol is
+    #   used, and not this value.  Defaults to "".
     # * <tt>:fields</tt>: The list of fields, as an array.  By default, all
     #   fields are considered required.
     # * <tt>:joiner</tt>: How to join fields together.  Defaults to '\t'.
@@ -394,4 +396,3 @@ module Puppet::Util::FileParsing
     end
 end
 
-# $Id: fileparsing.rb 2750 2007-08-06 17:59:37Z luke $

data/lib/puppet/util/filetype.rb

@@ -78,6 +78,7 @@ class Puppet::Util::FileType
     end
 
     def initialize(path)
+        raise ArgumentError.new("Path is nil") if path.nil?
         @path = path
     end
 
@@ -197,26 +198,44 @@ class Puppet::Util::FileType
     newfiletype(:suntab) do
         # Read a specific @path's cron tab.
         def read
-            Puppet::Util::SUIDManager.asuser(@path) {
-                %x{crontab -l 2>/dev/null}
-            }
+            begin
+                output = Puppet::Util.execute(%w{crontab -l}, :uid => @path)
+                return "" if output.include?("can't open your crontab")
+                return output
+            rescue
+                # If there's a failure, treat it like an empty file.
+                return ""
+            end
         end
 
         # Remove a specific @path's cron tab.
         def remove
-            Puppet::Util::SUIDManager.asuser(@path) {
-                %x{crontab -r 2>/dev/null}
-            }
+            begin
+                Puppet::Util.execute(%w{crontab -r}, :uid => @path)
+            rescue => detail
+                raise Puppet::Error, "Could not remove crontab for %s: %s" % [@path, detail]
+            end
         end
 
         # Overwrite a specific @path's cron tab; must be passed the @path name
         # and the text with which to create the cron tab.
         def write(text)
-            Puppet::Util::SUIDManager.asuser(@path) {
-                IO.popen("crontab", "w") { |p|
-                    p.print text
-                }
-            }
+            puts text
+            require "tempfile"
+            output_file = Tempfile.new("puppet")
+            fh = output_file.open
+            fh.print text
+            fh.close
+
+            # We have to chown the stupid file to the user.
+            File.chown(Puppet::Util.uid(@path), nil, output_file.path)
+
+            begin
+                Puppet::Util.execute(["crontab", output_file.path], :uid => @path)
+            rescue => detail
+                raise Puppet::Error, "Could not write crontab for %s: %s" % [@path, detail]
+            end
+            output_file.delete
         end
     end
 
@@ -308,4 +327,3 @@ class Puppet::Util::FileType
     end
 end
 
-# $Id: filetype.rb 2679 2007-07-11 20:23:49Z luke $