Fix another loading problem

Issue #390.

We can't rely on ENV["GEM_PATH"] to be set. Also, the spring gem will
not necessarily exist in the bundle path, so we need to fall back to
other paths.

Author: jonleighton

CHANGELOG.md

@@ -1,3 +1,8 @@
+## Next version
+
+* Fix yet another problem with loading spring which seems to affect
+  some/all rbenv users. Issue #390.
+
 ## 1.3.2
 
 * Fix another problem with gems bundled from git repositories. This

lib/spring/client/binstub.rb

@@ -37,7 +37,7 @@ class Binstub < Command
   require "bundler"
 
   if match = Bundler.default_lockfile.read.match(/^GEM$.*?^    (?:  )*spring \((.*?)\)$.*?^$/m)
-    Gem.paths = { "GEM_PATH" => Bundler.bundle_path.to_s }
+    Gem.paths = { "GEM_PATH" => [Bundler.bundle_path.to_s, *Gem.path].uniq }
     gem "spring", match[1]
     require "spring/binstub"
   end

lib/spring/client/run.rb

@@ -81,10 +81,10 @@ def boot_server
 
       def gem_env
         bundle = Bundler.bundle_path.to_s
-        paths  = ENV["GEM_PATH"].to_s.split(File::PATH_SEPARATOR)
+        paths  = Gem.path + ENV["GEM_PATH"].to_s.split(File::PATH_SEPARATOR)
 
         {
-          "GEM_PATH" => [bundle, *paths].join(File::PATH_SEPARATOR),
+          "GEM_PATH" => [bundle, *paths].uniq.join(File::PATH_SEPARATOR),
           "GEM_HOME" => bundle
         }
       end