puppet 5.3.3 → 5.3.4

data/lib/puppet/type/file.rb

@@ -727,7 +727,7 @@ Puppet::Type.newtype(:file) do
       if can_backup?(current_type)
         backup_existing
       else
-        self.warning "Could not back up file of type #{current_type}"
+        self.warning _("Could not back up file of type %{current_type}") % { current_type: current_type }
       end
     end
 
@@ -752,6 +752,7 @@ Puppet::Type.newtype(:file) do
     # catalog validation (because that would be a breaking change from Puppet 4).
     if Puppet.features.microsoft_windows? && parameter(:source) &&
       [:use, :use_when_creating].include?(self[:source_permissions])
+      #TRANSLATORS "source_permissions => ignore" should not be translated
       err_msg = _("Copying owner/mode/group from the source file on Windows is not supported; use source_permissions => ignore.")
       if self[:owner] == nil || self[:group] == nil || self[:mode] == nil
         # Fail on Windows if source permissions are being used and the file resource

data/lib/puppet/type/file/data_sync.rb

@@ -27,7 +27,8 @@ module Puppet
         return false if is == :absent
       else
         if resource[:ensure] == :present && has_contents && (s = resource.stat)
-          resource.warning "Ensure set to :present but file type is #{s.ftype} so no content will be synced"
+          #TRANSLATORS 'Ensure' is an attribute and ':present' is a value and should not be translated
+          resource.warning _("Ensure set to :present but file type is %{file_type} so no content will be synced") % { file_type: s.ftype}
         end
         return true
       end

data/lib/puppet/type/file/source.rb

@@ -128,7 +128,7 @@ module Puppet
     # Look up (if necessary) and return local content.
     def content
       return @content if @content
-      raise Puppet::DevError, "No source for content was stored with the metadata" unless metadata.source
+      raise Puppet::DevError, _("No source for content was stored with the metadata") unless metadata.source
 
       unless tmp = Puppet::FileServing::Content.indirection.find(metadata.source, :environment => resource.catalog.environment_instance, :links => resource[:links])
         self.fail "Could not find any content at %s" % metadata.source

data/lib/puppet/type/group.rb

@@ -54,7 +54,7 @@ module Puppet
 
       def sync
         if self.should == :absent
-          raise Puppet::DevError, "GID cannot be deleted"
+          raise Puppet::DevError, _("GID cannot be deleted")
         else
           provider.gid = self.should
         end

data/lib/puppet/type/mount.rb

@@ -112,7 +112,7 @@ module Puppet
         # Determine if there are any out-of-sync properties.
         oos = @resource.send(:properties).find_all do |prop|
           unless currentvalues.include?(prop)
-            raise Puppet::DevError, "Parent has property %s but it doesn't appear in the current values", [prop.name]
+            raise Puppet::DevError, _("Parent has property %{name} but it doesn't appear in the current values") % { name: prop.name }
           end
           if prop.name == :ensure
             false

data/lib/puppet/type/resources.rb

@@ -127,7 +127,7 @@ Puppet::Type.newtype(:resources) do
   def resource_type
     unless defined?(@resource_type)
       unless type = Puppet::Type.type(self[:name])
-        raise Puppet::DevError, "Could not find resource type"
+        raise Puppet::DevError, _("Could not find resource type")
       end
       @resource_type = type
     end

data/lib/puppet/type/schedule.rb

@@ -346,9 +346,9 @@ module Puppet
     newparam(:weekday) do
       desc <<-EOT
         The days of the week in which the schedule should be valid.
-        You may specify the full day name (Tuesday), the three character
-        abbreviation (Tue), or a number corresponding to the day of the
-        week where 0 is Sunday, 1 is Monday, etc. Multiple days can be specified
+        You may specify the full day name 'Tuesday', the three character
+        abbreviation 'Tue', or a number (as a string or as an integer) corresponding to the day of the
+        week where 0 is Sunday, 1 is Monday, and so on. Multiple days can be specified
         as an array. If not specified, the day of the week will not be
         considered in the schedule.
 
@@ -369,13 +369,22 @@ module Puppet
       validate do |values|
         values = [values] unless values.is_a?(Array)
         values.each { |value|
-          unless value.is_a?(String) and
-              (value =~ /^[0-6]$/ or value =~ /^(Mon|Tues?|Wed(?:nes)?|Thu(?:rs)?|Fri|Sat(?:ur)?|Sun)(day)?$/i)
-            raise ArgumentError, _("%s is not a valid day of the week") % value
+          if weekday_integer?(value) || weekday_string?(value)
+            value
+          else
+            raise ArgumentError, _("%{value} is not a valid day of the week") % { value: value }
           end
         }
       end
 
+      def weekday_integer?(value)
+        value.is_a?(Integer) && (0..6).include?(value)
+      end
+
+      def weekday_string?(value)
+        value.is_a?(String) && (value =~ /^[0-6]$/ || value =~ /^(Mon|Tues?|Wed(?:nes)?|Thu(?:rs)?|Fri|Sat(?:ur)?|Sun)(day)?$/i)
+      end
+
       weekdays = {
         'sun' => 0,
         'mon' => 1,
@@ -390,14 +399,17 @@ module Puppet
         values = [values] unless values.is_a?(Array)
         ret = {}
 
-        values.each { |value|
-           if value =~ /^[0-6]$/
-              index = value.to_i
-           else
-              index = weekdays[value[0,3].downcase]
-           end
-            ret[index] = true
-        }
+        values.each do |value|
+          case value
+          when /^[0-6]$/
+            index = value.to_i
+          when 0..6
+            index = value
+          else
+            index = weekdays[value[0,3].downcase]
+          end
+          ret[index] = true
+        end
         ret
       end
 

data/lib/puppet/type/user.rb

@@ -367,9 +367,15 @@ module Puppet
     end
 
     newparam(:managehome, :boolean => true, :parent => Puppet::Parameter::Boolean) do
-      desc "Whether to manage the home directory when managing the user.
-        This will create the home directory when `ensure => present`, and
-        delete the home directory when `ensure => absent`. Defaults to `false`."
+      desc "Whether to manage the home directory when Puppet creates or removes the user.
+        This creates the home directory if Puppet also creates the user account, and deletes the
+        home directory if Puppet also removes the user account. Defaults to `false`.
+
+        This parameter has no effect unless Puppet is also creating or removing the user in the
+        resource at the same time. For instance, Puppet creates a home directory for a managed
+        user if `ensure => present` and the user does not exist at the time of the Puppet run.
+        If the home directory is then deleted manually, Puppet will not recreate it on the next
+        run."
 
       defaultto false
 

data/lib/puppet/type/zone.rb

@@ -115,7 +115,7 @@ end
       # everything between it and us.
       self.class.state_sequence(self.retrieve, self.should).each do |state|
         method = state[direction]
-        raise Puppet::DevError, "Cannot move #{direction} from #{st[:name]}" unless method
+        raise Puppet::DevError, _("Cannot move %{direction} from %{name}") % { direction: direction, name: st[:name] } unless method
         provider_sync_send(method)
       end
 

data/lib/puppet/util.rb

@@ -197,25 +197,33 @@ module Util
     }
   end
 
+  # execute a block of work and based on the logging level provided, log the provided message with the seconds taken
+  # The message 'msg' should include string ' in %{seconds} seconds' as part of the message and any content should escape
+  # any percent signs '%' so that they are not interpreted as formatting commands
+  #     escaped_str = str.gsub(/%/, '%%')
+  #
+  # @param msg [String] the message to be formated to assigned the %{seconds} seconds take to execute,
+  #                     other percent signs '%' need to be escaped
+  # @param level [Symbol] the logging level for this message
+  # @param object [Object] The object use for logging the message
   def benchmark(*args)
     msg = args.pop
     level = args.pop
-    object = nil
-
-    if args.empty?
-      if respond_to?(level)
-        object = self
-      else
-        object = Puppet
-      end
-    else
-      object = args.pop
-    end
-
-    raise Puppet::DevError, "Failed to provide level to :benchmark" unless level
+    object = if args.empty?
+               if respond_to?(level)
+                 self
+               else
+                 Puppet
+               end
+             else
+               args.pop
+             end
+
+    #TRANSLATORS 'benchmark' is a method name and should not be translated
+    raise Puppet::DevError, _("Failed to provide level to benchmark") unless level
 
     unless level == :none or object.respond_to? level
-      raise Puppet::DevError, "Benchmarked object does not respond to #{level}"
+      raise Puppet::DevError, _("Benchmarked object does not respond to %{value}") % { value: level }
     end
 
     # Only benchmark if our log level is high enough
@@ -223,9 +231,7 @@ module Util
       seconds = Benchmark.realtime {
         yield
       }
-      #TRANSLATORS forms the end of a string indicating how long a
-      # given operation took
-      object.send(level, msg + (_(" in %0.2f seconds") % seconds))
+      object.send(level, msg % { seconds: "%0.2f" % seconds })
       return seconds
     else
       yield
@@ -301,7 +307,7 @@ module Util
             when :posix
               AbsolutePathPosix
             else
-              raise Puppet::DevError, "unknown platform #{platform} in absolute_path"
+              raise Puppet::DevError, _("unknown platform %{platform} in absolute_path") % { platform: platform }
             end
 
     !! (path =~ regex)
@@ -439,7 +445,7 @@ module Util
   #   query will encode + as %2B and space as %20
   #   fragment behaves like query
   def uri_encode(path, opts = { :allow_fragment => false })
-    raise ArgumentError.new('path may not be nil') if path.nil?
+    raise ArgumentError.new(_('path may not be nil')) if path.nil?
 
     # ensure string starts as UTF-8 for the sake of Ruby 1.9.3
     encoded = ''.encode!(Encoding::UTF_8)
@@ -557,11 +563,11 @@ module Util
   DEFAULT_WINDOWS_MODE = nil
 
   def replace_file(file, default_mode, &block)
-    raise Puppet::DevError, "replace_file requires a block" unless block_given?
+    raise Puppet::DevError, _("replace_file requires a block") unless block_given?
 
     if default_mode
       unless valid_symbolic_mode?(default_mode)
-        raise Puppet::DevError, "replace_file default_mode: #{default_mode} is invalid"
+        raise Puppet::DevError, _("replace_file default_mode: %{default_mode} is invalid") % { default_mode: default_mode }
       end
 
       mode = symbolic_mode_to_int(normalize_symbolic_mode(default_mode))

data/lib/puppet/util/at_fork/solaris.rb

@@ -93,10 +93,12 @@ class Puppet::Util::AtFork::Solaris
     begin
       raise_if_error { ct_tmpl_clear(tmpl.fileno) }
     rescue => detail
-      Puppet.log_exception(detail, parent \
-        ? _('Failed to deactivate process contract template in the parent process')
-        : _('Failed to deactivate process contract template in the child process')
-      )
+      msg = if parent
+              _('Failed to deactivate process contract template in the parent process')
+            else
+              _('Failed to deactivate process contract template in the child process')
+            end
+      Puppet.log_exception(detail, msg)
       exit(1)
     ensure
       tmpl.close

data/lib/puppet/util/command_line.rb

@@ -14,6 +14,7 @@ require 'puppet/util'
 require "puppet/util/rubygems"
 require "puppet/util/limits"
 require 'puppet/util/colors'
+require 'puppet/gettext/module_translations'
 
 module Puppet
   module Util
@@ -122,6 +123,10 @@ module Puppet
                 $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
               end
 
+              Puppet::GettextConfig.reset_text_domain('cli')
+              Puppet::ModuleTranslations.load_from_modulepath(configured_environment.modules)
+              Puppet::ModuleTranslations.load_from_vardir(Puppet[:vardir])
+
               # Puppet requires Facter, which initializes its lookup paths. Reset Facter to
               # pickup the new $LOAD_PATH.
               Facter.reset

data/lib/puppet/util/command_line/trollop.rb

@@ -165,11 +165,11 @@ class Parser
         when 'IO'; :io
         when 'Date'; :date
         else
-          raise ArgumentError, "unsupported argument type '#{opts[:type].class.name}'"
+          raise ArgumentError, _("unsupported argument type '%{type}'") % { type: opts[:type].class.name }
         end
       when nil; nil
       else
-        raise ArgumentError, "unsupported argument type '#{opts[:type]}'" unless TYPES.include?(opts[:type])
+        raise ArgumentError, _("unsupported argument type '%{type}'") % { type: opts[:type] } unless TYPES.include?(opts[:type])
         opts[:type]
       end
 
@@ -223,7 +223,7 @@ class Parser
       when /^[^-]/
         opts[:long]
       else
-        raise ArgumentError, "invalid long option name #{opts[:long].inspect}"
+        raise ArgumentError, _("invalid long option name %{name}") % { name: opts[:long].inspect }
       end
     raise ArgumentError, _("long option name %{value0} is already taken; please specify a (different) :long") % { value0: opts[:long].inspect } if @long[opts[:long]]
 
@@ -232,7 +232,7 @@ class Parser
     opts[:short] = case opts[:short]
       when /^-(.)$/; $1
       when nil, :none, /^.$/; opts[:short]
-      else raise ArgumentError, "invalid short option name '#{opts[:short].inspect}'"
+      else raise ArgumentError, _("invalid short option name '%{name}'") % { name: opts[:short].inspect }
     end
 
     if opts[:short]
@@ -812,7 +812,8 @@ def die arg, msg=nil
   if @last_parser
     @last_parser.die arg, msg
   else
-    raise ArgumentError, "Trollop::die can only be called after Trollop::options"
+    #TRANSLATORS 'Trollop' is the name of a module and 'die' and 'options' are methods in it and should not be translated.
+    raise ArgumentError, _("Trollop::die can only be called after Trollop::options")
   end
 end
 

data/lib/puppet/util/errors.rb

@@ -31,22 +31,75 @@ module Puppet::Util::Errors
     error
   end
 
-  # Return a human-readable string of this object's file and line attributes,
+
+
+  # Return a human-readable string of this object's file, line, and pos attributes,
   # if set.
   #
-  # @return [String] description of file and line
-  def error_context
-    if file and line
-      _(" at %{file}:%{line}") % { file: file, line: line }
+  # @param file [String] the file path for the error (nil or "", for not known)
+  # @param line [String] the line number for the error (nil or "", for not known)
+  # @param column [String] the column number for the error (nil or "",  for not known)
+  # @return [String] description of file, line, and column
+  #
+  def self.error_location(file, line=nil, column=nil)
+    file = nil if (file.is_a?(String) && file.empty?)
+    line = nil if (line.is_a?(String) && line.empty?)
+    column = nil if (column.is_a?(String) && column.empty?)
+    if file and line and column
+      _("(file: %{file}, line: %{line}, column: %{column})") % { file: file, line: line, column: column }
+    elsif file and line
+      _("(file: %{file}, line: %{line})") % { file: file, line: line }
+    elsif line and column
+      _("(line: %{line}, column: %{column})") % { line: line, column: column }
     elsif line
-      _(" at line %{line}") % { line: line }
+      _("(line: %{line})") % { line: line }
     elsif file
-      _(" in %{file}") % { file: file }
+      _("(file: %{file})") % { file: file }
     else
-      ""
+      ''
     end
   end
 
+  # Return a human-readable string of this object's file, line, and pos attributes,
+  # with a proceeding space in the output
+  # if set.
+  #
+  # @param file [String] the file path for the error (nil or "", for not known)
+  # @param line [String] the line number for the error (nil or "", for not known)
+  # @param column [String] the column number for the error (nil or "",  for not known)
+  # @return [String] description of file, line, and column
+  #
+  def self.error_location_with_space(file, line=nil, column=nil)
+    error_location_str = error_location(file, line, column)
+    if error_location_str.empty?
+      ''
+    else
+      ' ' + error_location_str
+    end
+  end
+
+  # Return a human-readable string of this object's file and line
+  # where unknown entries are listed as 'unknown'
+  #
+  # @param file [String] the file path for the error (nil or "", for not known)
+  # @param line [String] the line number for the error (nil or "", for not known)
+  # @return [String] description of file, and line
+  def self.error_location_with_unknowns(file, line)
+    file = nil if (file.is_a?(String) && file.empty?)
+    line = nil if (line.is_a?(String) && line.empty?)
+    file = _('unknown') unless file
+    line = _('unknown') unless line
+    error_location(file, line)
+  end
+
+  # Return a human-readable string of this object's file and line attributes,
+  # if set.
+  #
+  # @return [String] description of file and line with a leading space
+  def error_context
+    Puppet::Util::Errors.error_location_with_space(file, line)
+  end
+
   # Wrap a call in such a way that we always throw the right exception and keep
   # as much context as possible.
   #

data/lib/puppet/util/fileparsing.rb

@@ -151,8 +151,7 @@ module Puppet::Util::FileParsing
     if record.respond_to?(:process)
       if ret = record.send(:process, line.dup)
         unless ret.is_a?(Hash)
-          raise Puppet::DevError,
-            "Process record type #{record.name} returned non-hash"
+          raise Puppet::DevError, _("Process record type %{record_name} returned non-hash") % { record_name: record.name }
         end
       else
         return nil
@@ -236,7 +235,7 @@ module Puppet::Util::FileParsing
 
   # Handle parsing a single line.
   def parse_line(line)
-    raise Puppet::DevError, "No record types defined; cannot parse lines" unless records?
+    raise Puppet::DevError, _("No record types defined; cannot parse lines") unless records?
 
     @record_order.each do |record|
       # These are basically either text or record lines.
@@ -247,8 +246,7 @@ module Puppet::Util::FileParsing
           return result
         end
       else
-        raise Puppet::DevError,
-          "Somehow got invalid line type #{record.type}"
+        raise Puppet::DevError, _("Somehow got invalid line type %{record_type}") % { record_type: record.type }
       end
     end
 

data/lib/puppet/util/http_proxy.rb

@@ -1,5 +1,6 @@
 require 'uri'
 require 'openssl'
+require 'puppet/network/http'
 
 module Puppet::Util::HttpProxy
   def self.proxy(uri)
@@ -172,7 +173,13 @@ module Puppet::Util::HttpProxy
 
     0.upto(redirect_limit) do |redirection|
       proxy = get_http_object(current_uri)
-      response = proxy.send(:head, current_uri.path)
+
+      headers = { 'Accept' => '*/*', 'User-Agent' => Puppet[:http_user_agent] }
+      if Puppet.features.zlib?
+        headers.merge!({"Accept-Encoding" => Puppet::Network::HTTP::Compression::ACCEPT_ENCODING})
+      end
+
+      response = proxy.send(:head, current_uri.path, headers)
 
       if [301, 302, 307].include?(response.code.to_i)
         # handle the redirection
@@ -180,11 +187,12 @@ module Puppet::Util::HttpProxy
         next
       end
 
-      if block_given?
-        headers = {'Accept' => 'binary', 'accept-encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3'}
-        response = proxy.send("request_#{method}".to_sym, current_uri.path, headers, &block)
-      else
-        response = proxy.send(method, current_uri.path)
+      if method != :head
+        if block_given?
+          response = proxy.send("request_#{method}".to_sym, current_uri.path, headers, &block)
+        else
+          response = proxy.send(method, current_uri.path, headers)
+        end
       end
 
       Puppet.debug("HTTP #{method.to_s.upcase} request to #{current_uri} returned #{response.code} #{response.message}")