rubocop-gusto 10.1.0 → 10.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53a74cd600bf2446b894971dad3e18c55cf1f3c76485c3a5b4f00c65d672f658
-  data.tar.gz: a39f3b4113a0ac8f9ab0abb1d4d1b8ca77f540f620873db86e533bc465221bf5
+  metadata.gz: ad5b8322bb818e1f765532f2757ae7bcce5bf7275ef22ced8700f87883715972
+  data.tar.gz: aff19b02288f2b23afb2df259a2a63b441189527d9d91f2e115ab75c7a2f1746
 SHA512:
-  metadata.gz: 6b23cefe43c61ff7af9988fd5e0eeb7e63fadf62ee961e77edd65a132a3ccbb7c92541ff3206b1e217128d8676933bf37c650c3d6abb8416742828125e4c62a3
-  data.tar.gz: 04c1cb8f540994333c88372160840f00d4b51bbd9bfa093238ef65edcab9f15837496729c4621e7930c57e2312af61749642c0d4c4cf0d11f88eae4c59174538
+  metadata.gz: ed0bc51d62ead56c64464e36bd9142d6600d2a05430fc78c0510b50d577ccdb10d376de287079bec788abca083e40804eb59e6056f45743b9f8ac80576df7067
+  data.tar.gz: 39af6427e9a5b54b167c26679c314272c26c178b645bcb141b373da48c6829ee1d61d515518398bdf64b9279e8f005ba618674cda144fd80d873988198c2066e

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 ## Pending
 
+## 10.2.0
+
+- Fix Sorbet sigil exclusions, exclude specs from strict, and add rubocop-sorbet dependency
+- Add ActiveSupportExtensionsEnabled to rails config
+- Fix infinite loop and splitting problem in init command
+- Use default Style/InverseMethods configuration
+
+## 10.1.1
+
+- Opt in to Rails/IgnoredColumnsAssignment
+- Revert "Add Gusto/IgnoredColumnAssignment"
+- Update rubocop dependency from 1.79.0 to 1.79.1
+
+## 10.1.0
+
+- Add Gusto/IgnoredColumnAssignment cop
+
 ## 10.0.1
 
 - Require rubocop >= 1.76 to ensure Naming/PredicatePrefix is available.

data/config/default.yml

@@ -2,6 +2,7 @@ plugins:
   - rubocop-rspec
   - rubocop-performance
   - rubocop-rake
+  - rubocop-sorbet
 
 # After you add a rule, sort this file with `bundle exec rubocop-gusto sort config/default.yml`
 
@@ -58,9 +59,6 @@ Gusto/FactoryClassesOrModules:
   Include:
     - 'spec/**/factories/*.rb'
 
-Gusto/IgnoredColumnsAssignment:
-  Description: 'Use `+=` with an array for `ignored_columns` assignment instead of direct assignment.'
-
 Gusto/MinByMaxBy:
   Description: 'Checks for the use of `min` or `max` with a proc. Corrects to `min_by` or `max_by`.'
   Safe: false
@@ -344,9 +342,6 @@ RSpec/DescribedClass:
 
 RSpec/DescribedClassModuleWrapping:
   Enabled: true
-  # TODO: improve this file matching pattern
-  Include:
-    - '**/spec/**/*_spec.rb'
 
 RSpec/ExampleLength:
   Enabled: false
@@ -429,7 +424,6 @@ Rake/ClassDefinitionInTask:
   Enabled: false
 
 Rake/Desc:
-  # TODO: Roll this out.
   Enabled: true
 
 Security/YAMLLoad:
@@ -446,11 +440,7 @@ Sorbet:
 Sorbet/FalseSigil:
   # We want to avoid `typed: ignore` as much as possible, as it breaks LSP tooling.
   Include:
-  - "**/*.{rb,rbi,rake,ru}"
-  Exclude:
-  - bin/**/*
-  - db/**/*.rb
-  - script/**/*
+    - "**/*.{rb,rbi,rake,ru}"
 
 Sorbet/Refinement:
   # Still marked pending upstream, we contributed this and enable it here.
@@ -460,6 +450,13 @@ Sorbet/StrictSigil:
   # Forgot the difference between typed levels? (ignore, false, true, strict, and strong)
   # Check this out: https://sorbet.org/docs/static#file-level-granularity-strictness-levels
   Enabled: true
+  Include:
+  - "**/*.{rb,rbi,rake,ru}"
+  Exclude:
+  - bin/**/*
+  - db/**/*.rb
+  - script/**/*
+  - spec/**/*spec.rb
 
 Sorbet/ValidSigil:
   Enabled: true
@@ -482,7 +479,6 @@ Style/Alias:
   EnforcedStyle: prefer_alias_method
 
 Style/AsciiComments:
-  # TODO: roll this out fully
   Enabled: true
 
 Style/AutoResourceCleanup:
@@ -545,9 +541,9 @@ Style/FrozenStringLiteralComment:
   EnforcedStyle: always
   Enabled: true
 
+# This can make lines longer and impair readability
 Style/GuardClause:
   Enabled: false
-  MinBodyLength: 4
 
 Style/HashEachMethods:
   Enabled: true
@@ -562,7 +558,7 @@ Style/HashTransformValues:
   Enabled: false
 
 Style/IfInsideElse:
-    Enabled: false
+  Enabled: false
 
 Style/IfUnlessModifier:
   Enabled: false
@@ -570,9 +566,6 @@ Style/IfUnlessModifier:
 Style/ImplicitRuntimeError:
   Enabled: false
 
-Style/InverseMethods:
-  Enabled: false
-
 Style/Lambda:
   EnforcedStyle: literal
 
@@ -755,7 +748,6 @@ Style/SymbolProc:
   Enabled: true
 
 Style/TernaryParentheses:
-  Enabled: false
   EnforcedStyle: require_parentheses_when_complex
 
 Style/TrailingCommaInArguments:

data/config/rails.yml

@@ -7,6 +7,7 @@ plugins:
   - rubocop-rails
 
 AllCops:
+  ActiveSupportExtensionsEnabled: true
   TargetRubyVersion: <%= RbConfig::CONFIG['RUBY_API_VERSION'] %>
   MaxFilesInCache: 100000
   Exclude:
@@ -16,6 +17,9 @@ AllCops:
     - 'db/**/*schema.rb'
     - 'db/seeds{.rb,/**/*}'
 
+Performance/DoubleStartEndWith:
+  IncludeActiveSupportAliases: true
+
 Rails:
   Enabled: true
 
@@ -82,6 +86,9 @@ Rails/HttpPositionalArguments:
     - packs/**/spec/{controllers,fixture_generators}/**/*
     - spec/{controllers,fixture_generators}/**/*
 
+Rails/IgnoredColumnsAssignment:
+  Enabled: true
+
 Rails/InverseOf:
   Include:
     - '**/app/models/**/*'

data/exe/gusto-rubocop

@@ -5,8 +5,8 @@
 # This file is here to conform to our gusto-* convention.
 # rubocop gems have their own naming convention so we're doing both.
 
-$LOAD_PATH.unshift(File.expand_path('../lib', __dir__))
+$LOAD_PATH.unshift(File.expand_path("../lib", __dir__))
 
-require 'rubocop/gusto/cli'
+require "rubocop/gusto/cli"
 
 RuboCop::Gusto::Cli.start(ARGV)

data/exe/rubocop-gusto

@@ -2,8 +2,8 @@
 # frozen_string_literal: true
 # typed: strict
 
-$LOAD_PATH.unshift(File.expand_path('../lib', __dir__))
+$LOAD_PATH.unshift(File.expand_path("../lib", __dir__))
 
-require 'rubocop/gusto/cli'
+require "rubocop/gusto/cli"
 
 RuboCop::Gusto::Cli.start(ARGV)

data/lib/rubocop/cop/gusto/bootsnap_load_file.rb

@@ -9,10 +9,10 @@ module RuboCop
         RESTRICT_ON_SEND = %i(load).freeze
 
         # @!method yaml_or_json_load(node)
-        def_node_matcher :yaml_or_json_load, '(send $(const nil? PROHIBITED_CONSTANTS) :load ...)'
+        def_node_matcher :yaml_or_json_load, "(send $(const nil? PROHIBITED_CONSTANTS) :load ...)"
 
         # @!method file_read(node)
-        def_node_matcher :file_read, '(send (const nil? :File) :read $_)'
+        def_node_matcher :file_read, "(send (const nil? :File) :read $_)"
 
         # @!method load_inside_file_open(node)
         def_node_matcher :load_inside_file_open, <<~PATTERN

data/lib/rubocop/cop/gusto/datadog_constant.rb

@@ -4,8 +4,8 @@ module RuboCop
   module Cop
     module Gusto
       class DatadogConstant < Base
-        MSG = 'Do not call Datadog directly, use an appropriate wrapper library.'
-        NAMESPACE = 'Datadog'
+        MSG = "Do not call Datadog directly, use an appropriate wrapper library."
+        NAMESPACE = "Datadog"
 
         def on_const(node)
           add_offense(node) if node.const_name == NAMESPACE

data/lib/rubocop/cop/gusto/execute_migration.rb

@@ -4,7 +4,7 @@ module RuboCop
   module Cop
     module Gusto
       class ExecuteMigration < Base
-        MSG = 'Do not use `execute` to run raw SQL in a migration. Run the query from a backfill rake task or pass the SQL options to the `add_column`/`change_column` method.'
+        MSG = "Do not use `execute` to run raw SQL in a migration. Run the query from a backfill rake task or pass the SQL options to the `add_column`/`change_column` method."
         RESTRICT_ON_SEND = [:execute].freeze
 
         def on_send(node)

data/lib/rubocop/cop/gusto/factory_classes_or_modules.rb

@@ -4,7 +4,7 @@ module RuboCop
   module Cop
     module Gusto
       class FactoryClassesOrModules < Base
-        MSG = 'Do not define modules or classes in factory directories - they break reloading'
+        MSG = "Do not define modules or classes in factory directories - they break reloading"
 
         def on_class(node)
           add_offense(node)

data/lib/rubocop/cop/gusto/min_by_max_by.rb

@@ -26,7 +26,7 @@ module RuboCop
       class MinByMaxBy < Base
         extend AutoCorrector
 
-        MSG = 'Use `%{method}_by` instead of `%{method}` with a proc like `&:my_method_proc`. `%{method}` expects Comparable elements.'
+        MSG = "Use `%{method}_by` instead of `%{method}` with a proc like `&:my_method_proc`. `%{method}` expects Comparable elements."
         RESTRICT_ON_SEND = %i(min max).freeze
 
         def on_send(node)

data/lib/rubocop/cop/gusto/no_metaprogramming.rb

@@ -94,35 +94,35 @@ module RuboCop
 
         def on_defs(node)
           included_definition?(node) do
-            add_offense(node, message: 'self.included modifies the behavior of classes at runtime. Please avoid using if possible.')
+            add_offense(node, message: "self.included modifies the behavior of classes at runtime. Please avoid using if possible.")
           end
 
           inherited_definition?(node) do
-            add_offense(node, message: 'self.inherited modifies the behavior of classes at runtime. Please avoid using if possible.')
+            add_offense(node, message: "self.inherited modifies the behavior of classes at runtime. Please avoid using if possible.")
           end
         end
 
         def on_def(node)
           using_method_missing?(node) do
-            add_offense(node, message: 'Please do not use method_missing. Instead, explicitly define the methods you expect to receive.')
+            add_offense(node, message: "Please do not use method_missing. Instead, explicitly define the methods you expect to receive.")
           end
         end
 
         def on_send(node)
           using_define_method?(node) do
-            add_offense(node, message: 'Please do not define methods dynamically, instead define them using `def` and explicitly. This helps readability for both humans and machines.')
+            add_offense(node, message: "Please do not define methods dynamically, instead define them using `def` and explicitly. This helps readability for both humans and machines.")
           end
 
           using_define_singleton_method_on_klass_instance?(node) do
-            add_offense(node, message: 'Please do not use define_singleton_method. Instead, define the method explicitly using `def self.my_method; end`')
+            add_offense(node, message: "Please do not use define_singleton_method. Instead, define the method explicitly using `def self.my_method; end`")
           end
 
           using_instance_eval?(node) do
-            add_offense(node, message: 'Please do not use instance_eval to augment behavior onto an instance. Instead, define the method you want to use in the class definition.')
+            add_offense(node, message: "Please do not use instance_eval to augment behavior onto an instance. Instead, define the method you want to use in the class definition.")
           end
 
           using_class_eval?(node) do
-            add_offense(node, message: 'Please do not use class_eval to augment behavior onto a class. Instead, define the method you want to use in the class definition.')
+            add_offense(node, message: "Please do not use class_eval to augment behavior onto a class. Instead, define the method you want to use in the class definition.")
           end
         end
       end

data/lib/rubocop/cop/gusto/no_rescue_error_message_checking.rb

@@ -37,7 +37,7 @@ module RuboCop
       #   end
       #
       class NoRescueErrorMessageChecking < Base
-        MSG = 'Avoid checking error message while handling exceptions. This is brittle and can break easily.'
+        MSG = "Avoid checking error message while handling exceptions. This is brittle and can break easily."
         METHODS_TO_CHECK = %i(match? include? ==).to_set.freeze
 
         def on_rescue(node)

data/lib/rubocop/cop/gusto/no_send.rb

@@ -14,7 +14,7 @@ module RuboCop
       #   There's no better alternative, don't call private methods.
       #
       class NoSend < Base
-        MSG = 'Do not call a private method via `__send__`.'
+        MSG = "Do not call a private method via `__send__`."
         RESTRICT_ON_SEND = %i(__send__).freeze
 
         # @!method invoke_private_method_send?(node)

data/lib/rubocop/cop/gusto/object_in.rb

@@ -16,7 +16,7 @@ module RuboCop
       #  ('a'..'z').cover?('yellow') # => true
       #
       class ObjectIn < Base
-        MSG = 'Use `Range#cover?` instead of `Object#in?`.'
+        MSG = "Use `Range#cover?` instead of `Object#in?`."
         RESTRICT_ON_SEND = [:in?].freeze
 
         # @!method object_in(node)

data/lib/rubocop/cop/gusto/paperclip_or_attachable.rb

@@ -5,7 +5,7 @@ module RuboCop
   module Cop
     module Gusto
       class PaperclipOrAttachable < Base
-        MSG = 'No more new paperclip or Attachable are allowed. New attachments should use ActiveStorage instead'
+        MSG = "No more new paperclip or Attachable are allowed. New attachments should use ActiveStorage instead"
         RESTRICT_ON_SEND = %i(has_attached_file has_pdf_attachment has_attachment).freeze
 
         def on_send(node)

data/lib/rubocop/cop/gusto/perform_class_method.rb

@@ -26,9 +26,9 @@ module RuboCop
       #   end
       #
       class PerformClassMethod < Base
-        MSG = 'Class-level `perform` method is being defined. Did you mean to use an instance method?'
+        MSG = "Class-level `perform` method is being defined. Did you mean to use an instance method?"
         WORKER_FALLBACK = %w(Sidekiq::Worker).freeze
-        WORKER_MODULES = 'WorkerModules'
+        WORKER_MODULES = "WorkerModules"
 
         def on_def(node)
           return unless node.method?(:perform)

data/lib/rubocop/cop/gusto/polymorphic_type_validation.rb

@@ -28,7 +28,7 @@ module RuboCop
             polymorphic_methods_for :subscription_detail, VALID_TYPES
         MESSAGE
 
-        ALLOW_BLANK_MSG = 'Polymorphic type validations cannot use allow_blank: true'
+        ALLOW_BLANK_MSG = "Polymorphic type validations cannot use allow_blank: true"
 
         # @!method polymorphic_relation?(node)
         def_node_matcher :polymorphic_relation?, <<~PATTERN

data/lib/rubocop/cop/gusto/prefer_process_last_status.rb

@@ -17,7 +17,7 @@ module RuboCop
       class PreferProcessLastStatus < Base
         extend AutoCorrector
 
-        MSG = 'Prefer using `Process.last_status` instead of the global variables: `$?` and `$CHILD_STATUS`.'
+        MSG = "Prefer using `Process.last_status` instead of the global variables: `$?` and `$CHILD_STATUS`."
         OFFENDERS = Set[:$?, :$CHILD_STATUS].freeze
 
         def on_gvar(node)
@@ -27,7 +27,7 @@ module RuboCop
         end
 
         def autocorrect(corrector, node)
-          corrector.replace(node, 'Process.last_status')
+          corrector.replace(node, "Process.last_status")
         end
       end
     end

data/lib/rubocop/cop/gusto/rabl_extends.rb

@@ -19,8 +19,8 @@ module RuboCop
       #   child(:baz) { attributes :qux }
       #
       class RablExtends < Base
-        MSG = 'Avoid using Rabl extends as it has poor caching performance. Inline your JSON instead.'
-        RABL_EXTENSION = '.rabl'
+        MSG = "Avoid using Rabl extends as it has poor caching performance. Inline your JSON instead."
+        RABL_EXTENSION = ".rabl"
         RESTRICT_ON_SEND = %i(extends).freeze
 
         # @!method rabl_extends?(node)

data/lib/rubocop/cop/gusto/rails_env.rb

@@ -51,8 +51,8 @@ module RuboCop
             local?
           )
         ).freeze
-        MSG = 'Use Feature Flags or config instead of `Rails.env`.'
-        PROHIBITED_CLASS = 'Rails'
+        MSG = "Use Feature Flags or config instead of `Rails.env`."
+        PROHIBITED_CLASS = "Rails"
         RESTRICT_ON_SEND = %i(env).freeze
 
         def on_send(node)

data/lib/rubocop/cop/gusto/rake_constants.rb

@@ -28,7 +28,7 @@ module RuboCop
       #   end
       #
       class RakeConstants < Base
-        MSG = 'Do not define a constant in rake file, because they are sometimes `load`ed, instead of `require`d which can lead to warnings about redefining constants'
+        MSG = "Do not define a constant in rake file, because they are sometimes `load`ed, instead of `require`d which can lead to warnings about redefining constants"
 
         # @!method task_or_namespace?(node)
         def_node_matcher :task_or_namespace?, <<-PATTERN

data/lib/rubocop/cop/gusto/regexp_bypass.rb

@@ -39,16 +39,16 @@ module RuboCop
         extend AutoCorrector
 
         MSG = 'Regular expressions matching a single line should use \A instead of ^ and \z instead of $'
-        PROHIBITED_ANCHOR = '^'
-        PROHIBITED_END_ANCHOR = '$'
+        PROHIBITED_ANCHOR = "^"
+        PROHIBITED_END_ANCHOR = "$"
 
         def on_regexp(node)
-          return if node.children.find(&:regopt_type?)&.source&.include?('m')
+          return if node.children.find(&:regopt_type?)&.source&.include?("m")
 
           first_child = node.children.first
           return unless first_child && !first_child.regopt_type?
 
-          captureless_source = first_child.source.delete('()') # Remove parentheses to check actual content
+          captureless_source = first_child.source.delete("()") # Remove parentheses to check actual content
           return unless captureless_source.start_with?(PROHIBITED_ANCHOR) || captureless_source.end_with?(PROHIBITED_END_ANCHOR)
 
           add_offense(first_child) do |corrector|

data/lib/rubocop/cop/gusto/sidekiq_params.rb

@@ -4,7 +4,7 @@ module RuboCop
   module Cop
     module Gusto
       class SidekiqParams < Base
-        MSG = 'Sidekiq perform methods cannot take keyword arguments'
+        MSG = "Sidekiq perform methods cannot take keyword arguments"
         PROHIBITED_ARG_TYPES = Set.new(%i(kwoptarg kwarg)).freeze
 
         def on_def(node)

data/lib/rubocop/cop/gusto/toplevel_constants.rb

@@ -39,7 +39,7 @@ module RuboCop
       #   FOO = 'bar' # config/initializers/foo.rb
       #
       class ToplevelConstants < Base
-        MSG = 'Top-level constants should be defined in an initializer. See https://github.com/Gusto/rubocop-gusto/blob/main/lib/rubocop/cop/gusto/toplevel_constants.rb'
+        MSG = "Top-level constants should be defined in an initializer. See https://github.com/Gusto/rubocop-gusto/blob/main/lib/rubocop/cop/gusto/toplevel_constants.rb"
 
         def on_casgn(node)
           # Allow nested constants

data/lib/rubocop/cop/gusto/use_paint_not_colorize.rb

@@ -92,8 +92,8 @@ module RuboCop
           )
         ).freeze
 
-        MSG = 'Use Paint instead of colorize for terminal colors.'
-        PROHIBITED_CLASS = 'String'
+        MSG = "Use Paint instead of colorize for terminal colors."
+        PROHIBITED_CLASS = "String"
         RESTRICT_ON_SEND = COLOR_METHODS
 
         def on_send(node)
@@ -170,16 +170,16 @@ module RuboCop
             elsif method_name == :uncolorize
               # If uncolorize is called, convert to Paint.unpaint
               return "Paint.unpaint(#{original_string.source})"
-            elsif method_name.start_with?('on_')
+            elsif method_name.start_with?("on_")
               # Background color
-              color_name = method_name.to_s.delete_prefix('on_')
+              color_name = method_name.to_s.delete_prefix("on_")
               background = ":#{color_name}"
             elsif STYLE_MODIFIERS.include?(method_name)
               # Style modifier
               styles << ":#{method_name}"
-            elsif method_name.start_with?('light_')
+            elsif method_name.start_with?("light_")
               # Light/bright foreground color
-              color = method_name.to_s.delete_prefix('light_')
+              color = method_name.to_s.delete_prefix("light_")
               foreground = ":bright, :#{color}"
             else
               # Regular foreground color
@@ -221,7 +221,7 @@ module RuboCop
 
           # Add nil as a placeholder for foreground if we only have a background
           if background && !foreground
-            params << 'nil'
+            params << "nil"
           elsif foreground
             params << foreground
           end

data/lib/rubocop/cop/gusto/vcr_recordings.rb

@@ -17,7 +17,7 @@ module RuboCop
       class VcrRecordings < Base
         extend AutoCorrector
 
-        MSG = 'VCR should be set to not record in tests. Please use vcr: {record: :none}.'
+        MSG = "VCR should be set to not record in tests. Please use vcr: {record: :none}."
 
         # @!method vcr_recording?(node)
         def_node_matcher :vcr_recording?, <<~PATTERN
@@ -29,7 +29,7 @@ module RuboCop
           return unless recording_enabled?(node.key.children.first, node.value.children.first)
 
           add_offense(node) do |corrector|
-            replacement = node.source.sub(/: :\w*/, ': :none')
+            replacement = node.source.sub(/: :\w*/, ": :none")
             corrector.replace(node, replacement)
           end
         end
@@ -37,7 +37,7 @@ module RuboCop
         private
 
         def vcr_setting?(node)
-          node.parent.parent.source.include?('vcr')
+          node.parent.parent.source.include?("vcr")
         end
 
         def recording_enabled?(option, value)

data/lib/rubocop/cop/internal_affairs/assignment_first.rb

@@ -38,7 +38,7 @@ module RuboCop
           after_class
           after_module
         ).to_set.freeze
-        MSG = 'Avoid placing an assignment as the first action in `%{hook}`.'
+        MSG = "Avoid placing an assignment as the first action in `%{hook}`."
 
         def on_def(node)
           return unless HOOKS.include?(node.method_name)

data/lib/rubocop/cop/internal_affairs/require_restrict_on_send.rb

@@ -24,7 +24,7 @@ module RuboCop
       # NOTE: This works for us because we do not write cops that investigate every send node.
       # Upstream Rubocop chose not to implement this as there are many cops in Core that investigate every node.
       class RequireRestrictOnSend < Base
-        MSG = 'Missing `RESTRICT_ON_SEND` declaration when using `on_send` or `after_send`.'
+        MSG = "Missing `RESTRICT_ON_SEND` declaration when using `on_send` or `after_send`."
 
         # @!method defined_send_callback?(node)
         def_node_search :defined_send_callback?, <<~PATTERN

data/lib/rubocop/gusto/cli.rb

@@ -1,17 +1,17 @@
 # frozen_string_literal: true
 
-require 'thor'
-require 'rubocop/gusto/config_yml'
-require 'rubocop/gusto/init'
+require "thor"
+require "rubocop/gusto/config_yml"
+require "rubocop/gusto/init"
 
 module RuboCop
   module Gusto
     class Cli < Thor
-      register(Init, 'init', 'init', 'Initialize rubocop-gusto and update .rubocop.yml')
+      register(Init, "init", "init", "Initialize rubocop-gusto and update .rubocop.yml")
 
-      desc 'sort [RUBOCOP_YML_PATH]', 'Sort the cops in a .rubocop.yml file (default: .rubocop.yml)'
-      method_option :output, type: :string, default: nil, desc: 'The path to the output file'
-      def sort(rubocop_yml_path = '.rubocop.yml')
+      desc "sort [RUBOCOP_YML_PATH]", "Sort the cops in a .rubocop.yml file (default: .rubocop.yml)"
+      method_option :output, type: :string, default: nil, desc: "The path to the output file"
+      def sort(rubocop_yml_path = ".rubocop.yml")
         say "Sorting #{rubocop_yml_path}..."
         output_path = options[:output] || rubocop_yml_path
         ConfigYml.load_file(rubocop_yml_path).sort!.write(output_path)

data/lib/rubocop/gusto/config_yml.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require 'pathname'
+require "pathname"
+require "yaml"
 
 module RuboCop
   module Gusto
@@ -16,7 +17,7 @@ module RuboCop
       INDENT_REGEX = /\A(  |- )/
 
       # @param [String] file_path the path to the .rubocop.yml file
-      def self.load_file(file_path = '.rubocop.yml')
+      def self.load_file(file_path = ".rubocop.yml")
         new(File.readlines(file_path))
       rescue Errno::ENOENT
         new([])
@@ -33,7 +34,7 @@ module RuboCop
 
       # Find if there's already an inherit_gem section and add the gem to it if needed
       def add_inherit_gem(gem_name, *config_paths)
-        update_section_data('inherit_gem') do |data|
+        update_section_data("inherit_gem") do |data|
           data ||= {}
           data[gem_name.to_s] = config_paths.flatten
           data
@@ -42,7 +43,7 @@ module RuboCop
 
       # Add a plugin to the plugins section or create it if it doesn't exist
       def add_plugin(plugins)
-        update_section_data('plugins') do |data|
+        update_section_data("plugins") do |data|
           data ||= []
           data.concat(plugins).uniq
         end
@@ -80,7 +81,7 @@ module RuboCop
         end
 
         # Sort the cops by their key name, putting comments at the top
-        cops.sort_by! { |cop| chunk_name(cop) || 'AAAAA/Comment?' }
+        cops.sort_by! { |cop| chunk_name(cop) || "AAAAA/Comment?" }
 
         self
       end
@@ -110,21 +111,46 @@ module RuboCop
         # Try to find a line that exactly matches KEY_REGEX
         # Use rstrip, not strip, to preserve indentation
         name_line = chunk.find { |line| line.rstrip.match?(KEY_REGEX) }
-        name_line&.rstrip&.delete_suffix(':')
+        if name_line
+          name_line.rstrip.delete_suffix(":")
+        else
+          # Try to find a key with value on the same line (e.g., "inherit_from: .rubocop_todo.yml")
+          first_line = chunk.find { |line| !line.strip.empty? && !line.strip.start_with?("#") }
+          if first_line&.include?(":")
+            first_line.split(":").first.strip
+          end
+        end
       end
 
       # Splits the lines into blocks whenever we drop from indented to unindented
       def chunk_blocks(lines)
-        # slice whenever we drop from indented to unindented
+        # slice whenever we drop from indented to unindented line
+        # or when we encounter a new top-level key after blank line(s)
         chunks = lines.slice_when do |prev, line|
-          prev.match?(INDENT_REGEX) && !prev.strip.empty? && !line.match?(INDENT_REGEX)
+          if prev.strip.empty?
+            # split when going from blank to non-indented non-blank
+            !line.match?(INDENT_REGEX) && !line.strip.empty?
+          elsif prev.match?(INDENT_REGEX)
+            # split when going from indented to non-blank unindented
+            !line.match?(INDENT_REGEX) && !line.strip.empty?
+          else
+            # prev is non-indented, split on blank lines too
+            line.strip.empty?
+          end
         end
 
         # Process each chunk to remove leading newlines and add 1 trailing newline
         chunks.filter_map do |chunk|
           # Remove leading and trailing empty lines
-          chunk.shift while chunk.first.to_s.strip.empty?
-          chunk.pop while chunk.last.to_s.strip.empty?
+          until chunk.empty? || !chunk.first.strip.empty?
+            chunk.shift
+          end
+          until chunk.empty? || !chunk.last.strip.empty?
+            chunk.pop
+          end
+
+          # Skip empty chunks
+          next if chunk.empty?
 
           # Ensure each chunk ends with a blank newline
           chunk << "\n"

data/lib/rubocop/gusto/init.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'pathname'
-require 'yaml'
-require 'rubocop/gusto/config_yml'
+require "pathname"
+require "yaml"
+require "rubocop/gusto/config_yml"
 
 module RuboCop
   module Gusto
@@ -11,48 +11,48 @@ module RuboCop
 
       PLUGINS = %w(rubocop-gusto rubocop-rspec rubocop-performance rubocop-rake rubocop-rails).freeze
 
-      class_option :rubocop_yml, type: :string, default: '.rubocop.yml'
+      class_option :rubocop_yml, type: :string, default: ".rubocop.yml"
 
       def self.source_root
-        File.expand_path('templates', __dir__)
+        File.expand_path("templates", __dir__)
       end
 
       def add_dependencies
         if rails?
           # we don't want rubocop-rails to be a dependency of the gem so that we can use this in non-rails gems
-          run 'bundle show rubocop-rails >/dev/null || bundle add rubocop-rails --group development', capture: true
+          run "bundle show rubocop-rails >/dev/null || bundle add rubocop-rails --group development", capture: true
         end
 
-        run 'bundle binstub rubocop', capture: true
+        run "bundle binstub rubocop", capture: true
       end
 
       def copy_config_files
         config = ConfigYml.load_file(options[:rubocop_yml])
 
         if config.empty?
-          template 'rubocop.yml', options[:rubocop_yml]
+          template "rubocop.yml", options[:rubocop_yml]
           config = ConfigYml.load_file(options[:rubocop_yml])
         end
 
         if rails?
-          config.add_inherit_gem('rubocop-gusto', 'config/default.yml', 'config/rails.yml')
+          config.add_inherit_gem("rubocop-gusto", "config/default.yml", "config/rails.yml")
           config.add_plugin(PLUGINS)
         else
-          config.add_inherit_gem('rubocop-gusto', 'config/default.yml')
+          config.add_inherit_gem("rubocop-gusto", "config/default.yml")
           config.add_plugin(PLUGINS - %w(rubocop-rails))
         end
 
         config.sort!
         config.write(options[:rubocop_yml])
-        say_status 'update', options[:rubocop_yml]
+        say_status "update", options[:rubocop_yml]
 
-        create_file('.rubocop_todo.yml', skip: true)
+        create_file(".rubocop_todo.yml", skip: true)
       end
 
       private
 
       def rails?
-        File.exist?('config/application.rb')
+        File.exist?("config/application.rb")
       end
     end
   end

data/lib/rubocop/gusto/plugin.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'lint_roller'
+require "lint_roller"
 
 module RuboCop
   module Gusto
@@ -8,9 +8,9 @@ module RuboCop
     class Plugin < LintRoller::Plugin
       def about
         LintRoller::About.new(
-          name: 'rubocop-gusto',
+          name: "rubocop-gusto",
           version: RuboCop::Gusto::VERSION,
-          homepage: 'https://github.com/Gusto/rubocop-gusto',
+          homepage: "https://github.com/Gusto/rubocop-gusto",
           description: "A collection of Gusto's standard RuboCop cops and rules."
         )
       end
@@ -20,9 +20,9 @@ module RuboCop
       end
 
       def rules(_context)
-        project_root = Pathname.new(__dir__).join('../../..')
+        project_root = Pathname.new(__dir__).join("../../..")
 
-        LintRoller::Rules.new(type: :path, config_format: :rubocop, value: project_root.join('config', 'default.yml'))
+        LintRoller::Rules.new(type: :path, config_format: :rubocop, value: project_root.join("config", "default.yml"))
       end
     end
   end

data/lib/rubocop/gusto/templates/rubocop.yml

@@ -1,5 +1,3 @@
-inherit_from: .rubocop_todo.yml
-
 inherit_mode:
   merge:
     - Include
@@ -8,6 +6,8 @@ inherit_gem:
   rubocop-gusto:
     - config/default.yml
 
+inherit_from: .rubocop_todo.yml
+
 plugins:
   - rubocop-gusto
   - rubocop-rspec

data/lib/rubocop/gusto/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module Gusto
-    VERSION = '10.1.0'
+    VERSION = "10.2.0"
   end
 end

data/lib/rubocop/gusto.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'gusto/version'
+require_relative "gusto/version"
 
 module RuboCop
   # RuboCop Gusto project namespace.

data/lib/rubocop-gusto.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'rubocop'
-require 'rubocop-rspec'
+require "rubocop"
+require "rubocop-rspec"
 
-require_relative 'rubocop/gusto'
-require_relative 'rubocop/gusto/version'
-require_relative 'rubocop/gusto/plugin'
+require_relative "rubocop/gusto"
+require_relative "rubocop/gusto/version"
+require_relative "rubocop/gusto/plugin"
 
 # Require all cops
-Dir.glob(File.join(File.dirname(__FILE__), 'rubocop/cop/**/*.rb')).each do |file|
+Dir.glob(File.join(File.dirname(__FILE__), "rubocop/cop/**/*.rb")).each do |file|
   require file
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-gusto
 version: !ruby/object:Gem::Version
-  version: 10.1.0
+  version: 10.2.0
 platform: ruby
 authors:
 - Gusto Engineering
@@ -10,7 +10,7 @@ cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bigdecimal
+  name: lint_roller
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -24,35 +24,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: lint_roller
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.76'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.76'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.76'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.76'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-performance
+  name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -66,7 +66,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rake
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -80,7 +80,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rspec
+  name: rubocop-sorbet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -127,7 +127,6 @@ files:
 - lib/rubocop/cop/gusto/datadog_constant.rb
 - lib/rubocop/cop/gusto/execute_migration.rb
 - lib/rubocop/cop/gusto/factory_classes_or_modules.rb
-- lib/rubocop/cop/gusto/ignored_columns_assignment.rb
 - lib/rubocop/cop/gusto/min_by_max_by.rb
 - lib/rubocop/cop/gusto/no_metaprogramming.rb
 - lib/rubocop/cop/gusto/no_rescue_error_message_checking.rb

data/lib/rubocop/cop/gusto/ignored_columns_assignment.rb

@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-module RuboCop
-  module Cop
-    module Gusto
-      # Enforces proper usage of `ignored_columns` assignment
-      #
-      # This cop ensures that `ignored_columns` is assigned using `+=` with an array
-      # instead of direct assignment, which will overwrite the existing list of
-      # ignored columns for the model, or overwrite the list it should inherit in the
-      # case of single table inheritance.
-      #
-      # @example
-      #
-      #   # bad
-      #   self.ignored_columns = :column_name
-      #   self.ignored_columns = 'column_name'
-      #   self.ignored_columns = [:column_name]
-      #   self.ignored_columns = ['column_name']
-      #
-      #   # good
-      #   self.ignored_columns += [:column_name]
-      #   self.ignored_columns += ['column_name']
-      #
-      class IgnoredColumnsAssignment < Base
-        MSG = 'Use `+=` with an array for `ignored_columns` assignment instead of direct assignment.'
-        RESTRICT_ON_SEND = %i(ignored_columns=).freeze
-
-        # @!method ignored_columns_direct_assignment?(node)
-        def_node_matcher :ignored_columns_direct_assignment?, <<~PATTERN
-          (send (self) :ignored_columns= _)
-        PATTERN
-
-        def on_send(node)
-          if ignored_columns_direct_assignment?(node)
-            add_offense(node.loc.selector)
-          end
-        end
-      end
-    end
-  end
-end