ruby_language_server 0.3.10 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd91d47c15d866df0d207db2e5f9d289200e006620bf0457a62309630e3da707
-  data.tar.gz: 4dfac7f73cc17285a0543596d17bdd5326603d3716a625add6644ee55966c59d
+  metadata.gz: fe54fa7e2447945dfdec7a3e4115d6a31d028842d78b26631885d4e324cd77bc
+  data.tar.gz: 178acfce9a35034338ae281542c46c84ae96982c0202a5568585f976239abe20
 SHA512:
-  metadata.gz: 7d7782c575a27ab425bd3c3e73330a3196407e2a1caedcc4b9ac90f238f245bd0a6f2d98b1966e34ce203646bffec484831cf7b02828d063797cc5091d984be7
-  data.tar.gz: 5506cfa8697302b0be73362f709f51f0ac70b264749bcae831a278f355d44f8eff360b2b5aca8d895bc1508145253d585860fa946512be7d148167768173dd35
+  metadata.gz: 48e6196bf2fd6ae860211a5e31e670ef22fbe66d1cca0c44ae239b8ab82faa7ad3a657a3afcda15b6930e54becc8f743a2e415cef5648f3e03583158be5d507c
+  data.tar.gz: 4a5b80426e7e08be93eb514e42420c9f8bc15563b427fc20cc0d648d3a7280db092756ba1980153385696cc4e9249fb3843c26047e856a6ebfef39791f5dbe26

data/CHANGELOG.txt

@@ -1,5 +1,10 @@
 # Changelog
 
+#### 0.3.11 Wed Jan 29 06:48:37 UTC 2020
+
+* #57 rubocop gemfiles mismatch
+* #56 .rubocop.yml changes do not rerun rubocop validations
+
 #### 0.3.10 Fri Jan 24 00:19:14 PST 2020
 
 * botched the 0.3.9 release

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby_language_server (0.3.10)
+    ruby_language_server (0.3.11)
       activerecord (~> 5.2)
       amatch
       bundler
@@ -65,7 +65,7 @@ GEM
       ruby_dep (~> 1.2)
     lumberjack (1.0.13)
     method_source (0.9.2)
-    minitest (5.11.3)
+    minitest (5.13.0)
     minitest-color (0.0.2)
       minitest (~> 5)
     mize (0.4.0)
@@ -124,7 +124,7 @@ DEPENDENCIES
   guard
   guard-minitest
   guard-rubocop
-  minitest (~> 5.11)
+  minitest (= 5.13.0)
   minitest-color
   pry
   pry-byebug
@@ -133,4 +133,4 @@ DEPENDENCIES
   sexp_processor
 
 BUNDLED WITH
-   2.1.3
+   2.1.4

data/lib/ruby_language_server/gem_installer.rb

@@ -16,6 +16,7 @@ module RubyLanguageServer
         gemfile do
           source 'https://rubygems.org'
           gem 'rubocop', rubocop_gem.version.to_s
+          gem 'minitest', '5.13.0' # Very specific version matching one in gemspec
           gem_names.each do |gem_name|
             gem gem_name
           end

data/lib/ruby_language_server/good_cop.rb

@@ -4,12 +4,14 @@ require 'rubocop'
 
 module RubyLanguageServer
   class GoodCop < RuboCop::Runner
-    def initialize
-      @initialization_error = nil
-      config_store = RuboCop::ConfigStore.new
-      config_store.options_config = config_path
-      RubyLanguageServer.logger.debug("Rubocop config_path: #{config_path}")
-      super({}, config_store)
+    def initialize(config_path, initialization_error = nil)
+      @initialization_error = initialization_error
+      unless @initialization_error
+        config_store = RuboCop::ConfigStore.new
+        config_store.options_config = config_path
+        RubyLanguageServer.logger.debug("Rubocop config_path: #{config_path}")
+        super({}, config_store)
+      end
     rescue Exception => e
       RubyLanguageServer.logger.error(e)
       @initialization_error = "There was an issue loading the rubocop configuration file: #{e}.  Maybe you need to add some additional gems to the ide-ruby settings?"
@@ -100,7 +102,8 @@ module RubyLanguageServer
       if excluded_file?(filename)
         []
       else
-        processed_source = RuboCop::ProcessedSource.new(text, 2.7, filename)
+        ruby_version = 2.7
+        processed_source = RuboCop::ProcessedSource.new(text, ruby_version, filename)
         offenses = inspect_file(processed_source)
         offenses.compact.flatten
       end
@@ -119,14 +122,31 @@ module RubyLanguageServer
       ]
     end
 
-    def config_path
-      my_path = __FILE__
-      pathname = Pathname.new(my_path)
-      my_directory = pathname.dirname
-      fallback_pathname = my_directory + '../resources/fallback_rubocop.yml'
-      project_path = RubyLanguageServer::ProjectManager.root_path + '.rubocop.yml'
-      possible_config_paths = [project_path, fallback_pathname.to_s]
-      possible_config_paths.detect { |path| File.exist?(path) }
+    class << self
+      def instance
+        @config_path ||= config_path
+        config_path_timestamp = File.mtime(@config_path)
+        if @cached_config_path_timestamp.nil? || @cached_config_path_timestamp < config_path_timestamp
+          @cached_config_path_timestamp = config_path_timestamp
+          @instance = new(@config_path)
+        else
+          @instance
+        end
+      rescue StandardError => e
+        @instance = new(@config_path, e.to_s)
+      end
+
+      private
+
+      def config_path
+        my_path = __FILE__
+        pathname = Pathname.new(my_path)
+        my_directory = pathname.dirname
+        fallback_pathname = my_directory + '../resources/fallback_rubocop.yml'
+        project_path = RubyLanguageServer::ProjectManager.root_path + '.rubocop.yml'
+        possible_config_paths = [project_path, fallback_pathname.to_s]
+        possible_config_paths.detect { |path| File.exist?(path) }
+      end
     end
 
     def excluded_file?(filename)

data/lib/ruby_language_server/project_manager.rb

@@ -217,9 +217,8 @@ module RubyLanguageServer
     def updated_diagnostics_for_codefile(code_file)
       # Maybe we should be sharing this GoodCop across instances
       RubyLanguageServer.logger.debug("updated_diagnostics_for_codefile: #{code_file.uri}")
-      @good_cop ||= GoodCop.new
       project_relative_filename = filename_relative_to_project(code_file.uri)
-      code_file.diagnostics = @good_cop.diagnostics(code_file.text, project_relative_filename)
+      code_file.diagnostics = GoodCop.instance.diagnostics(code_file.text, project_relative_filename)
       RubyLanguageServer.logger.debug("code_file.diagnostics: #{code_file.diagnostics}")
       code_file.diagnostics
     end

data/lib/ruby_language_server/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyLanguageServer
-  VERSION = '0.3.10'
+  VERSION = '0.3.11'
 end

data/ruby_language_server.gemspec

@@ -52,7 +52,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'guard'
   spec.add_development_dependency 'guard-minitest'
   spec.add_development_dependency 'guard-rubocop'
-  spec.add_development_dependency 'minitest', '~>5.11'
+  spec.add_development_dependency 'minitest', '5.13.0' # Very exact verion matching the one in gem_installer.rb because of runtime gem version conflicts
   spec.add_development_dependency 'minitest-color'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'pry-byebug'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_language_server
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
 platform: ruby
 authors:
 - Kurt Werle
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-24 00:00:00.000000000 Z
+date: 2020-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -196,16 +196,16 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '5.11'
+        version: 5.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '5.11'
+        version: 5.13.0
 - !ruby/object:Gem::Dependency
   name: minitest-color
   requirement: !ruby/object:Gem::Requirement