puppet 8.5.1-universal-darwin → 8.6.0-universal-darwin

data/lib/puppet/ffi/windows/structs.rb

@@ -198,7 +198,7 @@ module Puppet::FFI::Windows
         :dwWin32ExitCode, :dword,
         :dwServiceSpecificExitCode, :dword,
         :dwCheckPoint, :dword,
-        :dwWaitHint, :dword,
+        :dwWaitHint, :dword
       )
     end
 
@@ -223,7 +223,7 @@ module Puppet::FFI::Windows
         :dwTagId, :dword,
         :lpDependencies, :pointer,
         :lpServiceStartName, :pointer,
-        :lpDisplayName, :pointer,
+        :lpDisplayName, :pointer
       )
     end
 
@@ -258,7 +258,7 @@ module Puppet::FFI::Windows
       )
     end
 
-    MAXIMUM_REPARSE_DATA_BUFFER_SIZE = 16384
+    MAXIMUM_REPARSE_DATA_BUFFER_SIZE = 16_384
 
     # SYMLINK_REPARSE_DATA_BUFFER
     # https://msdn.microsoft.com/en-us/library/cc232006.aspx

data/lib/puppet/file_bucket/dipper.rb

@@ -52,7 +52,7 @@ class Puppet::FileBucket::Dipper
         Puppet::FileBucket::File.indirection.save(file_bucket_file, dest_path)
       end
 
-      return file_bucket_file.checksum_data
+      file_bucket_file.checksum_data
     rescue => detail
       message = _("Could not back up %{file}: %{detail}") % { file: file, detail: detail }
       Puppet.log_exception(detail, message)
@@ -139,7 +139,7 @@ class Puppet::FileBucket::Dipper
         changed = nil
         if Puppet::FileSystem.exist?(file_handle) and !Puppet::FileSystem.writable?(file_handle)
           changed = Puppet::FileSystem.stat(file_handle).mode
-          ::File.chmod(changed | 0200, file)
+          ::File.chmod(changed | 0o200, file)
         end
         ::File.open(file, ::File::WRONLY | ::File::TRUNC | ::File::CREAT) { |of|
           of.binmode
@@ -152,9 +152,9 @@ class Puppet::FileBucket::Dipper
         Puppet.err _("Could not find file with checksum %{sum}") % { sum: sum }
         return nil
       end
-      return newsum
+      newsum
     else
-      return nil
+      nil
     end
   end
 

data/lib/puppet/file_bucket/file.rb

@@ -26,12 +26,12 @@ class Puppet::FileBucket::File
     when Pathname
       @contents = FileContents.new(contents)
     else
-      raise ArgumentError.new(_("contents must be a String or Pathname, got a %{contents_class}") % { contents_class: contents.class })
+      raise ArgumentError, _("contents must be a String or Pathname, got a %{contents_class}") % { contents_class: contents.class }
     end
 
     @bucket_path = options.delete(:bucket_path)
     @checksum_type = Puppet[:digest_algorithm].to_sym
-    raise ArgumentError.new(_("Unknown option(s): %{opts}") % { opts: options.keys.join(', ') }) unless options.empty?
+    raise ArgumentError, _("Unknown option(s): %{opts}") % { opts: options.keys.join(', ') } unless options.empty?
   end
 
   # @return [Num] The size of the contents
@@ -73,7 +73,7 @@ class Puppet::FileBucket::File
   end
 
   def self.from_binary(contents)
-    self.new(contents)
+    new(contents)
   end
 
   class StringContents
@@ -102,7 +102,7 @@ class Puppet::FileBucket::File
     def to_binary
       # This is not so horrible as for FileContent, but still possible to mutate the content that the
       # checksum is based on... so semi horrible...
-      return @contents;
+      @contents;
     end
   end
 

data/lib/puppet/file_serving/base.rb

@@ -13,9 +13,9 @@ class Puppet::FileServing::Base
   # Does our file exist?
   def exist?
     stat
-    return true
+    true
   rescue
-    return false
+    false
   end
 
   # Return the full path to our file.  Fails if there's no path set.
@@ -59,7 +59,7 @@ class Puppet::FileServing::Base
   attr_reader :path
 
   def path=(path)
-    raise ArgumentError.new(_("Paths must be fully qualified")) unless Puppet::FileServing::Base.absolute?(path)
+    raise ArgumentError, _("Paths must be fully qualified") unless Puppet::FileServing::Base.absolute?(path)
 
     @path = path
   end
@@ -69,14 +69,14 @@ class Puppet::FileServing::Base
   attr_reader :relative_path
 
   def relative_path=(path)
-    raise ArgumentError.new(_("Relative paths must not be fully qualified")) if Puppet::FileServing::Base.absolute?(path)
+    raise ArgumentError, _("Relative paths must not be fully qualified") if Puppet::FileServing::Base.absolute?(path)
 
     @relative_path = path
   end
 
   # Stat our file, using the appropriate link-sensitive method.
   def stat
-    @stat_method ||= self.links == :manage ? :lstat : :stat
+    @stat_method ||= links == :manage ? :lstat : :stat
     Puppet::FileSystem.send(@stat_method, full_path)
   end
 

data/lib/puppet/file_serving/configuration/parser.rb

@@ -25,10 +25,10 @@ class Puppet::FileServing::Configuration::Parser
         when /^\s*#/; next # skip comments
         when /^\s*$/; next # skip blank lines
         when /\[([-\w]+)\]/
-          mount = newmount($1)
+          mount = newmount(::Regexp.last_match(1))
         when /^\s*(\w+)\s+(.+?)(\s*#.*)?$/
-          var = $1
-          value = $2
+          var = ::Regexp.last_match(1)
+          value = ::Regexp.last_match(2)
           value.strip!
           raise(ArgumentError, _("Fileserver configuration file does not use '=' as a separator")) if value =~ /^=/
 
@@ -43,13 +43,13 @@ class Puppet::FileServing::Configuration::Parser
             end
           else
             error_location_str = Puppet::Util::Errors.error_location(@file.filename, @count)
-            raise ArgumentError.new(_("Invalid argument '%{var}' at %{error_location}") %
-                                        { var: var, error_location: error_location_str })
+            raise ArgumentError, _("Invalid argument '%{var}' at %{error_location}") %
+                                 { var: var, error_location: error_location_str }
           end
         else
           error_location_str = Puppet::Util::Errors.error_location(@file.filename, @count)
-          raise ArgumentError.new(_("Invalid entry at %{error_location}: '%{file_text}'") %
-                                      { file_text: line.chomp, error_location: error_location_str })
+          raise ArgumentError, _("Invalid entry at %{error_location}: '%{file_text}'") %
+                               { file_text: line.chomp, error_location: error_location_str }
         end
       end
     end
@@ -73,8 +73,8 @@ class Puppet::FileServing::Configuration::Parser
   def newmount(name)
     if @mounts.include?(name)
       error_location_str = Puppet::Util::Errors.error_location(@file, @count)
-      raise ArgumentError.new(_("%{mount} is already mounted at %{name} at %{error_location}") %
-                                  { mount: @mounts[name], name: name, error_location: error_location_str })
+      raise ArgumentError, _("%{mount} is already mounted at %{name} at %{error_location}") %
+                           { mount: @mounts[name], name: name, error_location: error_location_str }
     end
     case name
     when "modules"

data/lib/puppet/file_serving/configuration.rb

@@ -56,7 +56,7 @@ class Puppet::FileServing::Configuration
 
     mount_name, path = request.key.split(File::Separator, 2)
 
-    raise(ArgumentError, _("Cannot find file: Invalid mount '%{mount_name}'") % { mount_name: mount_name }) unless mount_name =~ %r{^[-\w]+$}
+    raise(ArgumentError, _("Cannot find file: Invalid mount '%{mount_name}'") % { mount_name: mount_name }) unless mount_name =~ /^[-\w]+$/
     raise(ArgumentError, _("Cannot find file: Invalid relative path '%{path}'") % { path: path }) if path and path.split('/').include?('..')
 
     mount = find_mount(mount_name, request.environment)
@@ -71,10 +71,10 @@ class Puppet::FileServing::Configuration
       path = nil
     elsif path
       # Remove any double slashes that might have occurred
-      path = path.gsub(/\/+/, "/")
+      path = path.gsub(%r{/+}, "/")
     end
 
-    return mount, path
+    [mount, path]
   end
 
   def umount(name)

data/lib/puppet/file_serving/fileset.rb

@@ -29,11 +29,11 @@ class Puppet::FileServing::Fileset
   def initialize(path, options = {})
     if Puppet::Util::Platform.windows?
       # REMIND: UNC path
-      path = path.chomp(File::SEPARATOR) unless path =~ /^[A-Za-z]:\/$/
+      path = path.chomp(File::SEPARATOR) unless path =~ %r{^[A-Za-z]:/$}
     else
       path = path.chomp(File::SEPARATOR) unless path == File::SEPARATOR
     end
-    raise ArgumentError.new(_("Fileset paths must be fully qualified: %{path}") % { path: path }) unless Puppet::Util.absolute_path?(path)
+    raise ArgumentError, _("Fileset paths must be fully qualified: %{path}") % { path: path } unless Puppet::Util.absolute_path?(path)
 
     @path = path
 
@@ -50,9 +50,9 @@ class Puppet::FileServing::Fileset
       initialize_from_hash(options)
     end
 
-    raise ArgumentError.new(_("Fileset paths must exist")) unless valid?(path)
+    raise ArgumentError, _("Fileset paths must exist") unless valid?(path)
     # TRANSLATORS "recurse" and "recurselimit" are parameter names and should not be translated
-    raise ArgumentError.new(_("Fileset recurse parameter must not be a number anymore, please use recurselimit")) if @recurse.is_a?(Integer)
+    raise ArgumentError, _("Fileset recurse parameter must not be a number anymore, please use recurselimit") if @recurse.is_a?(Integer)
   end
 
   # Return a list of all files in our fileset.  This is different from the
@@ -68,7 +68,7 @@ class Puppet::FileServing::Fileset
     munged_max_files = max_files == '-1' ? -1 : max_files
 
     if munged_max_files > 0 && files.size > munged_max_files
-      raise Puppet::Error.new _("The directory '%{path}' contains %{entries} entries, which exceeds the limit of %{munged_max_files} specified by the max_files parameter for this resource. The limit may be increased, but be aware that large number of file resources can result in excessive resource consumption and degraded performance. Consider using an alternate method to manage large directory trees") % { path: path, entries: files.size, munged_max_files: munged_max_files }
+      raise Puppet::Error, _("The directory '%{path}' contains %{entries} entries, which exceeds the limit of %{munged_max_files} specified by the max_files parameter for this resource. The limit may be increased, but be aware that large number of file resources can result in excessive resource consumption and degraded performance. Consider using an alternate method to manage large directory trees") % { path: path, entries: files.size, munged_max_files: munged_max_files }
     elsif munged_max_files == 0 && files.size > soft_max_files
       Puppet.warning _("The directory '%{path}' contains %{entries} entries, which exceeds the default soft limit %{soft_max_files} and may cause excessive resource consumption and degraded performance. To remove this warning set a value for `max_files` parameter or consider using an alternate method to manage large directory trees") % { path: path, entries: files.size, soft_max_files: soft_max_files }
     end
@@ -104,8 +104,8 @@ class Puppet::FileServing::Fileset
       method = option.to_s + "="
       begin
         send(method, value)
-      rescue NoMethodError
-        raise ArgumentError, _("Invalid option '%{option}'") % { option: option }, $!.backtrace
+      rescue NoMethodError => e
+        raise ArgumentError, _("Invalid option '%{option}'") % { option: option }, e.backtrace
       end
     end
   end
@@ -165,11 +165,11 @@ class Puppet::FileServing::Fileset
     result = []
 
     while entry = current_dirs.shift # rubocop:disable Lint/AssignmentInCondition
-      if continue_recursion_at?(entry.depth + 1)
-        entry.children.each do |child|
-          result << child.path
-          current_dirs << child
-        end
+      next unless continue_recursion_at?(entry.depth + 1)
+
+      entry.children.each do |child|
+        result << child.path
+        current_dirs << child
       end
     end
 
@@ -185,6 +185,6 @@ class Puppet::FileServing::Fileset
 
   def continue_recursion_at?(depth)
     # recurse if told to, and infinite recursion or current depth not at the limit
-    self.recurse && (self.recurselimit == :infinite || depth <= self.recurselimit)
+    recurse && (recurselimit == :infinite || depth <= recurselimit)
   end
 end

data/lib/puppet/file_serving/http_metadata.rb

@@ -20,7 +20,7 @@ class Puppet::FileServing::HttpMetadata < Puppet::FileServing::Metadata
     checksum = http_response['content-md5']
     if checksum
       # convert base64 digest to hex
-      checksum = checksum.unpack("m").first.unpack("H*").first
+      checksum = checksum.unpack1("m").unpack1("H*")
       @checksums[:md5] = "{md5}#{checksum}"
     end
 

data/lib/puppet/file_serving/metadata.rb

@@ -47,7 +47,7 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
 
     def initialize(stat, source_permissions)
       @stat = stat
-      @source_permissions_ignore = (!source_permissions || source_permissions == :ignore)
+      @source_permissions_ignore = !source_permissions || source_permissions == :ignore
     end
 
     def owner
@@ -59,7 +59,7 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
     end
 
     def mode
-      @source_permissions_ignore ? 0644 : @stat.mode
+      @source_permissions_ignore ? 0o644 : @stat.mode
     end
 
     def_delegators :@stat, :ftype
@@ -78,9 +78,9 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
 
     { :owner => 'S-1-5-32-544',
       :group => 'S-1-0-0',
-      :mode => 0644 }.each do |method, default_value|
+      :mode => 0o644 }.each do |method, default_value|
       define_method method do
-        return default_value
+        default_value
       end
     end
   end
@@ -107,20 +107,24 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
     @ftype = stat.ftype
 
     # We have to mask the mode, yay.
-    @mode = stat.mode & 007777
+    @mode = stat.mode & 0o07777
 
     case stat.ftype
     when "file"
-      @checksum = ("{#{@checksum_type}}") + send("#{@checksum_type}_file", real_path).to_s
+      @checksum = "{#{@checksum_type}}" + send("#{@checksum_type}_file", real_path).to_s
     when "directory" # Always just timestamp the directory.
       @checksum_type = "ctime"
-      @checksum = ("{#{@checksum_type}}") + send("#{@checksum_type}_file", path).to_s
+      @checksum = "{#{@checksum_type}}" + send("#{@checksum_type}_file", path).to_s
     when "link"
       @destination = Puppet::FileSystem.readlink(real_path)
-      @checksum = ("{#{@checksum_type}}") + send("#{@checksum_type}_file", real_path).to_s rescue nil
+      @checksum = begin
+        "{#{@checksum_type}}" + send("#{@checksum_type}_file", real_path).to_s
+      rescue
+        nil
+      end
     when "fifo", "socket"
       @checksum_type = "none"
-      @checksum = ("{#{@checksum_type}}") + send("#{@checksum_type}_file", real_path).to_s
+      @checksum = "{#{@checksum_type}}" + send("#{@checksum_type}_file", real_path).to_s
     else
       raise ArgumentError, _("Cannot manage files of type %{file_type}") % { file_type: stat.ftype }
     end

data/lib/puppet/file_serving/mount/file.rb

@@ -17,14 +17,14 @@ class Puppet::FileServing::Mount::File < Puppet::FileServing::Mount
   def complete_path(relative_path, node)
     full_path = path(node)
 
-    raise ArgumentError.new(_("Mounts without paths are not usable")) unless full_path
+    raise ArgumentError, _("Mounts without paths are not usable") unless full_path
 
     # If there's no relative path name, then we're serving the mount itself.
     return full_path unless relative_path
 
     file = ::File.join(full_path, relative_path)
 
-    if !(Puppet::FileSystem.exist?(file) or Puppet::FileSystem.symlink?(file))
+    unless Puppet::FileSystem.exist?(file) or Puppet::FileSystem.symlink?(file)
       Puppet.info(_("File does not exist or is not accessible: %{file}") % { file: file })
       return nil
     end
@@ -40,9 +40,9 @@ class Puppet::FileServing::Mount::File < Puppet::FileServing::Mount
   # Return the path as appropriate, expanding as necessary.
   def path(node = nil)
     if expandable?
-      return expand(@path, node)
+      expand(@path, node)
     else
-      return @path
+      @path
     end
   end
 
@@ -72,7 +72,7 @@ class Puppet::FileServing::Mount::File < Puppet::FileServing::Mount
   # Verify our configuration is valid.  This should really check to
   # make sure at least someone will be allowed, but, eh.
   def validate
-    raise ArgumentError.new(_("Mounts without paths are not usable")) if @path.nil?
+    raise ArgumentError, _("Mounts without paths are not usable") if @path.nil?
   end
 
   private
@@ -100,7 +100,7 @@ class Puppet::FileServing::Mount::File < Puppet::FileServing::Mount
     end
 
     path.gsub(/%(.)/) do |v|
-      key = $1
+      key = ::Regexp.last_match(1)
       if key == "%"
         "%"
       else

data/lib/puppet/file_serving/mount/locales.rb

@@ -11,15 +11,13 @@ class Puppet::FileServing::Mount::Locales < Puppet::FileServing::Mount
     mod = request.environment.modules.find { |m| m.locale(relative_path) }
     return nil unless mod
 
-    path = mod.locale(relative_path)
-
-    path
+    mod.locale(relative_path)
   end
 
   def search(relative_path, request)
     # We currently only support one kind of search on locales - return
     # them all.
-    paths = request.environment.modules.find_all { |mod| mod.locales? }.collect { |mod| mod.locale_directory }
+    paths = request.environment.modules.find_all(&:locales?).collect(&:locale_directory)
     if paths.empty?
       # If the modulepath is valid then we still need to return a valid root
       # directory for the search, but make sure nothing inside it is

data/lib/puppet/file_serving/mount/pluginfacts.rb

@@ -11,15 +11,13 @@ class Puppet::FileServing::Mount::PluginFacts < Puppet::FileServing::Mount
     mod = request.environment.modules.find { |m| m.pluginfact(relative_path) }
     return nil unless mod
 
-    path = mod.pluginfact(relative_path)
-
-    path
+    mod.pluginfact(relative_path)
   end
 
   def search(relative_path, request)
     # We currently only support one kind of search on plugins - return
     # them all.
-    paths = request.environment.modules.find_all { |mod| mod.pluginfacts? }.collect { |mod| mod.plugin_fact_directory }
+    paths = request.environment.modules.find_all(&:pluginfacts?).collect(&:plugin_fact_directory)
     if paths.empty?
       # If the modulepath is valid then we still need to return a valid root
       # directory for the search, but make sure nothing inside it is

data/lib/puppet/file_serving/mount/plugins.rb

@@ -11,15 +11,13 @@ class Puppet::FileServing::Mount::Plugins < Puppet::FileServing::Mount
     mod = request.environment.modules.find { |m| m.plugin(relative_path) }
     return nil unless mod
 
-    path = mod.plugin(relative_path)
-
-    path
+    mod.plugin(relative_path)
   end
 
   def search(relative_path, request)
     # We currently only support one kind of search on plugins - return
     # them all.
-    paths = request.environment.modules.find_all { |mod| mod.plugins? }.collect { |mod| mod.plugin_directory }
+    paths = request.environment.modules.find_all(&:plugins?).collect(&:plugin_directory)
     if paths.empty?
       # If the modulepath is valid then we still need to return a valid root
       # directory for the search, but make sure nothing inside it is

data/lib/puppet/file_serving/mount.rb

@@ -18,7 +18,7 @@ class Puppet::FileServing::Mount
 
   # Create our object.  It must have a name.
   def initialize(name)
-    unless name =~ %r{^[-\w]+$}
+    unless name =~ /^[-\w]+$/
       raise ArgumentError, _("Invalid mount name format '%{name}'") % { name: name }
     end
 

data/lib/puppet/file_system/file_impl.rb

@@ -52,7 +52,7 @@ class Puppet::FileSystem::FileImpl
   def exclusive_open(path, mode, options = 'r', timeout = 300, &block)
     wait = 0.001 + (Kernel.rand / 1000)
     written = false
-    while !written
+    until written
       ::File.open(path, options, mode) do |rf|
         if rf.flock(::File::LOCK_EX | ::File::LOCK_NB)
           Puppet.debug { _("Locked '%{path}'") % { path: path } }
@@ -163,9 +163,9 @@ class Puppet::FileSystem::FileImpl
       stat = lstat(path)
       gid = stat.gid
       uid = stat.uid
-      mode ||= stat.mode & 07777
+      mode ||= stat.mode & 0o7777
     rescue Errno::ENOENT
-      mode ||= 0640
+      mode ||= 0o640
     end
 
     tempfile = Puppet::FileSystem::Uniquefile.new(Puppet::FileSystem.basename_string(path), Puppet::FileSystem.dir_string(path))

data/lib/puppet/file_system/memory_impl.rb

@@ -74,7 +74,7 @@ class Puppet::FileSystem::MemoryImpl
     if block_given?
       yield handle
     else
-      return handle
+      handle
     end
   end
 

data/lib/puppet/file_system/path_pattern.rb

@@ -8,7 +8,7 @@ module Puppet::FileSystem
     class InvalidPattern < Puppet::Error; end
 
     DOTDOT = '..'
-    ABSOLUTE_UNIX = /^\//
+    ABSOLUTE_UNIX = %r{^/}
     ABSOLUTE_WINDOWS = /^[a-z]:/i
     CURRENT_DRIVE_RELATIVE_WINDOWS = /^\\/
 

data/lib/puppet/file_system/uniquefile.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'English'
 require_relative '../../puppet/file_system'
 require 'delegate'
 require 'tmpdir'
@@ -29,7 +30,7 @@ class Puppet::FileSystem::Uniquefile < DelegateClass(File)
   def initialize(basename, *rest)
     create_tmpname(basename, *rest) do |tmpname, _n, opts|
       mode = File::RDWR | File::CREAT | File::EXCL
-      perm = 0600
+      perm = 0o600
       if opts
         mode |= opts.delete(:mode) || 0
         opts[:perm] = perm
@@ -57,11 +58,9 @@ class Puppet::FileSystem::Uniquefile < DelegateClass(File)
   end
 
   def _close
-    begin
-      @tmpfile.close if @tmpfile
-    ensure
-      @tmpfile = nil
-    end
+    @tmpfile.close if @tmpfile
+  ensure
+    @tmpfile = nil
   end
   protected :_close
 
@@ -112,7 +111,7 @@ class Puppet::FileSystem::Uniquefile < DelegateClass(File)
       raise ArgumentError, _("unexpected prefix_suffix: %{value}") % { value: prefix_suffix.inspect }
     end
     t = Time.now.strftime("%Y%m%d")
-    path = "#{prefix}#{t}-#{$$}-#{rand(0x100000000).to_s(36)}"
+    path = "#{prefix}#{t}-#{$PROCESS_ID}-#{rand(0x100000000).to_s(36)}"
     path << "-#{n}" if n
     path << suffix
   end
@@ -142,11 +141,9 @@ class Puppet::FileSystem::Uniquefile < DelegateClass(File)
   end
 
   def try_convert_to_hash(h)
-    begin
-      h.to_hash
-    rescue NoMethodError
-      nil
-    end
+    h.to_hash
+  rescue NoMethodError
+    nil
   end
 
   @@systmpdir ||= defined?(Etc.systmpdir) ? Etc.systmpdir : '/tmp'
@@ -155,10 +152,14 @@ class Puppet::FileSystem::Uniquefile < DelegateClass(File)
     tmp = '.'
     [ENV.fetch('TMPDIR', nil), ENV.fetch('TMP', nil), ENV.fetch('TEMP', nil), @@systmpdir, '/tmp'].each do |dir|
       stat = File.stat(dir) if dir
-      if stat && stat.directory? && stat.writable?
-        tmp = dir
-        break
-      end rescue nil
+      begin
+        if stat && stat.directory? && stat.writable?
+          tmp = dir
+          break
+        end
+      rescue
+        nil
+      end
     end
     File.expand_path(tmp)
   end