rubocop-discourse 2.6.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d323501481e0e731a79b93e81cb53e5a2b67d0761aebf7ac6ed8088d607bf912
-  data.tar.gz: 8ab7c331ea82087f6a2f8a626ac9de4192a231aff5a58ca853938903d16bfc37
+  metadata.gz: f3d65cb32d6a544fd2b03dee2c2b423d865bf3b9c1957087038beb1ec1de1e08
+  data.tar.gz: 7beaaa46315bf22a20a11eed14e1ee8a787cf23026a974be936533cbee6e3da8
 SHA512:
-  metadata.gz: 567ae9f6c1175704e4146fdb1d24ec8220560edc5f438fb4ac8cb4be655f90f92cc5fbc0b2b9a1a2992bd8861725681d0e860be73d16288e34298e61e41d85b1
-  data.tar.gz: 38f89b89b1d18efd564afd9c2dc5de3830ace80aa8908e0430697f32436d6a3c91ffd87ec4f467da43f87df5132f1adb34d9161a93da8bc5882c5292fba71337
+  metadata.gz: d1126149b306f738ef8874dbe94cd4f9c816fc9b3d50617a1677ce3b1755950e72f21d436e0f6896817c91fcfa044c597ac230c5a37b1c787132d9d1f4c9ac9e
+  data.tar.gz: 5b3f747371f9eecd0f26ec04c0158eda78be9539d03a7e1a7a6893b6383f14884a7ae29ea3e858bbd08e32522d04ab637bbcc22d661a8186d2bd12b33a8a96bf

data/.github/workflows/ci.yml

@@ -4,25 +4,20 @@ on:
   pull_request:
   push:
     branches:
-      - master
       - main
+
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
 
       - name: Setup ruby
-        uses: actions/setup-ruby@v1
+        uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.6
-
-      - name: Setup bundler
-        run: gem install bundler
-
-      - name: Setup gems
-        run: bundle install
+          ruby-version: '2.6'
+          bundler-cache: true
 
       - name: Rubocop
         run: bundle exec rubocop
@@ -31,12 +26,12 @@ jobs:
         run: bundle exec rspec spec
 
   publish:
-    if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master')
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
     needs: build
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Release Gem
         uses: discourse/publish-rubygems-action@v2

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/lib/rubocop/cop/discourse/time_eq_matcher.rb

@@ -37,7 +37,7 @@ module RuboCop
         private
 
         def timestamp_suffix?(property)
-          property =~ /_at$/
+          property.is_a?(Symbol) && property =~ /_at$/
         end
 
         def not_nil?(expression)

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,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "rubocop-discourse"
-  s.version     = "2.6.0"
+  s.version     = "3.0.1"
   s.summary     = "Custom rubocop cops used by Discourse"
   s.authors     = ["Discourse Team"]
   s.license     = "MIT"

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/spec/lib/rubocop/cop/time_eq_matcher_spec.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe RuboCop::Cop::Discourse::TimeEqMatcher, :config do
+  subject(:cop) { described_class.new(config) }
+
+  let(:config) do
+    RuboCop::Config.new
+  end
+
+  it "raises an offense if a timestamp is compared using `eq`" do
+    inspect_source(<<~RUBY)
+    expect(user.created_at).to eq(Time.zone.now)
+    RUBY
+
+    expect(cop.offenses.first.message).to eq(described_class::MSG)
+  end
+
+  it "passes if a timestamp is compared using `eq_time`" do
+    inspect_source(<<~RUBY)
+      expect(user.created_at).to eq_time(Time.zone.now)
+    RUBY
+
+    expect(cop.offenses).to be_empty
+  end
+end

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.6.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Discourse Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-26 00:00:00.000000000 Z
+date: 2022-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -99,13 +99,16 @@ 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
 - spec/lib/rubocop/cop/no_mocking_jobs_enqueue_spec.rb
 - spec/lib/rubocop/cop/no_reset_column_information_migrations_spec.rb
 - spec/lib/rubocop/cop/only_top_level_multisite_specs_spec.rb
+- spec/lib/rubocop/cop/time_eq_matcher_spec.rb
 - spec/spec_helper.rb
+- stree-compat.yml
 homepage: https://github.com/discourse/rubocop-discourse
 licenses:
 - MIT