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

lib/puppet/network/http/api/indirected_routes.rb

@@ -57,7 +57,7 @@ def call(request, response)
 
   def uri2indirection(http_method, uri, params)
     # the first field is always nil because of the leading slash,
-    indirection_type, version, indirection_name, key = uri.split("/", 5)[1..-1]
+    indirection_type, version, indirection_name, key = uri.split("/", 5)[1..]
     url_prefix = "/#{indirection_type}/#{version}"
     environment = params.delete(:environment)
 

lib/puppet/network/http/connection.rb

@@ -266,7 +266,7 @@ def to_url(path)
 
   def normalize_path(path)
     if path[0] == '/'
-      path[1..-1]
+      path[1..]
     else
       path
     end

lib/puppet/parser/functions/sprintf.rb

@@ -45,7 +45,7 @@
   This statement produces a notice of `value is : 42`."
 ) do |args|
   fmt = args[0]
-  args = args[1..-1]
+  args = args[1..]
   begin
     return sprintf(fmt, *args)
   rescue KeyError => e

lib/puppet/parser/scope.rb

@@ -496,7 +496,7 @@ def lookupvar(name, options = EMPTY_HASH)
     # If name has '::' in it, it is resolved as a qualified variable
     unless (idx = name.index('::')).nil?
       # Always drop leading '::' if present as that is how the values are keyed.
-      return lookup_qualified_variable(idx == 0 ? name[2..-1] : name, options)
+      return lookup_qualified_variable(idx == 0 ? name[2..] : name, options)
     end
 
     # At this point, search is for a non qualified (simple) name
@@ -609,7 +609,7 @@ def lookup_qualified_variable(fqn, options)
     # not found - search inherited scope for class
     leaf_index = fqn.rindex('::')
     unless leaf_index.nil?
-      leaf_name = fqn[(leaf_index + 2)..-1]
+      leaf_name = fqn[(leaf_index + 2)..]
       class_name = fqn[0, leaf_index]
       begin
         qs = qualified_scope(class_name)
@@ -898,9 +898,9 @@ def to_s
     # check module paths first since they may be in the environment (i.e. they are longer)
     module_path = environment.full_modulepath.detect { |m_path| path.start_with?(m_path) }
     if module_path
-      path = "<module>" + path[module_path.length..-1]
+      path = "<module>" + path[module_path.length..]
     elsif env_path && path && path.start_with?(env_path)
-      path = "<env>" + path[env_path.length..-1]
+      path = "<env>" + path[env_path.length..]
     end
     # Make the output appear as "Scope(path, line)"
     "Scope(#{[path, detail[1]].join(', ')})"

lib/puppet/pops/evaluator/access_operator.rb

@@ -703,7 +703,7 @@ def access_PClassType(o, scope, keys)
 
         name = c.downcase
         # Remove leading '::' since all references are global, and 3x runtime does the wrong thing
-        name = name[2..-1] if name[0, 2] == NS
+        name = name[2..] if name[0, 2] == NS
 
         fail(Issues::ILLEGAL_NAME, @semantic.keys[i], { :name => c }) unless name =~ Patterns::NAME
 

lib/puppet/pops/evaluator/closure.rb

@@ -266,7 +266,7 @@ def combine_values_with_parameters(scope, args)
             given_argument = args[index]
             if param_captures
               # get excess arguments
-              value = args[(parameter_count - 1)..-1]
+              value = args[(parameter_count - 1)..]
               # If the input was a single nil, or undef, and there is a default, use the default
               # This supports :undef in case it was used in a 3x data structure and it is passed as an arg
               #

lib/puppet/pops/evaluator/deferred_resolver.rb

@@ -161,7 +161,7 @@ def resolve_future(f)
     mapped_arguments = map_arguments(f.arguments)
     # if name starts with $ then this is a call to dig
     if func_name[0] == DOLLAR
-      var_name = func_name[1..-1]
+      var_name = func_name[1..]
       func_name = DIG
       mapped_arguments.insert(0, @scope[var_name])
     end

lib/puppet/pops/evaluator/epp_evaluator.rb

@@ -86,7 +86,7 @@ def self.evaluate(parser, func_name, scope, use_global_scope_only, parse_result,
     filtered_args = {}
     template_args.each_pair do |k, v|
       if k =~ /::/
-        k = k[2..-1] if k.start_with?('::')
+        k = k[2..] if k.start_with?('::')
         scope[k] = v
       else
         filtered_args[k] = v

lib/puppet/pops/functions/dispatch.rb

@@ -95,7 +95,7 @@ def weave(scope, args)
           # parameter values in the received
           if knit < 0
             idx = -knit - 1
-            new_args += args[idx..-1] if idx < args.size
+            new_args += args[idx..] if idx < args.size
           else
             new_args << args[knit] if knit < args.size
           end

lib/puppet/pops/loader/loader_paths.rb

@@ -147,7 +147,7 @@ def effective_path(typed_name, start_index_in_name)
       if start_index_in_name > 0
         return nil if start_index_in_name >= parts.size
 
-        parts = parts[start_index_in_name..-1]
+        parts = parts[start_index_in_name..]
       end
       "#{File.join(generic_path, parts)}#{extension}"
     end
@@ -371,7 +371,7 @@ def effective_path(typed_name, start_index_in_name)
       if start_index_in_name > 0
         return nil if start_index_in_name >= parts.size
 
-        parts = parts[start_index_in_name..-1]
+        parts = parts[start_index_in_name..]
       end
       basename = File.join(generic_path, parts)
       @extensions.map { |ext| "#{basename}#{ext}" }

lib/puppet/pops/loader/typed_name.rb

@@ -21,7 +21,7 @@ def initialize(type, name, name_authority = Pcore::RUNTIME_NAME_AUTHORITY)
     parts = name.to_s.split(DOUBLE_COLON)
     if parts[0].empty?
       parts.shift
-      @name = name[2..-1]
+      @name = name[2..]
     else
       @name = name
     end

lib/puppet/pops/lookup/lookup_adapter.rb

@@ -111,7 +111,7 @@ def convert_result(key, lookup_options, lookup_invocation, the_lookup)
       end
     end
     begin
-      result = lookup_invocation.scope.call_function(NEW, [convert_to[0], result, *convert_to[1..-1]])
+      result = lookup_invocation.scope.call_function(NEW, [convert_to[0], result, *convert_to[1..]])
       # TRANSLATORS 'lookup_options', 'convert_to' and args_string variable should not be translated,
       args_string = Puppet::Pops::Types::StringConverter.singleton.convert(convert_to)
       lookup_invocation.report_text { _("Applying convert_to lookup_option with arguments %{args}") % { args: args_string } }

lib/puppet/pops/parser/lexer2.rb

@@ -458,7 +458,7 @@ def initialize
         before = scn.pos
         value = scn.scan(PATTERN_DOLLAR_VAR)
         if value
-          emit_completed([:VARIABLE, value[1..-1].freeze, scn.pos - before], before)
+          emit_completed([:VARIABLE, value[1..].freeze, scn.pos - before], before)
         else
           # consume the $ and let higher layer complain about the error instead of getting a syntax error
           emit(TOKEN_VARIABLE_EMPTY, before)