puppet 8.4.0-x64-mingw32 → 8.5.1-x64-mingw32

data/lib/puppet/settings/config_file.rb

@@ -85,10 +85,10 @@ class Puppet::Settings::ConfigFile
       if !allowed_section_names.empty? && !allowed_section_names.include?(section.name)
         error_location_str = Puppet::Util::Errors.error_location(file, section.line_number)
         message = _("Illegal section '%{name}' in config file at %{error_location}.") %
-            { name: section.name, error_location: error_location_str }
+                  { name: section.name, error_location: error_location_str }
         # TRANSLATORS 'puppet.conf' is the name of the puppet configuration file and should not be translated.
         message += ' ' + _("The only valid puppet.conf sections are: [%{allowed_sections_list}].") %
-            { allowed_sections_list: allowed_section_names.join(", ") }
+                         { allowed_sections_list: allowed_section_names.join(", ") }
         message += ' ' + _("Please use the directory environments feature to specify environments.")
         message += ' ' + _("(See https://puppet.com/docs/puppet/latest/environments_about.html)")
         raise(Puppet::Error, message)

data/lib/puppet/settings/duration_setting.rb

@@ -22,10 +22,9 @@ class Puppet::Settings::DurationSetting < Puppet::Settings::BaseSetting
 
   # Convert the value to an integer, parsing numeric string with units if necessary.
   def munge(value)
-    case
-    when value.is_a?(Integer) || value.nil?
+    if value.is_a?(Integer) || value.nil?
       value
-    when (value.is_a?(String) and value =~ FORMAT)
+    elsif (value.is_a?(String) and value =~ FORMAT)
       $1.to_i * UNITMAP[$2 || 's']
     else
       raise Puppet::Settings::ValidationError, _("Invalid duration format '%{value}' for parameter: %{name}") % { value: value.inspect, name: @name }

data/lib/puppet/settings/environment_conf.rb

@@ -69,7 +69,7 @@ class Puppet::Settings::EnvironmentConf
       if environment_conf_manifest && fallback_manifest_directory != environment_conf_manifest
         # TRANSLATORS 'disable_per_environment_manifest' is a setting and 'environment.conf' is a file name and should not be translated
         message = _("The 'disable_per_environment_manifest' setting is true, but the environment located at %{path_to_env} has a manifest setting in its environment.conf of '%{environment_conf}' which does not match the default_manifest setting '%{puppet_conf}'.") %
-            { path_to_env: @path_to_env, environment_conf: environment_conf_manifest, puppet_conf: puppet_conf_manifest }
+                  { path_to_env: @path_to_env, environment_conf: environment_conf_manifest, puppet_conf: puppet_conf_manifest }
         message += ' ' + _("If this environment is expecting to find modules in '%{environment_conf}', they will not be available!") % { environment_conf: environment_conf_manifest }
         Puppet.err(message)
       end
@@ -100,7 +100,7 @@ class Puppet::Settings::EnvironmentConf
   def modulepath
     default_modulepath = [File.join(@path_to_env, "modules")] + @global_module_path
     get_setting(:modulepath, default_modulepath) do |modulepath|
-      path = modulepath.kind_of?(String) ?
+      path = modulepath.is_a?(String) ?
         modulepath.split(File::PATH_SEPARATOR) :
         modulepath
       path.map { |p| expand_glob(absolute(p)) }.flatten.join(File::PATH_SEPARATOR)
@@ -143,7 +143,8 @@ class Puppet::Settings::EnvironmentConf
         _("Invalid sections in environment.conf at '%{path_to_conf_file}'. Environment conf may not have sections. The following sections are being ignored: '%{sections}'") % {
           path_to_conf_file: path_to_conf_file,
           sections: (section_keys - [:main]).join(',')
-        })
+        }
+      )
       valid = false
     end
 
@@ -155,7 +156,8 @@ class Puppet::Settings::EnvironmentConf
         _("Invalid settings in environment.conf at '%{path_to_conf_file}'. The following unknown setting(s) are being ignored: %{ignored_settings}") % {
           path_to_conf_file: path_to_conf_file,
           ignored_settings: extraneous_settings.join(', ')
-        })
+        }
+      )
       valid = false
     end
 

data/lib/puppet/settings/errors.rb

@@ -4,9 +4,9 @@
 require_relative '../../puppet/error'
 
 class Puppet::Settings
-  class SettingsError < Puppet::Error ; end
-  class ValidationError < SettingsError ; end
-  class InterpolationError < SettingsError ; end
+  class SettingsError < Puppet::Error; end
+  class ValidationError < SettingsError; end
+  class InterpolationError < SettingsError; end
 
   class ParseError < SettingsError
     include Puppet::ExternalFileError

data/lib/puppet/settings/integer_setting.rb

@@ -2,7 +2,7 @@
 
 class Puppet::Settings::IntegerSetting < Puppet::Settings::BaseSetting
   def munge(value)
-    return value if Integer === value
+    return value if value.is_a?(Integer)
 
     begin
       value = Integer(value)

data/lib/puppet/settings/priority_setting.rb

@@ -31,12 +31,11 @@ class Puppet::Settings::PrioritySetting < Puppet::Settings::BaseSetting
   def munge(value)
     return unless value
 
-    case
-    when value.is_a?(Integer)
+    if value.is_a?(Integer)
       value
-    when (value.is_a?(String) and value =~ /\d+/)
+    elsif (value.is_a?(String) and value =~ /\d+/)
       value.to_i
-    when (value.is_a?(String) and PRIORITY_MAP[value.to_sym])
+    elsif (value.is_a?(String) and PRIORITY_MAP[value.to_sym])
       PRIORITY_MAP[value.to_sym]
     else
       raise Puppet::Settings::ValidationError, _("Invalid priority format '%{value}' for parameter: %{name}") % { value: value.inspect, name: @name }

data/lib/puppet/settings/server_list_setting.rb

@@ -8,15 +8,15 @@ class Puppet::Settings::ServerListSetting < Puppet::Settings::ArraySetting
   def print(value)
     if value.is_a?(Array)
       # turn into a string
-      value.map {|item| item.join(":") }.join(",")
+      value.map { |item| item.join(":") }.join(",")
     else
       value
     end
   end
-  
+
   def munge(value)
-    servers = super 
-    servers.map! { |server| 
+    servers = super
+    servers.map! { |server|
       case server
       when String
         server.split(':')

data/lib/puppet/settings/ttl_setting.rb

@@ -34,18 +34,17 @@ class Puppet::Settings::TTLSetting < Puppet::Settings::BaseSetting
 
   # Convert the value to Numeric, parsing numeric string with units if necessary.
   def self.munge(value, param_name)
-    case
-    when value.is_a?(Numeric)
+    if value.is_a?(Numeric)
       if value < 0
         raise Puppet::Settings::ValidationError, _("Invalid negative 'time to live' %{value} - did you mean 'unlimited'?") % { value: value.inspect }
       end
 
       value
 
-    when value == 'unlimited'
+    elsif value == 'unlimited'
       Float::INFINITY
 
-    when (value.is_a?(String) and value =~ FORMAT)
+    elsif (value.is_a?(String) and value =~ FORMAT)
       $1.to_i * UNITMAP[$2 || 's']
     else
       raise Puppet::Settings::ValidationError, _("Invalid 'time to live' format '%{value}' for parameter: %{param_name}") % { value: value.inspect, param_name: param_name }

data/lib/puppet/settings/value_translator.rb

@@ -10,7 +10,7 @@ class Puppet::Settings::ValueTranslator
            when true; true
            when false; false
            else
-             value.gsub(/^["']|["']$/,'').sub(/\s+$/, '')
+             value.gsub(/^["']|["']$/, '').sub(/\s+$/, '')
            end
   end
 end

data/lib/puppet/settings.rb

@@ -69,7 +69,7 @@ class Puppet::Settings
     }
   end
 
-  def self.default_certname()
+  def self.default_certname
     hostname = hostname_fact
     domain = domain_fact
     if domain and domain != ""
@@ -80,11 +80,11 @@ class Puppet::Settings
     fqdn.to_s.gsub(/\.$/, '')
   end
 
-  def self.hostname_fact()
+  def self.hostname_fact
     Puppet.runtime[:facter].value 'networking.hostname'
   end
 
-  def self.domain_fact()
+  def self.domain_fact
     Puppet.runtime[:facter].value 'networking.domain'
   end
 
@@ -121,9 +121,10 @@ class Puppet::Settings
     newhash = {}
     hash.each do |key, val|
       key = key.to_s
-      if val.is_a? Hash
+      case val
+      when Hash
         newhash[key] = stringifyhash(val)
-      elsif val.is_a? Symbol
+      when Symbol
         newhash[key] = val.to_s
       else
         newhash[key] = val
@@ -240,7 +241,7 @@ class Puppet::Settings
   # Is our setting a boolean setting?
   def boolean?(param)
     param = param.to_sym
-    @config.include?(param) and @config[param].kind_of?(BooleanSetting)
+    @config.include?(param) and @config[param].is_a?(BooleanSetting)
   end
 
   # Remove all set values, potentially skipping cli values.
@@ -313,7 +314,7 @@ class Puppet::Settings
     @used = []
   end
 
-  def global_defaults_initialized?()
+  def global_defaults_initialized?
     @global_defaults_initialized
   end
 
@@ -377,7 +378,7 @@ class Puppet::Settings
   def self.clean_opt(opt, val)
     # rewrite --[no-]option to --no-option if that's what was given
     if opt =~ /\[no-\]/ and !val
-      opt = opt.gsub(/\[no-\]/,'no-')
+      opt = opt.gsub(/\[no-\]/, 'no-')
     end
     # otherwise remove the [no-] prefix to not confuse everybody
     opt = opt.gsub(/\[no-\]/, '')
@@ -475,14 +476,15 @@ class Puppet::Settings
   def handlearg(opt, value = nil)
     @cache.clear
 
-    if value.is_a?(FalseClass)
+    case value
+    when FalseClass
       value = "false"
-    elsif value.is_a?(TrueClass)
+    when TrueClass
       value = "true"
     end
 
     value &&= @translate[value]
-    str = opt.sub(/^--/,'')
+    str = opt.sub(/^--/, '')
 
     bool = true
     newstr = str.sub(/^no-/, '')
@@ -526,11 +528,11 @@ class Puppet::Settings
     if val == "all"
       hash = {}
       each do |name, _obj|
-        val = value(name,env)
+        val = value(name, env)
         val = val.inspect if val == ""
         hash[name] = val
       end
-      hash.sort { |a,b| a[0].to_s <=> b[0].to_s }.each do |name, v|
+      hash.sort { |a, b| a[0].to_s <=> b[0].to_s }.each do |name, v|
         puts "#{name} = #{v}"
       end
     else
@@ -538,10 +540,10 @@ class Puppet::Settings
         if include?(v)
           # if there is only one value, just print it for back compatibility
           if v == val
-            puts value(val,env)
+            puts value(val, env)
             break
           end
-          puts "#{v} = #{value(v,env)}"
+          puts "#{v} = #{value(v, env)}"
         else
           puts "invalid setting: #{v}"
           return false
@@ -636,13 +638,14 @@ class Puppet::Settings
           # will have associated hooks that it ends up being less work this
           # way overall.
           if setting.call_hook_on_initialize?
-            @hooks_to_call_on_application_initialization |= [ setting ]
+            @hooks_to_call_on_application_initialization |= [setting]
           else
             setting.handle(ChainedValues.new(
               preferred_run_mode,
               env,
               value_sets,
-              @config).interpolate(setting.name))
+              @config
+            ).interpolate(setting.name))
           end
           break
         end
@@ -660,7 +663,7 @@ class Puppet::Settings
       begin
         text = read_file(file)
       rescue => detail
-        message = _("Could not load %{file}: %{detail}") % { file: file, detail: detail}
+        message = _("Could not load %{file}: %{detail}") % { file: file, detail: detail }
         if require_config
           Puppet.log_and_raise(detail, message)
         else
@@ -942,7 +945,7 @@ class Puppet::Settings
     when :environment
       ValuesFromEnvironmentConf.new(source.name)
     else
-      raise Puppet::DevError, _("Unknown searchpath case: %{source_type} for the %{source} settings path element.") % { source_type: source.type, source: source}
+      raise Puppet::DevError, _("Unknown searchpath case: %{source_type} for the %{source} settings path element.") % { source_type: source.type, source: source }
     end
   end
 
@@ -1049,7 +1052,7 @@ class Puppet::Settings
         if tryconfig.call_hook_on_define?
           call << tryconfig
         elsif tryconfig.call_hook_on_initialize?
-          @hooks_to_call_on_application_initialization |= [ tryconfig ]
+          @hooks_to_call_on_application_initialization |= [tryconfig]
         end
       end
 
@@ -1075,7 +1078,7 @@ class Puppet::Settings
       next unless resource
       next if catalog.resource(resource.ref)
 
-      Puppet.debug {"Using settings: adding file resource '#{key}': '#{resource.inspect}'"}
+      Puppet.debug { "Using settings: adding file resource '#{key}': '#{resource.inspect}'" }
 
       catalog.add_resource(resource)
     end
@@ -1152,10 +1155,10 @@ Generated on #{Time.now}.
           report = transaction.report
           status_failures = report.resource_statuses.values.select { |r| r.failed? }
           status_fail_msg = status_failures
-            .collect(&:events)
-            .flatten
-            .select { |event| event.status == 'failure' }
-            .collect { |event| "#{event.resource}: #{event.message}" }.join("; ")
+                            .collect(&:events)
+                            .flatten
+                            .select { |event| event.status == 'failure' }
+                            .collect { |event| "#{event.resource}: #{event.message}" }.join("; ")
 
           raise "Got #{status_failures.length} failure(s) while initializing: #{status_fail_msg}"
         end
@@ -1185,7 +1188,8 @@ Generated on #{Time.now}.
       section,
       environment,
       value_sets_for(environment, section),
-      @config)
+      @config
+    )
   end
 
   # Find the correct value using our search path.
@@ -1300,17 +1304,16 @@ Generated on #{Time.now}.
 
   def issue_deprecation_warning(setting, msg = nil)
     name = setting.name
-    ref = DEPRECATION_REFS.find { |params,_reference| params.include?(name) }
+    ref = DEPRECATION_REFS.find { |params, _reference| params.include?(name) }
     ref = ref[1] if ref
-    case
-    when msg
+    if msg
       msg << " #{ref}" if ref
       Puppet.deprecation_warning(msg)
-    when setting.completely_deprecated?
+    elsif setting.completely_deprecated?
       message = _("Setting %{name} is deprecated.") % { name: name }
       message += " #{ref}"
       Puppet.deprecation_warning(message, "setting-#{name}")
-    when setting.allowed_on_commandline?
+    elsif setting.allowed_on_commandline?
       # TRANSLATORS 'puppet.conf' is a file name and should not be translated
       message = _("Setting %{name} is deprecated in puppet.conf.") % { name: name }
       message += " #{ref}"
@@ -1361,20 +1364,20 @@ Generated on #{Time.now}.
 
       user = setting.owner
       if user && user != "root" && catalog.resource(:user, user).nil?
-        resource = Puppet::Resource.new(:user, user, :parameters => {:ensure => :present})
+        resource = Puppet::Resource.new(:user, user, :parameters => { :ensure => :present })
         resource[:gid] = self[:group] if self[:group]
         catalog.add_resource resource
       end
       group = setting.group
-      if group && ! %w{root wheel}.include?(group) && catalog.resource(:group, group).nil?
-        catalog.add_resource Puppet::Resource.new(:group, group, :parameters => {:ensure => :present})
+      if group && !%w{root wheel}.include?(group) && catalog.resource(:group, group).nil?
+        catalog.add_resource Puppet::Resource.new(:group, group, :parameters => { :ensure => :present })
       end
     end
   end
 
   # Yield each search source in turn.
   def value_sets_for(environment, mode)
-    searchpath(environment, mode).collect { |source| searchpath_values(source) }.compact
+    searchpath(environment, mode).filter_map { |source| searchpath_values(source) }
   end
 
   # Read the file in.
@@ -1386,7 +1389,7 @@ Generated on #{Time.now}.
   # Private method for internal test use only; allows to do a comprehensive clear of all settings between tests.
   #
   # @return nil
-  def clear_everything_for_tests()
+  def clear_everything_for_tests
     unsafe_clear(true, true)
     @configuration_file = nil
     @global_defaults_initialized = false

data/lib/puppet/ssl/base.rb

@@ -65,7 +65,7 @@ class Puppet::SSL::Base
   def self.from_instance(instance, name = nil)
     unless instance.is_a?(wrapped_class)
       raise ArgumentError, _("Object must be an instance of %{class_name}, %{actual_class} given") %
-          { class_name: wrapped_class, actual_class: instance.class }
+                           { class_name: wrapped_class, actual_class: instance.class }
     end
     if name.nil? and !instance.respond_to?(:subject)
       raise ArgumentError, _("Name must be supplied if it cannot be determined from the instance")
@@ -118,7 +118,7 @@ class Puppet::SSL::Base
     digest(mds).to_hex
   end
 
-  def digest(algorithm=nil)
+  def digest(algorithm = nil)
     unless algorithm
       algorithm = digest_algorithm
     end

data/lib/puppet/ssl/certificate.rb

@@ -20,7 +20,7 @@ class Puppet::SSL::Certificate < Puppet::SSL::Base
   end
 
   def self.subject_alt_names_for(cert)
-    alts = cert.extensions.find{|ext| ext.oid == "subjectAltName"}
+    alts = cert.extensions.find { |ext| ext.oid == "subjectAltName" }
     return [] unless alts
 
     alts.value.split(/\s*,\s*/)
@@ -59,7 +59,7 @@ class Puppet::SSL::Certificate < Puppet::SSL::Base
     end
 
     custom_exts.map do |ext|
-      {'oid' => ext.oid, 'value' => get_ext_val(ext.oid)}
+      { 'oid' => ext.oid, 'value' => get_ext_val(ext.oid) }
     end
   end
 

data/lib/puppet/ssl/certificate_request.rb

@@ -142,8 +142,8 @@ class Puppet::SSL::CertificateRequest < Puppet::SSL::Base
 
     # Prefer the standard extReq, but accept the Microsoft specific version as
     # a fallback, if the standard version isn't found.
-    attribute   = @content.attributes.find {|x| x.oid == "extReq" }
-    attribute ||= @content.attributes.find {|x| x.oid == "msExtReq" }
+    attribute   = @content.attributes.find { |x| x.oid == "extReq" }
+    attribute ||= @content.attributes.find { |x| x.oid == "msExtReq" }
     return [] unless attribute
 
     extensions = unpack_extension_request(attribute)
@@ -161,9 +161,9 @@ class Puppet::SSL::CertificateRequest < Puppet::SSL::Base
       # fixed component in the sequence.
       case ext_values.length
       when 2
-        {"oid" => ext_values[0].value, "value" => value}
+        { "oid" => ext_values[0].value, "value" => value }
       when 3
-        {"oid" => ext_values[0].value, "value" => value, "critical" => ext_values[1].value}
+        { "oid" => ext_values[0].value, "value" => value, "critical" => ext_values[1].value }
       else
         raise Puppet::Error, _("In %{attr}, expected extension record %{index} to have two or three items, but found %{count}") % { attr: attribute.oid, index: index, count: ext_values.length }
       end
@@ -172,11 +172,11 @@ class Puppet::SSL::CertificateRequest < Puppet::SSL::Base
 
   def subject_alt_names
     @subject_alt_names ||= request_extensions
-      .select {|x| x["oid"] == "subjectAltName" }
-      .map {|x| x["value"].split(/\s*,\s*/) }
-      .flatten
-      .sort
-      .uniq
+                           .select { |x| x["oid"] == "subjectAltName" }
+                           .map { |x| x["value"].split(/\s*,\s*/) }
+                           .flatten
+                           .sort
+                           .uniq
   end
 
   # Return all user specified attributes attached to this CSR as a hash. IF an
@@ -196,7 +196,7 @@ class Puppet::SSL::CertificateRequest < Puppet::SSL::Base
     end
 
     x509_attributes.map do |attr|
-      {"oid" => attr.oid, "value" => attr.value.value.first.value}
+      { "oid" => attr.oid, "value" => attr.value.value.first.value }
     end
   end
 

data/lib/puppet/ssl/certificate_request_attributes.rb

@@ -23,7 +23,7 @@ class Puppet::SSL::CertificateRequestAttributes
     Puppet.info(_("csr_attributes file loading from %{path}") % { path: path })
     if Puppet::FileSystem.exist?(path)
       hash = Puppet::Util::Yaml.safe_load_file(path, [Symbol]) || {}
-      if ! hash.is_a?(Hash)
+      if !hash.is_a?(Hash)
         raise Puppet::Error, _("invalid CSR attributes, expected instance of Hash, received instance of %{klass}") % { klass: hash.class }
       end
 

data/lib/puppet/ssl/oids.rb

@@ -81,7 +81,7 @@ module Puppet::SSL::Oids
   # Register our custom Puppet OIDs with OpenSSL so they can be used as CSR
   # extensions. Without registering these OIDs, OpenSSL will fail when it
   # encounters such an extension in a CSR.
-  def self.register_puppet_oids()
+  def self.register_puppet_oids
     if !@did_register_puppet_oids
       PUPPET_OIDS.each do |oid_defn|
         OpenSSL::ASN1::ObjectId.register(*oid_defn)
@@ -106,7 +106,7 @@ module Puppet::SSL::Oids
   #  '1.3.6.1.4.1.34380.1.2.1.2':
   #    shortname: 'myothershortname'
   #    longname: 'Other Long name'
-  def self.parse_custom_oid_file(custom_oid_file, map_key='oid_mapping')
+  def self.parse_custom_oid_file(custom_oid_file, map_key = 'oid_mapping')
     if File.exist?(custom_oid_file) && File.readable?(custom_oid_file)
       mapping = nil
       begin
@@ -125,7 +125,7 @@ module Puppet::SSL::Oids
 
       oid_defns = []
       mapping[map_key].keys.each do |oid|
-        shortname, longname = mapping[map_key][oid].values_at("shortname","longname")
+        shortname, longname = mapping[map_key][oid].values_at("shortname", "longname")
         if shortname.nil? || longname.nil?
           raise Puppet::Error, _("Error loading ssl custom OIDs mapping file from '%{custom_oid_file}': incomplete definition of oid '%{oid}'") % { custom_oid_file: custom_oid_file, oid: oid }
         end
@@ -152,7 +152,7 @@ module Puppet::SSL::Oids
   #  '1.3.6.1.4.1.34380.1.2.1.2':
   #    shortname: 'myothershortname'
   #    longname: 'Other Long name'
-  def self.load_custom_oid_file(custom_oid_file, map_key='oid_mapping')
+  def self.load_custom_oid_file(custom_oid_file, map_key = 'oid_mapping')
     oid_defns = parse_custom_oid_file(custom_oid_file, map_key)
     unless oid_defns.nil?
       begin

data/lib/puppet/ssl/ssl_provider.rb

@@ -218,16 +218,16 @@ class Puppet::SSL::SSLProvider
       chain.reverse.each_with_index do |cert, i|
         digest = Puppet::SSL::Digest.new(alg, cert.to_der)
         if i == chain.length - 1
-          Puppet.debug(_("Verified client certificate '%{subject}' fingerprint %{digest}") % {subject: cert.subject.to_utf8, digest: digest})
+          Puppet.debug(_("Verified client certificate '%{subject}' fingerprint %{digest}") % { subject: cert.subject.to_utf8, digest: digest })
         else
-          Puppet.debug(_("Verified CA certificate '%{subject}' fingerprint %{digest}") % {subject: cert.subject.to_utf8, digest: digest})
+          Puppet.debug(_("Verified CA certificate '%{subject}' fingerprint %{digest}") % { subject: cert.subject.to_utf8, digest: digest })
         end
       end
       ssl_context.crls.each do |crl|
-        oid_values = Hash[crl.extensions.map { |ext| [ext.oid, ext.value] }]
+        oid_values = crl.extensions.to_h { |ext| [ext.oid, ext.value] }
         crlNumber = oid_values['crlNumber'] || 'unknown'
         authKeyId = (oid_values['authorityKeyIdentifier'] || 'unknown').chomp
-        Puppet.debug("Using CRL '#{crl.issuer.to_utf8}' authorityKeyIdentifier '#{authKeyId}' crlNumber '#{crlNumber }'")
+        Puppet.debug("Using CRL '#{crl.issuer.to_utf8}' authorityKeyIdentifier '#{authKeyId}' crlNumber '#{crlNumber}'")
       end
     end
   end
@@ -335,7 +335,8 @@ class Puppet::SSL::SSLProvider
         _("Invalid signature for CRL issued by '%{issuer}'") % { issuer: issuer(current_cert) }
       when OpenSSL::X509::V_ERR_UNABLE_TO_GET_ISSUER_CERT
         _("The issuer '%{issuer}' of certificate '%{subject}' is missing") % {
-          issuer: issuer(current_cert), subject: subject(current_cert) }
+          issuer: issuer(current_cert), subject: subject(current_cert)
+        }
       when OpenSSL::X509::V_ERR_UNABLE_TO_GET_CRL
         _("The CRL issued by '%{issuer}' is missing") % { issuer: issuer(current_cert) }
       when OpenSSL::X509::V_ERR_CERT_REVOKED
@@ -344,7 +345,8 @@ class Puppet::SSL::SSLProvider
         # error_string is labeled ASCII-8BIT, but is encoded based on Encoding.default_external
         err_utf8 = Puppet::Util::CharacterEncoding.convert_to_utf_8(store_context.error_string)
         _("Certificate '%{subject}' failed verification (%{err}): %{err_utf8}") % {
-          subject: subject(current_cert), err: store_context.error, err_utf8: err_utf8 }
+          subject: subject(current_cert), err: store_context.error, err_utf8: err_utf8
+        }
       end
 
     raise Puppet::SSL::CertVerifyError.new(message, store_context.error, current_cert)

data/lib/puppet/ssl/state_machine.rb

@@ -122,13 +122,13 @@ class Puppet::SSL::StateMachine
       if e.response.code == 304
         Puppet.info(_("CA certificate is unmodified, using existing CA certificate"))
       else
-        Puppet.info(_("Failed to refresh CA certificate, using existing CA certificate: %{message}") % {message: e.message})
+        Puppet.info(_("Failed to refresh CA certificate, using existing CA certificate: %{message}") % { message: e.message })
       end
 
       # return the original ssl_ctx
       [ssl_ctx, false]
     rescue Puppet::HTTP::HTTPError => e
-      Puppet.warning(_("Failed to refresh CA certificate, using existing CA certificate: %{message}") % {message: e.message})
+      Puppet.warning(_("Failed to refresh CA certificate, using existing CA certificate: %{message}") % { message: e.message })
 
       # return the original ssl_ctx
       [ssl_ctx, false]
@@ -220,13 +220,13 @@ class Puppet::SSL::StateMachine
       if e.response.code == 304
         Puppet.info(_("CRL is unmodified, using existing CRL"))
       else
-        Puppet.info(_("Failed to refresh CRL, using existing CRL: %{message}") % {message: e.message})
+        Puppet.info(_("Failed to refresh CRL, using existing CRL: %{message}") % { message: e.message })
       end
 
       # return the original ssl_ctx
       ssl_ctx
     rescue Puppet::HTTP::HTTPError => e
-      Puppet.warning(_("Failed to refresh CRL, using existing CRL: %{message}") % {message: e.message})
+      Puppet.warning(_("Failed to refresh CRL, using existing CRL: %{message}") % { message: e.message })
 
       # return the original ssl_ctx
       ssl_ctx
@@ -350,15 +350,15 @@ class Puppet::SSL::StateMachine
     rescue Puppet::SSL::SSLError => e
       Error.new(@machine, e.message, e)
     rescue OpenSSL::X509::CertificateError => e
-      Error.new(@machine, _("Failed to parse certificate: %{message}") % {message: e.message}, e)
+      Error.new(@machine, _("Failed to parse certificate: %{message}") % { message: e.message }, e)
     rescue Puppet::HTTP::ResponseError => e
       if e.response.code == 404
-        Puppet.info(_("Certificate for %{certname} has not been signed yet") % {certname: Puppet[:certname]})
+        Puppet.info(_("Certificate for %{certname} has not been signed yet") % { certname: Puppet[:certname] })
         $stdout.puts _("Couldn't fetch certificate from CA server; you might still need to sign this agent's certificate (%{name}).") % { name: Puppet[:certname] }
         Wait.new(@machine)
       else
         to_error(_("Failed to retrieve certificate for %{certname}: %{message}") %
-                 {certname: Puppet[:certname], message: e.response.message}, e)
+                 { certname: Puppet[:certname], message: e.response.message }, e)
       end
     end
   end
@@ -381,7 +381,7 @@ class Puppet::SSL::StateMachine
       @cert_provider.save_client_cert(Puppet[:certname], cert)
 
       Puppet.info(_("Renewed client certificate: %{cert_digest}, not before '%{not_before}', not after '%{not_after}'") % { cert_digest: @machine.digest_as_hex(cert.to_pem), not_before: cert.not_before, not_after: cert.not_after })
-      
+
       Done.new(@machine, next_ctx)
     rescue Puppet::HTTP::ResponseError => e
       if e.response.code == 404
@@ -409,10 +409,10 @@ class Puppet::SSL::StateMachine
         log_error(_("Exiting now because the waitforcert setting is set to 0."))
         exit(1)
       elsif Time.now.to_i > @machine.wait_deadline
-        log_error(_("Couldn't fetch certificate from CA server; you might still need to sign this agent's certificate (%{name}). Exiting now because the maxwaitforcert timeout has been exceeded.") % {name: Puppet[:certname] })
+        log_error(_("Couldn't fetch certificate from CA server; you might still need to sign this agent's certificate (%{name}). Exiting now because the maxwaitforcert timeout has been exceeded.") % { name: Puppet[:certname] })
         exit(1)
       else
-        Puppet.info(_("Will try again in %{time} seconds.") % {time: time})
+        Puppet.info(_("Will try again in %{time} seconds.") % { time: time })
 
         # close http/tls and session state before sleeping
         Puppet.runtime[:http].close
@@ -443,7 +443,7 @@ class Puppet::SSL::StateMachine
         LockFailure.new(@machine, _("Another puppet instance is already running and the maxwaitforlock timeout has been exceeded; exiting"))
       else
         Puppet.info _("Another puppet instance is already running; waiting for it to finish")
-        Puppet.info _("Will try again in %{time} seconds.") % {time: @machine.waitforlock}
+        Puppet.info _("Will try again in %{time} seconds.") % { time: @machine.waitforlock }
         Kernel.sleep @machine.waitforlock
 
         # try again