rubocop-discourse 3.9.1 → 3.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77217a0f29ec6a88cb9cd14fc09d951b5d6a6801bdc79b4705a3a18d29ca87bd
-  data.tar.gz: 0ba701b3bb6ef09efacf793df893be4be9808de1d492a0851195dcb95ed01326
+  metadata.gz: 4003717b78bca02f538f48bc23fdd1b0e913bb6816c5d6a1e87401c53c167a14
+  data.tar.gz: acba524c9e7e399a5b69974ce94dfefa33fbd61c5c2197ecb425b1ed22418e23
 SHA512:
-  metadata.gz: 0fc6f9d26180f1b00c98d0c5661776c56489fcda4be09f6431aee482a6a49cf1879e6827475cc374ff7f19cfcf952977f1d47f63e0ecc5bce321900d0e0dcf76
-  data.tar.gz: 8aa918ebf81e7e5d1c7fa1570b96d92ecd71c90d1d143ef8ae786d5325a2fc49763b87db414d0e7db0aafa0f4af3ab75822432bfee0df63e1cdb5de161bf4747
+  metadata.gz: 9fd47066d7d8066da4adb2f17d95de3420fbaae18599d07925671a28c58a95a2d39b4ba8319813a0daf2106e7ecce4407a99470a93f2d99f335147bad3142269
+  data.tar.gz: 311df91f7d4cf9b5e296d3dcbf625482a0fdea6ac1da33fe389b7db41ec0339b4918434ce97a13c023ba86e3a54eb81edcb512aba7cb9abd0a21b19bb5b5527d

data/.github/workflows/ci.yml

@@ -34,7 +34,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Release Gem
-        uses: discourse/publish-rubygems-action@v2
+        uses: discourse/publish-rubygems-action@v3
         env:
           RUBYGEMS_API_KEY: ${{ secrets.RUBYGEMS_API_KEY }}
           GIT_EMAIL: team@discourse.org

data/.rspec

@@ -0,0 +1 @@
+--require 'spec_helper'

data/config/default.yml

@@ -1,8 +1,7 @@
 Discourse/NoChdir:
   Enabled: true
   Exclude:
-    - 'spec/**/*' # Specs are run sequentially, so chdir can be used
-    - 'plugins/*/spec/**/*'
+    - "**/spec/**/*" # Specs are run sequentially, so chdir can be used
 
 Discourse/NoTimeNewWithoutArgs:
   Enabled: true
@@ -13,8 +12,8 @@ Discourse/NoURIEscapeEncode:
 Discourse/NoAddReferenceOrAliasesActiveRecordMigration:
   Enabled: true
   Include:
-    - '**/db/migrate/*'
-    - '**/db/post_migrate/*'
+    - "**/db/migrate/*"
+    - "**/db/post_migrate/*"
 
 Discourse/NoNokogiriHtmlFragment:
   Enabled: true
@@ -22,51 +21,45 @@ Discourse/NoNokogiriHtmlFragment:
 Discourse/NoResetColumnInformationInMigrations:
   Enabled: false
   Include:
-    - '**/db/migrate/*'
-    - '**/db/post_migrate/*'
+    - "**/db/migrate/*"
+    - "**/db/post_migrate/*"
 
 # Specs
 
 Discourse/NoDirectMultisiteManipulation:
   Enabled: true
-  Patterns:
-    - _spec.rb
-    - '(?:^|/)spec/'
+  Include:
+    - "**/spec/**/*"
 
 Discourse/TimeEqMatcher:
   Enabled: true
-  Patterns:
-    - _spec.rb
-    - '(?:^|/)spec/'
+  Include:
+    - "**/spec/**/*"
 
 Discourse/NoJsonParseResponse:
   Enabled: false
-  Patterns:
-    - _spec.rb
-    - '(?:^|/)spec/'
+  Include:
+    - "**/spec/**/*"
 
 Discourse/NoMockingJobs:
   Enabled: true
-  Patterns:
-    - _spec.rb
-    - '(?:^|/)spec/'
+  Include:
+    - "**/spec/**/*"
 
 Discourse/OnlyTopLevelMultisiteSpecs:
   Enabled: true
-  Patterns:
-    - _spec.rb
-    - '(?:^|/)spec/'
+  Include:
+    - "**/spec/**/*"
 
 Discourse/NoMixingMultisiteAndStandardSpecs:
   Enabled: true
-  Patterns:
-    - _spec.rb
-    - '(?:^|/)spec/'
+  Include:
+    - "**/spec/**/*"
 
 Discourse/Plugins/CallRequiresPlugin:
   Enabled: true
   Include:
-    - 'app/controllers/**/*'
+    - "app/controllers/**/*"
 
 Discourse/Plugins/UsePluginInstanceOn:
   Enabled: true
@@ -74,16 +67,16 @@ Discourse/Plugins/UsePluginInstanceOn:
 Discourse/Plugins/NamespaceMethods:
   Enabled: true
   Exclude:
-    - '**/spec/**/*'
-    - '**/tasks/**/*.rake'
-    - '**/db/fixtures/**/*'
+    - "**/spec/**/*"
+    - "**/tasks/**/*.rake"
+    - "**/db/fixtures/**/*"
 
 Discourse/Plugins/NamespaceConstants:
   Enabled: true
   Exclude:
-    - '**/spec/**/*'
-    - '**/tasks/**/*.rake'
-    - '**/db/fixtures/**/*'
+    - "**/spec/**/*"
+    - "**/tasks/**/*.rake"
+    - "**/db/fixtures/**/*"
 
 Discourse/Plugins/UseRequireRelative:
   Enabled: true

data/lib/rubocop/cop/discourse/services/empty_lines_around_blocks.rb

@@ -53,7 +53,7 @@ module RuboCop
           def on_block(node)
             return unless service?
             return unless top_level_block?(node)
-            return if node.single_line?
+            return if node.single_line? || single_block?(node)
 
             if missing_empty_lines?(node)
               add_offense(node, message: MSG) do |corrector|
@@ -78,6 +78,10 @@ module RuboCop
 
           private
 
+          def single_block?(node)
+            !node.ancestors.first.begin_type?
+          end
+
           def service?
             @service
           end

data/rubocop-core.yml

@@ -39,8 +39,7 @@ Style/GlobalVars:
   Exclude:
     - "lib/tasks/**/*"
     - "script/**/*"
-    - "spec/**/*.rb"
-    - "plugins/*/spec/**/*"
+    - "**/spec/**/*"
 
 Style/InvertibleUnlessCondition:
   Enabled: true
@@ -142,4 +141,4 @@ Lint/SafeNavigationConsistency:
   Enabled: true
 
 Lint/OrAssignmentToConstant:
-  Enabled: true
+  Enabled: true

data/rubocop-discourse.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "rubocop-discourse"
-  s.version = "3.9.1"
+  s.version = "3.9.3"
   s.summary = "Custom rubocop cops used by Discourse"
   s.authors = ["Discourse Team"]
   s.license = "MIT"

data/rubocop-rspec.yml

@@ -228,11 +228,11 @@ RSpec/Dialect:
   Enabled: true
   PreferredMethods:
     background: :before
-    scenario:   :it
-    xscenario:  :xit
-    given:      :let
-    given!:     :let!
-    feature:    :describe
+    scenario: :it
+    xscenario: :xit
+    given: :let
+    given!: :let!
+    feature: :describe
 
 RSpecRails/HttpStatus:
   Enabled: true

data/spec/lib/rubocop/cop/discourse/services/empty_lines_around_blocks_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "spec_helper"
-
 RSpec.describe RuboCop::Cop::Discourse::Services::EmptyLinesAroundBlocks,
                :config do
   subject(:cop) { described_class.new(config) }
@@ -130,6 +128,23 @@ RSpec.describe RuboCop::Cop::Discourse::Services::EmptyLinesAroundBlocks,
     end
 
     context "when blocks are nested" do
+      context "when there is just one nested block" do
+        it "does not register an offense" do
+          expect_no_offenses(<<~RUBY)
+            class MyService
+              include Service::Base
+
+              transaction do
+                try do
+                  step :first_step
+                  step :second_step
+                end
+              end
+            end
+          RUBY
+        end
+      end
+
       context "when the nested block is in the first position" do
         context "when there is no empty line before" do
           it "does not register an offense" do

data/spec/lib/rubocop/cop/discourse/services/group_keywords_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "spec_helper"
-
 RSpec.describe RuboCop::Cop::Discourse::Services::GroupKeywords, :config do
   subject(:cop) { described_class.new(config) }
 

data/spec/lib/rubocop/cop/fabricator_shorthand_spec.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-require "spec_helper"
-
-describe RuboCop::Cop::Discourse::FabricatorShorthand, :config do
+RSpec.describe RuboCop::Cop::Discourse::FabricatorShorthand, :config do
   subject(:cop) { described_class.new(config) }
 
   let(:config) { RuboCop::Config.new }

data/spec/lib/rubocop/cop/no_add_reference_active_record_migrations_spec.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-require "spec_helper"
-
-describe RuboCop::Cop::Discourse::NoAddReferenceOrAliasesActiveRecordMigration, :config do
+RSpec.describe RuboCop::Cop::Discourse::NoAddReferenceOrAliasesActiveRecordMigration, :config do
   subject(:cop) { described_class.new(config) }
 
   let(:config) { RuboCop::Config.new }

data/spec/lib/rubocop/cop/no_mixing_multisite_and_standard_specs_spec.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-require "spec_helper"
-
-describe RuboCop::Cop::Discourse::NoMixingMultisiteAndStandardSpecs, :config do
+RSpec.describe RuboCop::Cop::Discourse::NoMixingMultisiteAndStandardSpecs, :config do
   subject(:cop) { described_class.new(config) }
 
   let(:config) { RuboCop::Config.new }

data/spec/lib/rubocop/cop/no_mocking_jobs_enqueue_spec.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-require "spec_helper"
-
-describe RuboCop::Cop::Discourse::NoMockingJobs, :config do
+RSpec.describe RuboCop::Cop::Discourse::NoMockingJobs, :config do
   subject(:cop) { described_class.new(config) }
 
   let(:config) { RuboCop::Config.new }

data/spec/lib/rubocop/cop/no_reset_column_information_migrations_spec.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-require "spec_helper"
-
-describe RuboCop::Cop::Discourse::NoResetColumnInformationInMigrations, :config do
+RSpec.describe RuboCop::Cop::Discourse::NoResetColumnInformationInMigrations, :config do
   subject(:cop) { described_class.new(config) }
 
   let(:config) { RuboCop::Config.new }

data/spec/lib/rubocop/cop/only_top_level_multisite_specs_spec.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-require "spec_helper"
-
-describe RuboCop::Cop::Discourse::OnlyTopLevelMultisiteSpecs, :config do
+RSpec.describe RuboCop::Cop::Discourse::OnlyTopLevelMultisiteSpecs, :config do
   subject(:cop) { described_class.new(config) }
 
   let(:config) { RuboCop::Config.new }

data/spec/lib/rubocop/cop/plugins/call_requires_plugin_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "spec_helper"
-
 RSpec.describe RuboCop::Cop::Discourse::Plugins::CallRequiresPlugin, :config do
   subject(:cop) { described_class.new(config) }
 

data/spec/lib/rubocop/cop/plugins/namespace_constants_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "spec_helper"
-
 RSpec.describe RuboCop::Cop::Discourse::Plugins::NamespaceConstants, :config do
   subject(:cop) { described_class.new(config) }
 

data/spec/lib/rubocop/cop/plugins/namespace_methods_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "spec_helper"
-
 RSpec.describe RuboCop::Cop::Discourse::Plugins::NamespaceMethods, :config do
   subject(:cop) { described_class.new(config) }
 

data/spec/lib/rubocop/cop/plugins/no_monkey_patching_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "spec_helper"
-
 RSpec.describe RuboCop::Cop::Discourse::Plugins::NoMonkeyPatching, :config do
   subject(:cop) { described_class.new(config) }
 

data/spec/lib/rubocop/cop/plugins/use_plugin_instance_on_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "spec_helper"
-
 RSpec.describe RuboCop::Cop::Discourse::Plugins::UsePluginInstanceOn, :config do
   subject(:cop) { described_class.new(config) }
 

data/spec/lib/rubocop/cop/plugins/use_require_relative_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "spec_helper"
-
 RSpec.describe RuboCop::Cop::Discourse::Plugins::UseRequireRelative, :config do
   subject(:cop) { described_class.new(config) }
 

data/spec/lib/rubocop/cop/time_eq_matcher_spec.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-require "spec_helper"
-
-describe RuboCop::Cop::Discourse::TimeEqMatcher, :config do
+RSpec.describe RuboCop::Cop::Discourse::TimeEqMatcher, :config do
   subject(:cop) { described_class.new(config) }
 
   let(:config) { RuboCop::Config.new }

data/stree-compat.yml

@@ -13,13 +13,13 @@ AllCops:
   SuggestExtensions: false
   DisabledByDefault: true
   Exclude:
-    - 'db/schema.rb'
-    - 'bundle/**/*'
-    - 'vendor/**/*'
-    - '**/node_modules/**/*'
-    - 'public/**/*'
-    - 'plugins/**/gems/**/*'
-    - 'plugins/**/vendor/**/*'
+    - "db/schema.rb"
+    - "bundle/**/*"
+    - "vendor/**/*"
+    - "**/node_modules/**/*"
+    - "public/**/*"
+    - "plugins/**/gems/**/*"
+    - "plugins/**/vendor/**/*"
 
 Discourse:
   Enabled: true
@@ -27,5 +27,4 @@ Discourse:
 Discourse/FabricatorShorthand:
   Enabled: true
   Include:
-    - 'spec/**/*_spec.rb'
-    - 'plugins/*/spec/**/*_spec.rb'
+    - "**/spec/**/*"

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-discourse
 version: !ruby/object:Gem::Version
-  version: 3.9.1
+  version: 3.9.3
 platform: ruby
 authors:
 - Discourse Team
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-01-04 00:00:00.000000000 Z
+date: 2025-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -136,14 +135,13 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.12.0
-description: 
-email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/ci.yml"
 - ".gitignore"
+- ".rspec"
 - ".rubocop.yml"
 - Gemfile
 - LICENSE
@@ -211,7 +209,6 @@ homepage: https://github.com/discourse/rubocop-discourse
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -226,8 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Custom rubocop cops used by Discourse
 test_files: []