spring 1.3.1 → 1.3.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +5 -0
- data/lib/spring/client/binstub.rb +3 -6
- data/lib/spring/client/run.rb +12 -3
- data/lib/spring/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 76889e8dea82b0143cb774944f4122cf0968bd92
|
4
|
+
data.tar.gz: e46aede880a055694bff834fbe9b0b301b33acaf
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a0deb4670c1a305c57814ba43f75de2c74a2ff5cef1d62682570a6fa9cc3c6519450c68ba0f0b0cb3170b3104589edbdce7ac56a1ea83809b675eb00605910b4
|
7
|
+
data.tar.gz: a43f986537391bfa979cb5da46d73370af325527342f5db11812b8453d418bca56ef48267d9be9694eef09e8e85b067e94f243916a8882ddb459c8a2653f1223
|
data/CHANGELOG.md
CHANGED
@@ -29,18 +29,15 @@ CODE
|
|
29
29
|
SPRING = <<'CODE'
|
30
30
|
#!/usr/bin/env ruby
|
31
31
|
|
32
|
-
# This file loads spring without using Bundler, in order to be fast
|
33
|
-
# It gets overwritten when you run the `spring binstub` command
|
32
|
+
# This file loads spring without using Bundler, in order to be fast.
|
33
|
+
# It gets overwritten when you run the `spring binstub` command.
|
34
34
|
|
35
35
|
unless defined?(Spring)
|
36
36
|
require "rubygems"
|
37
37
|
require "bundler"
|
38
38
|
|
39
39
|
if match = Bundler.default_lockfile.read.match(/^GEM$.*?^ (?: )*spring \((.*?)\)$.*?^$/m)
|
40
|
-
|
41
|
-
ENV["GEM_HOME"] = nil
|
42
|
-
Gem.paths = ENV
|
43
|
-
|
40
|
+
Gem.paths = { "GEM_PATH" => Bundler.bundle_path.to_s }
|
44
41
|
gem "spring", match[1]
|
45
42
|
require "spring/binstub"
|
46
43
|
end
|
data/lib/spring/client/run.rb
CHANGED
@@ -1,5 +1,6 @@
|
|
1
1
|
require "rbconfig"
|
2
2
|
require "socket"
|
3
|
+
require "bundler"
|
3
4
|
|
4
5
|
module Spring
|
5
6
|
module Client
|
@@ -64,10 +65,8 @@ module Spring
|
|
64
65
|
def boot_server
|
65
66
|
env.socket_path.unlink if env.socket_path.exist?
|
66
67
|
|
67
|
-
# The GEM_HOME handling is to work around a problem with spring binstubs
|
68
|
-
# generated prior to 1.3.0.
|
69
68
|
pid = Process.spawn(
|
70
|
-
|
69
|
+
gem_env,
|
71
70
|
"ruby",
|
72
71
|
"-r", "spring/server",
|
73
72
|
"-e", "Spring::Server.boot"
|
@@ -80,6 +79,16 @@ module Spring
|
|
80
79
|
end
|
81
80
|
end
|
82
81
|
|
82
|
+
def gem_env
|
83
|
+
bundle = Bundler.bundle_path.to_s
|
84
|
+
paths = ENV["GEM_PATH"].to_s.split(File::PATH_SEPARATOR)
|
85
|
+
|
86
|
+
{
|
87
|
+
"GEM_PATH" => [bundle, *paths].join(File::PATH_SEPARATOR),
|
88
|
+
"GEM_HOME" => bundle
|
89
|
+
}
|
90
|
+
end
|
91
|
+
|
83
92
|
def stop_server
|
84
93
|
server.close
|
85
94
|
@server = nil
|
data/lib/spring/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: spring
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.3.
|
4
|
+
version: 1.3.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Jon Leighton
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-02-
|
11
|
+
date: 2015-02-14 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activesupport
|