Merge pull request #595 from k0kubun/default-gem-bundler

Avoid -I rubylibdir with default-gem bundler
rails · Jul 10, 2019 · caa09ef · caa09ef
2 parents f65c0b8 + 2fc1d35
commit caa09ef
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/spring/application_manager.rb b/lib/spring/application_manager.rb
@@ -94,6 +94,7 @@ def start_child(preload = false)
       @child, child_socket = UNIXSocket.pair
 
       Bundler.with_original_env do
+        bundler_dir = File.expand_path("../..", $LOADED_FEATURES.grep(/bundler\/setup\.rb$/).first)
         @pid = Process.spawn(
           {
             "RAILS_ENV"           => app_env,
@@ -102,7 +103,7 @@ def start_child(preload = false)
             "SPRING_PRELOAD"      => preload ? "1" : "0"
           },
           "ruby",
-          "-I", File.expand_path("../..", $LOADED_FEATURES.grep(/bundler\/setup\.rb$/).first),
+          *(bundler_dir != RbConfig::CONFIG["rubylibdir"] ? ["-I", bundler_dir] : []),
           "-I", File.expand_path("../..", __FILE__),
           "-e", "require 'spring/application/boot'",
           3 => child_socket,