Update Rubocop to latest and address lints.

Author: petergoldstein

.rubocop.yml

@@ -12,10 +12,15 @@ AllCops:
     - 'tmp/**/*'
     - 'spec/integration/**/*'
   NewCops: enable
+  TargetRubyVersion: 2.7
 
 Lint/FormatParameterMismatch:
   Enabled: false
 
 Metrics/BlockLength:
   Exclude:
     - 'spec/**/*.rb'
+
+Metrics/ClassLength:
+  Exclude:
+    - 'lib/annotate/annotate_models.rb'

Gemfile

@@ -18,9 +18,9 @@ group :development, :test do
   gem 'guard-rspec', require: false
   gem 'rspec', require: false
 
-  gem 'rubocop', '~> 1.48.0', require: false
+  gem 'rubocop', '~> 1.59.0', require: false
   gem 'rubocop-rake', require: false
-  gem 'rubocop-rspec', '~> 2.19.0', require: false
+  gem 'rubocop-rspec', '~> 2.25.0', require: false
   gem 'simplecov', require: false
   gem 'terminal-notifier-guard', require: false
 

lib/annotate/annotate_models.rb

@@ -39,7 +39,7 @@ module AnnotateModels
     }
   }.freeze
 
-  MAGIC_COMMENT_MATCHER = Regexp.new(/(^#\s*encoding:.*(?:\n|r\n))|(^# coding:.*(?:\n|\r\n))|(^# -\*- coding:.*(?:\n|\r\n))|(^# -\*- encoding\s?:.*(?:\n|\r\n))|(^#\s*frozen_string_literal:.+(?:\n|\r\n))|(^# -\*- frozen_string_literal\s*:.+-\*-(?:\n|\r\n))/).freeze
+  MAGIC_COMMENT_MATCHER = /(^#\s*encoding:.*(?:\n|r\n))|(^# coding:.*(?:\n|\r\n))|(^# -\*- coding:.*(?:\n|\r\n))|(^# -\*- encoding\s?:.*(?:\n|\r\n))|(^#\s*frozen_string_literal:.+(?:\n|\r\n))|(^# -\*- frozen_string_literal\s*:.+-\*-(?:\n|\r\n))/.freeze
 
   class << self
     def annotate_pattern(options = {})
@@ -156,7 +156,7 @@ def get_schema_info(klass, header, options = {}) # rubocop:disable Metrics/Metho
 
       # Precalculate Values
       cols_meta = cols.to_h do |col|
-        col_comment = with_comments || with_comments_column ? col.comment&.gsub(/\n/, "\\n") : nil
+        col_comment = with_comments || with_comments_column ? col.comment&.gsub("\n", "\\n") : nil
         col_type = get_col_type(col)
         attrs = get_attributes(col, col_type, klass, options)
         col_name = if with_comments && col_comment
@@ -694,7 +694,7 @@ def parse_options(options = {})
     end
 
     def split_model_dir(option_value)
-      option_value = option_value.is_a?(Array) ? option_value : option_value.split(',')
+      option_value = option_value.split(',') unless option_value.is_a?(Array)
       option_value.map(&:strip).reject(&:empty?)
     end
 

lib/annotate/annotate_routes.rb

@@ -18,8 +18,8 @@
 # Released under the same license as Ruby. No Support. No Warranty.
 #
 
-require_relative './annotate_routes/helpers'
-require_relative './annotate_routes/header_generator'
+require_relative 'annotate_routes/helpers'
+require_relative 'annotate_routes/header_generator'
 
 module AnnotateRoutes
   class << self
@@ -95,7 +95,7 @@ def rewrite_contents(existing_text, new_text, frozen)
     def annotate_routes(header, content, header_position, options = {})
       magic_comments_map, content = Helpers.extract_magic_comments_from_array(content)
       if %w(before top).include?(options[:position_in_routes])
-        header = header << '' if content.first != ''
+        header <<= '' if content.first != ''
         magic_comments_map << '' if magic_comments_map.any?
         new_content = magic_comments_map + header + content
       else

lib/annotate/annotate_routes/header_generator.rb

@@ -1,4 +1,4 @@
-require_relative './helpers'
+require_relative 'helpers'
 
 module AnnotateRoutes
   class HeaderGenerator
@@ -16,7 +16,7 @@ def generate(options = {})
       private
 
       def routes_map(options)
-        result = `rake routes`.chomp("\n").split(/\n/, -1)
+        result = `rake routes`.chomp("\n").split("\n", -1)
 
         # In old versions of Rake, the first line of output was the cwd.  Not so
         # much in newer ones.  We ditch that line if it exists, and if not, we

lib/annotate/annotate_routes/helpers.rb

@@ -1,6 +1,6 @@
 module AnnotateRoutes
   module Helpers
-    MAGIC_COMMENT_MATCHER = Regexp.new(/(^#\s*encoding:.*)|(^# coding:.*)|(^# -\*- coding:.*)|(^# -\*- encoding\s?:.*)|(^#\s*frozen_string_literal:.+)|(^# -\*- frozen_string_literal\s*:.+-\*-)/).freeze
+    MAGIC_COMMENT_MATCHER = /(^#\s*encoding:.*)|(^# coding:.*)|(^# -\*- coding:.*)|(^# -\*- encoding\s?:.*)|(^#\s*frozen_string_literal:.+)|(^# -\*- frozen_string_literal\s*:.+-\*-)/.freeze
 
     class << self
       # TODO: write the method doc using ruby rdoc formats
@@ -15,7 +15,7 @@ def strip_annotations(content)
         mode = :content
         header_position = 0
 
-        content.split(/\n/, -1).each_with_index do |line, line_number|
+        content.split("\n", -1).each_with_index do |line, line_number|
           if mode == :header && line !~ /\s*#/
             mode = :content
             real_content << line unless line.blank?

spec/lib/annotate/helpers_spec.rb

@@ -102,20 +102,20 @@
 
   describe '.fallback' do
     subject { described_class.fallback(*args) }
-    let(:args) { [arg_1, arg_2] }
+    let(:args) { [first_arg, second_arg] }
 
-    let(:arg_1) { '' } # is considered blank
-    let(:arg_2) { 'yes' }
+    let(:first_arg) { '' } # is considered blank
+    let(:second_arg) { 'yes' }
 
     it 'returns the first non-blank argument' do
-      is_expected.to eq(arg_2)
+      is_expected.to eq(second_arg)
     end
 
     context 'when the first argument is non-blank' do
-      let(:arg_1) { 'yes' }
-      let(:arg_2) { 'no' }
+      let(:first_arg) { 'yes' }
+      let(:second_arg) { 'no' }
 
-      it { is_expected.to eq(arg_1) }
+      it { is_expected.to eq(first_arg) }
     end
   end