standard 1.28.1 → 1.28.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8c0920e71bbf9f203f59f683dfaec09f0b5828546a4b47d9d72079aa2a8fda9
-  data.tar.gz: 53cce6a924e050971619a48ae411dba9e002f0c3cdd48588c3f7a2ee68e20c9f
+  metadata.gz: 30b728f2836aad5e7fddd215df4ff85951020b33cac13b33ab1961c5ed24ee89
+  data.tar.gz: 80ed236d661fd860ef7dc08d4b65d6c10b4495135527083c301b6a345853d182
 SHA512:
-  metadata.gz: f8d4318e2527b6f2d20308caa846ba861a1432a9b1930ebfd2003475eed86dc0b095191cc64f1415a8d6f6130e82923e792cbadfc686eb60401a18026ea8b0df
-  data.tar.gz: e1fa000dc59e5c530a369238ddc1beb75470d10deb191709bc9d84546b39a327bb4bd80ee80202ec81fc788fee8cd8af588ccab75a4f111457336a16af3a9e52
+  metadata.gz: 67c06d4ad34dc5036054a9c08961344fb3f41fbe81738e46dcb3dcbfb926d2291fd3e864c0694f73d4659d3f71ee904d2676bdc87e82b9e06def612c89d9cd24
+  data.tar.gz: ae8bb8be8db855f1815265db396020269ee4f79703fd181b5a84c460a932e204140848e4be81522e10866afca018e73b58a5712b181bee5506e7ee1c9c1abbd5

data/.github/workflows/test.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        ruby-version: [2.6, 2.7, '3.0', 3.1, 3.2]
+        ruby-version: [2.6, 2.7, '3.0', 3.1, 3.2, head]
 
     runs-on: ${{ matrix.os }}
 

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 1.28.3
+
+* Older ruby support fixes from [@pboling](https://github.com/pboling):
+    - [#559](https://github.com/standardrb/standard/issues/559)
+    - [#561](https://github.com/standardrb/standard/issues/560)
+    - [#561](https://github.com/standardrb/standard/issues/561)
+
+## 1.28.2
+
+* Attempts to fix the not-actually fixed plugin behavior in 1.28.1
+
 ## 1.28.1
 
 * Fixes plugin behavior caused by setting `DisabledByDefault: true` in `AllCops`

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    standard (1.28.1)
+    standard (1.28.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
       rubocop (~> 1.50.2)
@@ -39,7 +39,7 @@ GEM
       rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.28.0)
+    rubocop-ast (1.28.1)
       parser (>= 3.2.1.0)
     rubocop-performance (1.16.0)
       rubocop (>= 1.7.0, < 2.0)

data/README.md

@@ -432,6 +432,11 @@ extend_config:
 
 ### Running Standard's rules via RuboCop
 
+**Please note that the following usage is not supported and may break at any
+time. Use at your own risk and please refrain from opening GitHub issues with
+respect to loading Standard or its plugins' YAML configurations for use by
+the `rubocop` CLI.**
+
 If you find that neither plugins or configuration extensions meet your needs or
 if you have some other reason to run Standard's rules with RuboCop's CLI (e.g.,
 to continue using your favorite IDE/tooling/workflow with RuboCop support) Evil
@@ -466,6 +471,7 @@ Here are a few examples of Ruby Standard-compliant teams & projects:
 * [Brave Software](https://github.com/brave-intl/publishers)
 * [Collective Idea](https://collectiveidea.com/)
 * [Culture Foundry](https://www.culturefoundry.com/)
+* [Donut](https://www.donut.com/)
 * [Elevate Labs](https://elevatelabs.com)
 * [Envoy](https://www.envoy.com)
 * [Evil Martians](https://evilmartians.com)

data/config/ruby-1.8.yml

@@ -11,3 +11,6 @@ Style/FileWrite:
 
 Style/FileRead:
   Enabled: false
+
+Layout/DotPosition:
+  Enabled: false

data/config/ruby-3.1.yml

@@ -1,4 +1,4 @@
-inherit_from: ./base.yml
+inherit_from: ./ruby-3.2.yml
 
 AllCops:
   TargetRubyVersion: 3.1

data/config/ruby-3.2.yml

@@ -0,0 +1,4 @@
+inherit_from: ./base.yml
+
+AllCops:
+  TargetRubyVersion: 3.2

data/lib/standard/base/plugin.rb

@@ -55,6 +55,8 @@ module Standard::Base
         "ruby-3.0.yml"
       elsif desired_version < Gem::Version.new("3.2")
         "ruby-3.1.yml"
+      elsif desired_version < Gem::Version.new("3.3")
+        "ruby-3.2.yml"
       else
         default
       end

data/lib/standard/plugin/merges_plugins_into_rubocop_config.rb

@@ -27,17 +27,16 @@ module Standard
 
       def call(options_config, standard_config, plugins, permit_merging:)
         runner_context = @creates_runner_context.call(standard_config)
-        plugin_config = combine_rubocop_configs(options_config, runner_context, plugins).to_h
+        plugin_config = combine_rubocop_configs(options_config, runner_context, plugins, permit_merging: permit_merging).to_h
         merge_config_into_all_cops!(options_config, plugin_config)
         merge_config_into_standard!(options_config, plugin_config, permit_merging: permit_merging)
       end
 
       private
 
-      def combine_rubocop_configs(options_config, runner_context, plugins)
+      def combine_rubocop_configs(options_config, runner_context, plugins, permit_merging:)
+        all_cop_keys_configured_by_plugins = all_cop_keys_previously_configured_by_plugins(options_config, permit_merging: permit_merging)
         fake_out_rubocop_default_configuration(options_config) do |fake_config|
-          all_cop_keys_configured_by_plugins = []
-
           plugins.reduce(fake_config) do |combined_config, plugin|
             RuboCop::ConfigLoader.instance_variable_set(:@default_configuration, combined_config)
             next_config, path = config_for_plugin(plugin, runner_context)
@@ -49,7 +48,7 @@ module Standard
             )
             delete_already_configured_keys!(combined_config.keys, next_config, dont_delete_keys: ["AllCops"])
 
-            RuboCop::ConfigLoader.merge_with_default(next_config, path)
+            RuboCop::ConfigLoader.merge_with_default(next_config, path, unset_nil: false)
           end
         end
       end
@@ -61,7 +60,7 @@ module Standard
           [RuboCop::ConfigLoader.load_file(rules.value), rules.value]
         elsif rules.type == :object
           path = plugin.method(:rules).source_location[0]
-          [RuboCop::Config.create(rules.value, path), path]
+          [RuboCop::Config.create(rules.value, path, check: true), path]
         elsif rules.type == :error
           raise "Plugin `#{plugin.about&.name || plugin.inspect}' failed to load with error: #{rules.value.respond_to?(:message) ? rules.value.message : rules.value}"
         end
@@ -124,8 +123,16 @@ module Standard
         end
       end
 
+      def all_cop_keys_previously_configured_by_plugins(options_config, permit_merging:)
+        if permit_merging
+          []
+        else
+          Array(options_config["AllCops"]&.keys) - RuboCop::ConfigLoader.default_configuration["AllCops"].keys
+        end
+      end
+
       def fake_out_rubocop_default_configuration(options_config)
-        og_default_config = RuboCop::ConfigLoader.instance_variable_get(:@default_configuration)
+        og_default_config = RuboCop::ConfigLoader.default_configuration
         set_target_rails_version_on_all_cops_because_its_technically_not_allowed!(options_config)
         result = yield blank_rubocop_config(options_config)
         RuboCop::ConfigLoader.instance_variable_set(:@default_configuration, og_default_config)
@@ -137,9 +144,9 @@ module Standard
       #
       # See: https://github.com/rubocop/rubocop/pull/11833
       def set_target_rails_version_on_all_cops_because_its_technically_not_allowed!(options_config)
-        return unless options_config.key?("AllCops")
+        return if !options_config.key?("AllCops") || options_config["AllCops"].key?("TargetRailsVersion")
 
-        options_config["AllCops"]["TargetRailsVersion"] = "~"
+        options_config["AllCops"]["TargetRailsVersion"] = nil
       end
 
       def blank_rubocop_config(example_config)

data/lib/standard/version.rb

@@ -1,3 +1,3 @@
 module Standard
-  VERSION = Gem::Version.new("1.28.1")
+  VERSION = Gem::Version.new("1.28.3")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: standard
 version: !ruby/object:Gem::Version
-  version: 1.28.1
+  version: 1.28.3
 platform: ruby
 authors:
 - Justin Searls
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-01 00:00:00.000000000 Z
+date: 2023-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -116,6 +116,7 @@ files:
 - config/ruby-2.7.yml
 - config/ruby-3.0.yml
 - config/ruby-3.1.yml
+- config/ruby-3.2.yml
 - docs/ARCHITECTURE.md
 - docs/NEW_RUBIES.md
 - docs/RELEASE.md