standard 1.24.2 → 1.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13d481f6982b619853ac364ffa223ddb6c010ea68cd57248c759786119f991a7
-  data.tar.gz: 3ee49b870ff3d1ffe12bca06c1d0c80ec41e815fe056f476b91f2bb766293196
+  metadata.gz: 62f07904722bcfbbb854cb836adab694bb8e8c17462815746c43a9fc7efeec25
+  data.tar.gz: eb29fb518070108bb06c5935a674f7e4bc790bdf9ed1fb61f1b4b4c62e981678
 SHA512:
-  metadata.gz: e1e0ad0ae158c7659b253f1062693f82cd1691babf12e65237521d005f9c4ce148b53e2905dfa1d1029082133e4852ef0f8c9a46e6917d6860342cf602c0fc64
-  data.tar.gz: 0d4ad3d30a9652e3536129f0f4733e5b7efb8ccefb699333e83f18a47e4259c2917b7f4507806aa79f4de15b0e7a73f5cf4961fafe86be88cb6c3c97a00a2d6f
+  metadata.gz: 6f6a1c87fe29092994d039226b2724372b47d7108a2b10fbb32aa3da6d10c07301a2013553c1532bacc5e3d6a144bc741254c3e80abb14fc8b76704d011b79f9
+  data.tar.gz: ac43fa3bda8577a7bbc8b3f5dfb9b8ae949681b0c98da4bdfbd80bdf93ecb8b92e38a16358a935223e5b5c00045893540645eae5b43b8f8bbb6ad9ad0e04c3ed

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 1.25.0
+
+* Update rubocop-performance from 1.15.2 to [1.16.0](https://github.com/rubocop/rubocop-performance/releases/tag/v1.16.0)
+* Update rubocop from 1.44.1 to [1.48.1](https://github.com/rubocop/rubocop/releases/tag/v1.48.1)
+  * Enabled [Style/DirEmpty](https://docs.rubocop.org/rubocop/cops_style.html#styledirempty)
+  * Enabled [Style/RedundantHeredocDelimiterQuotes](https://docs.rubocop.org/rubocop/cops_style.html#styleredundantheredocdelimiterquotes)
+
+## 1.24.3
+
+* _Further_ _further_ _further_ improve `--lsp` server to ignore files correctly
+
 ## 1.24.2
 
 * _Further_ _further_ improve `--lsp` server to always respond to requests

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    standard (1.24.2)
+    standard (1.25.0)
       language_server-protocol (~> 3.17.0.2)
-      rubocop (= 1.44.1)
-      rubocop-performance (= 1.15.2)
+      rubocop (= 1.48.1)
+      rubocop-performance (= 1.16.0)
 
 GEM
   remote: https://rubygems.org/
@@ -19,9 +19,9 @@ GEM
       method_source (>= 0.6.7)
       rake (>= 0.9.2.2)
     method_source (1.0.0)
-    minitest (5.17.0)
+    minitest (5.18.0)
     parallel (1.22.1)
-    parser (3.2.1.0)
+    parser (3.2.1.1)
       ast (~> 2.4.1)
     pry (0.14.2)
       coderay (~> 1.1)
@@ -30,22 +30,22 @@ GEM
     rake (13.0.6)
     regexp_parser (2.7.0)
     rexml (3.2.5)
-    rubocop (1.44.1)
+    rubocop (1.48.1)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.24.1, < 2.0)
+      rubocop-ast (>= 1.26.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.24.1)
-      parser (>= 3.1.1.0)
-    rubocop-performance (1.15.2)
+    rubocop-ast (1.27.0)
+      parser (>= 3.2.1.0)
+    rubocop-performance (1.16.0)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    ruby-progressbar (1.11.0)
+    ruby-progressbar (1.13.0)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)

data/README.md

@@ -200,19 +200,6 @@ community conventions higher than personal style. This might not make sense for
 place for newbies. Setting up clear, automated contributor expectations makes a
 project healthier.
 
-## Usage via RuboCop
-
-If you only want to use Standard's rules while continuing to use RuboCop's CLI
-(for example, to continue using your favorite IDE/tooling/workflow with RuboCop
-support), you can configure this in your `.rubocop.yml`:
-
-```yaml
-require: standard
-
-inherit_gem:
-  standard: config/base.yml
-```
-
 ## Who uses Ruby Standard Style?
 
 Here are a few examples of Ruby Standard-compliant teams & projects:
@@ -242,6 +229,7 @@ Here are a few examples of Ruby Standard-compliant teams & projects:
 * [Rebase Interactive](https://www.rebaseinteractive.com/)
 * [Renuo](https://www.renuo.ch/)
 * [RubyCI](https://ruby.ci)
+* [Teamtailor](https://www.teamtailor.com/)
 * [thoughtbot](https://thoughtbot.com/)
 
 Does your team use Standard? [Add your name to the list](https://github.com/testdouble/standard/edit/main/README.md)!
@@ -430,7 +418,7 @@ and `rake standard` will also execute the default configuration of the
 `rubocop-rails` gem without needing to invoke `rubocop` separately.
 
 For a slightly more complex example, we could add the
-[https://github.com/Betterment/betterlint] gem from our friends at
+[betterlint](https://github.com/Betterment/betterlint) gem from our friends at
 [Betterment](https://www.betterment.com), first by telling Standard where our
 configuration file is:
 
@@ -475,11 +463,25 @@ Standard (like `TargetRubyVersion`) or prevent Standard's own rules from running
 `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
+### Usage via RuboCop
+
+If you find that Standard's `extend_config` feature doesn't meet your needs or
+if you only want to use Standard's rules while continuing to use RuboCop's CLI
+(e.g., to continue using your favorite IDE/tooling/workflow with RuboCop
+support) 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.
 
+In short, you can configure this in your `.rubocop.yml` to load Standard's
+ruleset like any other gem:
+
+```yaml
+require: standard
+
+inherit_gem:
+  standard: config/base.yml
+```
+
 ## How do I change the output?
 
 Standard's built-in formatter is intentionally minimal, printing only unfixed

data/config/base.yml

@@ -855,6 +855,9 @@ Metrics/BlockNesting:
 Metrics/ClassLength:
   Enabled: false
 
+Metrics/CollectionLiteralLength:
+  Enabled: false
+
 Metrics/CyclomaticComplexity:
   Enabled: false
 
@@ -1246,6 +1249,9 @@ Style/DefWithParentheses:
 Style/Dir:
   Enabled: true
 
+Style/DirEmpty:
+  Enabled: true
+
 Style/DisableCopsWithinSourceCodeDirective:
   Enabled: false
 
@@ -1325,6 +1331,9 @@ Style/ExponentialNotation:
 Style/FetchEnvVar:
   Enabled: false
 
+Style/FileEmpty:
+  Enabled: false
+
 Style/FileRead:
   Enabled: true
 
@@ -1692,6 +1701,9 @@ Style/RedundantFileExtensionInRequire:
 Style/RedundantFreeze:
   Enabled: true
 
+Style/RedundantHeredocDelimiterQuotes:
+  Enabled: true
+
 Style/RedundantInitialize:
   Enabled: true
 

data/config/ruby-2.3.yml

@@ -5,3 +5,6 @@ AllCops:
 
 Style/ComparableClamp:
   Enabled: false
+
+Style/DirEmpty:
+  Enabled: false

data/lib/standard/lsp/logger.rb

@@ -1,9 +1,19 @@
 module Standard
   module Lsp
     class Logger
+      def initialize
+        @puts_onces = []
+      end
+
       def puts(message)
         warn("[server] #{message}")
       end
+
+      def puts_once(message)
+        return if @puts_onces.include?(message)
+        @puts_onces << message
+        puts(message)
+      end
     end
   end
 end

data/lib/standard/lsp/routes.rb

@@ -30,7 +30,8 @@ module Standard
             diagnostic_provider: true,
             execute_command_provider: true,
             text_document_sync: Proto::Interface::TextDocumentSyncOptions.new(
-              change: Proto::Constant::TextDocumentSyncKind::FULL
+              change: Proto::Constant::TextDocumentSyncKind::FULL,
+              open_close: true
             )
           )
         ))
@@ -130,13 +131,17 @@ module Standard
 
       private
 
+      def uri_to_path(uri)
+        uri.sub(%r{^file://}, "")
+      end
+
       def format_file(file_uri)
         text = @text_cache[file_uri]
         if text.nil?
           @logger.puts "Format request arrived before text synchonized; skipping: `#{file_uri}'"
           []
         else
-          new_text = @standardizer.format(text)
+          new_text = @standardizer.format(uri_to_path(file_uri), text)
           if new_text == text
             []
           else
@@ -153,7 +158,7 @@ module Standard
 
       def diagnostic(file_uri, text)
         @text_cache[file_uri] = text
-        offenses = @standardizer.offenses(text)
+        offenses = @standardizer.offenses(uri_to_path(file_uri), text)
 
         lsp_diagnostics = offenses.map { |o|
           code = o[:cop_name]

data/lib/standard/lsp/server.rb

@@ -9,15 +9,11 @@ module Standard
     SEV = Proto::Constant::DiagnosticSeverity
 
     class Server
-      def self.start(standardizer)
-        new(standardizer).start
-      end
-
-      def initialize(standardizer)
-        @standardizer = standardizer
+      def initialize(config)
         @writer = Proto::Transport::Io::Writer.new($stdout)
         @reader = Proto::Transport::Io::Reader.new($stdin)
         @logger = Logger.new
+        @standardizer = Standard::Lsp::Standardizer.new(config, @logger)
         @routes = Routes.new(@writer, @logger, @standardizer)
       end
 

data/lib/standard/lsp/standardizer.rb

@@ -1,49 +1,65 @@
 require_relative "../runners/rubocop"
-require "tempfile"
 
 module Standard
   module Lsp
     class Standardizer
-      def initialize(config)
-        @template_options = config
-        @runner = Standard::Runners::Rubocop.new
+      def initialize(config, logger)
+        @config = config
+        @logger = logger
+        @rubocop_runner = Standard::Runners::Rubocop.new
       end
 
-      def format(text)
-        run_standard(text, format: true)
+      # This abuses the --stdin option of rubocop and reads the formatted text
+      # from the options[:stdin] that rubocop mutates. This depends on
+      # parallel: false as well as the fact that rubocop doesn't otherwise dup
+      # or reassign that options object. Risky business!
+      #
+      # Reassigning options[:stdin] is done here:
+      #   https://github.com/rubocop/rubocop/blob/master/lib/rubocop/cop/team.rb#L131
+      # Printing options[:stdin]
+      #   https://github.com/rubocop/rubocop/blob/master/lib/rubocop/cli/command/execute_runner.rb#L95
+      # Setting `parallel: true` would break this here:
+      #   https://github.com/rubocop/rubocop/blob/master/lib/rubocop/runner.rb#L72
+      def format(path, text)
+        ad_hoc_config = fork_config(path, text, format: true)
+        capture_rubocop_stdout(ad_hoc_config)
+        ad_hoc_config.rubocop_options[:stdin]
       end
 
-      def offenses(text)
-        results = run_standard(text, format: false)
-        JSON.parse(results, symbolize_names: true).dig(:files, 0, :offenses)
+      def offenses(path, text)
+        results = JSON.parse(
+          capture_rubocop_stdout(fork_config(path, text, format: false)),
+          symbolize_names: true
+        )
+        if results[:files].empty?
+          @logger.puts_once "Ignoring file, per configuration: #{path}"
+          []
+        else
+          results.dig(:files, 0, :offenses)
+        end
       end
 
       private
 
-      BASENAME = ["source", ".rb"].freeze
-      def run_standard(text, format:)
-        Tempfile.open(BASENAME) do |temp|
-          temp.write(text)
-          temp.flush
-          stdout = capture_rubocop_stdout(make_config(temp.path, format))
-          format ? File.read(temp.path) : stdout
-        end
-      end
-
-      def make_config(file, format)
-        # Can't make frozen versions of this hash because RuboCop mutates it
-        o = if format
-          {autocorrect: true, formatters: [["Standard::Formatter", nil]], parallel: true, todo_file: nil, todo_ignore_files: [], safe_autocorrect: true}
+      BASE_OPTIONS = {
+        force_exclusion: true,
+        parallel: false,
+        todo_file: nil,
+        todo_ignore_files: []
+      }
+      def fork_config(path, text, format:)
+        options = if format
+          {stdin: text, autocorrect: true, formatters: [], safe_autocorrect: true}
         else
-          {autocorrect: false, formatters: [["json"]], parallel: true, todo_file: nil, todo_ignore_files: [], format: "json"}
+          {stdin: text, autocorrect: false, formatters: [["json"]], format: "json"}
         end
-        Standard::Config.new(@template_options.runner, [file], o, @template_options.rubocop_config_store)
+        Standard::Config.new(@config.runner, [path], BASE_OPTIONS.merge(options), @config.rubocop_config_store)
       end
 
       def capture_rubocop_stdout(config)
         redir = StringIO.new
         $stdout = redir
-        @runner.call(config)
+        @rubocop_runner.call(config)
         redir.string
       ensure
         $stdout = STDOUT

data/lib/standard/runners/lsp.rb

@@ -4,8 +4,7 @@ module Standard
   module Runners
     class Lsp
       def call(config)
-        standardizer = Standard::Lsp::Standardizer.new(config)
-        Standard::Lsp::Server.start(standardizer)
+        Standard::Lsp::Server.new(config).start
       end
     end
   end

data/lib/standard/version.rb

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

data/standard.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rubocop", "1.44.1"
-  spec.add_dependency "rubocop-performance", "1.15.2"
+  spec.add_dependency "rubocop", "1.48.1"
+  spec.add_dependency "rubocop-performance", "1.16.0"
 
   # not semver: first three are lsp protocol version, last is patch
   spec.add_dependency "language_server-protocol", "~> 3.17.0.2"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: standard
 version: !ruby/object:Gem::Version
-  version: 1.24.2
+  version: 1.25.0
 platform: ruby
 authors:
 - Justin Searls
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-10 00:00:00.000000000 Z
+date: 2023-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.44.1
+        version: 1.48.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.44.1
+        version: 1.48.1
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.15.2
+        version: 1.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.15.2
+        version: 1.16.0
 - !ruby/object:Gem::Dependency
   name: language_server-protocol
   requirement: !ruby/object:Gem::Requirement
@@ -52,7 +52,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.17.0.2
-description:
+description: 
 email:
 - searls@gmail.com
 executables:
@@ -123,7 +123,7 @@ files:
 homepage: https://github.com/testdouble/standard
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -138,8 +138,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Ruby Style Guide, with linter & automatic code fixer
 test_files: []