puppet 0.24.9 → 0.25.0

data/lib/puppet/util/fileparsing.rb

@@ -169,7 +169,7 @@ module Puppet::Util::FileParsing
                 fields = []
                 ret = {}
                 record.fields.zip(match.captures).each do |field, value|
-                    if value == record.absent 
+                    if value == record.absent
                         ret[field] = :absent
                     else
                         ret[field] = value
@@ -223,7 +223,7 @@ module Puppet::Util::FileParsing
     # Split text into separate lines using the record separator.
     def lines(text)
         # Remove any trailing separators, and then split based on them
-        # LAK:NOTE See http://snurl.com/21zf8  [groups_google_com] 
+        # LAK:NOTE See http://snurl.com/21zf8  [groups_google_com]
         x = text.sub(/#{self.line_separator}\Q/,'').split(self.line_separator)
     end
 
@@ -332,7 +332,7 @@ module Puppet::Util::FileParsing
         end
 
         case record.type
-        when :text: return details[:line]
+        when :text; return details[:line]
         else
             if record.respond_to?(:to_line)
                 return record.to_line(details)

data/lib/puppet/util/filetype.rb

@@ -74,8 +74,10 @@ class Puppet::Util::FileType
 
     # Pick or create a filebucket to use.
     def bucket
-        filebucket = Puppet::Type.type(:filebucket)
-        (filebucket["puppet"] || filebucket.mkdefaultbucket).bucket
+        unless defined?(@bucket)
+            @bucket = Puppet::Type.type(:filebucket).mkdefaultbucket.bucket
+        end
+        @bucket
     end
 
     def initialize(path)
@@ -109,9 +111,9 @@ class Puppet::Util::FileType
         # Overwrite the file.
         def write(text)
             require "tempfile"
-            tf = Tempfile.new("puppet") 
-            tf.print text; tf.flush 
-            FileUtils.cp(tf.path, @path) 
+            tf = Tempfile.new("puppet")
+            tf.print text; tf.flush
+            FileUtils.cp(tf.path, @path)
             tf.close
             # If SELinux is present, we need to ensure the file has its expected context
             set_selinux_default_context(@path)
@@ -215,7 +217,7 @@ class Puppet::Util::FileType
                 raise Puppet::Error, "User %s not authorized to use cron" % @path if output.include?("you are not authorized to use cron")
                 return output
             rescue => detail
-                raise Puppet::Error, "Could not read crontab for %s: %s" % [@path, detail] 
+                raise Puppet::Error, "Could not read crontab for %s: %s" % [@path, detail]
             end
         end
 

data/lib/puppet/util/graph.rb

@@ -2,7 +2,7 @@
 #  Copyright (c) 2006. All rights reserved.
 
 require 'puppet'
-require 'puppet/pgraph'
+require 'puppet/simple_graph'
 
 # A module that handles the small amount of graph stuff in Puppet.
 module Puppet::Util::Graph
@@ -12,12 +12,12 @@ module Puppet::Util::Graph
     def to_graph(graph = nil, &block)
         # Allow our calling function to send in a graph, so that we
         # can call this recursively with one graph.
-        graph ||= Puppet::PGraph.new
-        
+        graph ||= Puppet::SimpleGraph.new
+
         self.each do |child|
             unless block_given? and ! yield(child)
                 graph.add_edge(self, child)
-                
+
                 if child.respond_to?(:to_graph)
                     child.to_graph(graph, &block)
                 end
@@ -25,7 +25,7 @@ module Puppet::Util::Graph
         end
 
         # Do a topsort, which will throw an exception if the graph is cyclic.
-        
+
         graph
     end
 end

data/lib/puppet/util/inifile.rb

@@ -5,7 +5,7 @@
 # something has changed are written back to disk
 # Great care is taken to preserve comments and blank lines from the original
 # files
-# 
+#
 # The parsing tries to stay close to python's ConfigParser
 
 require 'puppet/util/filetype'
@@ -79,7 +79,7 @@ module Puppet::Util::IniConfig
             return text
         end
 
-        private 
+        private
         def find_entry(key)
             @entries.each do |entry|
                 if entry.is_a?(Array) && entry[0] == key
@@ -88,7 +88,7 @@ module Puppet::Util::IniConfig
             end
             return nil
         end
-        
+
     end
 
     # A logical .ini-file that can be spread across several physical
@@ -113,7 +113,7 @@ module Puppet::Util::IniConfig
             text.each_line do |l|
                 line += 1
                 if l.strip.empty? || "#;".include?(l[0,1]) ||
-                        (l.split(nil, 2)[0].downcase == "rem" && 
+                        (l.split(nil, 2)[0].downcase == "rem" &&
                          l[0,1].downcase == "r")
                     # Whitespace or comment
                     if section.nil?
@@ -146,7 +146,7 @@ module Puppet::Util::IniConfig
         end
 
         # Store all modifications made to sections in this file back
-        # to the physical files. If no modifications were made to 
+        # to the physical files. If no modifications were made to
         # a physical file, nothing is written
         def store
             @files.each do |file, lines|

data/lib/puppet/util/json.rb

@@ -0,0 +1,13 @@
+# A simple module to provide consistency between how we use JSON and how 
+# ruby expects it to be used.  Basically, we don't want to require
+# that the sender specify a class.
+#  Ruby wants everyone to provide a 'json_class' field, and the JSON support
+# requires such a field to track the class down.  Because we use our URL to
+# figure out what class we're working on, we don't need that, and we don't want
+# our consumers and producers to need to know anything about our internals.
+module Puppet::Util::Json
+    def json_create(json)
+        raise ArgumentError, "No data provided in json data" unless json['data']
+        from_json(json['data'])
+    end
+end

data/lib/puppet/util/ldap/connection.rb

@@ -62,9 +62,9 @@ class Puppet::Util::Ldap::Connection
     def start
         begin
             case ssl
-            when :tls:
+            when :tls
                 @connection = LDAP::SSLConn.new(host, port, true)
-            when true:
+            when true
                 @connection = LDAP::SSLConn.new(host, port)
             else
                 @connection = LDAP::Conn.new(host, port)

data/lib/puppet/util/log.rb

@@ -104,6 +104,13 @@ class Puppet::Util::Log
         end
     end
 
+    def self.close_all
+        # And close all logs except the console.
+        destinations.each do |dest|
+            close(dest)
+        end
+    end
+
     # Flush any log destinations that support such operations.
     def Log.flush
         @destinations.each { |type, dest|
@@ -122,7 +129,7 @@ class Puppet::Util::Log
         unless @levels.index(hash[:level])
             raise Puppet::DevError, "Invalid log level %s" % hash[:level]
         end
-        if @levels.index(hash[:level]) >= @loglevel 
+        if @levels.index(hash[:level]) >= @loglevel
             return Puppet::Util::Log.new(hash)
         else
             return nil
@@ -244,23 +251,23 @@ class Puppet::Util::Log
     end
 
     newdesttype :console do
-                
-        
-        RED 	= {:console => "", :html => "FFA0A0"}
-        GREEN 	= {:console => "", :html => "00CD00"}
-        YELLOW 	= {:console => "", :html => "FFFF60"}
-        BLUE 	= {:console => "", :html => "80A0FF"}
-        PURPLE 	= {:console => "", :html => "FFA500"}
-        CYAN 	= {:console => "", :html => "40FFFF"}
-        WHITE	= {:console => "", :html => "FFFFFF"}
-        HRED	= {:console => "", :html => "FFA0A0"}
-        HGREEN 	= {:console => "", :html => "00CD00"}
-        HYELLOW	= {:console => "", :html => "FFFF60"}
-        HBLUE 	= {:console => "", :html => "80A0FF"}
-        HPURPLE	= {:console => "", :html => "FFA500"}
-        HCYAN 	= {:console => "", :html => "40FFFF"}
-        HWHITE	= {:console => "", :html => "FFFFFF"}
-        RESET 	= {:console => "", :html => ""}
+
+
+        RED     = {:console => "", :html => "FFA0A0"}
+        GREEN   = {:console => "", :html => "00CD00"}
+        YELLOW  = {:console => "", :html => "FFFF60"}
+        BLUE    = {:console => "", :html => "80A0FF"}
+        PURPLE  = {:console => "", :html => "FFA500"}
+        CYAN    = {:console => "", :html => "40FFFF"}
+        WHITE   = {:console => "", :html => "FFFFFF"}
+        HRED    = {:console => "", :html => "FFA0A0"}
+        HGREEN  = {:console => "", :html => "00CD00"}
+        HYELLOW = {:console => "", :html => "FFFF60"}
+        HBLUE   = {:console => "", :html => "80A0FF"}
+        HPURPLE = {:console => "", :html => "FFA500"}
+        HCYAN   = {:console => "", :html => "40FFFF"}
+        HWHITE  = {:console => "", :html => "FFFFFF"}
+        RESET   = {:console => "",    :html => ""      }
 
         @@colormap = {
             :debug => WHITE,
@@ -272,19 +279,19 @@ class Puppet::Util::Log
             :emerg => HRED,
             :crit => HRED
         }
-        
+
         def colorize(level, str)
             case Puppet[:color]
-            when false: str
-            when true, :ansi, "ansi": console_color(level, str)
-            when :html, "html": html_color(level, str)
+            when false; str
+            when true, :ansi, "ansi"; console_color(level, str)
+            when :html, "html"; html_color(level, str)
             end
         end
-        
+
         def console_color(level, str)
             @@colormap[level][:console] + str + RESET[:console]
         end
-        
+
         def html_color(level, str)
             %{<span style="color: %s">%s</span>} % [@@colormap[level][:html], str]
         end
@@ -425,7 +432,7 @@ class Puppet::Util::Log
     # for a loop here, if the machine somehow gets the destination set as
     # itself.
     def Log.newmessage(msg)
-        if @levels.index(msg.level) < @loglevel 
+        if @levels.index(msg.level) < @loglevel
             return
         end
 
@@ -437,7 +444,7 @@ class Puppet::Util::Log
     end
 
     def Log.sendlevel?(level)
-        @levels.index(level) >= @loglevel 
+        @levels.index(level) >= @loglevel
     end
 
     # Reopen all of our logs.
@@ -468,7 +475,7 @@ class Puppet::Util::Log
         @levels.include?(level)
     end
 
-    attr_accessor :level, :message, :time, :remote
+    attr_accessor :level, :message, :time, :remote, :file, :line, :version
     attr_reader :source
 
     def initialize(args)
@@ -508,13 +515,10 @@ class Puppet::Util::Log
         # We can't just check for whether it responds to :path, because
         # plenty of providers respond to that in their normal function.
         if (source.is_a?(Puppet::Type) or source.is_a?(Puppet::Parameter)) and source.respond_to?(:path)
-            @source = source.path
+            set_source_from_ral(source)
         else
             @source = source.to_s
         end
-        if source.respond_to?(:tags)
-            source.tags.each { |t| tag(t) }
-        end
     end
 
     def to_report
@@ -524,6 +528,19 @@ class Puppet::Util::Log
     def to_s
         return @message
     end
+
+    private
+
+    def set_source_from_ral(source)
+        @source = source.path
+
+        source.tags.each { |t| tag(t) }
+
+        [:file, :line, :version].each do |param|
+            next unless value = source.send(param)
+            send(param.to_s + "=", value)
+        end
+    end
 end
 
 # This is for backward compatibility from when we changed the constant to Puppet::Util::Log

data/lib/puppet/util/metric.rb

@@ -3,7 +3,7 @@ require 'puppet'
 
 # A class for handling metrics.  This is currently ridiculously hackish.
 class Puppet::Util::Metric
-    
+
     attr_accessor :type, :name, :value, :label
     attr_writer :values
 
@@ -32,7 +32,7 @@ class Puppet::Util::Metric
         start ||= Time.now.to_i - 5
 
         @rrd = RRDtool.new(self.path)
-        args = [] 
+        args = []
 
         values.each { |value|
             # the 7200 is the heartbeat -- this means that any data that isn't
@@ -81,7 +81,7 @@ class Puppet::Util::Metric
             args << defs
             args << lines
             args.flatten!
-            if range 
+            if range
                 args.push("--start",range[0],"--end",range[1])
             else
                 args.push("--start", Time.now.to_i - time, "--end", Time.now.to_i)
@@ -147,7 +147,7 @@ class Puppet::Util::Metric
     end
 
     private
-    
+
     # Convert a name into a label.
     def labelize(name)
         name.to_s.capitalize.gsub("_", " ")

data/lib/puppet/util/monkey_patches.rb

@@ -0,0 +1,43 @@
+#
+# Monkey patches to ruby classes for compatibility
+#
+#
+# In earlier versions of ruby (e.g. 1.8.1) yaml serialized symbols with an explicit
+# type designation.  Later versions understand the explicit form in addition to the
+# implicit "literal" form (e.g. :symbol) which they produce.
+#
+# This causes problems when the puppet master and the client are running on different
+# versions of ruby; the newer version can produce yaml that it's older partner can't 
+# decypher.
+#
+# This patch causes newer versions to produce the older encoding for Symbols.  It is
+# only applied if the existing library does not already produce them.  Thus it will
+# not be applied on older rubys and it will not be applied more than once.  It also 
+# checks that it has been applied to a version which support it and, if not reverts
+# to the original.
+#
+require "yaml"
+
+if :test.to_yaml !~ %r{!ruby/sym}
+    class Symbol
+        if !respond_to? :original_to_yaml
+            alias :original_to_yaml :to_yaml
+            def to_yaml(opts={})
+                YAML::quick_emit(nil,opts) { |out|
+                    if out.respond_to? :scalar
+                        # 1.8.5 through 1.8.8, possibly others
+                        out.scalar("tag:ruby:sym", to_s,:to_yaml_style)
+                    elsif out.respond_to? :<<
+                        # 1.8.2, possibly others
+                        out << "!ruby/sym "
+                        self.id2name.to_yaml( :Emitter => out )
+                    else
+                        # go back to the base version if neither of the above work
+                        alias :to_yaml :original_to_yaml
+                        to_yaml(opts)
+                    end
+                }
+            end    
+        end
+    end
+end

data/lib/puppet/util/nagios_maker.rb

@@ -55,7 +55,7 @@ module Puppet::Util::NagiosMaker
             You can purge Nagios resources using the ``resources`` type, but *only*
             in the default file locations.  This is an architectural limitation.
 
-            .. _naginator: http://reductivelabs.com/trac/naginator
+            .. _naginator: http://projects.reductivelabs.com/projects/naginator
         "
     end
 end

data/lib/puppet/util/package.rb

@@ -11,10 +11,10 @@ module Puppet::Util::Package
             b = bx.shift
 
             if( a == b )                 then next
-            elsif (a == '-' && b == '-') then next 
+            elsif (a == '-' && b == '-') then next
             elsif (a == '-')             then return -1
             elsif (b == '-')             then return 1
-            elsif (a == '.' && b == '.') then next 
+            elsif (a == '.' && b == '.') then next
             elsif (a == '.' )            then return -1
             elsif (b == '.' )            then return 1
             elsif (a =~ /^\d+$/ && b =~ /^\d+$/) then
@@ -22,12 +22,12 @@ module Puppet::Util::Package
                     return a.to_s.upcase <=> b.to_s.upcase
                 end
                 return a.to_i <=> b.to_i
-            else 
+            else
                 return a.upcase <=> b.upcase
             end
         end
         return version_a <=> version_b;
     end
-    
+
     module_function :versioncmp
 end

data/lib/puppet/util/pidlock.rb

@@ -1,68 +1,68 @@
 require 'fileutils'
 
 class Puppet::Util::Pidlock
-	attr_reader :lockfile
-	
-	def initialize(lockfile)
-		@lockfile = lockfile
-	end
-	
-	def locked?
-		clear_if_stale
-		File.exists? @lockfile
-	end
-	
-	def mine?
-		Process.pid == lock_pid
-	end
+    attr_reader :lockfile
 
-	def anonymous?
-		return false unless File.exists?(@lockfile)
-		File.read(@lockfile) == ""
-	end
-	
-	def lock(opts = {})
-		opts = {:anonymous => false}.merge(opts)
+    def initialize(lockfile)
+        @lockfile = lockfile
+    end
 
-		if locked?
-			mine?
-		else
-			if opts[:anonymous]
-				File.open(@lockfile, 'w') { |fd| true }
-			else
-				File.open(@lockfile, "w") { |fd| fd.write(Process.pid) }
-			end
-			true
-		end
-	end
-	
-	def unlock(opts = {})
-		opts = {:anonymous => false}.merge(opts)
+    def locked?
+        clear_if_stale
+        File.exists? @lockfile
+    end
 
-		if mine? or (opts[:anonymous] and anonymous?)
-			File.unlink(@lockfile)
-			true
-		else
-			false
-		end
-	end
+    def mine?
+        Process.pid == lock_pid
+    end
 
-	private
-	def lock_pid
-		if File.exists? @lockfile
-			File.read(@lockfile).to_i
-		else
-			nil
-		end
-	end
+    def anonymous?
+        return false unless File.exists?(@lockfile)
+        File.read(@lockfile) == ""
+    end
 
-	def clear_if_stale
-		return if lock_pid.nil?
-		
-		begin
-			Process.kill(0, lock_pid)
-		rescue Errno::ESRCH
-			File.unlink(@lockfile)
-		end
-	end
+    def lock(opts = {})
+        opts = {:anonymous => false}.merge(opts)
+
+        if locked?
+            mine?
+        else
+            if opts[:anonymous]
+                File.open(@lockfile, 'w') { |fd| true }
+            else
+                File.open(@lockfile, "w") { |fd| fd.write(Process.pid) }
+            end
+            true
+        end
+    end
+
+    def unlock(opts = {})
+        opts = {:anonymous => false}.merge(opts)
+
+        if mine? or (opts[:anonymous] and anonymous?)
+            File.unlink(@lockfile)
+            true
+        else
+            false
+        end
+    end
+
+    private
+    def lock_pid
+        if File.exists? @lockfile
+            File.read(@lockfile).to_i
+        else
+            nil
+        end
+    end
+
+    def clear_if_stale
+        return if lock_pid.nil?
+
+        begin
+            Process.kill(0, lock_pid)
+        rescue Errno::ESRCH
+            File.unlink(@lockfile)
+        end
+    end
 end