puppet 8.4.0-x86-mingw32 → 8.5.1-x86-mingw32

data/lib/puppet/type.rb

@@ -184,7 +184,7 @@ class Type
   #   specification to clearly state that the type is ensurable.
   #
   # @overload ensurable()
-  # @overload ensurable({|| ... })
+  # @overload ensurable({ ... })
   # @yield [ ] A block evaluated in scope of the new Parameter
   # @yieldreturn [void]
   # @return [void]
@@ -260,7 +260,7 @@ class Type
   # @api private
   #
   def self.can_apply_to(target)
-    [ target == :device ? :device : :host, :both ].include?(apply_to)
+    [target == :device ? :device : :host, :both].include?(apply_to)
   end
 
   # Processes the options for a named parameter.
@@ -431,7 +431,7 @@ class Type
     case key_attributes.length
     when 0; []
     when 1;
-      [ [ /(.*)/m, [ [key_attributes.first] ] ] ]
+      [[/(.*)/m, [[key_attributes.first]]]]
     else
       raise Puppet::DevError, _("you must specify title patterns when there are two or more key attributes")
     end
@@ -443,7 +443,7 @@ class Type
   # @return [Object] an object that is a _uniqueness_key_ for this object
   #
   def uniqueness_key
-    self.class.key_attributes.sort_by { |attribute_name| attribute_name.to_s }.map{ |attribute_name| self[attribute_name] }
+    self.class.key_attributes.sort_by { |attribute_name| attribute_name.to_s }.map { |attribute_name| self[attribute_name] }
   end
 
   # Creates a new parameter.
@@ -671,7 +671,7 @@ class Type
   # @raise [Puppet::Error] if the setting of the value fails, or if the given name is nil.
   # @raise [Puppet::ResourceError] when the parameter validation raises Puppet::Error or
   #   ArgumentError
-  def []=(name,value)
+  def []=(name, value)
     name = name.intern
 
     fail("no parameter named '#{name}'") unless self.class.validattr?(name)
@@ -710,7 +710,7 @@ class Type
     if @parameters.has_key?(attr)
       @parameters.delete(attr)
     else
-      raise Puppet::DevError.new(_("Undefined attribute '%{attribute}' in %{name}") % { attribute: attr, name: self})
+      raise Puppet::DevError.new(_("Undefined attribute '%{attribute}' in %{name}") % { attribute: attr, name: self })
     end
   end
 
@@ -728,7 +728,7 @@ class Type
   # included since they are a subclass of parameter.
   # @return [Array<Puppet::Parameter>] Array of parameter objects ( or subclass thereof )
   def parameters_with_value
-    self.class.allattrs.collect { |attr| parameter(attr) }.compact
+    self.class.allattrs.filter_map { |attr| parameter(attr) }
   end
 
   # Iterates over all parameters with value currently set.
@@ -747,7 +747,7 @@ class Type
   # @param options [Hash] options merged with a fixed set of options defined by this method, passed on to {Puppet::Transaction::Event}.
   # @return [Puppet::Transaction::Event] the created event
   def event(options = {})
-    Puppet::Transaction::Event.new(**{:resource => self, :file => file, :line => line, :tags => tags}.merge(options))
+    Puppet::Transaction::Event.new(**{ :resource => self, :file => file, :line => line, :tags => tags }.merge(options))
   end
 
   # @return [Object, nil] Returns the 'should' (wanted state) value for a specified property, or nil if the
@@ -785,8 +785,8 @@ class Type
       raise Puppet::Error, "Resource type #{self.class.name} does not support parameter #{name}"
     end
 
-    if provider and ! provider.class.supports_parameter?(klass)
-      missing = klass.required_features.find_all { |f| ! provider.class.feature?(f) }
+    if provider and !provider.class.supports_parameter?(klass)
+      missing = klass.required_features.find_all { |f| !provider.class.feature?(f) }
       debug "Provider %s does not support features %s; not managing attribute %s" % [provider.class.name, missing.join(", "), name]
       return nil
     end
@@ -859,7 +859,7 @@ class Type
     return unless parameter
 
     value = parameter.default
-    if value and ! value.nil?
+    if value and !value.nil?
       parameter.value = value
     else
       @parameters.delete(parameter.name)
@@ -923,7 +923,7 @@ class Type
   #   ruby file adding a new type with new properties?
   #
   def properties
-    self.class.properties.collect { |prop| @parameters[prop.name] }.compact
+    self.class.properties.filter_map { |prop| @parameters[prop.name] }
   end
 
   # Returns true if the type's notion of name is the identity of a resource.
@@ -955,19 +955,17 @@ class Type
     # Once an object is managed, it always stays managed; but an object
     # that is listed as unmanaged might become managed later in the process,
     # so we have to check that every time
-    if @managed
-      return @managed
-    else
+    unless @managed
       @managed = false
       properties.each { |property|
         s = property.should
-        if s and ! property.class.unmanaged
+        if s and !property.class.unmanaged
           @managed = true
           break
         end
       }
-      return @managed
     end
+    return @managed
   end
 
   ###############################
@@ -986,7 +984,7 @@ class Type
   # Removes this object (FROM WHERE?)
   # @todo removes if from where?
   # @return [void]
-  def remove()
+  def remove
     # This is hackish (mmm, cut and paste), but it works for now, and it's
     # better than warnings.
     @parameters.each do |_name, obj|
@@ -1053,7 +1051,7 @@ class Type
   # @return [Puppet::Resource] array of all property values (mix of types)
   # @raise [fail???] if there is a provider and it is not suitable for the host this is evaluated for.
   def retrieve
-    fail "Provider #{provider.class.name} is not functional on this host" if self.provider.is_a?(Puppet::Provider) and ! provider.class.suitable?
+    fail "Provider #{provider.class.name} is not functional on this host" if self.provider.is_a?(Puppet::Provider) and !provider.class.suitable?
 
     result = Puppet::Resource.new(self.class, title)
 
@@ -1117,18 +1115,15 @@ class Type
     # is the first property, which is important for skipping 'retrieve' on
     # all the properties if the resource is absent.
     ensure_state = false
-    return properties.inject({}) do | prophash, property|
+    return properties.each_with_object({}) do |property, prophash|
       if property.name == :ensure
         ensure_state = property.retrieve
         prophash[property] = ensure_state
+      elsif ensure_state == :absent
+        prophash[property] = :absent
       else
-        if ensure_state == :absent
-          prophash[property] = :absent
-        else
-          prophash[property] = property.retrieve
-        end
+        prophash[property] = property.retrieve
       end
-      prophash
     end
   end
 
@@ -1137,7 +1132,7 @@ class Type
   def noop?
     # If we're not a host_config, we're almost certainly part of
     # Settings, and we want to ignore 'noop'
-    return false if catalog and ! catalog.host_config?
+    return false if catalog and !catalog.host_config?
 
     if defined?(@noop)
       @noop
@@ -1188,13 +1183,13 @@ class Type
   def self.providers_by_source
     # Put the default provider first (can be nil), then the rest of the suitable providers.
     sources = []
-    [defaultprovider, suitableprovider].flatten.uniq.collect do |provider|
+    [defaultprovider, suitableprovider].flatten.uniq.filter_map do |provider|
       next if provider.nil?
       next if sources.include?(provider.source)
 
       sources << provider.source
       provider
-    end.compact
+    end
   end
 
   # Converts a simple hash into a Resource instance.
@@ -1203,7 +1198,7 @@ class Type
   # @return [Puppet::Resource] the resource created from the hash
   # @raise [Puppet::Error] if a title is missing in the given hash
   def self.hash2resource(hash)
-    hash = hash.inject({}) { |result, ary| result[ary[0].to_sym] = ary[1]; result }
+    hash = hash.each_with_object({}) { |ary, result| result[ary[0].to_sym] = ary[1]; }
 
     title = hash.delete(:title)
     title ||= hash[:name]
@@ -1314,7 +1309,7 @@ class Type
       and the second run will log the edit made by Puppet.)"
 
     validate do |list|
-      list = Array(list).collect {|p| p.to_sym}
+      list = Array(list).collect { |p| p.to_sym }
       unless list == [:all]
         list.each do |param|
           next if @resource.class.validattr?(param)
@@ -1341,7 +1336,7 @@ class Type
     end
 
     def properties_to_audit(list)
-      if !list.kind_of?(Array) && list.to_sym == :all
+      if !list.is_a?(Array) && list.to_sym == :all
         all_properties
       else
         Array(list).collect { |p| p.to_sym }
@@ -1502,7 +1497,7 @@ class Type
         unless @resource.catalog.resource(ref.to_s)
           description = self.class.direction == :in ? "dependency" : "dependent"
           fail ResourceError, _("Could not find %{description} %{ref} for %{resource}") %
-              { description: description, ref: ref, resource: resource.ref }
+                              { description: description, ref: ref, resource: resource.ref }
         end
       end
     end
@@ -1584,7 +1579,7 @@ class Type
   # so that if both params are used, those ones win.  It's a hackish
   # solution, but it works.
 
-  newmetaparam(:require, :parent => RelationshipMetaparam, :attributes => {:direction => :in, :events => :NONE}) do
+  newmetaparam(:require, :parent => RelationshipMetaparam, :attributes => { :direction => :in, :events => :NONE }) do
     desc "One or more resources that this resource depends on, expressed as
       [resource references](https://puppet.com/docs/puppet/latest/lang_data_resource_reference.html).
       Multiple resources can be specified as an array of references. When this
@@ -1598,7 +1593,7 @@ class Type
       [the language page on relationships](https://puppet.com/docs/puppet/latest/lang_relationships.html)."
   end
 
-  newmetaparam(:subscribe, :parent => RelationshipMetaparam, :attributes => {:direction => :in, :events => :ALL_EVENTS, :callback => :refresh}) do
+  newmetaparam(:subscribe, :parent => RelationshipMetaparam, :attributes => { :direction => :in, :events => :ALL_EVENTS, :callback => :refresh }) do
     desc "One or more resources that this resource depends on, expressed as
       [resource references](https://puppet.com/docs/puppet/latest/lang_data_resource_reference.html).
       Multiple resources can be specified as an array of references. When this
@@ -1616,7 +1611,7 @@ class Type
       [the language page on relationships](https://puppet.com/docs/puppet/latest/lang_relationships.html)."
   end
 
-  newmetaparam(:before, :parent => RelationshipMetaparam, :attributes => {:direction => :out, :events => :NONE}) do
+  newmetaparam(:before, :parent => RelationshipMetaparam, :attributes => { :direction => :out, :events => :NONE }) do
     desc "One or more resources that depend on this resource, expressed as
       [resource references](https://puppet.com/docs/puppet/latest/lang_data_resource_reference.html).
       Multiple resources can be specified as an array of references. When this
@@ -1630,7 +1625,7 @@ class Type
       [the language page on relationships](https://puppet.com/docs/puppet/latest/lang_relationships.html)."
   end
 
-  newmetaparam(:notify, :parent => RelationshipMetaparam, :attributes => {:direction => :out, :events => :ALL_EVENTS, :callback => :refresh}) do
+  newmetaparam(:notify, :parent => RelationshipMetaparam, :attributes => { :direction => :out, :events => :ALL_EVENTS, :callback => :refresh }) do
     desc "One or more resources that depend on this resource, expressed as
       [resource references](https://puppet.com/docs/puppet/latest/lang_data_resource_reference.html).
       Multiple resources can be specified as an array of references. When this
@@ -1869,7 +1864,7 @@ class Type
         # its indentation with scrub. But we don't need to manually scrub the
         # provider's doc string, since markdown_definitionlist sanitizes its inputs.
         scrub(@doc) + "Available providers are:\n\n" + parenttype.providers.sort_by(&:to_s).collect { |i|
-          markdown_definitionlist( i, scrub(parenttype().provider(i).doc) )
+          markdown_definitionlist(i, scrub(parenttype().provider(i).doc))
         }.join
       end
 
@@ -1885,7 +1880,7 @@ class Type
         provider_class = provider_class.class.name if provider_class.is_a?(Puppet::Provider)
 
         unless @resource.class.provider(provider_class)
-          raise ArgumentError, _("Invalid %{resource} provider '%{provider_class}'") % { resource: @resource.class.name, provider_class: provider_class}
+          raise ArgumentError, _("Invalid %{resource} provider '%{provider_class}'") % { resource: @resource.class.name, provider_class: provider_class }
         end
       end
 
@@ -1992,16 +1987,16 @@ class Type
   # requirement.
   #
   # @example Autorequire the files File['foo', 'bar']
-  #   autorequire( 'file', {|| ['foo', 'bar'] })
+  #   autorequire( 'file', { ['foo', 'bar'] })
   #
   # @example Autobefore the files File['foo', 'bar']
-  #   autobefore( 'file', {|| ['foo', 'bar'] })
+  #   autobefore( 'file', { ['foo', 'bar'] })
   #
   # @example Autosubscribe the files File['foo', 'bar']
-  #   autosubscribe( 'file', {|| ['foo', 'bar'] })
+  #   autosubscribe( 'file', { ['foo', 'bar'] })
   #
   # @example Autonotify the files File['foo', 'bar']
-  #   autonotify( 'file', {|| ['foo', 'bar'] })
+  #   autonotify( 'file', { ['foo', 'bar'] })
   #
   # @param name [String] the name of a type of which one or several resources should be autorelated e.g. "file"
   # @yield [ ] a block returning list of names of given type to auto require
@@ -2049,7 +2044,7 @@ class Type
   # @return [void]
   def self.eachautobefore
     @autobefores ||= {}
-    @autobefores.each { |type,block|
+    @autobefores.each { |type, block|
       yield(type, block)
     }
   end
@@ -2061,7 +2056,7 @@ class Type
   # @return [void]
   def self.eachautosubscribe
     @autosubscribes ||= {}
-    @autosubscribes.each { |type,block|
+    @autosubscribes.each { |type, block|
       yield(type, block)
     }
   end
@@ -2073,7 +2068,7 @@ class Type
   # @return [void]
   def self.eachautonotify
     @autonotifies ||= {}
-    @autonotifies.each { |type,block|
+    @autonotifies.each { |type, block|
       yield(type, block)
     }
   end
@@ -2149,7 +2144,7 @@ class Type
     self.class.relationship_params.collect do |klass|
       param = @parameters[klass.name]
       param.to_edges if param
-    end.flatten.reject { |r| r.nil? }
+    end.flatten.compact
   end
 
   # Sets the initial list of tags to associate to this resource.
@@ -2224,7 +2219,7 @@ class Type
     @parameters = []
     @paramhash = {}
 
-    @paramdoc = Hash.new { |hash,key|
+    @paramdoc = Hash.new { |hash, key|
       key = key.intern if key.is_a?(String)
       if hash.include?(key)
         hash[key]
@@ -2504,7 +2499,7 @@ class Type
     self.class.relationship_params.collect do |klass|
       param = @parameters[klass.name]
       param.validate_relationship if param
-    end.flatten.reject { |r| r.nil? }
+    end.flatten.compact
   end
 
   # @comment For now, leave the 'name' method functioning like it used to.  Once 'title'

data/lib/puppet/util/at_fork/solaris.rb

@@ -42,7 +42,7 @@ class Puppet::Util::AtFork::Solaris
     libhandle = Fiddle::Handle.new(library)
 
     functions.each do |f|
-      define_method f[0], Fiddle::Function.new(libhandle[f[0].to_s], f[2..-1], f[1]).method(:call).to_proc
+      define_method f[0], Fiddle::Function.new(libhandle[f[0].to_s], f[2..], f[1]).method(:call).to_proc
     end
   end
 
@@ -64,7 +64,7 @@ class Puppet::Util::AtFork::Solaris
 
   def activate_new_contract_template
     begin
-      tmpl = File.open(CTFS_PR_TEMPLATE, File::RDWR)
+      tmpl = File.new(CTFS_PR_TEMPLATE, File::RDWR)
 
       begin
         tmpl_fd = tmpl.fileno
@@ -109,7 +109,7 @@ class Puppet::Util::AtFork::Solaris
 
   def get_latest_child_contract_id
     begin
-      stat = File.open(CTFS_PR_LATEST, File::RDONLY)
+      stat = File.new(CTFS_PR_LATEST, File::RDONLY)
 
       begin
         stathdl = Fiddle::Pointer.new(0)
@@ -133,7 +133,7 @@ class Puppet::Util::AtFork::Solaris
     return if ctid.nil?
 
     begin
-      ctl = File.open(File.join(CTFS_PR_ROOT, ctid.to_s, %q(ctl)), File::WRONLY)
+      ctl = File.new(File.join(CTFS_PR_ROOT, ctid.to_s, %q(ctl)), File::WRONLY)
 
       begin
         raise_if_error { ct_ctl_abandon(ctl.fileno) }

data/lib/puppet/util/autoload.rb

@@ -82,7 +82,7 @@ class Puppet::Util::Autoload
         mark_loaded(name, file)
         Kernel.load file
         return true
-      rescue SystemExit,NoMemoryError
+      rescue SystemExit, NoMemoryError
         raise
       rescue Exception => detail
         message = _("Could not autoload %{name}: %{detail}") % { name: name, detail: detail }
@@ -117,7 +117,7 @@ class Puppet::Util::Autoload
     end
 
     def files_to_load(path, env)
-      search_directories(env).map {|dir| files_in_dir(dir, path) }.flatten.uniq
+      search_directories(env).map { |dir| files_in_dir(dir, path) }.flatten.uniq
     end
 
     # @api private

data/lib/puppet/util/backups.rb

@@ -19,7 +19,7 @@ module Puppet::Util::Backups
   private
 
   def perform_backup_with_bucket(fileobj)
-    file = (fileobj.class == String) ? fileobj : fileobj.name
+    file = (fileobj.instance_of?(String)) ? fileobj : fileobj.name
     case Puppet::FileSystem.lstat(file).ftype
     when "directory"
       # we don't need to backup directories when recurse is on
@@ -34,7 +34,7 @@ module Puppet::Util::Backups
   end
 
   def perform_backup_with_backuplocal(fileobj, backup)
-    file = (fileobj.class == String) ? fileobj : fileobj.name
+    file = (fileobj.instance_of?(String)) ? fileobj : fileobj.name
     newfile = file + backup
 
     remove_backup(newfile)
@@ -53,7 +53,7 @@ module Puppet::Util::Backups
   end
 
   def remove_backup(newfile)
-    if self.class.name == :file and self[:links] != :follow
+    if self.instance_of?(Puppet::Type::File) and self[:links] != :follow
       method = :lstat
     else
       method = :stat

data/lib/puppet/util/checksums.rb

@@ -168,7 +168,7 @@ module Puppet::Util::Checksums
     require_relative '../../puppet/ssl/openssl_loader'
 
     digest = OpenSSL::Digest.new('SHA224')
-    checksum_file(digest, filename,  lite)
+    checksum_file(digest, filename, lite)
   end
 
   def sha224_stream(lite = false, &block)

data/lib/puppet/util/classgen.rb

@@ -199,7 +199,7 @@ module Puppet::Util::ClassGen
   def storeclass(klass, klassname, options)
     hash = options[:hash]
     if hash
-      if hash.include? klassname and ! options[:overwrite]
+      if hash.include? klassname and !options[:overwrite]
         raise Puppet::SubclassAlreadyDefined,
               _("Already a generated class named %{klassname}") % { klassname: klassname }
       end
@@ -212,7 +212,7 @@ module Puppet::Util::ClassGen
     if array
       if (klass.respond_to? :name and
               array.find { |c| c.name == klassname } and
-              ! options[:overwrite])
+              !options[:overwrite])
         raise Puppet::SubclassAlreadyDefined,
               _("Already a generated class named %{klassname}") % { klassname: klassname }
       end
@@ -221,4 +221,3 @@ module Puppet::Util::ClassGen
     end
   end
 end
-

data/lib/puppet/util/colors.rb

@@ -3,37 +3,37 @@
 require_relative '../../puppet/util/platform'
 
 module Puppet::Util::Colors
-  BLACK       = {:console => "\e[0;30m", :html => "color: #FFA0A0"     }
-  RED         = {:console => "\e[0;31m", :html => "color: #FFA0A0"     }
-  GREEN       = {:console => "\e[0;32m", :html => "color: #00CD00"     }
-  YELLOW      = {:console => "\e[0;33m", :html => "color: #FFFF60"     }
-  BLUE        = {:console => "\e[0;34m", :html => "color: #80A0FF"     }
-  MAGENTA     = {:console => "\e[0;35m", :html => "color: #FFA500"     }
-  CYAN        = {:console => "\e[0;36m", :html => "color: #40FFFF"     }
-  WHITE       = {:console => "\e[0;37m", :html => "color: #FFFFFF"     }
-  HBLACK      = {:console => "\e[1;30m", :html => "color: #FFA0A0"     }
-  HRED        = {:console => "\e[1;31m", :html => "color: #FFA0A0"     }
-  HGREEN      = {:console => "\e[1;32m", :html => "color: #00CD00"     }
-  HYELLOW     = {:console => "\e[1;33m", :html => "color: #FFFF60"     }
-  HBLUE       = {:console => "\e[1;34m", :html => "color: #80A0FF"     }
-  HMAGENTA    = {:console => "\e[1;35m", :html => "color: #FFA500"     }
-  HCYAN       = {:console => "\e[1;36m", :html => "color: #40FFFF"     }
-  HWHITE      = {:console => "\e[1;37m", :html => "color: #FFFFFF"     }
-  BG_RED      = {:console => "\e[0;41m", :html => "background: #FFA0A0"}
-  BG_GREEN    = {:console => "\e[0;42m", :html => "background: #00CD00"}
-  BG_YELLOW   = {:console => "\e[0;43m", :html => "background: #FFFF60"}
-  BG_BLUE     = {:console => "\e[0;44m", :html => "background: #80A0FF"}
-  BG_MAGENTA  = {:console => "\e[0;45m", :html => "background: #FFA500"}
-  BG_CYAN     = {:console => "\e[0;46m", :html => "background: #40FFFF"}
-  BG_WHITE    = {:console => "\e[0;47m", :html => "background: #FFFFFF"}
-  BG_HRED     = {:console => "\e[1;41m", :html => "background: #FFA0A0"}
-  BG_HGREEN   = {:console => "\e[1;42m", :html => "background: #00CD00"}
-  BG_HYELLOW  = {:console => "\e[1;43m", :html => "background: #FFFF60"}
-  BG_HBLUE    = {:console => "\e[1;44m", :html => "background: #80A0FF"}
-  BG_HMAGENTA = {:console => "\e[1;45m", :html => "background: #FFA500"}
-  BG_HCYAN    = {:console => "\e[1;46m", :html => "background: #40FFFF"}
-  BG_HWHITE   = {:console => "\e[1;47m", :html => "background: #FFFFFF"}
-  RESET       = {:console => "\e[0m",    :html => ""                   }
+  BLACK       = { :console => "\e[0;30m", :html => "color: #FFA0A0"     }
+  RED         = { :console => "\e[0;31m", :html => "color: #FFA0A0"     }
+  GREEN       = { :console => "\e[0;32m", :html => "color: #00CD00"     }
+  YELLOW      = { :console => "\e[0;33m", :html => "color: #FFFF60"     }
+  BLUE        = { :console => "\e[0;34m", :html => "color: #80A0FF"     }
+  MAGENTA     = { :console => "\e[0;35m", :html => "color: #FFA500"     }
+  CYAN        = { :console => "\e[0;36m", :html => "color: #40FFFF"     }
+  WHITE       = { :console => "\e[0;37m", :html => "color: #FFFFFF"     }
+  HBLACK      = { :console => "\e[1;30m", :html => "color: #FFA0A0"     }
+  HRED        = { :console => "\e[1;31m", :html => "color: #FFA0A0"     }
+  HGREEN      = { :console => "\e[1;32m", :html => "color: #00CD00"     }
+  HYELLOW     = { :console => "\e[1;33m", :html => "color: #FFFF60"     }
+  HBLUE       = { :console => "\e[1;34m", :html => "color: #80A0FF"     }
+  HMAGENTA    = { :console => "\e[1;35m", :html => "color: #FFA500"     }
+  HCYAN       = { :console => "\e[1;36m", :html => "color: #40FFFF"     }
+  HWHITE      = { :console => "\e[1;37m", :html => "color: #FFFFFF"     }
+  BG_RED      = { :console => "\e[0;41m", :html => "background: #FFA0A0" }
+  BG_GREEN    = { :console => "\e[0;42m", :html => "background: #00CD00" }
+  BG_YELLOW   = { :console => "\e[0;43m", :html => "background: #FFFF60" }
+  BG_BLUE     = { :console => "\e[0;44m", :html => "background: #80A0FF" }
+  BG_MAGENTA  = { :console => "\e[0;45m", :html => "background: #FFA500" }
+  BG_CYAN     = { :console => "\e[0;46m", :html => "background: #40FFFF" }
+  BG_WHITE    = { :console => "\e[0;47m", :html => "background: #FFFFFF" }
+  BG_HRED     = { :console => "\e[1;41m", :html => "background: #FFA0A0" }
+  BG_HGREEN   = { :console => "\e[1;42m", :html => "background: #00CD00" }
+  BG_HYELLOW  = { :console => "\e[1;43m", :html => "background: #FFFF60" }
+  BG_HBLUE    = { :console => "\e[1;44m", :html => "background: #80A0FF" }
+  BG_HMAGENTA = { :console => "\e[1;45m", :html => "background: #FFA500" }
+  BG_HCYAN    = { :console => "\e[1;46m", :html => "background: #40FFFF" }
+  BG_HWHITE   = { :console => "\e[1;47m", :html => "background: #FFFFFF" }
+  RESET       = { :console => "\e[0m",    :html => "" }
 
   Colormap = {
     :debug => WHITE,
@@ -91,8 +91,8 @@ module Puppet::Util::Colors
 
   def console_color(color, str)
     Colormap[color][:console] +
-    str.gsub(RESET[:console], Colormap[color][:console]) +
-    RESET[:console]
+      str.gsub(RESET[:console], Colormap[color][:console]) +
+      RESET[:console]
   end
 
   def html_color(color, str)

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

@@ -40,9 +40,10 @@ module Puppet
 
         def on(*args, &block)
           # The 2nd element is an optional "short" representation.
-          if args.length == 3
+          case args.length
+          when 3
             long, desc, type = args
-          elsif args.length == 4
+          when 4
             long, short, desc, type = args
           else
             raise ArgumentError, _("this method only takes 3 or 4 arguments. Given: %{args}") % { args: args.inspect }
@@ -69,7 +70,7 @@ module Puppet
         end
 
         def parse(*args)
-          args = args[0] if args.size == 1 and Array === args[0]
+          args = args[0] if args.size == 1 and args[0].is_a?(Array)
           args_copy = args.dup
           begin
             @parser.parse args_copy
@@ -79,7 +80,7 @@ module Puppet
         end
 
         def pass_only_last_value_on_to(block)
-          lambda { |values| block.call(values.is_a?(Array) ? values.last : values) }
+          ->(values) { block.call(values.is_a?(Array) ? values.last : values) }
         end
         private :pass_only_last_value_on_to
       end