Fix a bug on re-generating binstub

yhirano55 · yhirano55 · commit 260ced72da95 · 2017-08-08T23:57:10.000+09:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## Next release
 
+* Fix a bug on re-generating binstub (#534)
 * Preserve comments right after the shebang line which might include magic comments such as `frozen_string_literal: true'
 
 ## 2.0.2
diff --git a/lib/spring/client/binstub.rb b/lib/spring/client/binstub.rb
@@ -49,7 +49,7 @@ class Binstub < Command
         %{begin\n  load File.expand_path("../spring", __FILE__)\nrescue LoadError\nend\n},
         %{begin\n  load File.expand_path('../spring', __FILE__)\nrescue LoadError\nend\n},
         %{begin\n  spring_bin_path = File.expand_path('../spring', __FILE__)\n  load spring_bin_path\nrescue LoadError => e\n  raise unless e.message.end_with? spring_bin_path, 'spring/binstub'\nend\n},
-        LOADER
+        /begin\n  load File\.expand_path\(['"]\.\.\/spring['"], __FILE__\)\nrescue LoadError => e\n  raise unless e\.message\.include\?\(['"]spring['"]\)\nend\n/
       ]
 
       class Item

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ class Binstub < Command`
`49`	`49`	`%{begin\n load File.expand_path("../spring", __FILE__)\nrescue LoadError\nend\n},`
`50`	`50`	`%{begin\n load File.expand_path('../spring', __FILE__)\nrescue LoadError\nend\n},`
`51`	`51`	`%{begin\n spring_bin_path = File.expand_path('../spring', __FILE__)\n load spring_bin_path\nrescue LoadError => e\n raise unless e.message.end_with? spring_bin_path, 'spring/binstub'\nend\n},`
`52`		`- LOADER`
	`52`	`+ /begin\n load File\.expand_path\(['"]\.\.\/spring['"], __FILE__\)\nrescue LoadError => e\n raise unless e\.message\.include\?\(['"]spring['"]\)\nend\n/`
`53`	`53`	`]`
`54`	`54`
`55`	`55`	`class Item`