Merge pull request #9222 from mhashizume/maint/main/rubocop-update

Update Rubocop

Author: joshcooper

.rubocop.yml

@@ -7,7 +7,7 @@ require:
   - rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 3.1
   Include:
     - 'lib/**/*.rb'
     - 'ext/**/*.rb'

.rubocop_todo.yml

@@ -22,6 +22,15 @@ I18n/GetText/DecorateStringFormattingUsingPercent:
 I18n/RailsI18n/DecorateString:
   Enabled: false
 
+Lint/AmbiguousAssignment: # new in 1.7
+  Enabled: false
+
+Lint/AmbiguousOperatorPrecedence: # new in 1.21
+  Enabled: false
+
+Lint/AmbiguousRange: # new in 1.19
+  Enabled: false
+
 # Configuration parameters: AllowedMethods.
 # AllowedMethods: enums
 Lint/ConstantDefinitionInBlock:
@@ -42,9 +51,51 @@ Lint/ConstantDefinitionInBlock:
     - 'lib/puppet/type/schedule.rb'
     - 'lib/puppet/type/tidy.rb'
 
+Lint/ConstantOverwrittenInRescue: # new in 1.31
+  Enabled: false
+
+Lint/DeprecatedConstants: # new in 1.8
+  Enabled: false
+
+Lint/DuplicateBranch: # new in 1.3
+  Enabled: false
+
+Lint/DuplicateMagicComment: # new in 1.37
+  Enabled: false
+
+Lint/DuplicateMatchPattern: # new in 1.50
+  Enabled: false
+
+Lint/DuplicateRegexpCharacterClassElement: # new in 1.1
+  Enabled: false
+
+Lint/EmptyBlock: # new in 1.1
+  Enabled: false
+
+Lint/EmptyClass: # new in 1.3
+  Enabled: false
+
+Lint/EmptyInPattern: # new in 1.16
+  Enabled: false
+
+Lint/IncompatibleIoSelectWithFiberScheduler: # new in 1.21
+  Enabled: false
+
+Lint/ItWithoutArgumentsInBlock: # new in 1.59
+  Enabled: false
+
+Lint/LambdaWithoutLiteralBlock: # new in 1.8
+  Enabled: false
+
+Lint/LiteralAssignmentInCondition: # new in 1.58
+  Enabled: false
+
 Lint/MissingSuper:
   Enabled: false
 
+Lint/MixedCaseRange: # new in 1.53
+  Enabled: false
+
 Lint/NestedMethodDefinition:
   Exclude:
     - 'lib/puppet/pops/types/p_binary_type.rb'
@@ -59,6 +110,33 @@ Lint/NestedMethodDefinition:
     - 'lib/puppet/pops/types/types.rb'
     - 'lib/puppet/type.rb'
 
+Lint/NonAtomicFileOperation: # new in 1.31
+  Enabled: false
+
+Lint/NoReturnInBeginEndBlocks: # new in 1.2
+  Enabled: false
+
+Lint/NumberedParameterAssignment: # new in 1.9
+  Enabled: false
+
+Lint/OrAssignmentToConstant: # new in 1.9
+  Enabled: false
+
+Lint/RedundantDirGlobSort: # new in 1.8
+  Enabled: false
+
+Lint/RedundantRegexpQuantifiers: # new in 1.53
+  Enabled: false
+
+Lint/RefinementImportMethods: # new in 1.27
+  Enabled: false
+
+Lint/RequireRangeParentheses: # new in 1.32
+  Enabled: false
+
+Lint/RequireRelativeSelfPath: # new in 1.22
+  Enabled: false
+
 Lint/RescueException:
   Exclude:
     - 'ext/windows/service/daemon.rb'
@@ -88,18 +166,39 @@ Lint/SuppressedException:
     - 'lib/puppet/util/execution.rb'
     - 'util/rspec_grouper'
 
+Lint/SymbolConversion: # new in 1.9
+  Enabled: false
+
+Lint/ToEnumArguments: # new in 1.1
+  Enabled: false
+
 # This cop supports safe auto-correction (--auto-correct).
 Lint/ToJSON:
   Exclude:
     - 'lib/puppet/module_tool/metadata.rb'
     - 'lib/puppet/network/http/error.rb'
     - 'lib/puppet/pops/serialization/json.rb'
 
+Lint/TripleQuotes: # new in 1.9
+  Enabled: false
+
+Lint/UnexpectedBlockArity: # new in 1.5
+  Enabled: false
+
+Lint/UnmodifiedReduceAccumulator: # new in 1.1
+  Enabled: false
+
 # This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods.
 Lint/UnusedMethodArgument:
   Enabled: false
 
+Lint/UselessRescue: # new in 1.43
+  Enabled: false
+
+Lint/UselessRuby2Keywords: # new in 1.23
+  Enabled: false
+
 Performance/BlockGivenWithExplicitBlock: # new in 1.9
   Enabled: false
 

Gemfile

@@ -47,11 +47,11 @@ group(:test) do
   gem 'webrick', '~> 1.7', require: false
   gem 'yard', require: false
 
-  gem 'rubocop', '1.28.0', require: false, platforms: [:ruby]
+  gem 'rubocop', '~> 1.0', require: false, platforms: [:ruby]
   gem 'rubocop-i18n', '~> 3.0', require: false, platforms: [:ruby]
-  gem 'rubocop-performance', '1.13.3', require: false, platforms: [:ruby]
-  gem 'rubocop-rake', '0.6.0', require: false, platforms: [:ruby]
-  gem 'rubocop-rspec', '2.10.0', require: false, platforms: [:ruby]
+  gem 'rubocop-performance', '~> 1.0', require: false, platforms: [:ruby]
+  gem 'rubocop-rake', '~> 0.6', require: false, platforms: [:ruby]
+  gem 'rubocop-rspec', '~> 2.0', require: false, platforms: [:ruby]
 end
 
 group(:development, optional: true) do

lib/puppet/application/agent.rb

@@ -410,6 +410,7 @@ def log_config
     end
   end
 
+  # rubocop:disable Lint/RedundantStringCoercion
   def fingerprint
     Puppet::Util::Log.newdestination(:console)
     cert_provider = Puppet::X509::CertProvider.new
@@ -429,6 +430,7 @@ def fingerprint
     Puppet.log_exception(e, _("Failed to generate fingerprint: %{message}") % { message: e.message })
     exit(1)
   end
+  # rubocop:enable Lint/RedundantStringCoercion
 
   def onetime(daemon)
     begin

lib/puppet/application/face_base.rb

@@ -3,7 +3,6 @@
 require_relative '../../puppet/application'
 require_relative '../../puppet/face'
 require 'optparse'
-require 'pp'
 
 class Puppet::Application::FaceBase < Puppet::Application
   option("--debug", "-d") do |_arg|

lib/puppet/application/filebucket.rb

@@ -13,7 +13,7 @@ class Puppet::Application::Filebucket < Puppet::Application
   option("--remote", "-r")
   option("--verbose", "-v")
 
-  attr :args
+  attr_reader :args
 
   def summary
     _("Store and retrieve files in a filebucket")

lib/puppet/file_bucket/file.rb

@@ -13,7 +13,7 @@ class Puppet::FileBucket::File
   extend Puppet::Indirector
   indirects :file_bucket_file, :terminus_class => :selector
 
-  attr :bucket_path
+  attr_reader :bucket_path
 
   def self.supported_formats
     [:binary]

lib/puppet/functions/getvar.rb

@@ -69,7 +69,7 @@ def get_from_navigation(scope, navigation, default_value = nil, &block)
     matches = navigation.match(/^((::)?(\w+::)*\w+)(.*)\z/)
     navigation = matches[4]
     if navigation[0] == '.'
-      navigation = navigation[1..-1]
+      navigation = navigation[1..]
     else
       unless navigation.empty?
         raise ArgumentError, _("First character after var name in get string must be a '.' - got %{char}") % { char: navigation[0] }

lib/puppet/metatype/manager.rb

@@ -28,7 +28,7 @@ def allclear
   #
   def clear_misses
     unless @types.nil?
-      @types.delete_if { |_, v| v.nil? }
+      @types.compact
     end
   end
 

lib/puppet/module_tool/errors/shared.rb

@@ -106,15 +106,15 @@ def initialize(options)
       @requested_module  = options[:requested_module]
       @requested_version = options[:requested_version]
       @conditions        = options[:conditions]
-      @source            = options[:source][1..-1]
+      @source            = options[:source][1..]
 
       super _("'%{module_name}' (%{version}) requested; Invalid dependency cycle") % { module_name: @requested_module, version: v(@requested_version) }
     end
 
     def multiline
       dependency_list = []
       dependency_list << _("You specified '%{name}' (%{version})") % { name: @source.first[:name], version: v(@requested_version) }
-      dependency_list += @source[1..-1].map do |m|
+      dependency_list += @source[1..].map do |m|
         # TRANSLATORS This message repeats as separate lines as a list under the heading "You specified '%{name}' (%{version})\n"
         _("This depends on '%{name}' (%{version})") % { name: m[:name], version: v(m[:version]) }
       end