runger_style 4.4.1 → 4.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4428b1d4a31a45eb414ee1d9235df01cd4d9f6c8aef534ccaaff48d1302923e9
-  data.tar.gz: 2250046cdd4cdff82ba1db8dfc4d89dace70fcf9ea58a2eb3b9eafc7851a2827
+  metadata.gz: '089e6bed54b363029e157336dac7eafac5a9401d50662662103b02373827c235'
+  data.tar.gz: 14e29ec24c33427d0330c3f8ed8b8a985b8dac4a5851098619fa072967b06cfc
 SHA512:
-  metadata.gz: f1a0cc0f2444fd15b13838c9e89e4ca461c022b3f2519b160f1495cedc8f21a8e33314d8fa5bfe72adc400877aaea3c4db5d838f4c114e652f68fa6f2a464694
-  data.tar.gz: 8a5d690cfc9ab98fbfdc24c853250e6409e4693c9997a293b824de373bd19d1492ac14f9de85b4d1bbb172ed6ef803d6e088899079a0443e5e5e9299c641e47e
+  metadata.gz: e942a2e414e7726ee7b9b0b8fcc47f20750833d05dbcca5f7659351d8ab28715e1d477917cde8ab73dc8a47bdd92b2aabc9b175b909d0dd561d1049a878d490e
+  data.tar.gz: '0762039ac0c0fad9fa0487e2c0cc974a81e237e7f5dbcf29c501b995b3aa4ba42c8d2644c3585b1d976f4e5a0e2f173529642f87e6301fdbc242da3a65814ba7'

data/.rubocop.yml

@@ -7,3 +7,7 @@ inherit_from:
   - rulesets/rake.yml
   - rulesets/rspec_rails.yml
   - rulesets/rspec.yml
+
+# Load the Rails cops to check that they work, but disable them because this isn't a Rails project.
+Rails:
+  Enabled: false

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v4.5.0 (2025-02-11)
+- Add custom `RungerStyle/MultilineHashValueIndentation` cop.
+- Add custom `RungerStyle/FirstArgumentIndentation` cop.
+
 ## v4.4.1 (2025-02-10)
 - Remove `RSpec/DescribeClass` custom config.
 

data/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: .
   specs:
-    runger_style (4.4.1)
+    runger_style (4.5.0)
       prism (>= 0.24.0)
       rubocop (>= 1.68.0)
 
@@ -46,7 +46,7 @@ GEM
       pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.9.1)
+    json (2.10.1)
     language_server-protocol (3.17.0.4)
     logger (1.6.5)
     memo_wise (1.10.0)
@@ -173,7 +173,7 @@ CHECKSUMS
   i18n (1.14.7) sha256=ceba573f8138ff2c0915427f1fc5bdf4aa3ab8ae88c8ce255eb3ecf0a11a5d0f
   io-console (0.8.0) sha256=cd6a9facbc69871d69b2cb8b926fc6ea7ef06f06e505e81a64f14a470fddefa2
   irb (1.15.1) sha256=d9bca745ac4207a8b728a52b98b766ca909b86ff1a504bcde3d6f8c84faae890
-  json (2.9.1) sha256=d2bdef4644052fad91c1785d48263756fe32fcac08b96a20bb15840e96550d11
+  json (2.10.1) sha256=ddc88ad91a1baf3f0038c174f253af3b086d30dc74db17ca4259bbde982f94dc
   language_server-protocol (3.17.0.4) sha256=c484626478664fd13482d8180947c50a8590484b1258b99b7aedb3b69df89669
   logger (1.6.5) sha256=c3cfe56d01656490ddd103d38b8993d73d86296adebc5f58cefc9ec03741e56b
   memo_wise (1.10.0) sha256=ae40ff8e7799697ff5d59d739b8766f76be22eba69c7c8468edb42ab83c94c3f
@@ -211,7 +211,7 @@ CHECKSUMS
   ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33
   runger_byebug (11.4.0) sha256=569e22ba2215f57e7f69e145fcb63be401e29fcd312f7936d813e12d0c7bbee6
   runger_release_assistant (2.0.0) sha256=f4f5708291eaeef1b881208f87a494877fe768739d6e96b7293fc335b28a3865
-  runger_style (4.4.1)
+  runger_style (4.5.0)
   securerandom (0.4.1) sha256=cc5193d414a4341b6e225f0cb4446aceca8e50d5e1888743fac16987638ea0b1
   slop (4.10.1) sha256=844322b5ffcf17ed4815fdb173b04a20dd82b4fd93e3744c88c8fafea696d9c7
   stringio (3.1.2) sha256=204f1828f85cdb39d57cac4abc6dc44b04505a223f131587f2e20ae3729ba131

data/lib/runger_style/cops/first_argument_indentation.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module RungerStyle # rubocop:disable Style/ClassAndModuleChildren
+  class FirstArgumentIndentation < ::RuboCop::Cop::Layout::FirstArgumentIndentation
+    def on_send(node)
+      return if memoizing?(node)
+
+      super
+    end
+
+    private
+
+    def memoizing?(node)
+      memoizing_method_names.include?(node.method_name)
+    end
+
+    def memoizing_method_names
+      @memoizing_method_names ||= cop_config['MemoizingMethods'].map(&:to_sym)
+    end
+  end
+end

data/lib/runger_style/cops/multiline_hash_value_indentation.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module RungerStyle # rubocop:disable Style/ClassAndModuleChildren
+  class MultilineHashValueIndentation < ::RuboCop::Cop::Base
+    extend ::RuboCop::Cop::AutoCorrector
+
+    MSG = 'Hash value should be indented by two spaces relative to its key.'
+
+    def on_pair(node)
+      key_node = node.key
+      value_node = node.value
+
+      # Only check if the key and value appear on separate lines.
+      if key_node.source_range.line != value_node.source_range.line
+        key_column = key_node.source_range.column
+        expected_value_column = key_column + 2
+        actual_value_column = value_node.source_range.column
+
+        if actual_value_column != expected_value_column
+          add_offense(value_node, message: MSG) do |corrector|
+            buffer = value_node.source_range.source_buffer
+            # Get the entire line where the value starts.
+            line_range = buffer.line_range(value_node.source_range.line)
+            # Create a range covering just the indentation of that line.
+            indentation_range =
+              Parser::Source::Range.new(
+                buffer,
+                line_range.begin_pos,
+                value_node.source_range.begin_pos,
+              )
+            # Replace the existing indentation with the expected number of spaces.
+            corrector.replace(indentation_range, ' ' * expected_value_column)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/runger_style/cops/multiline_method_arguments_line_breaks.rb

@@ -2,8 +2,8 @@
 
 module RungerStyle # rubocop:disable Style/ClassAndModuleChildren
   class MultilineMethodArgumentsLineBreaks < ::RuboCop::Cop::Base
-    extend RuboCop::Cop::AutoCorrector
-    include RuboCop::Cop::RangeHelp
+    extend ::RuboCop::Cop::AutoCorrector
+    include ::RuboCop::Cop::RangeHelp
 
     MSG = 'Each argument in a multi-line method call must start on a separate line.'
 

data/lib/runger_style/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RungerStyle
-  VERSION = '4.4.1'
+  VERSION = '4.5.0'
 end

data/rulesets/default.yml

@@ -13,8 +13,6 @@ Bundler/GemVersion:
 Layout:
   Exclude:
     - db/schema.rb
-Layout/ArgumentAlignment:
-  EnforcedStyle: with_fixed_indentation
 Layout/BlockAlignment:
   EnforcedStyleAlignWith: start_of_block
 Layout/ClassStructure:
@@ -35,7 +33,7 @@ Layout/EmptyLineAfterMultilineCondition:
 Layout/EmptyLineBetweenDefs:
   AllowAdjacentOneLineDefs: true
 Layout/FirstArgumentIndentation:
-  Enabled: false # this rule doesn't play nicely with the way that I like to use `memoize`
+  Enabled: false # Instead, we use RungerStyle/FirstArgumentIndentation.
 Layout/FirstArrayElementIndentation:
   EnforcedStyle: consistent
 Layout/FirstMethodArgumentLineBreak:
@@ -53,6 +51,15 @@ Layout/LineLength:
     # Ignore RSpec description strings:
     - !ruby/regexp /^ *(context|describe|it) ['"].*['"].* do$/
   Max: 100
+Layout/MultilineAssignmentLayout:
+  SupportedTypes:
+    - block
+    - case
+    - class
+    - if
+    - kwbegin
+    - module
+    - send # This (method calls) is not in the default list.
 Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented
 Layout/MultilineOperationIndentation:
@@ -97,6 +104,13 @@ Naming/RescuedExceptionsVariableName:
   Enabled: false
 Naming/VariableNumber:
   Enabled: false
+RungerStyle/FirstArgumentIndentation:
+  EnforcedStyle: consistent_relative_to_receiver
+  MemoizingMethods:
+    - memo_wise
+    - memoize
+  SupportedStyles:
+    - consistent_relative_to_receiver
 Style:
   Exclude:
     - db/schema.rb

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: runger_style
 version: !ruby/object:Gem::Version
-  version: 4.4.1
+  version: 4.5.0
 platform: ruby
 authors:
 - David Runger
 bindir: bin
 cert_chain: []
-date: 2025-02-10 00:00:00.000000000 Z
+date: 2025-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prism
@@ -66,6 +66,8 @@ files:
 - bin/rspec
 - bin/rubocop
 - lib/runger_style.rb
+- lib/runger_style/cops/first_argument_indentation.rb
+- lib/runger_style/cops/multiline_hash_value_indentation.rb
 - lib/runger_style/cops/multiline_method_arguments_line_breaks.rb
 - lib/runger_style/cops/require_all_custom_cops.rb
 - lib/runger_style/version.rb