standard 1.21.0 → 1.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b81947d8fd0c0d0ac932f947406aa3ecaa893f26861d143895c4c17d5174e12
-  data.tar.gz: 451ce5e6c758f9d12539e6ae7ee877ea3597c6cb876994e192d5ccc54bc3d453
+  metadata.gz: 0be084d42bce81134fcc2055df53cd9a3b639814b7e64f91e3c2e05faa4675ce
+  data.tar.gz: f4c0f98c8b6597cbd136e2990f50767892ba2797d9b351ec8e3e277ff7d67910
 SHA512:
-  metadata.gz: 4b25fcaa73ce0ec0ac525497f600a8d7c37c36e780c7d913d84e1837fa77d3551ed75890b069312950a81b00376725080b0272639be67ca8e1741f9f4cb9b91c
-  data.tar.gz: cca1619ce8107cb4e8d2a5156846272759643dd1031e4fe53671ec4c8f7ae7e7f31d01ec49499ef407de6a11b89236534638890cdf93454fd6cd536dc290fe66
+  metadata.gz: 1e9a9a9912071e338b36f0e4db34a8077c896fa6356d3ffa31a064a5ce7201d31a778895fbf051003640dcd92b837456202487c8b275236457063b451dc5c752
+  data.tar.gz: c4923a5c46669684793406b8dd70ce9b0d8f974fd280f846da920e018613e292ac235137254cb17b8c15ea8eebcf5da0c059602dce83a2b95df99f98760a6626

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 1.22.0
+
+* Add `extend_config` option [#506](https://github.com/testdouble/standard/pull/506)
+
+## 1.21.1
+
+* Fix standard comment directives [#498](https://github.com/testdouble/standard/pull/498)
+
 ## 1.21.0
 
 * Update rubocop-performance from 1.15.1 to [1.15.2](https://github.com/rubocop/rubocop-performance/releases/tag/v1.15.2)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    standard (1.21.0)
+    standard (1.22.0)
       language_server-protocol (~> 3.17.0.2)
       rubocop (= 1.42.0)
       rubocop-performance (= 1.15.2)
@@ -49,7 +49,7 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    unicode-display_width (2.4.0)
+    unicode-display_width (2.4.2)
 
 PLATFORMS
   ruby

data/README.md

@@ -215,9 +215,7 @@ inherit_gem:
 
 ## Who uses Ruby Standard Style?
 
-(This section will not [look very
-familiar](https://github.com/standard/standard#who-uses-javascript-standard-style)
-if you've used StandardJS.)
+Here are a few examples of Ruby Standard-compliant teams & projects:
 
 * [Test Double](https://testdouble.com/agency)
 * [Amazon Web Services](https://aws.amazon.com/)
@@ -244,9 +242,7 @@ if you've used StandardJS.)
 * [RubyCI](https://ruby.ci)
 * [thoughtbot](https://thoughtbot.com/)
 
-If your team starts using Standard, [send a pull
-request](https://github.com/testdouble/standard/edit/main/README.md) to let us
-know!
+Does your team use Standard? [Add your name to the list](https://github.com/testdouble/standard/edit/main/README.md)!
 
 ## Is there a readme badge?
 
@@ -401,6 +397,51 @@ configurations](https://github.com/testdouble/standard/tree/main/config) and
 consider helping out by submitting a pull request if you find a rule that won't
 work for older Rubies.
 
+## How do I use Standard with RuboCop extensions or custom rules?
+
+If you want to use Standard in conjunction with RuboCop extensions or custom
+cops, you can specify them in your own [RuboCop configuration
+YAML](https://docs.rubocop.org/rubocop/configuration.html) files and
+`.standard.yml` using the "extend_config:` setting:
+
+```yml
+# .standard.yml
+extend_config:
+  - .betterlint.yml
+```
+
+Which in turn would refer to a RuboCop configuration file:
+
+```yml
+# .betterlint.yml
+require:
+  - rubocop/cop/betterment.rb
+
+AllCops:
+  DisabledByDefault: true
+
+Betterment/UnscopedFind:
+  Enabled: true
+
+  unauthenticated_models:
+    - SystemConfiguration
+```
+
+When Standard runs, it will merge your configuration files with Standard's base
+ruleset. To ensure that this feature does not result in Standard's rules being
+modified, any configuration of rules includued in `rubocop` or
+`rubocop-performance` will be ignored. Most settings under `AllCops:` can be
+configured, unless they'd conflict with a setting used by Standard (like
+`TargetRubyVersion`) or prevent Standard's own rules from running (like
+`StyleGuideCopsOnly`). If you specify multiple YAML files under `extend_config`,
+note that their resulting RuboCop configurations will be merged in order (i.e.
+last-in-wins).
+
+If you find that Standard's `extend_config` feature doesn't meet your needs,
+Evil Martians also maintains [a regularly updated
+guide](https://evilmartians.com/chronicles/rubocoping-with-legacy-bring-your-ruby-code-up-to-standard)
+on how to configure RuboCop to load and execute Standard's ruleset.
+
 ## How do I change the output?
 
 Standard's built-in formatter is intentionally minimal, printing only unfixed
@@ -492,13 +533,6 @@ either:
   gem to your build, which will automatically ensure that the comment is
   prepended for every applicable file in your project
 
-## How do I use Standard with RuboCop extensions?
-
-This is not officially supported by Standard. However, Evil Martians wrote up [a
-regularly updated
-guide](https://evilmartians.com/chronicles/rubocoping-with-legacy-bring-your-ruby-code-up-to-standard)
-on how to do so.
-
 ## How often is Standard updated?
 
 We aim to update Standard once a month, in the first week of the month. In between releases, we'll be considering RuboCop updates, RuboCop Performance updates, and community contributions.

data/lib/standard/creates_config_store/merges_user_config_extensions.rb

@@ -0,0 +1,50 @@
+require_relative "../file_finder"
+
+class Standard::CreatesConfigStore
+  class MergesUserConfigExtensions
+    DISALLOWED_ALLCOPS_KEYS = [
+      "Include",
+      "Exclude",
+      "StyleGuideCopsOnly",
+      "TargetRubyVersion"
+    ].freeze
+
+    def call(options_config, standard_config)
+      return unless standard_config[:extend_config]&.any?
+
+      extended_config = load_and_merge_extended_rubocop_configs(standard_config)
+      merge_standard_and_user_all_cops!(options_config, extended_config)
+      merge_extended_rules_into_standard!(options_config, extended_config)
+    end
+
+    private
+
+    def load_and_merge_extended_rubocop_configs(standard_config)
+      {
+        "AllCops" => {}
+      }.tap do |config|
+        standard_config[:extend_config].each do |path|
+          extension = RuboCop::ConfigLoader.load_file(Standard::FileFinder.new.call(path, Dir.pwd)).to_h
+          config["AllCops"].merge!(extension["AllCops"]) if extension.key?("AllCops")
+          config.merge!(except(extension, ["AllCops"]))
+        end
+      end
+    end
+
+    def merge_standard_and_user_all_cops!(options_config, extended_config)
+      options_config["AllCops"].merge!(
+        except(extended_config["AllCops"], DISALLOWED_ALLCOPS_KEYS)
+      )
+    end
+
+    def merge_extended_rules_into_standard!(options_config, extended_config)
+      except(extended_config, options_config.keys).each do |key, value|
+        options_config[key] = value
+      end
+    end
+
+    def except(hash, keys)
+      hash.reject { |key, _| keys.include?(key) }.to_h
+    end
+  end
+end

data/lib/standard/creates_config_store.rb

@@ -3,6 +3,7 @@ require "rubocop"
 require_relative "creates_config_store/assigns_rubocop_yaml"
 require_relative "creates_config_store/sets_target_ruby_version"
 require_relative "creates_config_store/configures_ignored_paths"
+require_relative "creates_config_store/merges_user_config_extensions"
 
 module Standard
   class CreatesConfigStore
@@ -10,6 +11,7 @@ module Standard
       @assigns_rubocop_yaml = AssignsRubocopYaml.new
       @sets_target_ruby_version = SetsTargetRubyVersion.new
       @configures_ignored_paths = ConfiguresIgnoredPaths.new
+      @merges_user_config_extensions = MergesUserConfigExtensions.new
     end
 
     def call(standard_config)
@@ -17,6 +19,7 @@ module Standard
         options_config = @assigns_rubocop_yaml.call(config_store, standard_config)
         @sets_target_ruby_version.call(options_config, standard_config)
         @configures_ignored_paths.call(options_config, standard_config)
+        @merges_user_config_extensions.call(options_config, standard_config)
       end
     end
   end

data/lib/standard/loads_runner.rb

@@ -1,9 +1,23 @@
+require_relative "runners/rubocop"
+require_relative "runners/version"
+require_relative "runners/verbose_version"
+require_relative "runners/lsp"
+require_relative "runners/genignore"
+require_relative "runners/help"
+
 module Standard
   class LoadsRunner
-    # Warning: clever metaprogramming. 99% of the time this is Runners::Rubocop
+    RUNNERS = {
+      rubocop: ::Standard::Runners::Rubocop,
+      version: ::Standard::Runners::Version,
+      verbose_version: ::Standard::Runners::VerboseVersion,
+      lsp: ::Standard::Runners::Lsp,
+      genignore: ::Standard::Runners::Genignore,
+      help: ::Standard::Runners::Help
+    }.freeze
+
     def call(command)
-      require_relative "runners/#{command}"
-      ::Standard::Runners.const_get(command.to_s.capitalize).new
+      RUNNERS[command].new
     end
   end
 end

data/lib/standard/loads_yaml_config.rb

@@ -32,7 +32,8 @@ module Standard
         default_ignores: standard_yaml.key?("default_ignores") ? !!standard_yaml["default_ignores"] : true,
         config_root: yaml_path ? Pathname.new(yaml_path).dirname.to_s : nil,
         todo_file: todo_path,
-        todo_ignore_files: (todo_yaml["ignore"] || []).map { |f| (Hash === f) ? f.keys.first : f }
+        todo_ignore_files: Array(todo_yaml["ignore"]).map { |f| (Hash === f) ? f.keys.first : f },
+        extend_config: Array(standard_yaml["extend_config"])
       }
     end
 

data/lib/standard/merges_settings.rb

@@ -20,7 +20,7 @@ module Standard
 
     def separate_argv(argv)
       argv.partition do |flag|
-        ["--generate-todo", "--fix", "--no-fix", "--version", "-v", "--help", "-h", "--lsp"].include?(flag)
+        ["--generate-todo", "--fix", "--no-fix", "--version", "-v", "--verbose-version", "-V", "--help", "-h", "--lsp"].include?(flag)
       end
     end
 
@@ -39,6 +39,8 @@ module Standard
         :help
       elsif (argv & ["--version", "-v"]).any?
         :version
+      elsif (argv & ["--verbose-version", "-V"]).any?
+        :verbose_version
       elsif (argv & ["--generate-todo"]).any?
         :genignore
       elsif (argv & ["--lsp"]).any?

data/lib/standard/rubocop/ext.rb

@@ -13,4 +13,13 @@ module RuboCop
         .gsub(" ", '\s*')
     )
   end
+
+  class CommentConfig
+    alias_method :old_initialize, :initialize
+
+    def initialize(processed_source)
+      old_initialize(processed_source)
+      @no_directives &&= !processed_source.raw_source.include?("standard")
+    end
+  end
 end

data/lib/standard/runners/help.rb

@@ -15,6 +15,7 @@ module Standard
             --generate-todo   Create a .standard_todo.yml that lists all the files that contain errors
             --lsp             Start a LSP server listening on STDIN
             -v, --version     Print the version of Standard
+            -V, --verbose-version   Print the version of Standard and its dependencies.
             -h, --help        Print this message
             FILE              Files to lint [default: ./]
 

data/lib/standard/runners/verbose_version.rb

@@ -0,0 +1,14 @@
+require_relative "rubocop"
+
+module Standard
+  module Runners
+    class VerboseVersion
+      def call(config)
+        puts <<-MSG.gsub(/^ {10}/, "")
+          Standard version: #{Standard::VERSION}
+          RuboCop version:  #{RuboCop::Version.version(debug: true)}
+        MSG
+      end
+    end
+  end
+end

data/lib/standard/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: standard
 version: !ruby/object:Gem::Version
-  version: 1.21.0
+  version: 1.22.0
 platform: ruby
 authors:
 - Justin Searls
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-03 00:00:00.000000000 Z
+date: 2023-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -52,7 +52,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.17.0.2
-description: 
+description:
 email:
 - searls@gmail.com
 executables:
@@ -95,6 +95,7 @@ files:
 - lib/standard/creates_config_store.rb
 - lib/standard/creates_config_store/assigns_rubocop_yaml.rb
 - lib/standard/creates_config_store/configures_ignored_paths.rb
+- lib/standard/creates_config_store/merges_user_config_extensions.rb
 - lib/standard/creates_config_store/sets_target_ruby_version.rb
 - lib/standard/detects_fixability.rb
 - lib/standard/file_finder.rb
@@ -112,13 +113,14 @@ files:
 - lib/standard/runners/help.rb
 - lib/standard/runners/lsp.rb
 - lib/standard/runners/rubocop.rb
+- lib/standard/runners/verbose_version.rb
 - lib/standard/runners/version.rb
 - lib/standard/version.rb
 - standard.gemspec
 homepage: https://github.com/testdouble/standard
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -133,8 +135,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: Ruby Style Guide, with linter & automatic code fixer
 test_files: []