Merge pull request #402 from TimMoore/lock-spawned-server-version

jonleighton · jonleighton · commit b69282308308 · 2015-05-08T15:51:34.000+01:00
Lock the version of the spawned server
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,8 @@
 ## 1.3.5
 
 * Fix `rails test` command to run in test environment #403 - @eileencodes
+* Ensure the spawned server is loaded from the same version of the Spring gem
+  as the client. Issue #295.
 
 ## 1.3.4
 
diff --git a/lib/spring/client/run.rb b/lib/spring/client/run.rb
@@ -68,8 +68,7 @@ def boot_server
         pid = Process.spawn(
           gem_env,
           "ruby",
-          "-r", "spring/server",
-          "-e", "Spring::Server.boot"
+          "-e", "gem 'spring', '#{Spring::VERSION}'; require 'spring/server'; Spring::Server.boot"
         )
 
         until env.socket_path.exist?

Original file line number	Diff line number	Diff line change
`@@ -68,8 +68,7 @@ def boot_server`
`68`	`68`	`pid = Process.spawn(`
`69`	`69`	`gem_env,`
`70`	`70`	`"ruby",`
`71`		`- "-r", "spring/server",`
`72`		`- "-e", "Spring::Server.boot"`
	`71`	`+ "-e", "gem 'spring', '#{Spring::VERSION}'; require 'spring/server'; Spring::Server.boot"`
`73`	`72`	`)`
`74`	`73`
`75`	`74`	`until env.socket_path.exist?`