puppet 8.3.1 → 8.4.0

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

@@ -1,10 +1,10 @@
 # coding: utf-8
 # frozen_string_literal: true
+
 require_relative '../../../puppet/ffi/windows'
 
 module Puppet::FFI::Windows
   module Structs
-
     extend FFI::Library
     extend Puppet::FFI::Windows::APITypes
 
@@ -116,7 +116,7 @@ module Puppet::FFI::Windows
     # } TOKEN_PRIVILEGES, *PTOKEN_PRIVILEGES;
     class TOKEN_PRIVILEGES < FFI::Struct
       layout :PrivilegeCount, :dword,
-             :Privileges, [LUID_AND_ATTRIBUTES, 1]    # placeholder for offset
+             :Privileges, [LUID_AND_ATTRIBUTES, 1] # placeholder for offset
     end
 
     # https://msdn.microsoft.com/en-us/library/windows/desktop/bb530717(v=vs.85).aspx
@@ -258,7 +258,7 @@ module Puppet::FFI::Windows
       )
     end
 
-	MAXIMUM_REPARSE_DATA_BUFFER_SIZE = 16384
+    MAXIMUM_REPARSE_DATA_BUFFER_SIZE = 16384
 
     # SYMLINK_REPARSE_DATA_BUFFER
     # https://msdn.microsoft.com/en-us/library/cc232006.aspx

data/lib/puppet/ffi/windows.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'ffi'
 
 module Puppet

data/lib/puppet/file_bucket/dipper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'pathname'
 require_relative '../../puppet/file_bucket'
 require_relative '../../puppet/file_bucket/file'
@@ -38,6 +39,7 @@ class Puppet::FileBucket::Dipper
   def backup(file)
     file_handle = Puppet::FileSystem.pathname(file)
     raise(ArgumentError, _("File %{file} does not exist") % { file: file }) unless Puppet::FileSystem.exist?(file_handle)
+
     begin
       file_bucket_file = Puppet::FileBucket::File.new(file_handle, :bucket_path => @local_path)
       files_original_path = absolutize_path(file)
@@ -61,6 +63,7 @@ class Puppet::FileBucket::Dipper
   # Diffs two filebucket files identified by their sums
   def diff(checksum_a, checksum_b, file_a, file_b)
     raise RuntimeError, _("Diff is not supported on this platform") if Puppet[:diff] == ""
+
     if checksum_a
       source_path = "#{@rest_path}#{@checksum_type}/#{checksum_a}"
       if checksum_b
@@ -95,6 +98,7 @@ class Puppet::FileBucket::Dipper
       end
     end
     raise Puppet::Error, _("Failed to diff files") unless file_diff
+
     file_diff.to_s
   end
 
@@ -109,6 +113,7 @@ class Puppet::FileBucket::Dipper
     file_bucket_file = Puppet::FileBucket::File.indirection.find(source_path, :bucket_path => @local_path)
 
     raise Puppet::Error, _("File not found") unless file_bucket_file
+
     file_bucket_file
   end
 
@@ -164,12 +169,13 @@ class Puppet::FileBucket::Dipper
       :fromdate => fromdate,
       :todate => todate)
     raise Puppet::Error, _("File not found") unless file_bucket_list
+
     file_bucket_list.to_s
   end
 
   private
+
   def absolutize_path( path )
     Pathname.new(path).realpath
   end
-
 end

data/lib/puppet/file_bucket/file.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/file_bucket'
 require_relative '../../puppet/indirector'
 require_relative '../../puppet/util/checksums'

data/lib/puppet/file_bucket.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # stub
 module Puppet::FileBucket
   class BucketError < RuntimeError; end

data/lib/puppet/file_serving/base.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/file_serving'
 require_relative '../../puppet/util'
 
@@ -11,10 +12,10 @@ class Puppet::FileServing::Base
 
   # Does our file exist?
   def exist?
-      stat
-      return true
+    stat
+    return true
   rescue
-      return false
+    return false
   end
 
   # Return the full path to our file.  Fails if there's no path set.
@@ -44,26 +45,32 @@ class Puppet::FileServing::Base
 
   # Determine how we deal with links.
   attr_reader :links
+
   def links=(value)
     value = value.to_sym
     value = :manage if value == :ignore
-    #TRANSLATORS ':link', ':manage', ':follow' should not be translated
+    # TRANSLATORS ':link', ':manage', ':follow' should not be translated
     raise(ArgumentError, _(":links can only be set to :manage or :follow")) unless [:manage, :follow].include?(value)
+
     @links = value
   end
 
   # Set our base path.
   attr_reader :path
+
   def path=(path)
     raise ArgumentError.new(_("Paths must be fully qualified")) unless Puppet::FileServing::Base.absolute?(path)
+
     @path = path
   end
 
   # Set a relative path; this is used for recursion, and sets
   # the file's path relative to the initial recursion point.
   attr_reader :relative_path
+
   def relative_path=(path)
     raise ArgumentError.new(_("Relative paths must not be fully qualified")) if Puppet::FileServing::Base.absolute?(path)
+
     @relative_path = path
   end
 
@@ -75,9 +82,9 @@ class Puppet::FileServing::Base
 
   def to_data_hash
     {
-      'path'          => @path,
+      'path' => @path,
       'relative_path' => @relative_path,
-      'links'         => @links.to_s
+      'links' => @links.to_s
     }
   end
 

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/file_serving/configuration'
 require_relative '../../../puppet/util/watched_file'
 
@@ -30,6 +31,7 @@ class Puppet::FileServing::Configuration::Parser
           value = $2
           value.strip!
           raise(ArgumentError, _("Fileserver configuration file does not use '=' as a separator")) if value =~ /^=/
+
           case var
           when "path"
             path(mount, value)
@@ -109,6 +111,6 @@ class Puppet::FileServing::Configuration::Parser
   # Make sure all of our mounts are valid.  We have to do this after the fact
   # because details are added over time as the file is parsed.
   def validate
-    @mounts.each { |name, mount| mount.validate }
+    @mounts.each { |_name, mount| mount.validate }
   end
 end

data/lib/puppet/file_serving/configuration.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet'
 require_relative '../../puppet/file_serving'
 require_relative '../../puppet/file_serving/mount'
@@ -19,10 +20,11 @@ class Puppet::FileServing::Configuration
 
   Mount = Puppet::FileServing::Mount
 
-  private_class_method  :new
+  private_class_method :new
 
   attr_reader :mounts
-  #private :mounts
+
+  # private :mounts
 
   # Find the right mount.  Does some shenanigans to support old-style module
   # mounts.
@@ -59,6 +61,7 @@ class Puppet::FileServing::Configuration
 
     mount = find_mount(mount_name, request.environment)
     return nil unless mount
+
     if mount.name == "modules" and mount_name != "modules"
       # yay backward-compatibility
       path = "#{mount_name}/#{path}"
@@ -106,7 +109,6 @@ class Puppet::FileServing::Configuration
     rescue => detail
       Puppet.log_exception(detail, _("Error parsing fileserver configuration: %{detail}; using old configuration") % { detail: detail })
     end
-
   ensure
     # Make sure we've got our plugins and modules.
     mk_default_mounts

data/lib/puppet/file_serving/content.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/indirector'
 require_relative '../../puppet/file_serving'
 require_relative '../../puppet/file_serving/base'

data/lib/puppet/file_serving/fileset.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'find'
 require_relative '../../puppet/file_serving'
 require_relative '../../puppet/file_serving/metadata'
@@ -50,7 +51,7 @@ class Puppet::FileServing::Fileset
     end
 
     raise ArgumentError.new(_("Fileset paths must exist")) unless valid?(path)
-    #TRANSLATORS "recurse" and "recurselimit" are parameter names and should not be translated
+    # 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)
   end
 
@@ -89,8 +90,9 @@ class Puppet::FileServing::Fileset
 
   def links=(links)
     links = links.to_sym
-    #TRANSLATORS ":links" is a parameter name and should not be translated
+    # TRANSLATORS ":links" is a parameter name and should not be translated
     raise(ArgumentError, _("Invalid :links value '%{links}'") % { links: links }) unless [:manage, :follow].include?(links)
+
     @links = links
     @stat_method = @links == :manage ? :lstat : :stat
   end
@@ -116,6 +118,7 @@ class Puppet::FileServing::Fileset
         value = request.options[param.to_s]
       end
       next if value.nil?
+
       value = true if value == "true"
       value = false if value == "false"
       value = Integer(value) if value.is_a?(String) and value =~ /^\d+$/
@@ -135,9 +138,9 @@ class Puppet::FileServing::Fileset
     def children
       return [] unless directory?
 
-      Dir.entries(path, encoding: Encoding::UTF_8).
-        reject { |child| ignore?(child) }.
-        collect { |child| down_level(child) }
+      Dir.entries(path, encoding: Encoding::UTF_8)
+        .reject { |child| ignore?(child) }
+        .collect { |child| down_level(child) }
     end
 
     def ignore?(child)
@@ -161,7 +164,7 @@ class Puppet::FileServing::Fileset
 
     result = []
 
-    while entry = current_dirs.shift #rubocop:disable Lint/AssignmentInCondition
+    while entry = current_dirs.shift # rubocop:disable Lint/AssignmentInCondition
       if continue_recursion_at?(entry.depth + 1)
         entry.children.each do |child|
           result << child.path

data/lib/puppet/file_serving/http_metadata.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/file_serving/metadata'
 
 # Simplified metadata representation, suitable for the information
 # that is available from HTTP headers.
 class Puppet::FileServing::HttpMetadata < Puppet::FileServing::Metadata
-
   def initialize(http_response, path = '/dev/null')
     super(path)
 
@@ -42,8 +42,6 @@ class Puppet::FileServing::HttpMetadata < Puppet::FileServing::Metadata
     end
 
     @ftype = 'file'
-
-    self
   end
 
   # Override of the parent class method. Does not call super!

data/lib/puppet/file_serving/metadata.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet'
 require_relative '../../puppet/indirector'
 require_relative '../../puppet/file_serving'
@@ -8,7 +9,6 @@ require 'uri'
 
 # A class that handles retrieving file metadata.
 class Puppet::FileServing::Metadata < Puppet::FileServing::Base
-
   include Puppet::Util::Checksums
 
   extend Puppet::Indirector
@@ -151,15 +151,15 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
   def to_data_hash
     super.update(
       {
-        'owner'        => owner,
-        'group'        => group,
-        'mode'         => mode,
-        'checksum'     => {
-          'type'   => checksum_type,
-          'value'  => checksum
+        'owner' => owner,
+        'group' => group,
+        'mode' => mode,
+        'checksum' => {
+          'type' => checksum_type,
+          'value' => checksum
         },
-        'type'         => ftype,
-        'destination'  => destination,
+        'type' => ftype,
+        'destination' => destination,
       }.merge(content_uri ? {'content_uri' => content_uri} : {})
        .merge(source ? {'source' => source} : {})
     )
@@ -168,5 +168,4 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
   def self.from_data_hash(data)
     new(data.delete('path'), data)
   end
-
 end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/file_serving/mount'
 
 class Puppet::FileServing::Mount::File < Puppet::FileServing::Mount
@@ -6,9 +7,9 @@ class Puppet::FileServing::Mount::File < Puppet::FileServing::Mount
     @localmap ||= {
       "h" => Puppet.runtime[:facter].value('networking.hostname'),
       "H" => [
-               Puppet.runtime[:facter].value('networking.hostname'),
-               Puppet.runtime[:facter].value('networking.domain')
-             ].join("."),
+        Puppet.runtime[:facter].value('networking.hostname'),
+        Puppet.runtime[:facter].value('networking.domain')
+      ].join("."),
       "d" => Puppet.runtime[:facter].value('networking.domain')
     }
   end
@@ -55,6 +56,7 @@ class Puppet::FileServing::Mount::File < Puppet::FileServing::Mount
     else
       raise ArgumentError, _("%{path} does not exist or is not a directory") % { path: path } unless FileTest.directory?(path)
       raise ArgumentError, _("%{path} is not readable") % { path: path } unless FileTest.readable?(path)
+
       @expandable = false
     end
     @path = path
@@ -63,6 +65,7 @@ class Puppet::FileServing::Mount::File < Puppet::FileServing::Mount
   def search(path, request)
     path = complete_path(path, request.node)
     return nil unless path
+
     [path]
   end
 

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/file_serving/mount'
 
 # Find files in the modules' locales directories.
@@ -7,7 +8,7 @@ require_relative '../../../puppet/file_serving/mount'
 class Puppet::FileServing::Mount::Locales < Puppet::FileServing::Mount
   # Return an instance of the appropriate class.
   def find(relative_path, request)
-    mod = request.environment.modules.find { |m|  m.locale(relative_path) }
+    mod = request.environment.modules.find { |m| m.locale(relative_path) }
     return nil unless mod
 
     path = mod.locale(relative_path)

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/file_serving/mount'
 
 # This is the modules-specific mount: it knows how to search through
@@ -7,6 +8,7 @@ class Puppet::FileServing::Mount::Modules < Puppet::FileServing::Mount
   # Return an instance of the appropriate class.
   def find(path, request)
     raise _("No module specified") if path.to_s.empty?
+
     module_name, relative_path = path.split("/", 2)
     mod = request.environment.module(module_name)
     return nil unless mod

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/file_serving/mount'
 
 # Find files in the modules' pluginfacts directories.
@@ -7,7 +8,7 @@ require_relative '../../../puppet/file_serving/mount'
 class Puppet::FileServing::Mount::PluginFacts < Puppet::FileServing::Mount
   # Return an instance of the appropriate class.
   def find(relative_path, request)
-    mod = request.environment.modules.find { |m|  m.pluginfact(relative_path) }
+    mod = request.environment.modules.find { |m| m.pluginfact(relative_path) }
     return nil unless mod
 
     path = mod.pluginfact(relative_path)

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/file_serving/mount'
 
 # Find files in the modules' plugins directories.
@@ -7,7 +8,7 @@ require_relative '../../../puppet/file_serving/mount'
 class Puppet::FileServing::Mount::Plugins < Puppet::FileServing::Mount
   # Return an instance of the appropriate class.
   def find(relative_path, request)
-    mod = request.environment.modules.find { |m|  m.plugin(relative_path) }
+    mod = request.environment.modules.find { |m| m.plugin(relative_path) }
     return nil unless mod
 
     path = mod.plugin(relative_path)

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

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
+
 require 'puppet/file_serving/mount'
 
 class Puppet::FileServing::Mount::Scripts < Puppet::FileServing::Mount
   # Return an instance of the appropriate class.
   def find(path, request)
     raise _("No module specified") if path.to_s.empty?
+
     module_name, relative_path = path.split("/", 2)
     mod = request.environment.module(module_name)
     return nil unless mod

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

@@ -1,9 +1,11 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/file_serving/mount'
 
 class Puppet::FileServing::Mount::Tasks < Puppet::FileServing::Mount
   def find(path, request)
     raise _("No task specified") if path.to_s.empty?
+
     module_name, task_path = path.split("/", 2)
     mod = request.environment.module(module_name)
     return nil unless mod

data/lib/puppet/file_serving/mount.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/util/logging'
 require_relative '../../puppet/file_serving'
 require_relative '../../puppet/file_serving/metadata'
@@ -20,6 +21,7 @@ class Puppet::FileServing::Mount
     unless name =~ %r{^[-\w]+$}
       raise ArgumentError, _("Invalid mount name format '%{name}'") % { name: name }
     end
+
     @name = name
 
     super()

data/lib/puppet/file_serving/terminus_helper.rb

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

data/lib/puppet/file_serving/terminus_selector.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/file_serving'
 
 # This module is used to pick the appropriate terminus

data/lib/puppet/file_serving.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Just a stub class.
 class Puppet::FileServing # :nodoc:
 end

data/lib/puppet/file_system/file_impl.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
+
 # Abstract implementation of the Puppet::FileSystem
 #
 class Puppet::FileSystem::FileImpl
-
   def pathname(path)
     path.is_a?(Pathname) ? path : Pathname.new(path)
   end
@@ -151,7 +151,7 @@ class Puppet::FileSystem::FileImpl
   end
 
   def compare_stream(path, stream)
-    open(path, 0, 'rb') { |this| FileUtils.compare_stream(this, stream) }
+    ::File.open(path, 0, 'rb') { |this| FileUtils.compare_stream(this, stream) }
   end
 
   def chmod(mode, path)

data/lib/puppet/file_system/jruby.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/file_system/posix'
 
 class Puppet::FileSystem::JRuby < Puppet::FileSystem::Posix

data/lib/puppet/file_system/memory_file.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # An in-memory file abstraction. Commonly used with Puppet::FileSystem::File#overlay
 # @api private
 class Puppet::FileSystem::MemoryFile
@@ -55,6 +56,7 @@ class Puppet::FileSystem::MemoryFile
 
   def handle
     raise Errno::ENOENT unless exist?
+
     StringIO.new(@properties[:content] || '')
   end
 

data/lib/puppet/file_system/memory_impl.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Puppet::FileSystem::MemoryImpl
   def initialize(*files)
     @files = files + all_children_of(files)
@@ -32,8 +33,10 @@ class Puppet::FileSystem::MemoryImpl
     path = path.path
     link = find(path)
     return Puppet::FileSystem::MemoryFile.a_missing_file(path) unless link
+
     source = link.source_path
     return Puppet::FileSystem::MemoryFile.a_missing_file(link) unless source
+
     find(source) || Puppet::FileSystem::MemoryFile.a_missing_file(source)
   end
 

data/lib/puppet/file_system/path_pattern.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'pathname'
 require_relative '../../puppet/error'
 

data/lib/puppet/file_system/posix.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Puppet::FileSystem::Posix < Puppet::FileSystem::FileImpl
   def binread(path)
     path.binread
@@ -11,7 +12,7 @@ class Puppet::FileSystem::Posix < Puppet::FileSystem::FileImpl
   # issue this method reimplements the faster 2.0 version that will correctly
   # compare binary File and StringIO streams.
   def compare_stream(path, stream)
-    open(path, 0, 'rb') do |this|
+    ::File.open(path, 'rb') do |this|
       bsize = stream_blksize(this, stream)
       sa = String.new.force_encoding('ASCII-8BIT')
       sb = String.new.force_encoding('ASCII-8BIT')
@@ -26,9 +27,11 @@ class Puppet::FileSystem::Posix < Puppet::FileSystem::FileImpl
   end
 
   private
+
   def stream_blksize(*streams)
     streams.each do |s|
       next unless s.respond_to?(:stat)
+
       size = blksize(s.stat)
       return size if size
     end
@@ -39,6 +42,7 @@ class Puppet::FileSystem::Posix < Puppet::FileSystem::FileImpl
     s = st.blksize
     return nil unless s
     return nil if s == 0
+
     s
   end
 

data/lib/puppet/file_system/uniquefile.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/file_system'
 require 'delegate'
 require 'tmpdir'
@@ -26,7 +27,7 @@ class Puppet::FileSystem::Uniquefile < DelegateClass(File)
   end
 
   def initialize(basename, *rest)
-    create_tmpname(basename, *rest) do |tmpname, n, opts|
+    create_tmpname(basename, *rest) do |tmpname, _n, opts|
       mode = File::RDWR|File::CREAT|File::EXCL
       perm = 0600
       if opts
@@ -79,6 +80,7 @@ class Puppet::FileSystem::Uniquefile < DelegateClass(File)
 
   def unlink
     return unless @tmpname
+
     begin
       File.unlink(@tmpname)
     rescue Errno::ENOENT
@@ -100,14 +102,14 @@ class Puppet::FileSystem::Uniquefile < DelegateClass(File)
 
   def make_tmpname(prefix_suffix, n)
     case prefix_suffix
-      when String
-        prefix = prefix_suffix
-        suffix = ""
-      when Array
-        prefix = prefix_suffix[0]
-        suffix = prefix_suffix[1]
-      else
-        raise ArgumentError, _("unexpected prefix_suffix: %{value}") % { value: prefix_suffix.inspect }
+    when String
+      prefix = prefix_suffix
+      suffix = ""
+    when Array
+      prefix = prefix_suffix[0]
+      suffix = prefix_suffix[1]
+    else
+      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)}"
@@ -161,7 +163,6 @@ class Puppet::FileSystem::Uniquefile < DelegateClass(File)
     File.expand_path(tmp)
   end
 
-
   class << self
     # yields with locking for +tmpname+ and returns the result of the
     # block.
@@ -185,5 +186,4 @@ class Puppet::FileSystem::Uniquefile < DelegateClass(File)
       Dir.rmdir(*args)
     end
   end
-
 end