summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2016-06-20 22:53:32 -0500
committerSamuel Giddins <segiddins@segiddins.me>2016-06-21 09:59:41 -0500
commitd492047839c3714613a32f9be32ab3b3817539e7 (patch)
treeaba4189e52b13905a38917674649b2ed3299fe7b
parent13bd2b43f33abda2762e7e668e1fc9248e4fb928 (diff)
downloadbundler-seg-rubygems-merger.tar.gz
[PostItTrampoline] Support for running as a default specseg-rubygems-merger
-rw-r--r--lib/bundler/postit_trampoline.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/bundler/postit_trampoline.rb b/lib/bundler/postit_trampoline.rb
index 7406612e5b..50bfee66a5 100644
--- a/lib/bundler/postit_trampoline.rb
+++ b/lib/bundler/postit_trampoline.rb
@@ -29,9 +29,12 @@ The error was: #{e}
EOS
end
- Gem.loaded_specs.delete("bundler") unless defined?(Bundler)
+ if deleted_spec = Gem.loaded_specs.delete("bundler")
+ deleted_spec.full_require_paths.each {|path| $:.delete(path) }
+ else
+ $:.delete(File.expand_path("../..", __FILE__))
+ end
gem "bundler", version
- $:.delete(File.expand_path("../..", __FILE__))
else
begin
gem "bundler", version