rubocop-discourse 2.5.0 → 3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a1dd5d5b8d79de5bcda354a31c6f993460f11875065c64edd9f7cc3cce71bff
-  data.tar.gz: 175c1f83d9300537bac93184d5e8bf5d21cffc8196e996d59cc9298f69d8bdb5
+  metadata.gz: caa33338c84c26b1d2bc6010ca26ab11bd265c96086def2d8e6591fe995b2660
+  data.tar.gz: f8a7c7e8b0153aeb4fb251155836cc8abdcd58c538d7a8ce42fda403a0489b4a
 SHA512:
-  metadata.gz: ada5c637849f829f0d8d0247b86fbec1a1cc9182d06b6385f6ac13f081f9782a7d9cd38d8a3dd30c2bf121f834171a9f28933deaee4ab8a53a022aa3af5d06fc
-  data.tar.gz: ab731fee843a5a8ef9821c613751906457672eb11bed54ec0aae3856588b723a77c03aa26f258a3c1e19c25b1edac4d198ae8ffbfd3e4bbaf397d4e2f1332c8f
+  metadata.gz: bd90fcbefb1c81bb199ef9546e32a62bb7d044853faaf5e9e5445e8d05f819c507e618ce0d546edb67da34d463e098e105580e81a0f48a085d3fbf395f0fa86b
+  data.tar.gz: c28eddf777f8ac0e00785a21c2ce0ef44891548dc4d00a37ca1ae63d10507db095ec7ac578e6f6eef959c2ac8c7f0a1976dd05a41913de5d6a9b36314d0c3f2c

data/default.yml

@@ -1,21 +1,6 @@
-require:
-  - rubocop-discourse
-
 inherit_from:
-  - ./rubocop-core.yml
-  - ./rubocop-rspec.yml
-
-AllCops:
-  TargetRubyVersion: 2.6
-  DisabledByDefault: true
-  Exclude:
-    - "db/schema.rb"
-    - "bundle/**/*"
-    - "vendor/**/*"
-    - "**/node_modules/**/*"
-    - "public/**/*"
-    - "plugins/**/gems/**/*"
-    - "plugins/**/vendor/**/*"
+  - ./stree-compat.yml
+  - ./rubocop-layout.yml
 
-Discourse:
-  Enabled: true
+Layout/LineLength:
+  Enabled: false

data/rubocop-core.yml

@@ -38,83 +38,6 @@ Style/GlobalVars:
     - 'spec/**/*.rb'
     - 'plugins/*/spec/**/*'
 
-# Align `when` with `case`.
-Layout/CaseIndentation:
-  Enabled: true
-
-# Align comments with method definitions.
-Layout/CommentIndentation:
-  Enabled: true
-
-# No extra empty lines.
-Layout/EmptyLines:
-  Enabled: true
-
-# Two spaces, no tabs (for indentation).
-Layout/IndentationWidth:
-  Enabled: true
-
-Layout/SpaceAfterColon:
-  Enabled: true
-
-Layout/SpaceAfterComma:
-  Enabled: true
-
-Layout/SpaceAroundEqualsInParameterDefault:
-  Enabled: true
-
-Layout/SpaceAroundKeyword:
-  Enabled: true
-
-Layout/SpaceAroundOperators:
-  Enabled: true
-
-Layout/SpaceBeforeFirstArg:
-  Enabled: true
-
-# Use `foo {}` not `foo{}`.
-Layout/SpaceBeforeBlockBraces:
-  Enabled: true
-
-# Use `foo { bar }` not `foo {bar}`.
-Layout/SpaceInsideBlockBraces:
-  Enabled: true
-
-# Use `{ a: 1 }` not `{a:1}`.
-Layout/SpaceInsideHashLiteralBraces:
-  Enabled: true
-
-Layout/SpaceInsideParens:
-  Enabled: true
-
-# Detect hard tabs, no hard tabs.
-Layout/IndentationStyle:
-  Enabled: true
-
-# Blank lines should not have any spaces.
-Layout/TrailingEmptyLines:
-  Enabled: true
-
-# No trailing whitespace.
-Layout/TrailingWhitespace:
-  Enabled: true
-
-Layout/BlockAlignment:
-  Enabled: true
-
-# Align `end` with the matching keyword or starting expression except for
-# assignments, where it should be aligned with the LHS.
-Layout/EndAlignment:
-  Enabled: true
-  EnforcedStyleAlignWith: variable
-
-Layout/MultilineMethodCallIndentation:
-  Enabled: true
-  EnforcedStyle: indented
-
-Layout/HashAlignment:
-  Enabled: true
-
 Lint/Debugger:
   Enabled: true
 
@@ -127,3 +50,10 @@ Lint/ShadowingOuterLocalVariable:
 
 Bundler/OrderedGems:
   Enabled: false
+
+# Enable Layout/LineLength because certain cops that most projects use
+# (e.g. Style/IfUnlessModifier) require Layout/LineLength to be enabled.
+# By leaving it disabled, those rules will mis-fire.
+Layout/LineLength:
+  Enabled: true
+  Max: 240

data/rubocop-discourse.gemspec

@@ -2,9 +2,9 @@
 
 Gem::Specification.new do |s|
   s.name        = "rubocop-discourse"
-  s.version     = "2.5.0"
+  s.version     = "3.0"
   s.summary     = "Custom rubocop cops used by Discourse"
-  s.authors     = ["David Taylor"]
+  s.authors     = ["Discourse Team"]
   s.license     = "MIT"
   s.homepage    = "https://github.com/discourse/rubocop-discourse"
 

data/rubocop-layout.yml

@@ -0,0 +1,76 @@
+# Align `when` with `case`.
+Layout/CaseIndentation:
+  Enabled: true
+
+# Align comments with method definitions.
+Layout/CommentIndentation:
+  Enabled: true
+
+# No extra empty lines.
+Layout/EmptyLines:
+  Enabled: true
+
+# Two spaces, no tabs (for indentation).
+Layout/IndentationWidth:
+  Enabled: true
+
+Layout/SpaceAfterColon:
+  Enabled: true
+
+Layout/SpaceAfterComma:
+  Enabled: true
+
+Layout/SpaceAroundEqualsInParameterDefault:
+  Enabled: true
+
+Layout/SpaceAroundKeyword:
+  Enabled: true
+
+Layout/SpaceAroundOperators:
+  Enabled: true
+
+Layout/SpaceBeforeFirstArg:
+  Enabled: true
+
+# Use `foo {}` not `foo{}`.
+Layout/SpaceBeforeBlockBraces:
+  Enabled: true
+
+# Use `foo { bar }` not `foo {bar}`.
+Layout/SpaceInsideBlockBraces:
+  Enabled: true
+
+# Use `{ a: 1 }` not `{a:1}`.
+Layout/SpaceInsideHashLiteralBraces:
+  Enabled: true
+
+Layout/SpaceInsideParens:
+  Enabled: true
+
+# Detect hard tabs, no hard tabs.
+Layout/IndentationStyle:
+  Enabled: true
+
+# Blank lines should not have any spaces.
+Layout/TrailingEmptyLines:
+  Enabled: true
+
+# No trailing whitespace.
+Layout/TrailingWhitespace:
+  Enabled: true
+
+Layout/BlockAlignment:
+  Enabled: true
+
+# Align `end` with the matching keyword or starting expression except for
+# assignments, where it should be aligned with the LHS.
+Layout/EndAlignment:
+  Enabled: true
+  EnforcedStyleAlignWith: variable
+
+Layout/MultilineMethodCallIndentation:
+  Enabled: true
+  EnforcedStyle: indented
+
+Layout/HashAlignment:
+  Enabled: true

data/rubocop-rspec.yml

@@ -8,16 +8,40 @@ RSpec/AroundBlock:
   Enabled: true
 
 RSpec/BeforeAfterAll:
-  Enabled: false # To be decided
+  Enabled: true
+
+RSpec/ChangeByZero:
+  Enabled: true
 
 RSpec/ContextMethod:
-  Enabled: false # TODO
+  Enabled: true
 
 RSpec/ContextWording:
-  Enabled: false # To be decided
+  Enabled: true
+  Prefixes:
+    - when
+    - with
+    - without
+    - for
+    - while
+    - if
+    - as
+    - after
 
 RSpec/DescribeClass:
-  Enabled: false # To be decided
+  Enabled: true
+  Exclude:
+    - "**/spec/features/**/*"
+    - "**/spec/requests/**/*"
+    - "**/spec/routing/**/*"
+    - "**/spec/system/**/*"
+    - "**/spec/views/**/*"
+    - "**/spec/initializers/**/*"
+    - "**/spec/integration/**/*"
+    - "**/spec/integrity/**/*"
+    - "**/spec/tasks/**/*"
+    - "**/spec/lib/freedom_patches/**/*"
+    - "**/spec/multisite/**/*"
 
 RSpec/DescribeMethod:
   Enabled: true

data/stree-compat.yml

@@ -0,0 +1,21 @@
+require:
+  - rubocop-discourse
+
+inherit_from:
+  - ./rubocop-core.yml
+  - ./rubocop-rspec.yml
+
+AllCops:
+  TargetRubyVersion: 2.6
+  DisabledByDefault: true
+  Exclude:
+    - "db/schema.rb"
+    - "bundle/**/*"
+    - "vendor/**/*"
+    - "**/node_modules/**/*"
+    - "public/**/*"
+    - "plugins/**/gems/**/*"
+    - "plugins/**/vendor/**/*"
+
+Discourse:
+  Enabled: true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-discourse
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: '3.0'
 platform: ruby
 authors:
-- David Taylor
+- Discourse Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-01 00:00:00.000000000 Z
+date: 2022-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -99,6 +99,7 @@ files:
 - lib/rubocop/discourse/inject.rb
 - rubocop-core.yml
 - rubocop-discourse.gemspec
+- rubocop-layout.yml
 - rubocop-rspec.yml
 - spec/lib/rubocop/cop/no_add_reference_active_record_migrations_spec.rb
 - spec/lib/rubocop/cop/no_mixing_multisite_and_standard_specs_spec.rb
@@ -106,6 +107,7 @@ files:
 - spec/lib/rubocop/cop/no_reset_column_information_migrations_spec.rb
 - spec/lib/rubocop/cop/only_top_level_multisite_specs_spec.rb
 - spec/spec_helper.rb
+- stree-compat.yml
 homepage: https://github.com/discourse/rubocop-discourse
 licenses:
 - MIT