rubocop-gusto 10.1.1 → 10.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a06f9920ea80223223c9353783cfc0a8824f232cc3e18c323195811a28eb28a
-  data.tar.gz: 2943d0fd74fc5f31be0f0527e136ee034514d4215357c33e5c64207e377855e1
+  metadata.gz: ad5b8322bb818e1f765532f2757ae7bcce5bf7275ef22ced8700f87883715972
+  data.tar.gz: aff19b02288f2b23afb2df259a2a63b441189527d9d91f2e115ab75c7a2f1746
 SHA512:
-  metadata.gz: 7dffff3eae0680c7ced3dfd4fc42eb98b37431a86aebcce90c0492a3c05f9c7f13a38c3634037aa3da96647d9857e8553af6ca155ba3707bbcf0a7e9d3fa2e42
-  data.tar.gz: ebc7a8072aa0e99bf33f1596aa4502573c99006d28ba179f15fa5c32394d6dc27f94bebc322942c586157e6549a7b2c25b907fd3f4092f4f9f604c58bbd1579a
+  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`
 
@@ -341,9 +342,6 @@ RSpec/DescribedClass:
 
 RSpec/DescribedClassModuleWrapping:
   Enabled: true
-  # TODO: improve this file matching pattern
-  Include:
-    - '**/spec/**/*_spec.rb'
 
 RSpec/ExampleLength:
   Enabled: false
@@ -426,7 +424,6 @@ Rake/ClassDefinitionInTask:
   Enabled: false
 
 Rake/Desc:
-  # TODO: Roll this out.
   Enabled: true
 
 Security/YAMLLoad:
@@ -443,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.
@@ -457,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
@@ -479,7 +479,6 @@ Style/Alias:
   EnforcedStyle: prefer_alias_method
 
 Style/AsciiComments:
-  # TODO: roll this out fully
   Enabled: true
 
 Style/AutoResourceCleanup:
@@ -542,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
@@ -559,7 +558,7 @@ Style/HashTransformValues:
   Enabled: false
 
 Style/IfInsideElse:
-    Enabled: false
+  Enabled: false
 
 Style/IfUnlessModifier:
   Enabled: false
@@ -567,9 +566,6 @@ Style/IfUnlessModifier:
 Style/ImplicitRuntimeError:
   Enabled: false
 
-Style/InverseMethods:
-  Enabled: false
-
 Style/Lambda:
   EnforcedStyle: literal
 
@@ -752,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
 

data/lib/rubocop/gusto/config_yml.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "pathname"
+require "yaml"
 
 module RuboCop
   module Gusto
@@ -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/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.1"
+    VERSION = "10.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-gusto
 version: !ruby/object:Gem::Version
-  version: 10.1.1
+  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:
     - - ">="