Merge pull request #9238 from tvpartytonight/PUP-11767_todo_cleanup

(PUP-11767) Rubocop todo cleanup

Author: joshcooper

.rubocop.yml

@@ -226,6 +226,11 @@ Style/ColonMethodCall:
 
 Style/CombinableLoops:
   Enabled: true
+  Exclude:
+    - 'lib/puppet/graph/relationship_graph.rb'
+    - 'lib/puppet/pops/types/ruby_generator.rb'
+    - 'lib/puppet/provider/service/init.rb'
+    - 'lib/puppet/util/rdoc/generators/puppet_generator.rb'
 
 Style/ColonMethodDefinition:
   Enabled: true
@@ -307,6 +312,8 @@ Style/HashEachMethods:
 
 Style/HashLikeCase:
   Enabled: true
+  Exclude:
+    - 'lib/puppet/util/command_line/trollop.rb'
 
 Style/HashTransformKeys:
   Enabled: true

.rubocop_todo.yml

@@ -346,68 +346,24 @@ Style/CaseEquality:
     - 'lib/puppet/interface/face_collection.rb'
     - 'lib/puppet/module_tool/installed_modules.rb'
     - 'lib/puppet/module_tool/shared_behaviors.rb'
-    - 'lib/puppet/provider/package/pip.rb'
-    - 'lib/puppet/provider/package/pkgin.rb'
-    - 'lib/puppet/settings/integer_setting.rb'
     - 'lib/puppet/util/command_line/puppet_option_parser.rb'
     - 'lib/puppet/util/log/destination.rb'
     - 'lib/puppet/util/multi_match.rb'
     - 'lib/puppet/util/rdoc/generators/puppet_generator.rb'
 
-# This cop supports unsafe auto-correction (--auto-correct-all).
-Style/CaseLikeIf:
-  Enabled: false
-
 # This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: nested, compact
 Style/ClassAndModuleChildren:
   Enabled: false
 
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: is_a?, kind_of?
-Style/ClassCheck:
-  Exclude:
-    - 'lib/puppet/error.rb'
-    - 'lib/puppet/functions.rb'
-    - 'lib/puppet/graph/simple_graph.rb'
-    - 'lib/puppet/node/environment.rb'
-    - 'lib/puppet/provider/group/groupadd.rb'
-    - 'lib/puppet/provider/group/windows_adsi.rb'
-    - 'lib/puppet/provider/user/windows_adsi.rb'
-    - 'lib/puppet/settings.rb'
-    - 'lib/puppet/settings/environment_conf.rb'
-    - 'lib/puppet/type.rb'
-    - 'lib/puppet/util/suidmanager.rb'
-    - 'lib/puppet/util/windows/adsi.rb'
-    - 'lib/puppet/util/windows/sid.rb'
-
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: IgnoredMethods.
-# IgnoredMethods: ==, equal?, eql?
-Style/ClassEqualityComparison:
-  Enabled: false
-
-# This cop supports safe auto-correction (--auto-correct).
-Style/ClassMethods:
-  Exclude:
-    - 'lib/puppet/util/rdoc/generators/puppet_generator.rb'
-
 Style/ClassVars:
   Enabled: false
 
 # This cop supports safe auto-correction (--auto-correct).
 Style/ColonMethodCall:
   Enabled: false
 
-Style/CombinableLoops:
-  Exclude:
-    - 'lib/puppet/graph/relationship_graph.rb'
-    - 'lib/puppet/pops/types/ruby_generator.rb'
-    - 'lib/puppet/provider/service/init.rb'
-    - 'lib/puppet/util/rdoc/generators/puppet_generator.rb'
-
 # This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: EnforcedStyle, AllowInnerBackticks.
 # SupportedStyles: backticks, percent_x, mixed
@@ -444,9 +400,6 @@ Style/ConditionalAssignment:
 Style/DateTime:
   Enabled: false
 
-Style/DefWithParentheses:
-  Enabled: false
-
 # Configuration parameters: AllowedConstants.
 Style/Documentation:
   Enabled: false
@@ -469,26 +422,6 @@ Style/DoubleNegation:
     - 'lib/puppet/util/feature.rb'
     - 'lib/puppet/util/windows/adsi.rb'
 
-# This cop supports safe auto-correction (--auto-correct).
-Style/EachWithObject:
-  Enabled: false
-
-# This cop supports safe auto-correction (--auto-correct).
-Style/EmptyBlockParameter:
-  Exclude:
-    - 'lib/puppet/parser/type_loader.rb'
-
-# This cop supports safe auto-correction (--auto-correct).
-Style/EmptyCaseCondition:
-  Exclude:
-    - 'lib/puppet/pops/serialization/serializer.rb'
-    - 'lib/puppet/pops/types/type_calculator.rb'
-    - 'lib/puppet/settings.rb'
-    - 'lib/puppet/settings/duration_setting.rb'
-    - 'lib/puppet/settings/priority_setting.rb'
-    - 'lib/puppet/settings/ttl_setting.rb'
-    - 'lib/puppet/type.rb'
-
 # This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: empty, nil, both
@@ -526,30 +459,10 @@ Style/Encoding:
     - 'lib/puppet/type/package.rb'
     - 'lib/puppet/util/windows/service.rb'
 
-# This cop supports safe auto-correction (--auto-correct).
-Style/EvenOdd:
-  Exclude:
-    - 'lib/puppet/pops/serialization/json.rb'
-    - 'lib/puppet/pops/types/types.rb'
-
-# This cop supports safe auto-correction (--auto-correct).
-Style/ExpandPathArguments:
-  Exclude:
-    - 'lib/puppet/util/libuser.rb'
-
 # This cop supports safe auto-correction (--auto-correct).
 Style/ExplicitBlockArgument:
   Enabled: false
 
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: each, for
-Style/For:
-  Exclude:
-    - 'lib/puppet/file_system/uniquefile.rb'
-    - 'lib/puppet/module_tool/contents_description.rb'
-    - 'lib/puppet/util/rdoc/generators/puppet_generator.rb'
-
 # This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: format, sprintf, percent
@@ -562,6 +475,7 @@ Style/FormatStringToken:
   Enabled: false
 
 # This cop supports safe auto-correction (--auto-correct).
+# Applying the safe auto-correct results in util_spec failures.
 Style/GlobalStdStream:
   Exclude:
     - 'lib/puppet/application/apply.rb'
@@ -583,59 +497,19 @@ Style/GlobalVars:
 Style/GuardClause:
   Enabled: false
 
-# This cop supports unsafe auto-correction (--auto-correct-all).
-# Configuration parameters: AllowedReceivers.
-Style/HashEachMethods:
-  Enabled: false
-
-# Configuration parameters: MinBranchesCount.
-Style/HashLikeCase:
-  Exclude:
-    - 'lib/puppet/util/command_line/trollop.rb'
-
 # This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: EnforcedStyle, EnforcedShorthandSyntax, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
 # SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
 # SupportedShorthandSyntax: always, never, either
 Style/HashSyntax:
   Enabled: false
 
-# This cop supports unsafe auto-correction (--auto-correct-all).
-Style/HashTransformValues:
-  Exclude:
-    - 'lib/puppet/functions/group_by.rb'
-    - 'lib/puppet/parser/scope.rb'
-    - 'lib/puppet/pops/loader/task_instantiator.rb'
-    - 'lib/puppet/pops/types/p_type_set_type.rb'
-    - 'lib/puppet/transaction/report.rb'
-
-# This cop supports safe auto-correction (--auto-correct).
-Style/IdenticalConditionalBranches:
-  Exclude:
-    - 'lib/puppet/functions/filter.rb'
-    - 'lib/puppet/network/http_pool.rb'
-    - 'lib/puppet/node.rb'
-    - 'lib/puppet/parser/resource.rb'
-    - 'lib/puppet/pops/loader/module_loaders.rb'
-    - 'lib/puppet/pops/types/p_type_set_type.rb'
-    - 'lib/puppet/type.rb'
-    - 'lib/puppet/util/feature.rb'
-
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: AllowIfModifier.
-Style/IfInsideElse:
-  Enabled: false
-
 # This cop supports safe auto-correction (--auto-correct).
 Style/IfUnlessModifier:
   Enabled: false
 
 # This cop supports safe auto-correction (--auto-correct).
-Style/IfUnlessModifierOfIfUnless:
-  Exclude:
-    - 'lib/puppet/util/command_line/trollop.rb'
-
-# This cop supports safe auto-correction (--auto-correct).
+# The auto-correct function introduces testing errors in the evaluating_parser_spec
 Style/IfWithSemicolon:
   Exclude:
     - 'lib/puppet/pops/parser/evaluating_parser.rb'
@@ -644,11 +518,6 @@ Style/IfWithSemicolon:
 Style/ImplicitRuntimeError:
   Enabled: false
 
-# This cop supports unsafe auto-correction (--auto-correct-all).
-Style/InfiniteLoop:
-  Exclude:
-    - 'lib/puppet/util/posix.rb'
-
 # This cop supports unsafe auto-correction (--auto-correct-all).
 # Configuration parameters: InverseMethods, InverseBlocks.
 Style/InverseMethods:
@@ -665,38 +534,6 @@ Style/InverseMethods:
     - 'lib/puppet/reference/providers.rb'
     - 'lib/puppet/type/file.rb'
 
-# This cop supports safe auto-correction (--auto-correct).
-Style/KeywordParametersOrder:
-  Exclude:
-    - 'lib/puppet/http/service/file_server.rb'
-
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: line_count_dependent, lambda, literal
-Style/Lambda:
-  Exclude:
-    - 'lib/puppet/defaults.rb'
-    - 'lib/puppet/functions/unique.rb'
-    - 'lib/puppet/graph/relationship_graph.rb'
-    - 'lib/puppet/http/session.rb'
-    - 'lib/puppet/pops/lookup/interpolation.rb'
-    - 'lib/puppet/pops/parser/lexer2.rb'
-    - 'lib/puppet/provider/aix_object.rb'
-    - 'lib/puppet/provider/service/upstart.rb'
-    - 'lib/puppet/transaction.rb'
-    - 'lib/puppet/util/command_line/puppet_option_parser.rb'
-    - 'lib/puppet/util/symbolic_file_mode.rb'
-
-# This cop supports safe auto-correction (--auto-correct).
-Style/LineEndConcatenation:
-  Exclude:
-    - 'lib/puppet/functions.rb'
-    - 'lib/puppet/module.rb'
-    - 'lib/puppet/network/http/api.rb'
-    - 'lib/puppet/provider/user/directoryservice.rb'
-    - 'lib/puppet/util/windows/file.rb'
-    - 'lib/puppet/util/windows/process.rb'
-
 # This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: IgnoredMethods.
 Style/MethodCallWithoutArgsParentheses:

lib/puppet/defaults.rb

@@ -467,7 +467,7 @@ def self.initialize_default_settings!(settings)
         EOT
     },
     :diff_args => {
-        :default  => lambda { default_diffargs },
+        :default  => -> { default_diffargs },
         :desc     => "Which arguments to pass to the diff command when printing differences between
           files. The command to use can be chosen with the `diff` setting.",
     },
@@ -818,7 +818,7 @@ def self.initialize_default_settings!(settings)
     # We have to downcase the fqdn, because the current ssl stuff (as opposed to in master) doesn't have good facilities for
     # manipulating naming.
     :certname => {
-      :default => lambda { Puppet::Settings.default_certname.downcase },
+      :default => -> { Puppet::Settings.default_certname.downcase },
       :desc => "The name to use when handling certificates. When a node
         requests a certificate from the CA Puppet Server, it uses the value of the
         `certname` setting as its requested Subject CN.
@@ -1086,15 +1086,15 @@ def self.initialize_default_settings!(settings)
                    Default is `prime256v1`."
     },
     :digest_algorithm => {
-        :default  => lambda { default_digest_algorithm },
+        :default  => -> { default_digest_algorithm },
         :type     => :enum,
         :values   => valid_digest_algorithms,
         :desc     => "Which digest algorithm to use for file resources and the filebucket.
                       Valid values are #{valid_digest_algorithms.join(', ')}. Default is
                       #{default_digest_algorithm}.",
     },
     :supported_checksum_types => {
-      :default => lambda { default_file_checksum_types },
+      :default => -> { default_file_checksum_types },
       :type    => :array,
       :desc    => "Checksum types supported by this agent for use in file resources of a
                    static catalog. Values must be comma-separated. Valid types are
@@ -1129,7 +1129,7 @@ def self.initialize_default_settings!(settings)
       :desc    => "The name to use the Certificate Authority certificate.",
     },
     :cadir => {
-      :default => lambda { default_cadir },
+      :default => -> { default_cadir },
       :type => :directory,
       :desc => "The root directory for the certificate authority.",
     },
@@ -1419,7 +1419,7 @@ def self.initialize_default_settings!(settings)
       :desc       => "File that provides mapping between custom SSL oids and user-friendly names"
     },
     :basemodulepath => {
-      :default => lambda { default_basemodulepath },
+      :default => -> { default_basemodulepath },
       :type => :path,
       :desc => "The search path for **global** modules. Should be specified as a
         list of directories separated by the system path separator character. (The
@@ -1431,7 +1431,7 @@ def self.initialize_default_settings!(settings)
         <https://puppet.com/docs/puppet/latest/environments_about.html>",
     },
     :vendormoduledir => {
-      :default => lambda { default_vendormoduledir },
+      :default => -> { default_vendormoduledir },
       :type => :string,
       :desc => "The directory containing **vendored** modules. These modules will
       be used by _all_ environments like those in the `basemodulepath`. The only
@@ -1666,7 +1666,7 @@ def self.initialize_default_settings!(settings)
       :desc       => "Whether the server will search for SRV records in DNS for the current domain.",
     },
     :srv_domain => {
-      :default    => lambda { Puppet::Settings.domain_fact },
+      :default    => -> { Puppet::Settings.domain_fact },
       :desc       => "The domain which will be queried to find the SRV records of servers to use.",
     },
     :http_extra_headers => {

lib/puppet/error.rb

@@ -21,7 +21,7 @@ module ExternalFileError
     # 4 args including the position on the line.
     #
     def initialize(message, file = nil, line = nil, pos = nil, original = nil)
-      if pos.kind_of? Exception
+      if pos.is_a? Exception
         original = pos
         pos = nil
       end

lib/puppet/file_system/uniquefile.rb

@@ -153,7 +153,7 @@ def try_convert_to_hash(h)
 
   def tmpdir
     tmp = '.'
-    for dir in [ENV.fetch('TMPDIR', nil), ENV.fetch('TMP', nil), ENV.fetch('TEMP', nil), @@systmpdir, '/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