puppet 8.2.0-universal-darwin → 8.4.0-universal-darwin

data/lib/puppet/util/windows.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/util/platform'
 
 module Puppet::Util::Windows
@@ -8,15 +9,20 @@ module Puppet::Util::Windows
     class UserProfile; end
     class Group < ADSIObject; end
   end
+
   module File; end
+
   module Registry
   end
+
   module Service
     DEFAULT_TIMEOUT = 30
   end
+
   module SID
     class Principal; end
   end
+
   class EventLog; end
 
   if Puppet::Util::Platform.windows?

data/lib/puppet/util/yaml.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'yaml'
 
 module Puppet::Util::Yaml

data/lib/puppet/util.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # A module to collect utility functions.
 
 require 'English'
@@ -102,7 +103,6 @@ module Util
     end
   end
 
-
   # Change the process to a different user
   def self.chuser
     group = Puppet[:group]
@@ -115,7 +115,7 @@ module Util
 
         # Don't exit on failed group changes, since it's
         # not fatal
-        #exit(74)
+        # exit(74)
       end
     end
 
@@ -177,7 +177,7 @@ module Util
                args.pop
              end
 
-    #TRANSLATORS 'benchmark' is a method name and should not be translated
+    # 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
@@ -220,11 +220,11 @@ module Util
           if e.to_s =~ /HOME/ and (ENV['HOME'].nil? || ENV['HOME'] == "")
             # if we get here they have a tilde in their PATH.  We'll issue a single warning about this and then
             # ignore this path element and carry on with our lives.
-            #TRANSLATORS PATH and HOME are environment variables and should not be translated
+            # TRANSLATORS PATH and HOME are environment variables and should not be translated
             Puppet::Util::Warnings.warnonce(_("PATH contains a ~ character, and HOME is not set; ignoring PATH element '%{dir}'.") % { dir: dir })
           elsif e.to_s =~ /doesn't exist|can't find user/
             # ...otherwise, we just skip the non-existent entry, and do nothing.
-            #TRANSLATORS PATH is an environment variable and should not be translated
+            # TRANSLATORS PATH is an environment variable and should not be translated
             Puppet::Util::Warnings.warnonce(_("Couldn't expand PATH containing a ~ character; ignoring PATH element '%{dir}'.") % { dir: dir })
           else
             raise
@@ -332,7 +332,7 @@ module Util
   end
   module_function :uri_to_path
 
-  RFC_3986_URI_REGEX = /^(?<scheme>([^:\/?#]+):)?(?<authority>\/\/([^\/?#]*))?(?<path>[^?#]*)(\?(?<query>[^#]*))?(#(?<fragment>.*))?$/
+  RFC_3986_URI_REGEX = /^(?<scheme>(?:[^:\/?#]+):)?(?<authority>\/\/(?:[^\/?#]*))?(?<path>[^?#]*)(?:\?(?<query>[^#]*))?(?:#(?<fragment>.*))?$/
 
   # Percent-encodes a URI query parameter per RFC3986 - https://tools.ietf.org/html/rfc3986
   #
@@ -409,8 +409,7 @@ module Util
   def uri_encode(path, opts = { :allow_fragment => false })
     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 = String.new.encode!(Encoding::UTF_8)
+    encoded = ''.dup
 
     # parse uri into named matches, then reassemble properly encoded
     parts = path.match(RFC_3986_URI_REGEX)
@@ -454,7 +453,7 @@ module Util
 
   def rfc2396_escape(str)
     str.gsub(UNSAFE) do |match|
-      tmp = String.new
+      tmp = ''.dup
       match.each_byte do |uc|
         tmp << sprintf('%%%02X', uc)
       end
@@ -610,19 +609,18 @@ module Util
         tempfile = Puppet::FileSystem::Uniquefile.new(Puppet::FileSystem.basename_string(file), Puppet::FileSystem.dir_string(file))
       end
 
-
       effective_mode =
-      if !Puppet::Util::Platform.windows?
-        # Grab the current file mode, and fall back to the defaults.
+        if !Puppet::Util::Platform.windows?
+          # Grab the current file mode, and fall back to the defaults.
 
-        if Puppet::FileSystem.exist?(file)
-          stat = Puppet::FileSystem.lstat(file)
-          tempfile.chown(stat.uid, stat.gid)
-          stat.mode
-        else
-          mode
+          if Puppet::FileSystem.exist?(file)
+            stat = Puppet::FileSystem.lstat(file)
+            tempfile.chown(stat.uid, stat.gid)
+            stat.mode
+          else
+            mode
+          end
         end
-      end
 
       # OK, now allow the caller to write the content of the file.
       yield tempfile
@@ -671,6 +669,7 @@ module Util
         if Puppet::FileSystem.exist?(file) && Puppet::FileSystem.directory?(file)
           raise Errno::EISDIR, _("Is a directory: %{directory}") % { directory: file }
         end
+
         File.rename(tempfile.path, Puppet::FileSystem.path_string(file))
       end
     ensure
@@ -681,7 +680,6 @@ module Util
       end
     end
 
-
     # Ideally, we would now fsync the directory as well, but Ruby doesn't
     # have support for that, and it doesn't matter /that/ much...
 
@@ -708,8 +706,8 @@ module Util
   #  code (e.g. webrick), and we have no idea what they might throw.
   rescue Exception => err
     ## NOTE: when debugging spec failures, these two lines can be very useful
-    #puts err.inspect
-    #puts Puppet::Util.pretty_backtrace(err.backtrace)
+    # puts err.inspect
+    # puts Puppet::Util.pretty_backtrace(err.backtrace)
     Puppet.log_exception(err, "#{message}: #{err}")
     Puppet::Util::Log.force_flushqueue()
     exit(code)
@@ -742,7 +740,6 @@ module Util
 end
 end
 
-
 require_relative 'util/errors'
 require_relative 'util/metaid'
 require_relative 'util/classgen'

data/lib/puppet/vendor.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet
   # Simple module to manage vendored code.
   #
@@ -32,7 +33,7 @@ module Puppet
 
       # @api private
       def load_entry(entry)
-        Puppet.debug("Loading vendored #{$1}")
+        Puppet.debug("Loading vendored #{entry}")
         load "#{vendor_dir}/#{entry}"
       end
 

data/lib/puppet/version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # The version method and constant are isolated in puppet/version.rb so that a
 # simple `require 'puppet/version'` allows a rubygems gemspec or bundler
 # Gemfile to get the Puppet version of the gem install.
@@ -7,7 +8,7 @@
 # Raketasks and such to set the version based on the output of `git describe`
 
 module Puppet
-  PUPPETVERSION = '8.2.0'
+  PUPPETVERSION = '8.4.0'
 
   ##
   # version is a public API method intended to always provide a fast and
@@ -62,6 +63,7 @@ module Puppet
   def self.version
     version_file = File.join(File.dirname(__FILE__), 'VERSION')
     return @puppet_version if @puppet_version
+
     @puppet_version = read_version_file(version_file) || PUPPETVERSION
   end
 

data/lib/puppet/x509/cert_provider.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/x509'
 
 # Class for loading and saving cert related objects. By default the provider
@@ -58,6 +59,7 @@ class Puppet::X509::CertProvider
     if !pem && required
       raise Puppet::Error, _("The CA certificates are missing from '%{path}'") % { path: @capath }
     end
+
     pem ? load_cacerts_from_pem(pem) : nil
   rescue SystemCallError => e
     raise Puppet::Error.new(_("Failed to load CA certificates from '%{capath}'") % {capath: @capath}, e)
@@ -104,6 +106,7 @@ class Puppet::X509::CertProvider
     if !pem && required
       raise Puppet::Error, _("The CRL is missing from '%{path}'") % { path: @crlpath }
     end
+
     pem ? load_crls_from_pem(pem) : nil
   rescue SystemCallError => e
     raise Puppet::Error.new(_("Failed to load CRLs from '%{crlpath}'") % {crlpath: @crlpath}, e)
@@ -182,7 +185,7 @@ class Puppet::X509::CertProvider
   # @api private
   def save_private_key(name, key, password: nil)
     pem = if password
-            cipher = OpenSSL::Cipher::AES.new(128, :CBC)
+            cipher = OpenSSL::Cipher.new('aes-128-cbc')
             key.export(cipher, password)
           else
             key.to_pem
@@ -212,6 +215,7 @@ class Puppet::X509::CertProvider
     if !pem && required
       raise Puppet::Error, _("The private key is missing from '%{path}'") % { path: path }
     end
+
     pem ? load_private_key_from_pem(pem, password: password) : nil
   rescue SystemCallError => e
     raise Puppet::Error.new(_("Failed to load private key for '%{name}'") % {name: name}, e)
@@ -275,6 +279,7 @@ class Puppet::X509::CertProvider
     if !pem && required
       raise Puppet::Error, _("The client certificate is missing from '%{path}'") % { path: path }
     end
+
     pem ? load_client_cert_from_pem(pem) : nil
   rescue SystemCallError => e
     raise Puppet::Error.new(_("Failed to load client certificate for '%{name}'") % {name: name}, e)
@@ -376,13 +381,18 @@ class Puppet::X509::CertProvider
     OpenSSL::X509::Request.new(pem)
   end
 
-  private
-
+  # Return the path to the cert related object (key, CSR, cert, etc).
+  #
+  # @param base [String] base directory
+  # @param name [String] the name associated with the cert related object
   def to_path(base, name)
     raise _("Certname %{name} must not contain unprintable or non-ASCII characters") % { name: name.inspect } unless name =~ VALID_CERTNAME
+
     File.join(base, "#{name.downcase}.pem")
   end
 
+  private
+
   def permissions_for_setting(name)
     setting = Puppet.settings.setting(name)
     perm = { mode: setting.mode.to_i(8) }

data/lib/puppet/x509/pem_store.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/x509'
 
 # Methods for managing PEM encoded files. While PEM encoded strings are

data/lib/puppet/x509.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../puppet'
 require_relative '../puppet/ssl/openssl_loader'
 

data/lib/puppet.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative 'puppet/version'
 require_relative 'puppet/concurrent/synchronized'
 

data/lib/puppet_pal.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Puppet as a Library "PAL"
 # This is the entry point when using PAL as a standalone library.
 #

data/lib/puppet_x.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # The Puppet Extensions Module.
 #
 # Submodules of this module should be named after the publisher (e.g.