rubocop-dbl 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8fe3d4a4f7e6815e04cb657a97fbac59d0a376bec3b02f3935f5932f42f6b38
-  data.tar.gz: 2cfc77717d8b79375e569d0dce3743505eebde4ef449bdc42ec1e2309111c0e4
+  metadata.gz: 3ec53394cf1a5816713e5bf4c77e1e88649fb7a049081c253da7cb971e91463e
+  data.tar.gz: 9b748ef9863698f9b6db0318dc22a94cec63314b77f6a0f161e9e0da20a314ab
 SHA512:
-  metadata.gz: 684c2c5dc56489b9c645c0806169a1b0721c8734fe092748f5b3a68e4a340d08004e544dd34fdeaf4b8fedf6a47d06235b87f29fca160646c7c499d47a610fea
-  data.tar.gz: 13db56ad3a82a228a1ac8e7024975552df2942b8721fdd0a7087f626483189d5a639bf90f04ec1ee6d6ae89c909c911c8faf3d919276b1c50774ddea001ffc4d
+  metadata.gz: c49572ee20abe581d8412897f5a1fea1c1b90bde6d4aded720e97e2fe8612cd23631486575fdba9d73341b5e8669741f54d9862b0a5018d0b18ee36bde47b9ca
+  data.tar.gz: b8e0899af2188c0634f8af1ce420a53a1b2ce07c83f32b2e03bed6e36b079c6d8af1ee82c60983fd8039f119469833bd58b9bb4a0dab9324646db36eb900e3ad

data/config/cops/layout.yml

@@ -24,3 +24,10 @@ Layout/ParameterAlignment:
   SupportedStyles:
     - with_first_parameter
     - with_fixed_indentation
+
+Layout/LineLength:
+  Max: 120
+  IgnoreCopDirectives: true
+  AllowedPatterns: ['\s#\s'] # allows comments to overflow the line length. E.g. for URLs
+  Exclude:
+    - 'spec/**/*'

data/config/cops/style.yml

@@ -76,3 +76,7 @@ Style/RedundantArgument:
 
 Style/SwapValues:
   Enabled: true
+
+# "private_class_method" must always be inlined, no need for a cop
+Style/AccessModifierDeclarations:
+  EnforcedStyle: inline

data/config/cops/types.yml

@@ -11,8 +11,14 @@
 #
 
 Sorbet/HasSigil:
-  MinimumStrictness: true
+  MinimumStrictness: strict
   SuggestedStrictness: strict
   Exclude:
-    - spec/**/*
-    - test/**/*
+    - "spec/**/*"
+    - "test/**/*"
+
+Sorbet/StrictSigil:
+  Enabled: true
+  Exclude:
+    - "spec/**/*"
+    - "lib/tasks/**/*"

data/config/dbl.yml

@@ -20,7 +20,7 @@ inherit_from:
 # see: https://docs.rubocop.org/rubocop/usage/caching.html
 AllCops:
   UseCache: true
-  TargetRubyVersion: 3.1.4
+  TargetRubyVersion: 3.0.0
   NewCops: enable
   Exclude:
     - '**/tmp/**/*'
@@ -30,7 +30,6 @@ AllCops:
     - 'actionmailbox/test/dummy/**/*'
     - 'actiontext/test/dummy/**/*'
     - '**/node_modules/**/*'
-    # Additional exclude files by rubocop-rails
     - 'bin/**/*'
     - 'config/**/*'
     - 'db/**/*'

data/lib/generators/rubocop_dbl/install_generator.rb

@@ -10,38 +10,143 @@ module RubocopDbl
 
       def create_config_file
         file_method = config_file_exists? ? :prepend : :create
-        send :"#{file_method}_file", config_file_path, config_file_content
-      end
+        content = defined?(Rails) ? config_file_content_rails : config_file_content
 
-      private
+        send(
+          :"#{file_method}_file",
+          config_file_path,
+          content,
+        )
+      end
 
-      def config_file_exists?
+      private def config_file_exists?
         File.exist?(config_file_path)
       end
 
-      def config_file_path
+      private def config_file_path
         '.rubocop.yml'
       end
 
-      def config_file_content
-        if defined?(Rails)
-          <<~HEREDOC
-            require:
-              - rubocop-rails
-
+      private def config_file_content
+        <<~HEREDOC
             inherit_gem:
               rubocop-dbl:
-                - config/dbl.yml
-                - config/cops/rails.yml
-          HEREDOC
-        else
-          <<~HEREDOC
+              - config/dbl.yml
 
-            inherit_gem:
-              rubocop-dbl:
+          # we do not want to overwrite the base-array (from rubocop-dbl), but extend it
+          inherit_mode:
+            merge:
+              - Exclude
+
+          AllCops:
+            TargetRubyVersion: 3.3.0
+            Exclude:
+              - 'sorbet/rbi/shims/**/*'
+        HEREDOC
+      end
+
+      private def config_file_content_rails
+        <<~HEREDOC
+          require:
+            - rubocop-rails
+
+          inherit_gem:
+            rubocop-dbl:
               - config/dbl.yml
-          HEREDOC
-        end
+
+          inherit_mode:
+            merge:
+              - Exclude
+
+          AllCops:
+            TargetRubyVersion: 3.3.0
+            Exclude:
+              - 'sorbet/rbi/shims/**/*'
+
+          # Defaults for this cop are found here:
+          # https://github.com/rubocop/rubocop-rails/blob/master/config/default.yml
+          #
+          # Add customizations below.
+          #
+          # Ensure to document why we change a default by linking the corresponding PR.
+          # For example:
+          #
+          #     Rails/ActionFilter:
+          #       Enabled: false
+          #
+
+          # @NOTE: added: "staging"
+          Rails/UnknownEnv:
+            Environments:
+              - production
+              - development
+              - test
+              - staging
+
+          # @NOTE: disabled
+          Rails/HttpStatus:
+            Enabled: false
+
+          # @NOTE: disabled
+          Rails/ApplicationController:
+            Enabled: false
+
+
+          #
+          # @NOTE: all the cops ahead are "pending" in the current default config
+          #
+          Rails/ActiveRecordCallbacksOrder:
+            Enabled: true
+
+          Rails/AfterCommitOverride:
+            Enabled: true
+
+          Rails/AttributeDefaultBlockValue:
+            Enabled: true
+
+          Rails/FindById:
+            Enabled: true
+
+          Rails/Inquiry:
+            Enabled: true
+
+          Rails/MailerName:
+            Enabled: true
+
+          Rails/MatchRoute:
+            Enabled: true
+
+          Rails/NegateInclude:
+            Enabled: true
+
+          Rails/Pluck:
+            Enabled: true
+
+          Rails/PluckInWhere:
+            Enabled: true
+
+          Rails/RenderInline:
+            Enabled: true
+
+          Rails/RenderPlainText:
+            Enabled: true
+
+          Rails/ShortI18n:
+            Enabled: true
+            EnforcedStyle: aggressive
+
+          Rails/SquishedSQLHeredocs:
+            Enabled: true
+
+          Rails/WhereEquals:
+            Enabled: true
+
+          Rails/WhereExists:
+            Enabled: true
+
+          Rails/WhereNot:
+            Enabled: true
+        HEREDOC
       end
     end
   end

data/lib/rubocop_dbl/version.rb

@@ -1,5 +1,5 @@
 # typed: false
 
 module RubocopDbl
-  VERSION = '2.0.0'.freeze
+  VERSION = '2.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-dbl
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - 'Team DBL :rocket:'
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-30 00:00:00.000000000 Z
+date: 2024-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -107,7 +107,6 @@ files:
 - config/cops/metrics.yml
 - config/cops/naming.yml
 - config/cops/performance.yml
-- config/cops/rails.yml
 - config/cops/rspec.yml
 - config/cops/style.yml
 - config/cops/types.yml
@@ -127,14 +126,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.6
 signing_key:
 specification_version: 4
 summary: RuboCop configuration for our Ruby on Rails projects

data/config/cops/rails.yml

@@ -1,83 +0,0 @@
-# Defaults for this cop are found here:
-# https://github.com/rubocop/rubocop-rails/blob/master/config/default.yml
-#
-# Add customizations below.
-#
-# Ensure to document why we change a default by linking the corresponding PR.
-# For example:
-#
-#     Rails/ActionFilter:
-#       Enabled: false
-#
-
-# @NOTE: added: "staging"
-Rails/UnknownEnv:
-  Environments:
-    - production
-    - development
-    - test
-    - staging
-
-# @NOTE: disabled
-Rails/HttpStatus:
-  Enabled: false
-
-# @NOTE: disabled
-Rails/ApplicationController:
-  Enabled: false
-
-
-#
-# @NOTE: all the cops ahead are "pending" in the current default config
-#
-Rails/ActiveRecordCallbacksOrder:
-  Enabled: true
-
-Rails/AfterCommitOverride:
-  Enabled: true
-
-Rails/AttributeDefaultBlockValue:
-  Enabled: true
-
-Rails/FindById:
-  Enabled: true
-
-Rails/Inquiry:
-  Enabled: true
-
-Rails/MailerName:
-  Enabled: true
-
-Rails/MatchRoute:
-  Enabled: true
-
-Rails/NegateInclude:
-  Enabled: true
-
-Rails/Pluck:
-  Enabled: true
-
-Rails/PluckInWhere:
-  Enabled: true
-
-Rails/RenderInline:
-  Enabled: true
-
-Rails/RenderPlainText:
-  Enabled: true
-
-Rails/ShortI18n:
-  Enabled: true
-  EnforcedStyle: aggressive
-
-Rails/SquishedSQLHeredocs:
-  Enabled: true
-
-Rails/WhereEquals:
-  Enabled: true
-
-Rails/WhereExists:
-  Enabled: true
-
-Rails/WhereNot:
-  Enabled: true