haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use a real file for bundler

This commit is contained in:
Seth Vargo 2016-05-29 00:41:59 -04:00
parent b993699af6
commit 159e1ec1f1
No known key found for this signature in database
GPG Key ID: 905A90C2949E8787
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/vagrant/bundler.rb
View File

@ -254,13 +254,14 @@ module Vagrant
def with_isolated_gem def with_isolated_gem
raise Errors::BundlerDisabled if !@enabled raise Errors::BundlerDisabled if !@enabled
tmp_gemfile = Dir::Tmpname.create("vagrant-gemfile") {} tmp_gemfile = tempfile("vagrant-gemfile")
tmp_gemfile.close
# Remove bundler settings so that Bundler isn't loaded when building # Remove bundler settings so that Bundler isn't loaded when building
# native extensions because it causes all sorts of problems. # native extensions because it causes all sorts of problems.
old_rubyopt = ENV["RUBYOPT"] old_rubyopt = ENV["RUBYOPT"]
old_gemfile = ENV["BUNDLE_GEMFILE"] old_gemfile = ENV["BUNDLE_GEMFILE"]
ENV["BUNDLE_GEMFILE"] = tmp_gemfile ENV["BUNDLE_GEMFILE"] = tmp_gemfile.path
ENV["RUBYOPT"] = (ENV["RUBYOPT"] || "").gsub(/-rbundler\/setup\s*/, "") ENV["RUBYOPT"] = (ENV["RUBYOPT"] || "").gsub(/-rbundler\/setup\s*/, "")
# Set the GEM_HOME so gems are installed only to our local gem dir # Set the GEM_HOME so gems are installed only to our local gem dir
@ -290,7 +291,7 @@ module Vagrant
return yield return yield
end end
ensure ensure
File.unlink(tmp_gemfile) if File.file?(tmp_gemfile) tmp_gemfile.unlink rescue nil
ENV["BUNDLE_GEMFILE"] = old_gemfile ENV["BUNDLE_GEMFILE"] = old_gemfile
ENV["GEM_HOME"] = @gem_home ENV["GEM_HOME"] = @gem_home