puppet 8.5.1-x64-mingw32 → 8.6.0-x64-mingw32

data/lib/puppet/application/face_base.rb

@@ -74,7 +74,7 @@ class Puppet::Application::FaceBase < Puppet::Application
     # non-option word to use as the action.
     action_name = nil
     index       = -1
-    until action_name or (index += 1) >= command_line.args.length do
+    until action_name or (index += 1) >= command_line.args.length
       item = command_line.args[index]
       if item =~ /^-/
         option = @face.options.find do |name|
@@ -88,7 +88,7 @@ class Puppet::Application::FaceBase < Puppet::Application
           # when we get there. --daniel 2011-04-04
           if option.takes_argument? and !item.index('=')
             index += 1 unless
-              (option.optional_argument? and command_line.args[index + 1] =~ /^-/)
+              option.optional_argument? and command_line.args[index + 1] =~ /^-/
           end
         else
           option = find_global_settings_argument(item)
@@ -103,9 +103,9 @@ class Puppet::Application::FaceBase < Puppet::Application
           else
             option = find_application_argument(item)
             if option
-              index += 1 if (option[:argument] and not option[:optional])
+              index += 1 if option[:argument] and !(option[:optional])
             else
-              raise OptionParser::InvalidOption.new(item.sub(/=.*$/, ''))
+              raise OptionParser::InvalidOption, item.sub(/=.*$/, '')
             end
           end
         end
@@ -164,7 +164,7 @@ class Puppet::Application::FaceBase < Puppet::Application
         pattern.match item and return object
       end
     end
-    return nil                  # nothing found.
+    nil                  # nothing found.
   end
 
   def find_application_argument(item)
@@ -181,7 +181,7 @@ class Puppet::Application::FaceBase < Puppet::Application
         }
       end
     end
-    return nil                  # not found
+    nil                  # not found
   end
 
   def setup
@@ -205,7 +205,7 @@ class Puppet::Application::FaceBase < Puppet::Application
     @arguments << options
 
     # If we don't have a rendering format, set one early.
-    self.render_as ||= (@action.render_as || :console)
+    self.render_as ||= @action.render_as || :console
   end
 
   def main

data/lib/puppet/application/filebucket.rb

@@ -213,7 +213,7 @@ class Puppet::Application::Filebucket < Puppet::Application
   def run_command
     @args = command_line.args
     command = args.shift
-    return send(command) if %w{get backup restore diff list}.include? command
+    return send(command) if %w[get backup restore diff list].include? command
 
     help
   end

data/lib/puppet/application/lookup.rb

@@ -8,7 +8,7 @@ require_relative '../../puppet/parser/compiler'
 class Puppet::Application::Lookup < Puppet::Application
   RUN_HELP = _("Run 'puppet lookup --help' for more details").freeze
   DEEP_MERGE_OPTIONS = '--knock-out-prefix, --sort-merged-arrays, and --merge-hash-arrays'
-  TRUSTED_INFORMATION_FACTS = ["hostname", "domain", "fqdn", "clientcert"].freeze
+  TRUSTED_INFORMATION_FACTS = %w[hostname domain fqdn clientcert].freeze
 
   run_mode :server
 
@@ -354,7 +354,7 @@ class Puppet::Application::Lookup < Puppet::Application
         given_facts = Puppet::Util::Yaml.safe_load_file(fact_file)
       else
         given_facts = Puppet::Util::Json.load_file_if_valid(fact_file)
-        given_facts = Puppet::Util::Yaml.safe_load_file_if_valid(fact_file) unless given_facts
+        given_facts ||= Puppet::Util::Yaml.safe_load_file_if_valid(fact_file)
       end
 
       unless given_facts.instance_of?(Hash)
@@ -369,7 +369,9 @@ class Puppet::Application::Lookup < Puppet::Application
       end
     end
 
-    unless node.is_a?(Puppet::Node) # to allow unit tests to pass a node instance
+    if node.is_a?(Puppet::Node)
+      node.add_extra_facts(given_facts) if given_facts
+    else # to allow unit tests to pass a node instance
       facts = retrieve_node_facts(node, given_facts)
       ni = Puppet::Node.indirection
       tc = ni.terminus_class
@@ -399,8 +401,6 @@ class Puppet::Application::Lookup < Puppet::Application
         node = ni.find(node, facts: facts, environment: Puppet[:environment])
         ni.terminus_class = tc
       end
-    else
-      node.add_extra_facts(given_facts) if given_facts
     end
     node.environment = Puppet[:environment] if Puppet.settings.set_by_cli?(:environment)
     Puppet[:code] = 'undef' unless options[:compile]

data/lib/puppet/application/resource.rb

@@ -15,6 +15,7 @@ class Puppet::Application::Resource < Puppet::Application
   option("--verbose", "-v")
   option("--edit", "-e")
   option("--to_yaml", "-y")
+  option('--fail', '-f')
 
   option("--types", "-t") do |_arg|
     env = Puppet.lookup(:environments).get(Puppet[:environment]) || create_default_environment
@@ -109,6 +110,9 @@ class Puppet::Application::Resource < Puppet::Application
         Output found resources in yaml format, suitable to use with Hiera and
         create_resources.
 
+      * --fail:
+        Fails and returns an exit code of 1 if the resource could not be modified.
+
       EXAMPLE
       -------
       This example uses `puppet resource` to return a Puppet configuration for
@@ -207,7 +211,7 @@ class Puppet::Application::Resource < Puppet::Application
     params = {}
     args.each do |setting|
       if setting =~ /^(\w+)=(.+)$/
-        params[$1] = $2
+        params[::Regexp.last_match(1)] = ::Regexp.last_match(2)
       else
         raise _("Invalid parameter setting %{setting}") % { setting: setting }
       end
@@ -236,8 +240,11 @@ class Puppet::Application::Resource < Puppet::Application
           resource = Puppet::Resource.new(type, name, :parameters => params)
 
           # save returns [resource that was saved, transaction log from applying the resource]
-          save_result = Puppet::Resource.indirection.save(resource, key)
-          [save_result.first]
+          save_result, report = Puppet::Resource.indirection.save(resource, key)
+          status = report.resource_statuses[resource.ref]
+          raise "Failed to manage resource #{resource.ref}" if status&.failed? && options[:fail]
+
+          [save_result]
         end
       else
         if type == "file"

data/lib/puppet/application/ssl.rb

@@ -160,7 +160,7 @@ class Puppet::Application::Ssl < Puppet::Application
 
       clean(certname)
     when 'bootstrap'
-      if !Puppet::Util::Log.sendlevel?(:info)
+      unless Puppet::Util::Log.sendlevel?(:info)
         Puppet::Util::Log.level = :info
       end
       @machine.ensure_client_certificate
@@ -192,7 +192,7 @@ class Puppet::Application::Ssl < Puppet::Application
     Puppet.notice _("Submitted certificate request for '%{name}' to %{url}") % { name: Puppet[:certname], url: route.url }
   rescue Puppet::HTTP::ResponseError => e
     if e.response.code == 400
-      raise Puppet::Error.new(_("Could not submit certificate request for '%{name}' to %{url} due to a conflict on the server") % { name: Puppet[:certname], url: route.url })
+      raise Puppet::Error, _("Could not submit certificate request for '%{name}' to %{url} due to a conflict on the server") % { name: Puppet[:certname], url: route.url }
     else
       raise Puppet::Error.new(_("Failed to submit certificate request: %{message}") % { message: e.message }, e)
     end
@@ -234,7 +234,7 @@ class Puppet::Application::Ssl < Puppet::Application
     cert
   rescue Puppet::HTTP::ResponseError => e
     if e.response.code == 404
-      return nil
+      nil
     else
       raise Puppet::Error.new(_("Failed to download certificate: %{message}") % { message: e.message }, e)
     end

data/lib/puppet/application.rb

@@ -180,14 +180,14 @@ class Application
     def option(*options, &block)
       long = options.find { |opt| opt =~ /^--/ }.gsub(/^--(?:\[no-\])?([^ =]+).*$/, '\1').tr('-', '_')
       fname = "handle_#{long}".intern
-      if (block_given?)
+      if block_given?
         define_method(fname, &block)
       else
         define_method(fname) do |value|
-          self.options["#{long}".to_sym] = value
+          self.options[long.to_s.to_sym] = value
         end
       end
-      self.option_parser_commands << [options, fname]
+      option_parser_commands << [options, fname]
     end
 
     def banner(banner = nil)
@@ -242,7 +242,7 @@ class Application
       ####  eventually we need to issue a deprecation warning here,
       ####  and then get rid of this stanza in a subsequent release.
       ################################################################
-      if (clazz.nil?)
+      if clazz.nil?
         class_name = application_name.capitalize
         clazz = try_load_class(class_name)
       end
@@ -251,17 +251,17 @@ class Application
       ################################################################
 
       if clazz.nil?
-        raise Puppet::Error.new(_("Unable to load application class '%{class_name}' from file 'puppet/application/%{application_name}.rb'") % { class_name: class_name, application_name: application_name })
+        raise Puppet::Error, _("Unable to load application class '%{class_name}' from file 'puppet/application/%{application_name}.rb'") % { class_name: class_name, application_name: application_name }
       end
 
-      return clazz
+      clazz
     end
 
     # Given the fully qualified name of a class, attempt to get the class instance.
     # @param [String] class_name the fully qualified name of the class to try to load
     # @return [Class] the Class instance, or nil? if it could not be loaded.
     def try_load_class(class_name)
-      return self.const_defined?(class_name) ? const_get(class_name) : nil
+      const_defined?(class_name) ? const_get(class_name) : nil
     end
     private :try_load_class
 
@@ -284,7 +284,7 @@ class Application
         Puppet.settings.preferred_run_mode = mode_name
       end
 
-      return @run_mode if @run_mode and not mode_name
+      return @run_mode if @run_mode and !mode_name
 
       require_relative '../puppet/util/run_mode'
       @run_mode = Puppet::Util::RunMode[mode_name || Puppet.settings.preferred_run_mode]
@@ -330,7 +330,7 @@ class Application
   # See also `lib/puppet/util/command_line.rb` for some special case early
   # handling of this.
   option("--version", "-V") do |_arg|
-    puts "#{Puppet.version}"
+    puts Puppet.version
     exit(0)
   end
 
@@ -452,7 +452,7 @@ class Application
   # @return [void]
   # @api public
   def setup_logs
-    handle_logdest_arg(Puppet[:logdest]) if !options[:setdest]
+    handle_logdest_arg(Puppet[:logdest]) unless options[:setdest]
 
     unless options[:setdest]
       if options[:debug] || options[:verbose]
@@ -481,12 +481,10 @@ class Application
     Puppet[:logdest] = arg
 
     logdest.each do |dest|
-      begin
-        Puppet::Util::Log.newdestination(dest)
-        options[:setdest] = true
-      rescue => detail
-        Puppet.log_and_raise(detail, _("Could not set logdest to %{dest}.") % { dest: arg })
-      end
+      Puppet::Util::Log.newdestination(dest)
+      options[:setdest] = true
+    rescue => detail
+      Puppet.log_and_raise(detail, _("Could not set logdest to %{dest}.") % { dest: arg })
     end
   end
 
@@ -555,14 +553,14 @@ class Application
     self.class.option_parser_commands.each do |options, fname|
       option_parser.on(*options) do |value|
         # Call the method that "option()" created.
-        self.send(fname, value)
+        send(fname, value)
       end
     end
 
     # Scan command line.  We just hand any exceptions to our upper levels,
     # rather than printing help and exiting, so that we can meaningfully
     # respond with context-sensitive help if we want to. --daniel 2011-04-12
-    option_parser.parse!(self.command_line.args)
+    option_parser.parse!(command_line.args)
   end
 
   def handlearg(opt, val)

data/lib/puppet/coercion.rb

@@ -37,6 +37,6 @@ module Puppet::Coercion
   # @raise
   # @api private
   def self.boolean_values
-    ['true', 'false', 'yes', 'no']
+    %w[true false yes no]
   end
 end

data/lib/puppet/configurer/downloader.rb

@@ -20,7 +20,7 @@ class Puppet::Configurer::Downloader
           if first_failure
             event = (first_failure.events || []).first
             detail = event ? event.message : 'unknown'
-            raise Puppet::Error.new(_("Failed to retrieve %{name}: %{detail}") % { name: name, detail: detail })
+            raise Puppet::Error, _("Failed to retrieve %{name}: %{detail}") % { name: name, detail: detail }
           end
         end
 
@@ -40,7 +40,12 @@ class Puppet::Configurer::Downloader
   end
 
   def initialize(name, path, source, ignore = nil, environment = nil, source_permissions = :ignore)
-    @name, @path, @source, @ignore, @environment, @source_permissions = name, path, source, ignore, environment, source_permissions
+    @name = name
+    @path = path
+    @source = source
+    @ignore = ignore
+    @environment = environment
+    @source_permissions = source_permissions
   end
 
   def file
@@ -77,10 +82,10 @@ class Puppet::Configurer::Downloader
       :noop => false,
       :max_files => -1
     }
-    if !Puppet::Util::Platform.windows?
+    unless Puppet::Util::Platform.windows?
       defargs[:owner] = Process.uid
       defargs[:group] = Process.gid
     end
-    return defargs
+    defargs
   end
 end

data/lib/puppet/configurer/fact_handler.rb

@@ -13,20 +13,19 @@ module Puppet::Configurer::FactHandler
     # This works because puppet agent configures Facts to use 'facter' for
     # finding facts and the 'rest' terminus for caching them.  Thus, we'll
     # compile them and then "cache" them on the server.
-    begin
-      facts = Puppet::Node::Facts.indirection.find(Puppet[:node_name_value], :environment => Puppet::Node::Environment.remote(@environment))
-      unless Puppet[:node_name_fact].empty?
-        Puppet[:node_name_value] = facts.values[Puppet[:node_name_fact]]
-        facts.name = Puppet[:node_name_value]
-      end
-      facts
-    rescue SystemExit, NoMemoryError
-      raise
-    rescue Exception => detail
-      message = _("Could not retrieve local facts: %{detail}") % { detail: detail }
-      Puppet.log_exception(detail, message)
-      raise Puppet::Error, message, detail.backtrace
+
+    facts = Puppet::Node::Facts.indirection.find(Puppet[:node_name_value], :environment => Puppet::Node::Environment.remote(@environment))
+    unless Puppet[:node_name_fact].empty?
+      Puppet[:node_name_value] = facts.values[Puppet[:node_name_fact]]
+      facts.name = Puppet[:node_name_value]
     end
+    facts
+  rescue SystemExit, NoMemoryError
+    raise
+  rescue Exception => detail
+    message = _("Could not retrieve local facts: %{detail}") % { detail: detail }
+    Puppet.log_exception(detail, message)
+    raise Puppet::Error, message, detail.backtrace
   end
 
   def facts_for_uploading

data/lib/puppet/configurer.rb

@@ -83,8 +83,8 @@ class Puppet::Configurer
     else
       result = retrieve_new_catalog(facts, query_options)
 
-      if !result
-        if !Puppet[:usecacheonfailure]
+      unless result
+        unless Puppet[:usecacheonfailure]
           Puppet.warning _("Not using cache on failed catalog")
           return nil
         end
@@ -390,7 +390,7 @@ class Puppet::Configurer
       configured_environment = Puppet[:environment] if Puppet.settings.set_by_config?(:environment)
 
       # We only need to find out the environment to run in if we don't already have a catalog
-      unless (cached_catalog || options[:catalog] || Puppet.settings.set_by_cli?(:environment) || Puppet[:strict_environment_mode])
+      unless cached_catalog || options[:catalog] || Puppet.settings.set_by_cli?(:environment) || Puppet[:strict_environment_mode]
         Puppet.debug(_("Environment not passed via CLI and no catalog was given, attempting to find out the last server-specified environment"))
         initial_environment, loaded_last_environment = last_server_specified_environment
 
@@ -442,7 +442,7 @@ class Puppet::Configurer
       # facts may be used to determine which catalog we get, we need to
       # rerun the process if the environment is changed.
       tries = 0
-      while catalog.environment and not catalog.environment.empty? and catalog.environment != @environment
+      while catalog.environment and !catalog.environment.empty? and catalog.environment != @environment
         if tries > 3
           raise Puppet::Error, _("Catalog environment didn't stabilize after %{tries} fetches, aborting run") % { tries: tries }
         end
@@ -505,7 +505,7 @@ class Puppet::Configurer
       true
     rescue => detail
       Puppet.log_exception(detail, _("Failed to apply catalog: %{detail}") % { detail: detail })
-      return nil
+      nil
     ensure
       execute_postrun_command or return nil # rubocop:disable Lint/EnsureReturn
     end
@@ -536,7 +536,7 @@ class Puppet::Configurer
     rescue Puppet::HTTP::ResponseError => detail
       if detail.response.code == 404
         if Puppet[:strict_environment_mode]
-          raise Puppet::Error.new(_("Environment '%{environment}' not found on server, aborting run.") % { environment: @environment })
+          raise Puppet::Error, _("Environment '%{environment}' not found on server, aborting run.") % { environment: @environment }
         else
           Puppet.notice(_("Environment '%{environment}' not found on server, skipping initial pluginsync.") % { environment: @environment })
         end
@@ -675,12 +675,12 @@ class Puppet::Configurer
 
     puppet.put_facts(facts.name, facts: facts, environment: Puppet.lookup(:current_environment).name.to_s)
 
-    return true
+    true
   rescue => detail
     Puppet.log_exception(detail, _("Failed to submit facts: %{detail}") %
                                  { detail: detail })
 
-    return false
+    false
   end
 
   private
@@ -722,7 +722,7 @@ class Puppet::Configurer
     result
   rescue => detail
     Puppet.log_exception(detail, _("Could not retrieve catalog from cache: %{detail}") % { detail: detail })
-    return nil
+    nil
   end
 
   def retrieve_new_catalog(facts, query_options)
@@ -744,18 +744,16 @@ class Puppet::Configurer
     result
   rescue StandardError => detail
     Puppet.log_exception(detail, _("Could not retrieve catalog from remote server: %{detail}") % { detail: detail })
-    return nil
+    nil
   end
 
   def download_plugins(remote_environment_for_plugins)
-    begin
-      @handler.download_plugins(remote_environment_for_plugins)
-    rescue Puppet::Error => detail
-      if !Puppet[:ignore_plugin_errors] && Puppet[:usecacheonfailure]
-        @running_failure = true
-      else
-        raise detail
-      end
+    @handler.download_plugins(remote_environment_for_plugins)
+  rescue Puppet::Error => detail
+    if !Puppet[:ignore_plugin_errors] && Puppet[:usecacheonfailure]
+      @running_failure = true
+    else
+      raise detail
     end
   end
 end

data/lib/puppet/confine/feature.rb

@@ -4,7 +4,7 @@ require_relative '../../puppet/confine'
 
 class Puppet::Confine::Feature < Puppet::Confine
   def self.summarize(confines)
-    confines.collect { |c| c.values }.flatten.uniq.find_all { |value| !confines[0].pass?(value) }
+    confines.collect(&:values).flatten.uniq.find_all { |value| !confines[0].pass?(value) }
   end
 
   # Is the named feature available?

data/lib/puppet/confine/variable.rb

@@ -29,7 +29,7 @@ class Puppet::Confine::Variable < Puppet::Confine
   end
 
   def message(value)
-    "facter value '#{test_value}' for '#{self.name}' not in required list '#{values.join(",")}'"
+    "facter value '#{test_value}' for '#{name}' not in required list '#{values.join(',')}'"
   end
 
   # Compare the passed-in value to the retrieved value.

data/lib/puppet/confine.rb

@@ -31,7 +31,7 @@ class Puppet::Confine
           Puppet.warning("Could not load confine test '#{name}': #{detail}")
         end
         # Could not find file
-        if !Puppet[:always_retry_plugins]
+        unless Puppet[:always_retry_plugins]
           @tests[name] = nil
         end
       end
@@ -75,7 +75,7 @@ class Puppet::Confine
       end
     end
 
-    return true
+    true
   ensure
     reset
   end

data/lib/puppet/confine_collection.rb

@@ -22,7 +22,7 @@ class Puppet::ConfineCollection
         confine.name = test
         @confines << confine
       end
-      @confines[-1].label = self.label
+      @confines[-1].label = label
     end
   end
 

data/lib/puppet/confiner.rb

@@ -33,7 +33,7 @@ module Puppet::Confiner
   # @api private
   #
   def confine_collection
-    @confine_collection ||= Puppet::ConfineCollection.new(self.to_s)
+    @confine_collection ||= Puppet::ConfineCollection.new(to_s)
   end
 
   # Checks whether this implementation is suitable for the current platform (or returns a summary
@@ -43,6 +43,6 @@ module Puppet::Confiner
   # @api public
   #
   def suitable?(short = true)
-    return(short ? confine_collection.valid? : confine_collection.summary)
+    (short ? confine_collection.valid? : confine_collection.summary)
   end
 end

data/lib/puppet/daemon.rb

@@ -68,7 +68,7 @@ class Puppet::Daemon
       Puppet.debug("Finished closing streams for daemon mode")
     rescue => detail
       Puppet.err "Could not start #{Puppet.run_mode.name}: #{detail}"
-      Puppet::Util.replace_file("/tmp/daemonout", 0644) do |f|
+      Puppet::Util.replace_file("/tmp/daemonout", 0o644) do |f|
         f.puts "Could not start #{Puppet.run_mode.name}: #{detail}"
       end
       exit(12)
@@ -83,7 +83,7 @@ class Puppet::Daemon
   def reexec
     raise Puppet::DevError, _("Cannot reexec unless ARGV arguments are set") unless argv
 
-    command = $0 + " " + argv.join(" ")
+    command = $PROGRAM_NAME + " " + argv.join(" ")
     Puppet.notice "Restarting with '#{command}'"
     stop(:exit => false)
     exec(command)
@@ -115,7 +115,7 @@ class Puppet::Daemon
     end
 
     # extended signals not supported under windows
-    if !Puppet::Util::Platform.windows?
+    unless Puppet::Util::Platform.windows?
       signals = { :HUP => :restart, :USR1 => :reload, :USR2 => :reopen_logs }
       signals.each do |signal, method|
         Signal.trap(signal) do

data/lib/puppet/datatypes.rb

@@ -128,12 +128,11 @@ module Puppet::DataTypes
     # and it will fail unless protected with an if defined? if the local
     # variable does not exist in the block's binder.
     #
-    begin
-      loader = block.binding.eval('loader_injected_arg if defined?(loader_injected_arg)')
-      create_loaded_type(type_name, loader, &block)
-    rescue StandardError => e
-      raise ArgumentError, _("Data Type Load Error for type '%{type_name}': %{message}") % { type_name: type_name, message: e.message }
-    end
+
+    loader = block.binding.eval('loader_injected_arg if defined?(loader_injected_arg)')
+    create_loaded_type(type_name, loader, &block)
+  rescue StandardError => e
+    raise ArgumentError, _("Data Type Load Error for type '%{type_name}': %{message}") % { type_name: type_name, message: e.message }
   end
 
   def self.create_loaded_type(type_name, loader, &block)

data/lib/puppet/defaults.rb

@@ -77,7 +77,7 @@ module Puppet
   #   see the docs for Settings.define_settings
   ############################################################################################
 
-  AS_DURATION = %q{This setting can be a time interval in seconds (30 or 30s), minutes (30m), hours (6h), days (2d), or years (5y).}
+  AS_DURATION = 'This setting can be a time interval in seconds (30 or 30s), minutes (30m), hours (6h), days (2d), or years (5y).'
 
   # @api public
   # @param args [Puppet::Settings] the settings object to define default settings for
@@ -132,7 +132,7 @@ module Puppet
     :log_level => {
       :default    => 'notice',
       :type       => :enum,
-      :values     => ["debug","info","notice","warning","err","alert","emerg","crit"],
+      :values     => %w[debug info notice warning err alert emerg crit],
       :desc       => "Default logging level for messages from Puppet. Allowed values are:
 
         * debug
@@ -166,12 +166,18 @@ module Puppet
         values = munge(value)
         valid   = %w[deprecations undefined_variables undefined_resources]
         invalid = values - (values & valid)
-        if not invalid.empty?
+        unless invalid.empty?
           raise ArgumentError, _("Cannot disable unrecognized warning types '%{invalid}'.") % { invalid: invalid.join(',') } +
               ' ' + _("Valid values are '%{values}'.") % { values: valid.join(', ') }
         end
       end
     },
+    :skip_logging_catalog_request_destination => {
+      :default => false,
+      :type    => :boolean,
+      :desc    => "If you wish to suppress the notice of which compiler supplied the
+        catalog",
+    },
     :merge_dependency_warnings => {
       :default => false,
       :type    => :boolean,
@@ -489,7 +495,7 @@ module Puppet
     },
     :daemonize => {
         :type     => :boolean,
-        :default  => (!Puppet::Util::Platform.windows?),
+        :default  => !Puppet::Util::Platform.windows?,
         :desc     => "Whether to send the process into the background.  This defaults
           to true on POSIX systems, and to false on Windows (where Puppet
           currently cannot daemonize).",
@@ -501,7 +507,7 @@ module Puppet
                      end
     },
     :maximum_uid => {
-        :default  => 4294967290,
+        :default  => 4_294_967_290,
         :type     => :integer,
         :desc     => "The maximum allowed UID.  Some platforms use negative UIDs
           but then ship with tools that do not know how to handle signed ints,
@@ -650,7 +656,7 @@ module Puppet
     :http_proxy_password =>{
       :default    => "none",
       :hook       => proc do |value|
-        if value =~ /[@!# \/]/
+        if value =~ %r{[@!# /]}
           raise "Passwords set in the http_proxy_password setting must be valid as part of a URL, and any reserved characters must be URL-encoded. We received: #{value}"
         end
       end,
@@ -1104,7 +1110,7 @@ EOT
         values = munge(value)
 
         invalid = values - Puppet.valid_file_checksum_types
-        if not invalid.empty?
+        unless invalid.empty?
           raise ArgumentError, _("Invalid value '%{value}' for parameter %{name}. Allowed values are '%{allowed_values}'") % {
             value: invalid.first, name: @name, allowed_values: Puppet.valid_file_checksum_types.join("', '")
           }
@@ -1298,7 +1304,7 @@ EOT
       :sourceaddress => {
         :default    => nil,
         :desc       => "The address the agent should use to initiate requests.",
-      },
+      }
     )
 
   settings.define_settings(:environment,