User Bundler.with_unbundled_env when available

cbeer · Apr 11, 2020 · ef2729d · ef2729d
1 parent 939ef8b
commit ef2729d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/lib/engine_cart.rb b/lib/engine_cart.rb
@@ -12,9 +12,21 @@ def self.load_application! path = nil
     require File.expand_path("config/environment", path || EngineCart.destination)
   end
 
+  def self.with_unbundled_env
+    method = if Bundler.respond_to?(:with_unbundled_env)
+      :with_unbundled_env
+    else
+      :with_clean_env
+    end
+
+    Bundler.public_send(method) do
+      yield
+    end
+  end
+
   def self.within_test_app
     Dir.chdir(EngineCart.destination) do
-      Bundler.with_clean_env do
+      EngineCart.with_unbundled_env do
         yield
       end
     end

diff --git a/lib/engine_cart/tasks/engine_cart.rake b/lib/engine_cart/tasks/engine_cart.rake
@@ -139,7 +139,7 @@ end
 def within_test_app
   puts "\rtravis_fold:start:enginecart-bundler-cleanenv\r" if ENV['TRAVIS'] == 'true'
   Dir.chdir(EngineCart.destination) do
-    Bundler.with_clean_env do
+    EngineCart.with_unbundled_env do
       yield
     end
   end