puppet 8.3.1-x64-mingw32 → 8.4.0-x64-mingw32

data/lib/puppet/util/backups.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
+
 require 'find'
 require 'fileutils'
 module Puppet::Util::Backups
-
   # Deal with backups.
   def perform_backup(file = nil)
     # if they specifically don't want a backup, then just say
@@ -24,10 +24,11 @@ module Puppet::Util::Backups
     when "directory"
       # we don't need to backup directories when recurse is on
       return true if self[:recurse]
+
       info _("Recursively backing up to filebucket")
       Find.find(self[:path]) { |f| backup_file_with_filebucket(f) if File.file?(f) }
     when "file"; backup_file_with_filebucket(file)
-    when "link";
+    when "link"; # do nothing
     end
     true
   end

data/lib/puppet/util/character_encoding.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # A module to centralize heuristics/practices for managing character encoding in Puppet
 
 module Puppet::Util::CharacterEncoding

data/lib/puppet/util/checksums.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'digest/md5'
 require 'digest/sha1'
 require 'time'
@@ -66,7 +67,7 @@ module Puppet::Util::Checksums
     require 'digest/sha2'
 
     digest = Digest::SHA256.new
-    checksum_file(digest, filename,  lite)
+    checksum_file(digest, filename, lite)
   end
 
   def sha256_stream(lite = false, &block)
@@ -113,7 +114,7 @@ module Puppet::Util::Checksums
     require 'digest/sha2'
 
     digest = Digest::SHA384.new
-    checksum_file(digest, filename,  lite)
+    checksum_file(digest, filename, lite)
   end
 
   def sha384_stream(lite = false, &block)
@@ -140,7 +141,7 @@ module Puppet::Util::Checksums
     require 'digest/sha2'
 
     digest = Digest::SHA512.new
-    checksum_file(digest, filename,  lite)
+    checksum_file(digest, filename, lite)
   end
 
   def sha512_stream(lite = false, &block)
@@ -156,7 +157,7 @@ module Puppet::Util::Checksums
   # Calculate a checksum using Digest::SHA224.
   def sha224(content)
     require_relative '../../puppet/ssl/openssl_loader'
-    OpenSSL::Digest::SHA224.new.hexdigest(content)
+    OpenSSL::Digest.new('SHA224').hexdigest(content)
   end
 
   def sha224?(string)
@@ -166,13 +167,13 @@ module Puppet::Util::Checksums
   def sha224_file(filename, lite = false)
     require_relative '../../puppet/ssl/openssl_loader'
 
-    digest = OpenSSL::Digest::SHA224.new
+    digest = OpenSSL::Digest.new('SHA224')
     checksum_file(digest, filename,  lite)
   end
 
   def sha224_stream(lite = false, &block)
     require_relative '../../puppet/ssl/openssl_loader'
-    digest = OpenSSL::Digest::SHA224.new
+    digest = OpenSSL::Digest.new('SHA224')
     checksum_stream(digest, block, lite)
   end
 
@@ -192,7 +193,7 @@ module Puppet::Util::Checksums
   # Calculate a checksum of a file's content using Digest::MD5.
   def md5_file(filename, lite = false)
     digest = Digest::MD5.new
-    checksum_file(digest, filename,  lite)
+    checksum_file(digest, filename, lite)
   end
 
   def md5_stream(lite = false, &block)
@@ -232,6 +233,7 @@ module Puppet::Util::Checksums
 
   def mtime?(string)
     return true if string.is_a? Time
+
     !!DateTime.parse(string)
   rescue
     false
@@ -302,6 +304,7 @@ module Puppet::Util::Checksums
 
   def ctime?(string)
     return true if string.is_a? Time
+
     !!DateTime.parse(string)
   rescue
     false
@@ -360,7 +363,7 @@ module Puppet::Util::Checksums
   def checksum_file(digest, filename, lite = false)
     buffer = lite ? 512 : 4096
     File.open(filename, 'rb') do |file|
-      while content = file.read(buffer) #rubocop:disable Lint/AssignmentInCondition
+      while content = file.read(buffer) # rubocop:disable Lint/AssignmentInCondition
         digest << content
         break if lite
       end
@@ -373,5 +376,4 @@ module Puppet::Util::Checksums
     block.call(DigestLite.new(digest, lite))
     digest.hexdigest
   end
-
 end

data/lib/puppet/util/classgen.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet
   class ConstantAlreadyDefined < Error; end
   class SubclassAlreadyDefined < Error; end
@@ -66,7 +67,7 @@ module Puppet::Util::ClassGen
   def rmclass(name, options)
     const = genconst_string(name, options)
     retval = false
-    if is_constant_defined?(const)
+    if const_defined?(const, false)
       remove_const(const)
       retval = true
     end
@@ -102,7 +103,7 @@ module Puppet::Util::ClassGen
     name = name.to_s.downcase.intern
 
     if type == Module
-      #evalmethod = :module_eval
+      # evalmethod = :module_eval
       evalmethod = :class_eval
       # Create the class, with the correct name.
       klass = Module.new do
@@ -140,25 +141,19 @@ module Puppet::Util::ClassGen
     klass
   end
 
-  # @api private
-  #
-  def is_constant_defined?(const)
-    const_defined?(const, false)
-  end
-
   # Handle the setting and/or removing of the associated constant.
   # @api private
   #
   def handleclassconst(klass, name, options)
-   const = genconst_string(name, options)
+    const = genconst_string(name, options)
 
-    if is_constant_defined?(const)
+    if const_defined?(const, false)
       if options[:overwrite]
         Puppet.info _("Redefining %{name} in %{klass}") % { name: name, klass: self }
         remove_const(const)
       else
         raise Puppet::ConstantAlreadyDefined,
-          _("Class %{const} is already defined in %{klass}") % { const: const, klass: self }
+              _("Class %{const} is already defined in %{klass}") % { const: const, klass: self }
       end
     end
     const_set(const, klass)
@@ -206,7 +201,7 @@ module Puppet::Util::ClassGen
     if hash
       if hash.include? klassname and ! options[:overwrite]
         raise Puppet::SubclassAlreadyDefined,
-          _("Already a generated class named %{klassname}") % { klassname: klassname }
+              _("Already a generated class named %{klassname}") % { klassname: klassname }
       end
 
       hash[klassname] = klass
@@ -219,7 +214,7 @@ module Puppet::Util::ClassGen
               array.find { |c| c.name == klassname } and
               ! options[:overwrite])
         raise Puppet::SubclassAlreadyDefined,
-          _("Already a generated class named %{klassname}") % { klassname: klassname }
+              _("Already a generated class named %{klassname}") % { klassname: klassname }
       end
 
       array << klass

data/lib/puppet/util/colors.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/util/platform'
 
 module Puppet::Util::Colors
@@ -44,43 +45,43 @@ module Puppet::Util::Colors
     :emerg => HRED,
     :crit => HRED,
 
-    :black       => BLACK,
-    :red         => RED,
-    :green       => GREEN,
-    :yellow      => YELLOW,
-    :blue        => BLUE,
-    :magenta     => MAGENTA,
-    :cyan        => CYAN,
-    :white       => WHITE,
-    :hblack      => HBLACK,
-    :hred        => HRED,
-    :hgreen      => HGREEN,
-    :hyellow     => HYELLOW,
-    :hblue       => HBLUE,
-    :hmagenta    => HMAGENTA,
-    :hcyan       => HCYAN,
-    :hwhite      => HWHITE,
-    :bg_red      => BG_RED,
-    :bg_green    => BG_GREEN,
-    :bg_yellow   => BG_YELLOW,
-    :bg_blue     => BG_BLUE,
-    :bg_magenta  => BG_MAGENTA,
-    :bg_cyan     => BG_CYAN,
-    :bg_white    => BG_WHITE,
-    :bg_hred     => BG_HRED,
-    :bg_hgreen   => BG_HGREEN,
-    :bg_hyellow  => BG_HYELLOW,
-    :bg_hblue    => BG_HBLUE,
+    :black => BLACK,
+    :red => RED,
+    :green => GREEN,
+    :yellow => YELLOW,
+    :blue => BLUE,
+    :magenta => MAGENTA,
+    :cyan => CYAN,
+    :white => WHITE,
+    :hblack => HBLACK,
+    :hred => HRED,
+    :hgreen => HGREEN,
+    :hyellow => HYELLOW,
+    :hblue => HBLUE,
+    :hmagenta => HMAGENTA,
+    :hcyan => HCYAN,
+    :hwhite => HWHITE,
+    :bg_red => BG_RED,
+    :bg_green => BG_GREEN,
+    :bg_yellow => BG_YELLOW,
+    :bg_blue => BG_BLUE,
+    :bg_magenta => BG_MAGENTA,
+    :bg_cyan => BG_CYAN,
+    :bg_white => BG_WHITE,
+    :bg_hred => BG_HRED,
+    :bg_hgreen => BG_HGREEN,
+    :bg_hyellow => BG_HYELLOW,
+    :bg_hblue => BG_HBLUE,
     :bg_hmagenta => BG_HMAGENTA,
-    :bg_hcyan    => BG_HCYAN,
-    :bg_hwhite   => BG_HWHITE,
-    :reset       => { :console => "\e[m", :html => "" }
+    :bg_hcyan => BG_HCYAN,
+    :bg_hwhite => BG_HWHITE,
+    :reset => { :console => "\e[m", :html => "" }
   }
 
   def colorize(color, str)
     case Puppet[:color]
     when true, :ansi, "ansi", "yes"
-        console_color(color, str)
+      console_color(color, str)
     when :html, "html"
       html_color(color, str)
     else

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/util/command_line/trollop'
 
 module Puppet
@@ -24,7 +25,6 @@ module Puppet
           @parser = Trollop::Parser.new do
             banner usage_msg
           end
-
         end
 
         # This parameter, if set, will tell the underlying option parser not to throw an
@@ -49,20 +49,20 @@ module Puppet
           end
 
           options = {
-              :long => long,
-              :short => short,
-              :required => false,
-              :callback => pass_only_last_value_on_to(block),
-              :multi => true,
+            :long => long,
+            :short => short,
+            :required => false,
+            :callback => pass_only_last_value_on_to(block),
+            :multi => true,
           }
 
           case type
-            when :REQUIRED
-              options[:type] = :string
-            when :NONE
-              options[:type] = :flag
-            else
-              raise PuppetOptionError.new(_("Unsupported type: '%{type}'") % { type: type })
+          when :REQUIRED
+            options[:type] = :string
+          when :NONE
+            options[:type] = :flag
+          else
+            raise PuppetOptionError.new(_("Unsupported type: '%{type}'") % { type: type })
           end
 
           @parser.opt long.sub("^--", "").intern, desc, options