diff options
| author | Ariejan de Vroom <ariejan@ariejan.net> | 2010-02-07 11:04:12 +0100 |
|---|---|---|
| committer | Yehuda Katz <yehudakatz@YK.local> | 2010-02-07 04:38:07 -0800 |
| commit | 9fbab6d5a19127d8ba209d98138a6c26fdb9d390 (patch) | |
| tree | 395c3b73ae84f38a3446f7572fb6edf86ba8b941 | |
| parent | 38619af329f38b9652753e4f13bd6171e14104fb (diff) | |
| download | bundler-9fbab6d5a19127d8ba209d98138a6c26fdb9d390.tar.gz | |
Fixed name conflict with 'rubygems.rb'. Fixes #24
| -rw-r--r-- | lib/bundler.rb | 2 | ||||
| -rw-r--r-- | lib/bundler/rubygems-ext.rb (renamed from lib/bundler/rubygems.rb) | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/bundler.rb b/lib/bundler.rb index 0f1e883878..b5465711c6 100644 --- a/lib/bundler.rb +++ b/lib/bundler.rb @@ -1,7 +1,7 @@ require 'fileutils' require 'pathname' require 'yaml' -require 'bundler/rubygems' +require 'bundler/rubygems-ext' module Bundler VERSION = "0.9.3" diff --git a/lib/bundler/rubygems.rb b/lib/bundler/rubygems-ext.rb index 5d5db079b7..b8cf472dfa 100644 --- a/lib/bundler/rubygems.rb +++ b/lib/bundler/rubygems-ext.rb @@ -1,5 +1,7 @@ +unless defined? Gem require 'rubygems' require 'rubygems/specification' +end module Gem @loaded_stacks = Hash.new { |h,k| h[k] = [] } |