Fixed name conflict with 'rubygems.rb'. Fixes #24

rubygems · Feb 7, 2010 · 9fbab6d · 9fbab6d
1 parent 38619af
commit 9fbab6d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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 → lib/bundler/rubygems-ext.rb b/lib/bundler/rubygems.rb → 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] = [] }