Migrating to Bundler.with_clean_env in runner

config/boot.rb

@@ -1,9 +1,5 @@
 require 'rubygems'
 
-ORIGINAL_ENV = {}
-ENV.each do |key, value|
-  ORIGINAL_ENV[key] = value
-end
 # Set up gems listed in the Gemfile.
 gemfile = File.expand_path('../../Gemfile', __FILE__)
 begin
@@ -15,15 +11,3 @@
   STDERR.puts "Try running `bundle install`."
   exit!
 end if File.exist?(gemfile)
-
-# puts "ORIGINAL_ENV"
-# ORIGINAL_ENV.each do |k, v|
-  # puts "%s => %s" % [k, v]
-# end
-# puts "ENV"
-# ENV.each do |k, v|
-  # puts "%s => %s" % [k, v]
-# end
-
-# ORIGINAL_ENV["PATH"] = ENV["PATH"]
-# ORIGINAL_ENV["RUBYOPT"] = ENV["RUBYOPT"]

extras/big_tuna/runner.rb

@@ -18,17 +18,9 @@ def self.execute(dir, command)
       end
     end
 
-    def self.with_clean_env(dir, &blk)
-      old_env = ENV.clone
-      ENV.clear
-      ORIGINAL_ENV.each { |key, value| ENV[key] = value }
-      ENV["RAILS_ENV"] = "test"
-      result = blk.call
-      result
-    ensure
-      ENV.clear
-      old_env.each do |key, value|
-        ENV[key] = value
+    def self.with_clean_env(dir)
+      Bundler.with_clean_env do
+        yield
       end
     end