spring 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f106243aa762e34fe036fe17fdb7f5be16dae9c1
-  data.tar.gz: 5b7644c2ab8bc4a7ef84b03467945a27b76747cd
+  metadata.gz: 76889e8dea82b0143cb774944f4122cf0968bd92
+  data.tar.gz: e46aede880a055694bff834fbe9b0b301b33acaf
 SHA512:
-  metadata.gz: 7764048029b1f16fb2dbaa11fcf3ef1d333da5cce9bcc987bc11faad303b6c5cbbd759913989013bf6f02c937311b42e5c9457984e578986026150047d7823e3
-  data.tar.gz: 77cd422487e054a4faf153a58d3c6216cfda027d09328cfc05e44f8b3abfd0e886e3abe654750652eb51b99d9d6483d598599d628d2d012d32aa07abc2de1667
+  metadata.gz: a0deb4670c1a305c57814ba43f75de2c74a2ff5cef1d62682570a6fa9cc3c6519450c68ba0f0b0cb3170b3104589edbdce7ac56a1ea83809b675eb00605910b4
+  data.tar.gz: a43f986537391bfa979cb5da46d73370af325527342f5db11812b8453d418bca56ef48267d9be9694eef09e8e85b067e94f243916a8882ddb459c8a2653f1223

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.3.2
+
+* Fix another problem with gems bundled from git repositories. This
+  affected chruby and RVM users, and possibly others. See #383.
+
 ## 1.3.1
 
 * Fix a problem with gems bundled from a git repository, where the

data/lib/spring/client/binstub.rb

@@ -29,18 +29,15 @@ CODE
       SPRING = <<'CODE'
 #!/usr/bin/env ruby
 
-# This file loads spring without using Bundler, in order to be fast
-# It gets overwritten when you run the `spring binstub` command
+# This file loads spring without using Bundler, in order to be fast.
+# It gets overwritten when you run the `spring binstub` command.
 
 unless defined?(Spring)
   require "rubygems"
   require "bundler"
 
   if match = Bundler.default_lockfile.read.match(/^GEM$.*?^    (?:  )*spring \((.*?)\)$.*?^$/m)
-    ENV["GEM_PATH"] = ([Bundler.bundle_path.to_s] + Gem.path).join(File::PATH_SEPARATOR)
-    ENV["GEM_HOME"] = nil
-    Gem.paths = ENV
-
+    Gem.paths = { "GEM_PATH" => Bundler.bundle_path.to_s }
     gem "spring", match[1]
     require "spring/binstub"
   end

data/lib/spring/client/run.rb

@@ -1,5 +1,6 @@
 require "rbconfig"
 require "socket"
+require "bundler"
 
 module Spring
   module Client
@@ -64,10 +65,8 @@ module Spring
       def boot_server
         env.socket_path.unlink if env.socket_path.exist?
 
-        # The GEM_HOME handling is to work around a problem with spring binstubs
-        # generated prior to 1.3.0.
         pid = Process.spawn(
-          ENV["GEM_HOME"] == "" ? { "GEM_HOME" => nil } : {},
+          gem_env,
           "ruby",
           "-r", "spring/server",
           "-e", "Spring::Server.boot"
@@ -80,6 +79,16 @@ module Spring
         end
       end
 
+      def gem_env
+        bundle = Bundler.bundle_path.to_s
+        paths  = ENV["GEM_PATH"].to_s.split(File::PATH_SEPARATOR)
+
+        {
+          "GEM_PATH" => [bundle, *paths].join(File::PATH_SEPARATOR),
+          "GEM_HOME" => bundle
+        }
+      end
+
       def stop_server
         server.close
         @server = nil

data/lib/spring/version.rb

@@ -1,3 +1,3 @@
 module Spring
-  VERSION = "1.3.1"
+  VERSION = "1.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spring
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Jon Leighton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-09 00:00:00.000000000 Z
+date: 2015-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport