puppet 3.2.4 → 3.3.0.rc2

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

@@ -109,14 +109,13 @@ class Puppet::Util::Ldap::Manager
   # Find the associated entry for a resource.  Returns a hash, minus
   # 'dn', or nil if the entry cannot be found.
   def find(name)
-    result = nil
     connect do |conn|
       begin
         conn.search2(dn(name), 0, "objectclass=*") do |result|
           # Convert to puppet-appropriate attributes
           return entry2provider(result)
         end
-      rescue => detail
+      rescue
         return nil
       end
     end

data/lib/puppet/util/log.rb

@@ -142,6 +142,19 @@ class Puppet::Util::Log
     end
   end
 
+  def Log.with_destination(destination, &block)
+    if @destinations.include?(destination)
+      yield
+    else
+      newdestination(destination)
+      begin
+        yield
+      ensure
+        close(destination)
+      end
+    end
+  end
+
   # Route the actual message. FIXME There are lots of things this method
   # should do, like caching and a bit more.  It's worth noting that there's
   # a potential for a loop here, if the machine somehow gets the destination set as
@@ -261,6 +274,18 @@ class Puppet::Util::Log
     @line = data['line'] if data['line']
   end
 
+  def to_pson
+    {
+      'level' => @level,
+      'message' => @message,
+      'source' => @source,
+      'tags' => @tags,
+      'time' => @time.iso8601(9),
+      'file' => @file,
+      'line' => @line,
+    }.to_pson
+  end
+
   def message=(msg)
     raise ArgumentError, "Puppet::Util::Log requires a message" unless msg
     @message = msg.to_s
@@ -279,16 +304,11 @@ class Puppet::Util::Log
   # If they pass a source in to us, we make sure it is a string, and
   # we retrieve any tags we can.
   def source=(source)
-    if source.respond_to?(:source_descriptors)
-      descriptors = source.source_descriptors
-      @source = descriptors[:path]
-
-      descriptors[:tags].each { |t| tag(t) }
-
-      [:file, :line].each do |param|
-        next unless descriptors[param]
-        send(param.to_s + "=", descriptors[param])
-      end
+    if source.respond_to?(:path)
+      @source = source.path
+      source.tags.each { |t| tag(t) }
+      self.file = source.file
+      self.line = source.line
     else
       @source = source.to_s
     end
@@ -301,6 +321,7 @@ class Puppet::Util::Log
   def to_s
     message
   end
+
 end
 
 # This is for backward compatibility from when we changed the constant to Puppet::Util::Log

data/lib/puppet/util/log/destinations.rb

@@ -126,56 +126,6 @@ Puppet::Util::Log.newdesttype :console do
   end
 end
 
-Puppet::Util::Log.newdesttype :host do
-  def initialize(host)
-    Puppet.info "Treating #{host} as a hostname"
-    args = {}
-    if host =~ /:(\d+)/
-      args[:Port] = $1
-      args[:Server] = host.sub(/:\d+/, '')
-    else
-      args[:Server] = host
-    end
-
-    @name = host
-
-    @driver = Puppet::Network::Client::LogClient.new(args)
-  end
-
-  def handle(msg)
-    unless msg.is_a?(String) or msg.remote
-      @hostname ||= Facter["hostname"].value
-      unless defined?(@domain)
-        @domain = Facter["domain"].value
-        @hostname += ".#{@domain}" if @domain
-      end
-      if Puppet::Util.absolute_path?(msg.source)
-        msg.source = @hostname + ":#{msg.source}"
-      elsif msg.source == "Puppet"
-        msg.source = @hostname + " #{msg.source}"
-      else
-        msg.source = @hostname + " #{msg.source}"
-      end
-      begin
-        #puts "would have sent #{msg}"
-        #puts "would have sent %s" %
-        #    CGI.escape(YAML.dump(msg))
-        begin
-          tmp = CGI.escape(YAML.dump(msg))
-        rescue => detail
-          puts "Could not dump: #{detail}"
-          return
-        end
-        # Add the hostname to the source
-        @driver.addlog(tmp)
-      rescue => detail
-        Puppet.log_exception(detail)
-        Puppet::Util::Log.close(self)
-      end
-    end
-  end
-end
-
 # Log to a transaction report.
 Puppet::Util::Log.newdesttype :report do
   attr_reader :report

data/lib/puppet/util/metric.rb

@@ -15,6 +15,14 @@ class Puppet::Util::Metric
     metric
   end
 
+  def to_pson
+    {
+      'name' => @name,
+      'label' => @label,
+      'values' => @values
+    }.to_pson
+  end
+
   # Return a specific value
   def [](name)
     if value = @values.find { |v| v[0] == name }
@@ -85,7 +93,6 @@ class Puppet::Util::Metric
       args.push("--title",self.label)
       args.push("--imgformat","PNG")
       args.push("--interlace")
-      i = 0
       defs = []
       lines = []
       #p @values.collect { |s,l| s }

data/lib/puppet/util/monkey_patches.rb

@@ -1,4 +1,3 @@
-require 'puppet/util'
 module Puppet::Util::MonkeyPatches
 end
 
@@ -67,53 +66,6 @@ class Object
   end
 end
 
-# Workaround for yaml_initialize, which isn't supported before Ruby
-# 1.8.3.
-if RUBY_VERSION == '1.8.1' || RUBY_VERSION == '1.8.2'
-  YAML.add_ruby_type( /^object/ ) { |tag, val|
-    type, obj_class = YAML.read_type_class( tag, Object )
-    r = YAML.object_maker( obj_class, val )
-    if r.respond_to? :yaml_initialize
-      r.instance_eval { instance_variables.each { |name| remove_instance_variable name } }
-      r.yaml_initialize(tag, val)
-    end
-    r
-  }
-end
-
-class Fixnum
-  # Returns the int itself. This method is intended for compatibility to
-  # character constant in Ruby 1.9.  1.8.5 is missing it; add it.
-  def ord
-    self
-  end unless method_defined? 'ord'
-end
-
-class Array
-  # Ruby < 1.8.7 doesn't have this method but we use it in tests
-  def combination(num)
-    return [] if num < 0 || num > size
-    return [[]] if num == 0
-    return map{|e| [e] } if num == 1
-    tmp = self.dup
-    self[0, size - (num - 1)].inject([]) do |ret, e|
-      tmp.shift
-      ret += tmp.combination(num - 1).map{|a| a.unshift(e) }
-    end
-  end unless method_defined? :combination
-
-  alias :count :length unless method_defined? :count
-
-  # Ruby 1.8.5 lacks `drop`, which we don't want to lose.
-  def drop(n)
-    n = n.to_int
-    raise ArgumentError, "attempt to drop negative size" if n < 0
-
-    slice(n, length - n) or []
-  end unless method_defined? :drop
-end
-
-
 class Symbol
   # So, it turns out that one of the biggest memory allocation hot-spots in
   # our code was using symbol-to-proc - because it allocated a new instance
@@ -187,6 +139,10 @@ class IO
   end unless singleton_methods.include?(:binwrite)
 end
 
+class Float
+  INFINITY = (1.0/0.0) if defined?(Float::INFINITY).nil?
+end
+
 class Range
   def intersection(other)
     raise ArgumentError, 'value must be a Range' unless other.kind_of?(Range)
@@ -205,15 +161,6 @@ class Range
   alias_method :&, :intersection unless method_defined? :&
 end
 
-# Ruby 1.8.5 doesn't have tap
-module Kernel
-  def tap
-    yield(self)
-    self
-  end unless method_defined?(:tap)
-end
-
-
 ########################################################################
 # The return type of `instance_variables` changes between Ruby 1.8 and 1.9
 # releases; it used to return an array of strings in the form "@foo", but
@@ -266,97 +213,6 @@ if RUBY_VERSION[0,3] == '1.8'
   end
 end
 
-# The mv method in Ruby 1.8.5 can't mv directories across devices
-# File.rename causes "Invalid cross-device link", which is rescued, but in Ruby
-# 1.8.5 it tries to recover with a copy and unlink, but the unlink causes the
-# error "Is a directory".  In newer Rubies remove_entry is used
-# The implementation below is what's used in Ruby 1.8.7 and Ruby 1.9
-if RUBY_VERSION == '1.8.5'
-  require 'fileutils'
-
-  module FileUtils
-    def mv(src, dest, options = {})
-      fu_check_options options, OPT_TABLE['mv']
-      fu_output_message "mv#{options[:force] ? ' -f' : ''} #{[src,dest].flatten.join ' '}" if options[:verbose]
-      return if options[:noop]
-      fu_each_src_dest(src, dest) do |s, d|
-        destent = Entry_.new(d, nil, true)
-        begin
-          if destent.exist?
-            if destent.directory?
-              raise Errno::EEXIST, dest
-            else
-              destent.remove_file if rename_cannot_overwrite_file?
-            end
-          end
-          begin
-            File.rename s, d
-          rescue Errno::EXDEV
-            copy_entry s, d, true
-            if options[:secure]
-              remove_entry_secure s, options[:force]
-            else
-              remove_entry s, options[:force]
-            end
-          end
-        rescue SystemCallError
-          raise unless options[:force]
-        end
-      end
-    end
-    module_function :mv
-
-    alias move mv
-    module_function :move
-  end
-end
-
-# Ruby 1.8.6 doesn't have it either
-# From https://github.com/puppetlabs/hiera/pull/47/files:
-# In ruby 1.8.5 Dir does not have mktmpdir defined, so this monkey patches
-# Dir to include the 1.8.7 definition of that method if it isn't already defined.
-# Method definition borrowed from ruby-1.8.7-p357/lib/ruby/1.8/tmpdir.rb
-unless Dir.respond_to?(:mktmpdir)
-  def Dir.mktmpdir(prefix_suffix=nil, tmpdir=nil)
-    case prefix_suffix
-    when nil
-      prefix = "d"
-      suffix = ""
-    when String
-      prefix = prefix_suffix
-      suffix = ""
-    when Array
-      prefix = prefix_suffix[0]
-      suffix = prefix_suffix[1]
-    else
-      raise ArgumentError, "unexpected prefix_suffix: #{prefix_suffix.inspect}"
-    end
-    tmpdir ||= Dir.tmpdir
-    t = Time.now.strftime("%Y%m%d")
-    n = nil
-    begin
-      path = "#{tmpdir}/#{prefix}#{t}-#{$$}-#{rand(0x100000000).to_s(36)}"
-      path << "-#{n}" if n
-      path << suffix
-      Dir.mkdir(path, 0700)
-    rescue Errno::EEXIST
-      n ||= 0
-      n += 1
-      retry
-    end
-
-    if block_given?
-      begin
-        yield path
-      ensure
-        FileUtils.remove_entry_secure path
-      end
-    else
-      path
-    end
-  end
-end
-
 # (#19151) Reject all SSLv2 ciphers and handshakes
 require 'openssl'
 class OpenSSL::SSL::SSLContext
@@ -399,3 +255,13 @@ if Puppet::Util::Platform.windows?
   end
 end
 
+# Older versions of SecureRandom (e.g. in 1.8.7) don't have the uuid method
+module SecureRandom
+  def self.uuid
+    # Copied from the 1.9.1 stdlib implementation of uuid
+    ary = self.random_bytes(16).unpack("NnnnnN")
+    ary[2] = (ary[2] & 0x0fff) | 0x4000
+    ary[3] = (ary[3] & 0x3fff) | 0x8000
+    "%08x-%04x-%04x-%04x-%04x%08x" % ary
+  end unless singleton_methods.include?(:uuid)
+end

data/lib/puppet/util/network_device/cisco/facts.rb

@@ -64,7 +64,7 @@ class Puppet::Util::NetworkDevice::Cisco::Facts
 
   def uptime_to_seconds(uptime)
     captures = (uptime.match /^(?:(\d+) years?,)?\s*(?:(\d+) weeks?,)?\s*(?:(\d+) days?,)?\s*(?:(\d+) hours?,)?\s*(\d+) minutes?$/).captures
-    seconds = captures.zip([31536000, 604800, 86400, 3600, 60]).inject(0) do |total, (x,y)|
+    captures.zip([31536000, 604800, 86400, 3600, 60]).inject(0) do |total, (x,y)|
       total + (x.nil? ? 0 : x.to_i * y)
     end
   end

data/lib/puppet/util/network_device/config.rb

@@ -1,8 +1,8 @@
 require 'ostruct'
-require 'puppet/util/loadedfile'
+require 'puppet/util/watched_file'
 require 'puppet/util/network_device'
 
-class Puppet::Util::NetworkDevice::Config < Puppet::Util::LoadedFile
+class Puppet::Util::NetworkDevice::Config
 
   def self.main
     @main ||= self.new
@@ -18,12 +18,9 @@ class Puppet::Util::NetworkDevice::Config < Puppet::Util::LoadedFile
     FileTest.exists?(@file)
   end
 
-  def initialize()
-    @file = Puppet[:deviceconfig]
+  def initialize
+    @file = Puppet::Util::WatchedFile.new(Puppet[:deviceconfig])
 
-    raise Puppet::DevError, "No device config file defined" unless @file
-    return unless self.exists?
-    super(@file)
     @devices = {}
 
     read(true) # force reading at start
@@ -31,9 +28,9 @@ class Puppet::Util::NetworkDevice::Config < Puppet::Util::LoadedFile
 
   # Read the configuration file.
   def read(force = false)
-    return unless FileTest.exists?(@file)
+    return unless exists?
 
-    parse if force or changed?
+    parse if force or @file.changed?
   end
 
   private

data/lib/puppet/util/network_device/transport/ssh.rb

@@ -36,7 +36,7 @@ class Puppet::Util::NetworkDevice::Transport::Ssh < Puppet::Util::NetworkDevice:
       raise TimeoutError, "timed out while opening an ssh connection to the host"
     rescue Net::SSH::AuthenticationFailed
       raise Puppet::Error, "SSH authentication failure connecting to #{host} as #{user}"
-    rescue Net::SSH::Exception => detail
+    rescue Net::SSH::Exception
       raise Puppet::Error, "SSH connection failure to #{host}"
     end
 

data/lib/puppet/util/pidlock.rb

@@ -34,6 +34,9 @@ class Puppet::Util::Pidlock
     @lockfile.lock_data.to_i
   end
 
+  def file_path
+    @lockfile.file_path
+  end
 
   def clear_if_stale
     return if lock_pid.nil?

data/lib/puppet/util/posix.rb

@@ -31,7 +31,7 @@ module Puppet::Util::POSIX
 
     begin
       return Etc.send(method, id).send(field)
-    rescue NoMethodError, ArgumentError => detail
+    rescue NoMethodError, ArgumentError
       # ignore it; we couldn't find the object
       return nil
     end

data/lib/puppet/util/profiler.rb

@@ -10,7 +10,7 @@ module Puppet::Util::Profiler
 
   NONE = Puppet::Util::Profiler::None.new
 
-  # @returns This thread's configured profiler
+  # @return This thread's configured profiler
   def self.current
     Thread.current[:profiler] || NONE
   end

data/lib/puppet/util/rdoc.rb

@@ -45,7 +45,7 @@ module Puppet::Util::RDoc
     end
   end
 
-  # launch a output to console manifest doc
+  # launch an output to console manifest doc
   def manifestdoc(files)
     Puppet[:ignoreimport] = true
     files.select { |f| FileTest.file?(f) }.each do |f|