Merge pull request #546 from mattbrictson/honor-bundle-app-config

matthewd · web-flow · commit eb80f1f29743 · 2018-06-02T22:28:49.000+09:00
Use Bundler.with_original_env so that BUNDLER_APP_CONFIG is honored
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 * Fix binstubs not being replaced when their quoting style was changed (#534)
 * Preserve comments right after the shebang line which might include magic comments such as `frozen_string_literal: true'
+* Fix binstub failures when Bundler's `BUNDLE_APP_CONFIG` environment variable is present (#545)
 
 ## 2.0.2
 
diff --git a/lib/spring/application_manager.rb b/lib/spring/application_manager.rb
@@ -92,7 +92,7 @@ def stop
     def start_child(preload = false)
       @child, child_socket = UNIXSocket.pair
 
-      Bundler.with_clean_env do
+      Bundler.with_original_env do
         @pid = Process.spawn(
           {
             "RAILS_ENV"           => app_env,

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ def stop`
`92`	`92`	`def start_child(preload = false)`
`93`	`93`	`@child, child_socket = UNIXSocket.pair`
`94`	`94`
`95`		`- Bundler.with_clean_env do`
	`95`	`+ Bundler.with_original_env do`
`96`	`96`	`@pid = Process.spawn(`
`97`	`97`	`{`
`98`	`98`	`"RAILS_ENV" => app_env,`