rubocop-gusto 10.8.0 → 10.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e949d8014c77fd20ec618ea6aac33438bc6d211a47748ae12d80a9fee1eb7416
-  data.tar.gz: f6d9c0e2fd5cadffe3a9b7fbeb9b37231d364885109ce7be731c6852dada912d
+  metadata.gz: bfe32904ee2cd054ac91081d5cab3f9cd4b15deb007e816ca1afefdf00aa41b0
+  data.tar.gz: 244866f38efc30bc95881ff3129664f136448284209a5b04f76bbe9241338d89
 SHA512:
-  metadata.gz: f3cd3c47b88b1d80a4d1eebd62cc5a9bce4cd4f589b03b854654aadfa00aaba5f2e4a574883d99b43b14a5666abc998f388f8e13b59cf61e607d7635b33289d3
-  data.tar.gz: cb4487b2568f8ea75b3dc1d21903c9d60f4702c1ecf6e3e5f85b9c3b559716ec21a86570f7b574e9bb8ea37ba6786c2a7f1f94db5afaa27faba6bc67d8843efe
+  metadata.gz: ec813a15822dbd2030267110dd697142e51c705bf48c9c2b197d0b6567d4373a2d389e1465a12f67df5edc640d932e2a3587fc4fb2a921577594ff93a78ecc07
+  data.tar.gz: abf67fb4291bc44ab9b86c3a0bdf91c9871af49bee41ac8de6f9f986888b6231cecb3cb9d754289b97ae389a1aa56e7727cc5f64097d5140fadf59f286c55fd8

data/CHANGELOG.md

@@ -1,10 +1,33 @@
-## Pending
-
 ## 10.8.0
 
 - Remove redundant `Rails: Enabled: true` from `config/rails.yml` (already set by rubocop-rails' own defaults)
 - Enable `Rails/DefaultScope` cop (disabled by default in rubocop-rails)
 
+## [10.9.1](https://github.com/Gusto/rubocop-gusto/compare/v10.9.0...v10.9.1) (2026-05-22)
+
+
+### Bug Fixes
+
+* remove redundant config entries ([#112](https://github.com/Gusto/rubocop-gusto/issues/112)) ([e3dab8d](https://github.com/Gusto/rubocop-gusto/commit/e3dab8d3f96907a4b4be955fd3407926aa47b5a7))
+
+## [10.9.0](https://github.com/Gusto/rubocop-gusto/compare/v10.8.1...v10.9.0) (2026-05-22)
+
+
+### Features
+
+* make rubocop-rspec move/scatter cops Sorbet-sig-aware ([#107](https://github.com/Gusto/rubocop-gusto/issues/107)) ([b3f1449](https://github.com/Gusto/rubocop-gusto/commit/b3f14491b74548adbd05738b90484ba6ccb5ea67))
+
+## [10.8.1](https://github.com/Gusto/rubocop-gusto/compare/v10.8.0...v10.8.1) (2026-03-30)
+
+
+### Bug Fixes
+
+* Change runner configuration to use custom group ([#95](https://github.com/Gusto/rubocop-gusto/issues/95)) ([87af85d](https://github.com/Gusto/rubocop-gusto/commit/87af85d17c150d689ca73448e0d2b5372968f21b))
+* correct release-please-action pinned SHA ([#89](https://github.com/Gusto/rubocop-gusto/issues/89)) ([87db13a](https://github.com/Gusto/rubocop-gusto/commit/87db13ad17f60d0398a84dc7957515cac623efee))
+* pin GitHub Actions to commit SHAs to prevent supply-chain attacks ([#85](https://github.com/Gusto/rubocop-gusto/issues/85)) ([bc85834](https://github.com/Gusto/rubocop-gusto/commit/bc85834d5fbed70278f9cd67eff6e564fb4e9925))
+* remove extra empty line at block body end in execute_migration_spec ([87af85d](https://github.com/Gusto/rubocop-gusto/commit/87af85d17c150d689ca73448e0d2b5372968f21b))
+* use GitHub App token in release-please to trigger CI on PRs ([#98](https://github.com/Gusto/rubocop-gusto/issues/98)) ([a2d3171](https://github.com/Gusto/rubocop-gusto/commit/a2d3171909ee8fe04be233b13adb8aaac48e0bef))
+
 ## 10.7.0
 
 - Improve `Rack/LowercaseHeaderKeys` for Rack 3 migration

data/README.md

@@ -1,6 +1,10 @@
-# Rubocop::Gusto
+# RuboCop::Gusto
 
-Gusto's Ruby style guide implemented as RuboCop rules.
+[![Gem Version](https://img.shields.io/gem/v/rubocop-gusto)](https://rubygems.org/gems/rubocop-gusto)
+[![Build](https://img.shields.io/github/actions/workflow/status/Gusto/rubocop-gusto/build.yml?branch=main)](https://github.com/Gusto/rubocop-gusto/actions/workflows/build.yml)
+[![GitHub Release](https://img.shields.io/github/v/release/Gusto/rubocop-gusto)](https://github.com/Gusto/rubocop-gusto/releases)
+
+Gusto's custom [RuboCop](https://rubocop.org/) cops and shared configuration, distributed as a gem and integrated via the [`lint_roller`](https://github.com/standardrb/lint_roller) plugin interface.
 
 ## Installation
 
@@ -18,36 +22,70 @@ $ bundle
 
 ## Usage
 
-`rubocop-gusto` ships with an executable that updates and maintains .rubocop.yml.
+`rubocop-gusto` ships with a CLI that sets up your project's `.rubocop.yml`:
 
 ```sh
 bundle exec rubocop-gusto init
 ```
 
+This adds `rubocop-gusto` to your `.rubocop.yml` `plugins:` list and includes any relevant configuration (e.g. Rails-specific rules when Rails is detected).
+
 If this is an existing project, it is recommended to run the autocorrector (`bundle exec rubocop -a`) and then to regenerate the `.rubocop_todo.yml` (`bundle exec rubocop --auto-gen-config`), so issues can be dealt with piecemeal.
 
+### Available cops
+
+Custom cops live under the following namespaces:
+
+- `Gusto/` — general Gusto-specific cops (see [`lib/rubocop/cop/gusto/`](lib/rubocop/cop/gusto/))
+- `Rack/` — cops scoped to Rack middleware patterns (see [`lib/rubocop/cop/rack/`](lib/rubocop/cop/rack/))
+
 ## Publishing New Versions
 
-To publish a new release:
+Releases are fully automated via [release-please](https://github.com/googleapis/release-please).
+
+**How it works:**
+
+1. Merge PRs to `main` using [Conventional Commits](https://www.conventionalcommits.org/) in the PR title (enforced by CI).
+2. release-please automatically creates and maintains a "Release PR" that bumps the version and updates the changelog.
+3. When you merge the Release PR, a GitHub Release and git tag are created, and the gem is published to RubyGems.
 
-1. Update the `RuboCop::Gusto::VERSION` constant to a higher version number conforming to this project's [versioning policy](#versioning-policy).
-2. Document your changes in the [changelog](CHANGELOG.md).
-3. Open a pull request and follow the typical review/merge process.
-4. TODO: finish release process
+**Conventional commit types and version bumps:**
 
-After publishing, wait for dependabot, or make a new PR downstream to update to the latest version.
+| PR title prefix | Version bump | Example |
+|---|---|---|
+| `feat:` | Minor (10.8.0 -> 10.9.0) | `feat: add Gusto/NewCop cop` |
+| `fix:` | Patch (10.8.0 -> 10.8.1) | `fix: correct false positive in DefaultScope` |
+| `feat!:` or `BREAKING CHANGE` footer | Major (10.8.0 -> 11.0.0) | `feat!: drop Ruby 3.1 support` |
+| `chore:`, `docs:`, `ci:`, etc. | No release | `chore: update dev dependencies` |
 
 ## Contributing
 
 Submit new rules, updated configuration, and other checks to be used organization wide by submitting a Pull Request!
 
+PR titles must use [Conventional Commits](https://www.conventionalcommits.org/) format (enforced by CI) — see the version bump table above for which prefixes trigger releases.
+
+### Adding a new cop
+
+1. Create `lib/rubocop/cop/gusto/<cop_name>.rb`
+2. Add an entry to `config/default.yml`, then sort it:
+   ```sh
+   bundle exec rubocop-gusto sort config/default.yml
+   ```
+3. Add a spec in `spec/rubocop/cop/gusto/<cop_name>_spec.rb`
+4. Run tests and lint:
+   ```sh
+   bundle exec rspec
+   bundle exec rubocop
+   ```
+
 ### Versioning policy
 
-Rubocop-gusto generally follows semver, with the exception that the only thing that is considered a breaking change is a change in the public API to use rubocop-gusto.  
+rubocop-gusto generally follows semver, with the exception that the only thing that is considered a breaking change is a change in the public API to use rubocop-gusto.
 
 Users can generally expect to need to regenerate their rubocop todo when they make a minor version bump to rubocop-gusto.
 
-### Git Pre-Commit Hooks
-```
+### Git pre-commit hooks
+
+```sh
 git config core.hooksPath script/githooks
 ```

data/config/default.yml

@@ -155,37 +155,13 @@ Layout/BlockAlignment:
 
 Layout/CaseIndentation:
   EnforcedStyle: end
-  IndentOneStep: false
-
-Layout/DotPosition:
-  Enabled: true
-  # We use the (default) leading dot position for Sorbet and IDE compatibility.
-  EnforcedStyle: leading
-
-Layout/EmptyLineAfterGuardClause:
-  Enabled: true
-
-Layout/EmptyLineAfterMagicComment:
-  Enabled: true
-
-Layout/EmptyLineBetweenDefs:
-  AllowAdjacentOneLineDefs: true
 
 Layout/EmptyLinesAroundAttributeAccessor:
   Enabled: false
 
-Layout/EmptyLinesAroundClassBody:
-  EnforcedStyle: no_empty_lines
-
-Layout/EmptyLinesAroundModuleBody:
-  EnforcedStyle: no_empty_lines
-
 Layout/EndAlignment:
   EnforcedStyleAlignWith: start_of_line
 
-Layout/ExtraSpacing:
-  AllowForAlignment: true
-
 Layout/FirstArgumentIndentation:
   EnforcedStyle: consistent
 
@@ -211,53 +187,22 @@ Layout/LineLength:
   # TODO: Pick some maximum like 200 to start with
   Enabled: false
 
-Layout/MultilineArrayBraceLayout:
-  EnforcedStyle: symmetrical
-
-Layout/MultilineAssignmentLayout:
-  Enabled: false
-
-Layout/MultilineHashBraceLayout:
-  EnforcedStyle: symmetrical
-
-Layout/MultilineMethodCallBraceLayout:
-  EnforcedStyle: symmetrical
-
 Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented
 
-Layout/MultilineMethodDefinitionBraceLayout:
-  EnforcedStyle: symmetrical
-
 Layout/MultilineOperationIndentation:
   EnforcedStyle: indented
 
 Layout/ParameterAlignment:
   EnforcedStyle: with_fixed_indentation
 
-Layout/SpaceAroundEqualsInParameterDefault:
-  Enabled: true
-
-Layout/SpaceAroundMethodCallOperator:
-  Enabled: true
-
 Layout/SpaceInLambdaLiteral:
   EnforcedStyle: require_space
 
 Lint/AmbiguousBlockAssociation:
-  Enabled: true
   Exclude:
     - '**/spec/**/*'
 
-Lint/EmptyFile:
-  Enabled: true
-
-Lint/EnsureReturn:
-  Enabled: true
-
-Lint/RaiseException:
-  Enabled: true
-
 Lint/SelfAssignment:
   Severity: error
 
@@ -287,7 +232,6 @@ Metrics/BlockLength:
   Enabled: false
 
 Metrics/ClassLength:
-  Enabled: true
   Max: 2500
 
 Metrics/CyclomaticComplexity:
@@ -333,16 +277,9 @@ Performance/RedundantBlockCall:
 Performance/ZipWithoutBlock:
   Enabled: true
 
-RSpec:
-  Include:
-    - '**/spec/**/*'
-
 RSpec/ContainExactly:
   Enabled: false
 
-RSpec/ContextWording:
-  Enabled: true
-
 RSpec/DescribeClass:
   Enabled: false
 
@@ -370,12 +307,6 @@ RSpec/ExpectInHook:
 RSpec/IndexedLet:
   Enabled: false
 
-RSpec/IteratedExpectation:
-  Enabled: true
-
-RSpec/LeadingSubject:
-  Enabled: true
-
 RSpec/LetSetup:
   Enabled: false
 
@@ -417,12 +348,6 @@ RSpec/ReceiveMessages:
 RSpec/ScatteredSetup:
   AutoCorrect: false
 
-RSpec/SpecFilePathFormat:
-  Enabled: true
-
-RSpec/SpecFilePathSuffix:
-  Enabled: true
-
 RSpec/StubbedMock:
   Enabled: false
 
@@ -452,12 +377,6 @@ Rack/LowercaseHeaderKeys:
 Rake/ClassDefinitionInTask:
   Enabled: false
 
-Rake/Desc:
-  Enabled: true
-
-Security/YAMLLoad:
-  Enabled: true
-
 Sorbet:
   # TODO: validate these choices for Harmonization
   # BindingConstantWithoutTypeAlias
@@ -466,11 +385,6 @@ Sorbet:
   # SignatureBuildOrder
   Enabled: true
 
-Sorbet/FalseSigil:
-  # We want to avoid `typed: ignore` as much as possible, as it breaks LSP tooling.
-  Include:
-    - "**/*.{rb,rbi,rake,ru}"
-
 Sorbet/Refinement:
   # Still marked pending upstream, we contributed this and enable it here.
   Enabled: true
@@ -479,8 +393,6 @@ 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
@@ -488,7 +400,6 @@ Sorbet/StrictSigil:
   - spec/**/*spec.rb
 
 Sorbet/ValidSigil:
-  Enabled: true
   RequireSigilOnAllFiles: true
   # We don't want to require any specific typed level at this point – only that there IS a typed sigil.
   MinimumStrictness: ignore
@@ -503,7 +414,6 @@ Style/AccessorGrouping:
   Enabled: false
 
 Style/Alias:
-  Enabled: true
   EnforcedStyle: prefer_alias_method
 
 Style/ArgumentsForwarding:
@@ -517,7 +427,6 @@ Style/AutoResourceCleanup:
   Enabled: true
 
 Style/BlockDelimiters:
-  EnforcedStyle: line_count_based
   AllowedMethods:
     - it
     - expect
@@ -529,15 +438,11 @@ Style/ClassAndModuleChildren:
   # EnforcedStyle: compact
   Enabled: false
 
-Style/CollectionMethods:
-  Enabled: false
-
 Style/CommandLiteral:
   # This cop Style/CommandLiteral protects us from accidentally using backticks for strings quotes.
   # Forcing the use of %x() should make it more obvious visually where the command literals are.
   # This is easy to miss, but is a bug-without-test-failures at best and an opportunity for an
   # attack vector at worst.
-  Enabled: true
   EnforcedStyle: percent_x
 
 Style/ConditionalAssignment:
@@ -560,9 +465,6 @@ Style/ExpandPathArguments:
   Exclude:
     - '**/bin/*'
 
-Style/ExponentialNotation:
-  Enabled: true
-
 Style/FormatString:
   Enabled: false
 
@@ -571,15 +473,11 @@ Style/FormatStringToken:
 
 Style/FrozenStringLiteralComment:
   EnforcedStyle: always_true
-  Enabled: true
 
 # This can make lines longer and impair readability
 Style/GuardClause:
   Enabled: false
 
-Style/HashEachMethods:
-  Enabled: true
-
 Style/HashSyntax:
   EnforcedStyle: ruby19_no_mixed_keys
 
@@ -595,9 +493,6 @@ Style/IfInsideElse:
 Style/IfUnlessModifier:
   Enabled: false
 
-Style/ImplicitRuntimeError:
-  Enabled: false
-
 Style/ItBlockParameter:
   Enabled: true
   EnforcedStyle: only_numbered_parameters
@@ -609,7 +504,6 @@ Style/LambdaCall:
   Enabled: false
 
 Style/MethodCallWithArgsParentheses:
-  IgnoreMacros: true
   AllowedMethods:
     # Ruby
     - puts
@@ -698,18 +592,11 @@ Style/MethodCallWithArgsParentheses:
     - input
     - action
 
-Style/MethodCalledOnDoEndBlock:
-  Enabled: false
-
-Style/MissingElse:
-  Enabled: false
-
 Style/ModuleFunction:
   # Sorbet does not enforce the singleton version of module function methods: https://github.com/sorbet/sorbet/issues/8531
   # Even if did, requiring the code to typecheck both paths would be a pain for maintainability.
   # Also, it's better for the code to be explicit about which version of the method is being called,
   #  as it is one fewer decision the downstream developer has to make.
-  Enabled: true
   EnforcedStyle: forbidden
 
 Style/MultilineBlockChain:
@@ -728,9 +615,6 @@ Style/Next:
 Style/NumericPredicate:
   Enabled: false
 
-Style/OptionHash:
-  Enabled: false
-
 Style/OptionalBooleanParameter:
   AllowedMethods:
     - respond_to_missing?
@@ -745,9 +629,6 @@ Style/PercentLiteralDelimiters:
     '%w': ()
     '%W': ()
 
-Style/RaiseArgs:
-  Enabled: true
-
 Style/RedundantSelf:
   Enabled: false
 
@@ -755,22 +636,15 @@ Style/RegexpLiteral:
   Enabled: false
 
 Style/RescueStandardError:
-  Enabled: true
   AutoCorrect: true
   EnforcedStyle: 'implicit'
 
 Style/Send:
   Enabled: true
 
-Style/SingleLineBlockParams:
-  Enabled: false
-
 Style/SlicingWithRange:
   Enabled: false
 
-Style/SpecialGlobalVars:
-  Enabled: true
-
 Style/StringLiterals:
   Enabled: false
 
@@ -780,22 +654,13 @@ Style/StringMethods:
 Style/SymbolArray:
   Enabled: false
 
-Style/SymbolProc:
-  Enabled: true
-
 Style/TernaryParentheses:
   Enabled: false
 
-Style/TrailingCommaInArguments:
-  Enabled: true
-  EnforcedStyleForMultiline: no_comma # matches Standard  https://github.com/standardrb/standard/blob/250b306cd44bea509d20023d9ab63170da67c815/config/base.yml#L1857
-
 Style/TrailingCommaInArrayLiteral:
-  Enabled: true
   EnforcedStyleForMultiline: consistent_comma
 
 Style/TrailingCommaInHashLiteral:
-  Enabled: true
   EnforcedStyleForMultiline: consistent_comma
 
 Style/TrivialAccessors:

data/config/rails.yml

@@ -31,9 +31,6 @@ Performance/DoubleStartEndWith:
 Rails/ActiveRecordAliases:
   Enabled: false
 
-Rails/ActiveRecordOverride:
-  Enabled: true
-
 Rails/ApplicationRecord:
   AutoCorrect: true
 
@@ -42,7 +39,6 @@ Rails/BulkChangeTable:
 
 Rails/Date:
   AutoCorrect: false
-  Enabled: true
 
 Rails/DefaultScope:
   Enabled: true
@@ -112,18 +108,6 @@ Rails/NotNullColumn:
 Rails/ReadWriteAttribute:
   Enabled: false
 
-Rails/SaveBang:
-  SafeAutoCorrect: false
-
-Rails/SkipsModelValidations:
-  Enabled: true
-
-Rails/TimeZone:
-  Enabled: true
-
-Rails/UniqueValidationWithoutIndex:
-  Enabled: true
-
 Rails/UnknownEnv:
   Environments:
     - demo

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

@@ -41,7 +41,7 @@ module RuboCop
         METHODS_TO_CHECK = %i(match? include? ==).to_set.freeze
 
         def on_rescue(node)
-          node.resbody_branches.last.each_descendant(:if, :unless).each do |condition_node|
+          node.resbody_branches.last.each_descendant(:if, :unless) do |condition_node|
             add_offense(condition_node) if message_check?(condition_node)
           end
         end

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

@@ -30,6 +30,11 @@ module RuboCop
         WORKER_FALLBACK = %w(Sidekiq::Worker).freeze
         WORKER_MODULES = "WorkerModules"
 
+        # @!method worker_module_include?(node)
+        def_node_matcher :worker_module_include?, <<~PATTERN
+          (send nil? :include (const _ _))
+        PATTERN
+
         def on_def(node)
           return unless node.method?(:perform)
           return unless (method_type = perform_class_method_type(node))
@@ -51,19 +56,12 @@ module RuboCop
 
         def is_sidekiq_worker?(search_node, method_type)
           search_node = search_node.parent if method_type == :sclass
-          search_node.parent.children.any? do |sibling|
-            next if sibling.nil?
-            next unless is_include?(sibling)
-            next unless sibling.first_argument.const_type?
-
-            worker_modules.include?(sibling.first_argument.const_name)
+          search_node.parent.each_child_node.any? do |sibling|
+            worker_module_include?(sibling) &&
+              worker_modules.include?(sibling.first_argument.const_name)
           end
         end
 
-        def is_include?(node)
-          node.send_type? && node.method?(:include)
-        end
-
         def worker_modules
           @worker_modules ||= cop_config.fetch(WORKER_MODULES, WORKER_FALLBACK)
         end

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

@@ -69,7 +69,7 @@ module RuboCop
             if type_validation?(validation_node) && validation_node.first_argument.value == type_field
               has_validation = true
               # Check for allow_blank in the validation options
-              validation_node.arguments[1].each_node(:pair) do |pair_node|
+              validation_node.last_argument.each_node(:pair) do |pair_node|
                 has_allow_blank = true if allow_blank?(pair_node)
               end
             elsif polymorphic_methods_for?(validation_node) && validation_node.first_argument.value == relation_name

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

@@ -52,19 +52,24 @@ module RuboCop
           )
         ).freeze
         MSG = "Use Feature Flags or config instead of `Rails.env`."
-        PROHIBITED_CLASS = "Rails"
         RESTRICT_ON_SEND = %i(env).freeze
 
-        def on_send(node)
-          return unless node.receiver&.const_name == PROHIBITED_CLASS
+        # @!method prohibited_rails_env?(node)
+        def_node_matcher :prohibited_rails_env?, <<~PATTERN
+          (send
+            (send (const _ :Rails) :env)
+            #prohibited_predicate?
+          )
+        PATTERN
 
-          return unless (parent = node.parent)
-          return unless parent.send_type?
-          return unless parent.predicate_method?
+        def on_send(node)
+          add_offense(node.parent) if prohibited_rails_env?(node.parent)
+        end
 
-          return if ALLOWED_LIST.include?(parent.method_name)
+        private
 
-          add_offense(parent)
+        def prohibited_predicate?(name)
+          name.to_s.end_with?("?") && !ALLOWED_LIST.include?(name)
         end
       end
     end

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

@@ -33,6 +33,11 @@ module RuboCop
         MSG = "Don't mock #{CLASSES.join('/')} directly. Use Rails Testing Time Helpers (eg `freeze_time` and `travel_to`) instead.".freeze
         RESTRICT_ON_SEND = %i(to).freeze
 
+        # @!method and_call_original?(node)
+        def_node_search :and_call_original?, <<~PATTERN
+          (send _ :and_call_original)
+        PATTERN
+
         # Matches allow/expect with a time class (or chain) receiver and a `receive` or `receive_message_chain`
         # Examples matched:
         #   allow(Time).to receive(:now)
@@ -70,9 +75,7 @@ module RuboCop
           return false if node.nil?
 
           current = node
-          while current.respond_to?(:send_type?) && current.send_type?
-            current = current.receiver
-          end
+          current = current.receiver while current&.send_type?
 
           if current.nil?
             return false
@@ -83,16 +86,14 @@ module RuboCop
           # Accept both `Time` and `::Time` as root-level constants
           namespace = current.namespace
           is_root_level = namespace.nil? || namespace.cbase_type?
-          is_root_level && CLASSES.include?(current.children[1])
+          is_root_level && CLASSES.include?(current.short_name)
         end
 
         def and_call_original_in_chain?(node)
           return false if node.nil?
           return false unless node.send_type?
 
-          return true if node.method?(:and_call_original)
-
-          node.each_descendant(:send).any? { |send_node| send_node.method?(:and_call_original) }
+          and_call_original?(node)
         end
       end
     end

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

@@ -5,15 +5,14 @@ module RuboCop
     module Gusto
       class SidekiqParams < Base
         MSG = "Sidekiq perform methods cannot take keyword arguments"
-        PROHIBITED_ARG_TYPES = Set.new(%i(kwoptarg kwarg)).freeze
 
-        def on_def(node)
-          return unless node.method?(:perform)
-          return if node.arguments.empty?
+        # @!method perform_with_kwargs?(node)
+        def_node_matcher :perform_with_kwargs?, <<~PATTERN
+          (def :perform (args <{kwarg kwoptarg} ...>) ...)
+        PATTERN
 
-          node.arguments.each_child_node do |arg|
-            add_offense(node) if PROHIBITED_ARG_TYPES.include?(arg.type)
-          end
+        def on_def(node)
+          add_offense(node) if perform_with_kwargs?(node)
         end
       end
     end

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

@@ -129,7 +129,7 @@ module RuboCop
 
         def colorized_string?(node)
           node.send_type? &&
-            node.receiver.is_a?(RuboCop::AST::Node) &&
+            node.receiver &&
             string_or_colorized_receiver?(node.receiver)
         end
 
@@ -152,19 +152,16 @@ module RuboCop
                 foreground = ":#{args.first.value}"
               elsif args.length == 1 && args.first.hash_type?
                 # Hash argument, like colorize(color: :red, background: :blue)
-                args.first.pairs.each do |pair|
-                  break unless pair.value.sym_type? # can't handle non-symbol arguments
+                args.first.each_pair do |key_node, value_node|
+                  break unless value_node.sym_type? # can't handle non-symbol arguments
 
-                  key = pair.key.value
-                  value = ":#{pair.value.value}"
-
-                  case key
+                  case key_node.value
                   when :color
-                    foreground = value
+                    foreground = ":#{value_node.value}"
                   when :background
-                    background = value
+                    background = ":#{value_node.value}"
                   when :mode
-                    styles << value
+                    styles << ":#{value_node.value}"
                   else
                     break # unknown key, skip the rest of the hash
                   end

data/lib/rubocop/cop/rspec/scattered_let.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+require "rubocop/cop/rspec/scattered_let"
+
+module RuboCop
+  module Cop
+    module RSpec
+      # Patches the upstream `RSpec/ScatteredLet` cop so that Sorbet `sig`
+      # declarations attached to `let`/`let!` blocks (Sorbet's RSpec mode)
+      # do not interrupt the consecutive-let chain.
+      #
+      # Without this patch the upstream cop flags valid `sig`+`let`
+      # arrangements because the intervening `sig` block breaks the
+      # consecutive-sibling check. (The sig-aware `MoveNode` patch in
+      # `lib/rubocop/gusto/move_node_patch.rb` handles dragging the `sig`
+      # along during autocorrect.)
+      #
+      # @example
+      #   # good (no longer flagged)
+      #   context "..." do
+      #     sig { returns(Something) }
+      #     let(:thing) { create(:something) }
+      #
+      #     sig { returns(Other) }
+      #     let(:other) { create(:other) }
+      #   end
+      class ScatteredLet
+        LetUnit = Struct.new(:let, :start_index, :length)
+        private_constant :LetUnit
+
+        # @!method sig_block?(node)
+        def_node_matcher :sig_block?, <<~PATTERN
+          (block (send nil? :sig) _ _)
+        PATTERN
+
+        private
+
+        def check_let_declarations(body)
+          children = body.each_child_node.to_a
+          units = build_let_units(children)
+          return if units.empty?
+
+          reference_unit = units.first
+          expected_start = reference_unit.start_index
+
+          units.each do |unit|
+            if unit.start_index == expected_start
+              reference_unit = unit
+            else
+              add_offense(unit.let) do |corrector|
+                ::RuboCop::RSpec::Corrector::MoveNode.new(
+                  unit.let, corrector, processed_source
+                ).move_after(reference_unit.let)
+              end
+            end
+            expected_start += unit.length
+          end
+        end
+
+        def build_let_units(children)
+          children.each_with_index.with_object([]) do |(node, idx), units|
+            next unless let?(node)
+
+            prev = idx.positive? ? children[idx - 1] : nil
+            if prev && sig_block?(prev)
+              units << LetUnit.new(node, prev.sibling_index, 2)
+            else
+              units << LetUnit.new(node, node.sibling_index, 1)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/gusto/move_node_patch.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require "rubocop/rspec/corrector/move_node"
+
+module RuboCop
+  module RSpec
+    module Corrector
+      # Patches `MoveNode` to treat Sorbet `sig { ... }` blocks as part of the
+      # `let`/`subject`/hook they precede.
+      #
+      # Sorbet's RSpec mode attaches type signatures to memoized helpers via a
+      # `sig` block immediately above the declaration:
+      #
+      #   sig { returns(Something) }
+      #   let(:thing) { create(:something) }
+      #
+      # Several rubocop-rspec cops use `MoveNode` to relocate `let`/`subject`/
+      # hook nodes (`ScatteredLet`, `LeadingSubject`, `LetBeforeExamples`,
+      # `HooksBeforeExamples`). Without this patch, the move strands the `sig`
+      # at the original location. This patch:
+      #
+      # 1. Extends the source range of the moved node to include a preceding
+      #    `sig` block, so `sig` is carried with the move.
+      # 2. In `move_before`, redirects the insertion point above a preceding
+      #    `sig` on the destination, so the destination's `sig` pairing stays
+      #    intact.
+      module SigAwareMoveNode
+        extend ::RuboCop::AST::NodePattern::Macros
+
+        # @!method sig_block?(node)
+        def_node_matcher :sig_block?, <<~PATTERN
+          (block (send nil? :sig ...) _ _)
+        PATTERN
+
+        def move_before(other)
+          sig = preceding_sig_block(other)
+          super(sig || other)
+        end
+
+        private
+
+        def node_range(node)
+          sig = preceding_sig_block(node)
+          return super unless sig
+
+          ::Parser::Source::Range.new(
+            buffer,
+            begin_pos_with_comment(sig).begin_pos,
+            end_line_position(node).end_pos
+          )
+        end
+
+        def preceding_sig_block(node)
+          prev = node.left_sibling
+          prev if sig_block?(prev)
+        end
+      end
+
+      MoveNode.prepend(SigAwareMoveNode)
+    end
+  end
+end

data/lib/rubocop/gusto/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module Gusto
-    VERSION = "10.8.0"
+    VERSION = "10.9.1"
   end
 end

data/lib/rubocop-gusto.rb

@@ -6,6 +6,7 @@ require "rubocop-rspec"
 require_relative "rubocop/gusto"
 require_relative "rubocop/gusto/version"
 require_relative "rubocop/gusto/plugin"
+require_relative "rubocop/gusto/move_node_patch"
 
 # Require all cops
 Dir.glob(File.join(File.dirname(__FILE__), "rubocop/cop/**/*.rb")).each do |file|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-gusto
 version: !ruby/object:Gem::Version
-  version: 10.8.0
+  version: 10.9.1
 platform: ruby
 authors:
 - Gusto Engineering
 bindir: exe
 cert_chain: []
-date: 2026-03-25 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lint_roller
@@ -148,10 +148,12 @@ files:
 - lib/rubocop/cop/internal_affairs/assignment_first.rb
 - lib/rubocop/cop/internal_affairs/require_restrict_on_send.rb
 - lib/rubocop/cop/rack/lowercase_header_keys.rb
+- lib/rubocop/cop/rspec/scattered_let.rb
 - lib/rubocop/gusto.rb
 - lib/rubocop/gusto/cli.rb
 - lib/rubocop/gusto/config_yml.rb
 - lib/rubocop/gusto/init.rb
+- lib/rubocop/gusto/move_node_patch.rb
 - lib/rubocop/gusto/plugin.rb
 - lib/rubocop/gusto/templates/rubocop.yml
 - lib/rubocop/gusto/version.rb
@@ -174,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 4.0.10
 specification_version: 4
 summary: A gem for sharing gusto rubocop rules
 test_files: []