ruby_language_server 0.3.11 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe54fa7e2447945dfdec7a3e4115d6a31d028842d78b26631885d4e324cd77bc
-  data.tar.gz: 178acfce9a35034338ae281542c46c84ae96982c0202a5568585f976239abe20
+  metadata.gz: c3c05305f5598c756c440e7a668d1d8a7021f18b079d4ead930e3bac72c0115a
+  data.tar.gz: 9b620bcffca253ef2a464a1be4d39e7864064ac4310acca2a49457a62ab6f33b
 SHA512:
-  metadata.gz: 48e6196bf2fd6ae860211a5e31e670ef22fbe66d1cca0c44ae239b8ab82faa7ad3a657a3afcda15b6930e54becc8f743a2e415cef5648f3e03583158be5d507c
-  data.tar.gz: 4a5b80426e7e08be93eb514e42420c9f8bc15563b427fc20cc0d648d3a7280db092756ba1980153385696cc4e9249fb3843c26047e856a6ebfef39791f5dbe26
+  metadata.gz: d3cea5c0f8687fa542916a3e4478f14612d2b1d590be461518d6bcf58ca141360301a0416bd624e7298170c9fc8abda77c16dc119c5f377d550fb0b79c818e11
+  data.tar.gz: 5bc4f5db091bb6257e8eb8b4af3c0e76900b493ec2a4a80ea261380a8a91323e2d25cfc7b6d40cbb1877e96a3b7d673efa6b8795917f6c169e975f6c3f1acf9b

data/CHANGELOG.txt

@@ -1,5 +1,9 @@
 # Changelog
 
+#### 0.3.12 Thu Feb  6 06:18:33 UTC 2020
+
+* #58 Change the way additional gems are installed so there are not conflicts
+
 #### 0.3.11 Wed Jan 29 06:48:37 UTC 2020
 
 * #57 rubocop gemfiles mismatch

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby_language_server (0.3.11)
+    ruby_language_server (0.3.12)
       activerecord (~> 5.2)
       amatch
       bundler
@@ -32,14 +32,14 @@ GEM
       tins (~> 1.0)
     arel (9.0.0)
     ast (2.4.0)
-    byebug (11.0.1)
+    byebug (11.1.1)
     coderay (1.1.2)
     concurrent-ruby (1.1.5)
     etc (1.1.0)
-    ffi (1.11.1)
+    ffi (1.12.2)
     formatador (0.2.5)
     fuzzy_match (2.1.0)
-    guard (2.15.0)
+    guard (2.16.1)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
@@ -55,15 +55,14 @@ GEM
     guard-rubocop (1.3.0)
       guard (~> 2.0)
       rubocop (~> 0.20)
-    i18n (1.8.1)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.3)
+    jaro_winkler (1.5.4)
     json (2.3.0)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    lumberjack (1.0.13)
+    listen (3.2.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    lumberjack (1.2.4)
     method_source (0.9.2)
     minitest (5.13.0)
     minitest-color (0.0.2)
@@ -74,26 +73,26 @@ GEM
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.17.0)
-    parser (2.6.3.0)
+    parallel (1.19.1)
+    parser (2.7.0.2)
       ast (~> 2.4.0)
     protocol (2.0.0)
       ruby_parser (~> 3.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    pry-byebug (3.7.0)
+    pry-byebug (3.8.0)
       byebug (~> 11.0)
       pry (~> 0.10)
     rainbow (3.0.0)
     rake (13.0.1)
     rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rubocop (0.74.0)
+    rubocop (0.79.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
@@ -102,20 +101,19 @@ GEM
     rubocop-rspec (1.37.1)
       rubocop (>= 0.68.1)
     ruby-progressbar (1.10.1)
-    ruby_dep (1.5.0)
     ruby_parser (3.14.1)
       sexp_processor (~> 4.9)
-    sexp_processor (4.12.1)
+    sexp_processor (4.13.0)
     shellany (0.0.1)
     sqlite3 (1.4.2)
     sync (0.5.0)
-    thor (0.20.3)
+    thor (1.0.1)
     thread_safe (0.3.6)
     tins (1.24.0)
       sync
     tzinfo (1.2.6)
       thread_safe (~> 0.1)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.6.1)
 
 PLATFORMS
   ruby
@@ -124,7 +122,7 @@ DEPENDENCIES
   guard
   guard-minitest
   guard-rubocop
-  minitest (= 5.13.0)
+  minitest
   minitest-color
   pry
   pry-byebug

data/lib/ruby_language_server/gem_installer.rb

@@ -6,18 +6,21 @@ module RubyLanguageServer
   # Sole purpose is to install gems
   module GemInstaller
     class << self
-      def install_gems(gem_names)
-        gem_names&.compact!
-        gem_names&.reject! { |name| name.strip == '' }
-        return if gem_names.nil? || gem_names.empty?
+      def install_gems(additional_gem_names)
+        additional_gem_names&.compact!
+        additional_gem_names&.reject! { |name| name.strip == '' }
+        return if additional_gem_names.nil? || additional_gem_names.empty?
+
+        RubyLanguageServer.logger.info("Trying to install gems #{additional_gem_names}")
 
-        RubyLanguageServer.logger.info("Trying to install gems #{gem_names}")
-        rubocop_gem = Gem::Specification.find_by_name 'rubocop'
         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|
+          # Lock all the gems we already have installed to the versions we have installed
+          # For some reason, installing bundler makes it unhappy.  Whatever.
+          Gem::Specification.reject { |s| s.name == 'bundler' }.each do |specification|
+            gem(specification.name, specification.version.to_s)
+          end
+          additional_gem_names.each do |gem_name|
             gem gem_name
           end
         end

data/lib/ruby_language_server/project_manager.rb

@@ -62,7 +62,7 @@ module RubyLanguageServer
         RubyLanguageServer::GemInstaller.install_gems(gem_names)
         @additional_gem_mutex.synchronize { @additional_gems_installed = true }
       rescue StandardError => e
-        RubyLanguageServer.logger.error("Issue installing rubocop gems: #{e}")
+        RubyLanguageServer.logger.error("Issue installing rubocop gems: #{e} #{e.backtrace}")
       end
     end
 

data/lib/ruby_language_server/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyLanguageServer
-  VERSION = '0.3.11'
+  VERSION = '0.3.12'
 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.13.0' # Very exact verion matching the one in gem_installer.rb because of runtime gem version conflicts
+  spec.add_development_dependency 'minitest'
   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.11
+  version: 0.3.12
 platform: ruby
 authors:
 - Kurt Werle
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-29 00:00:00.000000000 Z
+date: 2020-02-06 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.13.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.13.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-color
   requirement: !ruby/object:Gem::Requirement