rubocop-discourse 3.9.3 → 3.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4003717b78bca02f538f48bc23fdd1b0e913bb6816c5d6a1e87401c53c167a14
-  data.tar.gz: acba524c9e7e399a5b69974ce94dfefa33fbd61c5c2197ecb425b1ed22418e23
+  metadata.gz: 4648e09304959a3f22318ef9baf648c09462f73f160e04a67b8df867496cca11
+  data.tar.gz: acf98a1d3d919939d40c89f2007e29f734f9bd78b1f52f94cfd32dde8c73f81d
 SHA512:
-  metadata.gz: 9fd47066d7d8066da4adb2f17d95de3420fbaae18599d07925671a28c58a95a2d39b4ba8319813a0daf2106e7ecce4407a99470a93f2d99f335147bad3142269
-  data.tar.gz: 311df91f7d4cf9b5e296d3dcbf625482a0fdea6ac1da33fe389b7db41ec0339b4918434ce97a13c023ba86e3a54eb81edcb512aba7cb9abd0a21b19bb5b5527d
+  metadata.gz: 4c272e1f33440930bb5a378a2b2014cf2d64a2a05ea94ac32a089bf5403ab6974483ffe795cb74a66df7a060490c513ecfbf9b26f806af24094afc51f3798b7d
+  data.tar.gz: 648a590086786be389403cd4edc7d1a8a0b58f84e66e44ae4619bafd63be92391331687957bc5f69edba994d082cb2f7bf7a782fe0d36249800c1eac57e714c3

data/.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Release Gem
         uses: discourse/publish-rubygems-action@v3

data/.streerc

@@ -0,0 +1,2 @@
+--print-width=100
+--plugins=plugin/trailing_comma,plugin/disable_auto_ternary

data/Gemfile

@@ -6,5 +6,6 @@ source "https://rubygems.org"
 gemspec
 
 group :development, :test do
-  gem 'byebug'
+  gem "syntax_tree"
+  gem "byebug"
 end

data/lib/rubocop/discourse/plugin.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Discourse
+    class Plugin < LintRoller::Plugin
+      def about
+        LintRoller::About.new(
+          name: "rubocop-discourse",
+          version: RuboCop::Discourse::VERSION,
+          homepage: "https://github.com/discourse/rubocop-discourse",
+          description: "Custom rubocop cops used by Discourse",
+        )
+      end
+
+      def supported?(context)
+        context.engine == :rubocop
+      end
+
+      def rules(_context)
+        LintRoller::Rules.new(
+          type: :path,
+          config_format: :rubocop,
+          value: Pathname.new(__dir__).join("../../../config/default.yml"),
+        )
+      end
+    end
+  end
+end

data/lib/rubocop/discourse/version.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Discourse
+    VERSION = "3.11.0"
+  end
+end

data/lib/rubocop-discourse.rb

@@ -1,13 +1,11 @@
 # frozen_string_literal: true
 
 require "rubocop"
+require "lint_roller"
 require "active_support"
 require "active_support/core_ext/string/inflections"
 require "active_support/core_ext/object/blank"
 require "active_support/core_ext/enumerable"
-require_relative "rubocop/discourse"
-require_relative "rubocop/discourse/inject"
-
-RuboCop::Discourse::Inject.defaults!
-
 require_relative "rubocop/cop/discourse_cops"
+require_relative "rubocop/discourse/version"
+require_relative "rubocop/discourse/plugin"

data/rubocop-discourse.gemspec

@@ -1,8 +1,12 @@
 # frozen_string_literal: true
 
+lib = File.expand_path("lib", __dir__)
+$LOAD_PATH.unshift(lib) if !$LOAD_PATH.include?(lib)
+require "rubocop/discourse/version"
+
 Gem::Specification.new do |s|
   s.name = "rubocop-discourse"
-  s.version = "3.9.3"
+  s.version = RuboCop::Discourse::VERSION
   s.summary = "Custom rubocop cops used by Discourse"
   s.authors = ["Discourse Team"]
   s.license = "MIT"
@@ -10,14 +14,16 @@ Gem::Specification.new do |s|
 
   s.files = `git ls-files`.split($/)
   s.require_paths = ["lib"]
+  s.metadata["default_lint_roller_plugin"] = "RuboCop::Discourse::Plugin"
 
   s.add_runtime_dependency "activesupport", ">= 6.1"
-  s.add_runtime_dependency "rubocop", ">= 1.59.0"
+  s.add_runtime_dependency "rubocop", ">= 1.72.0"
   s.add_runtime_dependency "rubocop-rspec", ">= 3.0.1"
   s.add_runtime_dependency "rubocop-factory_bot", ">= 2.0.0"
   s.add_runtime_dependency "rubocop-capybara", ">= 2.0.0"
   s.add_runtime_dependency "rubocop-rails", ">= 2.25.0"
   s.add_runtime_dependency "rubocop-rspec_rails", ">= 2.30.0"
+  s.add_runtime_dependency "lint_roller", ">= 1.1.0"
 
   s.add_development_dependency "rake", "~> 13.1.0"
   s.add_development_dependency "rspec", "~> 3.12.0"

data/rubocop-rails.yml

@@ -1,4 +1,4 @@
-require:
+plugins:
   - rubocop-rails
 
 Rails:

data/rubocop-rspec.yml

@@ -1,5 +1,7 @@
-require:
+plugins:
   - rubocop-rspec
+
+require:
   - rubocop-rspec_rails
 
 RSpec/AnyInstance:

data/stree-compat.yml

@@ -1,4 +1,4 @@
-require:
+plugins:
   - rubocop-discourse
 
 inherit_from:
@@ -9,7 +9,7 @@ inherit_from:
   - ./rubocop-rails.yml
 
 AllCops:
-  TargetRubyVersion: 3.2
+  TargetRubyVersion: "3.3"
   SuggestExtensions: false
   DisabledByDefault: true
   Exclude:

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-discourse
 version: !ruby/object:Gem::Version
-  version: 3.9.3
+  version: 3.11.0
 platform: ruby
 authors:
 - Discourse Team
 bindir: bin
 cert_chain: []
-date: 2025-01-31 00:00:00.000000000 Z
+date: 2025-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -29,14 +29,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.59.0
+        version: 1.72.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.59.0
+        version: 1.72.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -107,6 +107,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.30.0
+- !ruby/object:Gem::Dependency
+  name: lint_roller
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -143,6 +157,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".streerc"
 - Gemfile
 - LICENSE
 - README.md
@@ -172,8 +187,8 @@ files:
 - lib/rubocop/cop/discourse/services/group_keywords.rb
 - lib/rubocop/cop/discourse/time_eq_matcher.rb
 - lib/rubocop/cop/discourse_cops.rb
-- lib/rubocop/discourse.rb
-- lib/rubocop/discourse/inject.rb
+- lib/rubocop/discourse/plugin.rb
+- lib/rubocop/discourse/version.rb
 - rubocop-capybara.yml
 - rubocop-core.yml
 - rubocop-discourse.gemspec
@@ -208,7 +223,8 @@ files:
 homepage: https://github.com/discourse/rubocop-discourse
 licenses:
 - MIT
-metadata: {}
+metadata:
+  default_lint_roller_plugin: RuboCop::Discourse::Plugin
 rdoc_options: []
 require_paths:
 - lib

data/lib/rubocop/discourse/inject.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module RuboCop
-  module Discourse
-    # Because RuboCop doesn't yet support plugins, we have to monkey patch in a
-    # bit of our configuration.
-    module Inject
-      def self.defaults!
-        path = CONFIG_DEFAULT.to_s
-        hash = ConfigLoader.send(:load_yaml_configuration, path)
-        config = Config.new(hash, path)
-        puts "configuration from #{path}" if ConfigLoader.debug?
-        config = ConfigLoader.merge_with_default(config, path)
-        ConfigLoader.instance_variable_set(:@default_configuration, config)
-      end
-    end
-  end
-end

data/lib/rubocop/discourse.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-module RuboCop
-  # RuboCop Discourse project namespace
-  module Discourse
-    PROJECT_ROOT = Pathname.new(__dir__).parent.parent.expand_path.freeze
-    CONFIG_DEFAULT = PROJECT_ROOT.join("config", "default.yml").freeze
-    CONFIG = YAML.safe_load(CONFIG_DEFAULT.read).freeze
-
-    private_constant(:CONFIG_DEFAULT, :PROJECT_ROOT)
-  end
-end