puppet 4.10.12-universal-darwin → 5.0.0-universal-darwin

data/lib/puppet/util/logging.rb

@@ -80,7 +80,7 @@ module Logging
     if exception.respond_to?(:original)
       original =  exception.original
       unless original.nil?
-        arr << 'Wrapped exception:'
+        arr << _('Wrapped exception:')
         arr << original.message
         build_exception_trace(arr, original, trace)
       end
@@ -103,7 +103,7 @@ module Logging
       arr << Puppet::Util.pretty_backtrace(exception.backtrace)
     end
     if exception.respond_to?(:original) and exception.original
-      arr << "Wrapped exception:"
+      arr << _("Wrapped exception:")
       arr << format_exception(exception.original, :default, trace)
     end
     arr.flatten.join("\n")
@@ -176,13 +176,13 @@ module Logging
         call_trace =
         case MM.new(file, line)
         when FILE_AND_LINE
-          "\n   (at #{file}:#{line})"
+          _("\n   (at %{file}:%{line})") % { file: file, line: line }
         when FILE_NO_LINE
-          "\n   (in #{file})"
+          _("\n   (in %{file})") % { file: file }
         when NO_FILE_LINE
-          "\n   (in unknown file, line #{line})"
+          _("\n   (in unknown file, line %{line})") % { line: line }
         else
-          "\n   (file & line not available)"
+          _("\n   (file & line not available)")
         end
         warning("#{message}#{call_trace}")
       end
@@ -279,10 +279,13 @@ module Logging
       key ||= (offender = get_deprecation_offender)
       if (! $deprecation_warnings.has_key?(key)) then
         $deprecation_warnings[key] = message
+        # split out to allow translation
+        unknown = _('unknown')
         call_trace = use_caller ?
           (offender || get_deprecation_offender).join('; ') :
-          "#{file || 'unknown'}:#{line || 'unknown'}"
-        warning("#{message}\n   (at #{call_trace})")
+          "#{file || unknown}:#{line || unknown}"
+        #TRANSLATORS error message with origin location
+        warning(_("%{message}\n   (at %{call_trace})") % { message: message, call_trace: call_trace })
       end
     end
   end

data/lib/puppet/util/metric.rb

@@ -4,17 +4,24 @@ require 'puppet/network/format_support'
 
 # A class for handling metrics.  This is currently ridiculously hackish.
 class Puppet::Util::Metric
+  include Puppet::Util::PsychSupport
   include Puppet::Network::FormatSupport
 
   attr_accessor :type, :name, :value, :label
   attr_writer :values
 
   def self.from_data_hash(data)
-    metric = new(data['name'], data['label'])
-    metric.values = data['values']
+    metric = allocate
+    metric.initialize_from_hash(data)
     metric
   end
 
+  def initialize_from_hash(data)
+    @name = data['name']
+    @label = data['label'] || self.class.labelize(@name)
+    @values = data['values']
+  end
+
   def to_data_hash
     {
       'name' => @name,
@@ -23,10 +30,6 @@ class Puppet::Util::Metric
     }
   end
 
-  def to_pson(*args)
-    to_data_hash.to_pson(*args)
-  end
-
   # Return a specific value
   def [](name)
     if value = @values.find { |v| v[0] == name }

data/lib/puppet/util/monkey_patches.rb

@@ -18,24 +18,6 @@ module RDoc
   end
 end
 
-class Symbol
-  def <=> (other)
-    if (other.class != Symbol)
-      case Puppet[:strict]
-      when :warning
-        Puppet.warn_once('deprecation', 'symbol_comparison', 'Comparing Symbols to non-Symbol values is deprecated')
-      when :error
-        raise ArgumentError.new("Comparing Symbols to non-Symbol values is no longer allowed")
-      end
-    end
-    self.to_s <=> other.to_s
-  end
-
-  def intern
-    self
-  end unless method_defined? 'intern'
-end
-
 class Object
   # ActiveSupport 2.3.x mixes in a dangerous method
   # that can cause rspec to fork bomb
@@ -45,54 +27,6 @@ class Object
   end
 end
 
-require 'fcntl'
-class IO
-  def self.binwrite(name, string, offset = nil)
-    # Determine if we should truncate or not.  Since the truncate method on a
-    # file handle isn't implemented on all platforms, safer to do this in what
-    # looks like the libc / POSIX flag - which is usually pretty robust.
-    # --daniel 2012-03-11
-    mode = Fcntl::O_CREAT | Fcntl::O_WRONLY | (offset.nil? ? Fcntl::O_TRUNC : 0)
-
-    # We have to duplicate the mode because Ruby on Windows is a bit precious,
-    # and doesn't actually carry over the mode.  It won't work to just use
-    # open, either, because that doesn't like our system modes and the default
-    # open bits don't do what we need, which is awesome. --daniel 2012-03-30
-    IO.open(IO::sysopen(name, mode), mode) do |f|
-      # ...seek to our desired offset, then write the bytes.  Don't try to
-      # seek past the start of the file, eh, because who knows what platform
-      # would legitimately blow up if we did that.
-      #
-      # Double-check the positioning, too, since destroying data isn't my idea
-      # of a good time. --daniel 2012-03-11
-      target = [0, offset.to_i].max
-      unless (landed = f.sysseek(target, IO::SEEK_SET)) == target
-        raise "unable to seek to target offset #{target} in #{name}: got to #{landed}"
-      end
-
-      f.syswrite(string)
-    end
-  end unless singleton_methods.include?(:binwrite)
-end
-
-class Range
-  def intersection(other)
-    raise ArgumentError, 'value must be a Range' unless other.kind_of?(Range)
-    return unless other === self.first || self === other.first
-
-    start = [self.first, other.first].max
-    if self.exclude_end? && self.last <= other.last
-      start ... self.last
-    elsif other.exclude_end? && self.last >= other.last
-      start ... other.last
-    else
-      start .. [ self.last, other.last ].min
-    end
-  end unless method_defined? :intersection
-
-  alias_method :&, :intersection unless method_defined? :&
-end
-
 # (#19151) Reject all SSLv2 ciphers and handshakes
 require 'openssl'
 class OpenSSL::SSL::SSLContext
@@ -145,3 +79,30 @@ if Puppet::Util::Platform.windows?
     end
   end
 end
+
+# The Enumerable#uniq method was added in Ruby 2.4.0 (https://bugs.ruby-lang.org/issues/11090)
+# This is a backport to earlier Ruby versions.
+#
+unless Enumerable.instance_methods.include?(:uniq)
+  module Enumerable
+    def uniq
+      result = []
+      uniq_map = {}
+      if block_given?
+        each do |value|
+          key = yield value
+          next if uniq_map.has_key?(key)
+          uniq_map[key] = true
+          result << value
+        end
+      else
+        each do |value|
+          next if uniq_map.has_key?(value)
+          uniq_map[value] = true
+          result << value
+        end
+      end
+      result
+    end
+  end
+end

data/lib/puppet/util/network_device.rb

@@ -7,7 +7,7 @@ class Puppet::Util::NetworkDevice
     require "puppet/util/network_device/#{device.provider}/device"
     @current = Puppet::Util::NetworkDevice.const_get(device.provider.capitalize).const_get(:Device).new(device.url, device.options)
   rescue => detail
-    raise detail, "Can't load #{device.provider} for #{device.name}: #{detail}", detail.backtrace
+    raise detail, _("Can't load %{provider} for %{device}: %{detail}") % { provider: device.provider, device: device.name, detail: detail }, detail.backtrace
   end
 
   # Should only be used in tests

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

@@ -51,7 +51,7 @@ class Puppet::Util::NetworkDevice::Cisco::Device < Puppet::Util::NetworkDevice::
       if out =~ /^%/mo or out =~ /^Command rejected:/mo
         # strip off the command just sent
         error = out.sub(cmd,'')
-        Puppet.err "Error while executing '#{cmd}', device returned: #{error}"
+        Puppet.err _("Error while executing '%{cmd}', device returned: %{error}") % { cmd: cmd, error: error }
       end
     end
   end
@@ -67,7 +67,7 @@ class Puppet::Util::NetworkDevice::Cisco::Device < Puppet::Util::NetworkDevice::
   end
 
   def enable
-    raise "Can't issue \"enable\" to enter privileged, no enable password set" unless enable_password
+    raise _("Can't issue \"enable\" to enter privileged, no enable password set") unless enable_password
     transport.command("enable", :prompt => /^Password:/)
     transport.command(enable_password)
   end
@@ -196,7 +196,7 @@ class Puppet::Util::NetworkDevice::Cisco::Device < Puppet::Util::NetworkDevice::
         end
         vlans[vlan[:name]] = vlan
       when /^\s+([a-zA-Z0-9,\/. ]+)\s*$/
-        raise "invalid sh vlan summary output" unless vlan
+        raise _("invalid sh vlan summary output") unless vlan
         if $1.strip.length > 0
           vlan[:interfaces] += $1.strip.split(/\s*,\s*/).map{ |ifn| canonalize_ifname(ifn) }
         end
@@ -208,7 +208,7 @@ class Puppet::Util::NetworkDevice::Cisco::Device < Puppet::Util::NetworkDevice::
 
   def update_vlan(id, is = {}, should = {})
     if should[:ensure] == :absent
-      Puppet.info "Removing #{id} from device vlan"
+      Puppet.info _("Removing %{id} from device vlan") % { id: id }
       execute("conf t")
       execute("no vlan #{id}")
       execute("exit")
@@ -217,7 +217,7 @@ class Puppet::Util::NetworkDevice::Cisco::Device < Puppet::Util::NetworkDevice::
 
     # Cisco VLANs are supposed to be alphanumeric only
     if should[:description] =~ /[^\w]/
-      Puppet.err "Invalid VLAN name '#{should[:description]}' for Cisco device.\nVLAN name must be alphanumeric, no spaces or special characters."
+      Puppet.err _("Invalid VLAN name '%{name}' for Cisco device.\nVLAN name must be alphanumeric, no spaces or special characters.") % { name: should[:description] }
       return
     end
     
@@ -251,7 +251,7 @@ class Puppet::Util::NetworkDevice::Cisco::Device < Puppet::Util::NetworkDevice::
         when "dynamic desirable"
           trunking[:mode] = 'dynamic desirable'
         else
-          raise "Unknown switchport mode: #{$1} for #{interface}"
+          raise _("Unknown switchport mode: %{mode} for %{interface}") % { mode: $1, interface: interface }
         end
       when /^Administrative Trunking Encapsulation:\s+(.*)$/
         case $1
@@ -260,7 +260,7 @@ class Puppet::Util::NetworkDevice::Cisco::Device < Puppet::Util::NetworkDevice::
         when "negotiate"
           trunking[:encapsulation] = :negotiate
         else
-          raise "Unknown switchport encapsulation: #{$1} for #{interface}"
+          raise _("Unknown switchport encapsulation: %{value} for %{interface}") % { value: $1, interface: interface }
         end
       when /^Access Mode VLAN:\s+(.*) \((.*)\)$/
         trunking[:access_vlan] = $1 if $2 != '(Inactive)'

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

@@ -87,7 +87,7 @@ class Puppet::Util::NetworkDevice::Cisco::Interface
       if out =~ /^%/mo or out =~ /^Command rejected:/mo
         # strip off the command just sent
         error = out.sub(command,'')
-        Puppet.err "Error while executing '#{command}', device returned: #{error}"
+        Puppet.err _("Error while executing '%{command}', device returned: %{error}") % { command: command, error: error }
       end
     end
   end

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

@@ -52,7 +52,7 @@ class Puppet::Util::NetworkDevice::Config
           when /^\[([\w.-]+)\]\s*$/ # [device.fqdn]
             name = $1
             name.chomp!
-            raise Puppet::Error, "Duplicate device found at line #{count}, already found at #{device.line}" if devices.include?(name)
+            raise Puppet::Error, _("Duplicate device found at line %{count}, already found at %{line}") % { count: count, line: device.line } if devices.include?(name)
             device = OpenStruct.new
             device.name = name
             device.line = count
@@ -62,16 +62,16 @@ class Puppet::Util::NetworkDevice::Config
           when /^\s*(type|url|debug)(\s+(.+)\s*)*$/
             parse_directive(device, $1, $3, count)
           else
-            raise Puppet::Error, "Invalid line #{count}: #{line}"
+            raise Puppet::Error, _("Invalid line %{count}: %{line}") % { count: count, line: line }
           end
           count += 1
         }
       }
     rescue Errno::EACCES => detail
-      Puppet.err "Configuration error: Cannot read #{@file}; cannot serve"
+      Puppet.err _("Configuration error: Cannot read %{file}; cannot serve") % { file: @file }
       #raise Puppet::Error, "Cannot read #{@config}"
     rescue Errno::ENOENT => detail
-      Puppet.err "Configuration error: '#{@file}' does not exit; cannot serve"
+      Puppet.err _("Configuration error: '%{file}' does not exit; cannot serve") % { file: @file }
     end
 
     @devices = devices
@@ -85,13 +85,13 @@ class Puppet::Util::NetworkDevice::Config
       begin
         URI.parse(value)
       rescue URI::InvalidURIError
-        raise Puppet::Error, "#{value} is an invalid url"
+        raise Puppet::Error, _("%{value} is an invalid url") % { value: value }
       end
       device.url = value
     when "debug"
       device.options[:debug] = true
     else
-      raise Puppet::Error, "Invalid argument '#{var}' at line #{count}"
+      raise Puppet::Error, _("Invalid argument '%{var}' at line %{count}") % { var: var, count: count }
     end
   end
 

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

@@ -13,7 +13,7 @@ class Puppet::Util::NetworkDevice::Transport::Ssh < Puppet::Util::NetworkDevice:
     super()
     @verbose = verbose
     unless Puppet.features.ssh?
-      raise 'Connecting with ssh to a network device requires the \'net/ssh\' ruby library'
+      raise _('Connecting with ssh to a network device requires the \'net/ssh\' ruby library')
     end
   end
 
@@ -33,21 +33,21 @@ class Puppet::Util::NetworkDevice::Transport::Ssh < Puppet::Util::NetworkDevice:
       Puppet.debug("connecting to #{host} as #{user}")
       @ssh = Net::SSH.start(host, user, :port => port, :password => password, :timeout => timeout)
     rescue TimeoutError
-      raise TimeoutError, "timed out while opening an ssh connection to the host", $!.backtrace
+      raise TimeoutError, _("timed out while opening an ssh connection to the host"), $!.backtrace
     rescue Net::SSH::AuthenticationFailed
-      raise Puppet::Error, "SSH authentication failure connecting to #{host} as #{user}", $!.backtrace
+      raise Puppet::Error, _("SSH authentication failure connecting to %{host} as %{user}") % { host: host, user: user }, $!.backtrace
     rescue Net::SSH::Exception
-      raise Puppet::Error, "SSH connection failure to #{host}", $!.backtrace
+      raise Puppet::Error, _("SSH connection failure to %{host}") % { host: host }, $!.backtrace
     end
 
     @buf = ""
     @eof = false
     @channel = nil
     @ssh.open_channel do |channel|
-      channel.request_pty { |ch,success| raise "failed to open pty" unless success }
+      channel.request_pty { |ch,success| raise _("failed to open pty") unless success }
 
       channel.send_channel_request("shell") do |ch, success|
-        raise "failed to open ssh shell channel" unless success
+        raise _("failed to open ssh shell channel") unless success
 
         ch.on_data { |_,data| @buf << data }
         ch.on_extended_data { |_,type,data|  @buf << data if type == 1 }

data/lib/puppet/util/plist.rb

@@ -45,7 +45,7 @@ module Puppet::Util::Plist
                                                   {:failonfail => true, :combine => true})
           return parse_plist(plist)
         rescue Puppet::ExecutionFailure => detail
-          Puppet.warning("Cannot read file #{file_path}; Puppet is skipping it.\n" + "Details: #{detail}")
+          Puppet.warning(_("Cannot read file %{file_path}; Puppet is skipping it.\n") % { file_path: file_path } + _("Details: %{detail}") % { detail: detail })
         end
       end
       return nil
@@ -125,6 +125,8 @@ module Puppet::Util::Plist
         plist_format = CFPropertyList::List::FORMAT_XML
       elsif format.to_sym == :binary
         plist_format = CFPropertyList::List::FORMAT_BINARY
+      elsif format.to_sym == :plain
+        plist_format = CFPropertyList::List::FORMAT_PLAIN
       else
         raise FormatError.new "Unknown plist format #{format}"
       end
@@ -138,7 +140,7 @@ module Puppet::Util::Plist
         plist_to_save.value = CFPropertyList.guess(plist)
         plist_to_save.save(file_path, to_format(format), :formatted => true)
       rescue IOError => e
-        Puppet.err("Unable to write the file #{file_path}. #{e.inspect}")
+        Puppet.err(_("Unable to write the file %{file_path}. %{error}") % { file_path: file_path, error: e.inspect })
       end
     end
 

data/lib/puppet/util/posix.rb

@@ -21,7 +21,7 @@ module Puppet::Util::POSIX
 
     if id.is_a?(Integer)
       if id > Puppet[:maximum_uid].to_i
-        Puppet.err "Tried to get #{field} field for silly id #{id}"
+        Puppet.err _("Tried to get %{field} field for silly id %{id}") % { field: field, id: id }
         return nil
       end
       method = methodbyid(space)
@@ -46,7 +46,7 @@ module Puppet::Util::POSIX
     if id.is_a?(Integer)
       integer = true
       if id > Puppet[:maximum_uid].to_i
-        Puppet.err "Tried to get #{field} field for silly id #{id}"
+        Puppet.err _("Tried to get %{field} field for silly id %{id}") % { field: field, id: id }
         return nil
       end
     end
@@ -74,7 +74,7 @@ module Puppet::Util::POSIX
     when :gr, :group; return :gid
     when :pw, :user, :passwd; return :uid
     else
-      raise ArgumentError.new("Can only handle users and groups")
+      raise ArgumentError.new(_("Can only handle users and groups"))
     end
   end
 
@@ -84,7 +84,7 @@ module Puppet::Util::POSIX
     when :gr, :group; return :getgrgid
     when :pw, :user, :passwd; return :getpwuid
     else
-      raise ArgumentError.new("Can only handle users and groups")
+      raise ArgumentError.new(_("Can only handle users and groups"))
     end
   end
 
@@ -94,7 +94,7 @@ module Puppet::Util::POSIX
     when :gr, :group; return :getgrnam
     when :pw, :user, :passwd; return :getpwnam
     else
-      raise ArgumentError.new("Can only handle users and groups")
+      raise ArgumentError.new(_("Can only handle users and groups"))
     end
   end
 

data/lib/puppet/util/profiler/wall_clock.rb

@@ -12,7 +12,7 @@ class Puppet::Util::Profiler::WallClock < Puppet::Util::Profiler::Logging
 
   def do_finish(context, description, metric_id)
     {:time => context.stop,
-     :msg => "took #{context} seconds"}
+     :msg => _("took %{context} seconds") % { context: context }}
   end
 
   class Timer

data/lib/puppet/util/provider_features.rb

@@ -69,7 +69,7 @@ module Puppet::Util::ProviderFeatures
       @features[obj.name] = obj
     rescue ArgumentError => detail
       error = ArgumentError.new(
-        "Could not create feature #{name}: #{detail}"
+        _("Could not create feature %{name}: %{detail}") % { name: name, detail: detail }
       )
       error.set_backtrace(detail.backtrace)
       raise error