Merge remote branch 'evanphx/1-0-stable' into 1-0-stable

rubygems · May 4, 2011 · edd02db · edd02db
2 parents a5d9884 + 244c72e
commit edd02db
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/lib/bundler/rubygems_ext.rb b/lib/bundler/rubygems_ext.rb
@@ -39,6 +39,11 @@ def load_paths
       end
     end
 
+    # RubyGems 1.8+ used only.
+    def gem_dir
+      full_gem_path
+    end
+
     def groups
       @groups ||= []
     end

diff --git a/lib/bundler/rubygems_integration.rb b/lib/bundler/rubygems_integration.rb
@@ -14,7 +14,7 @@ def mark_loaded(spec)
     end
 
     def path(obj)
-      Gem::Path.path(obj)
+      obj.to_s
     end
 
     def platforms
@@ -252,10 +252,6 @@ def stub_rubygems(specs)
         stub_source_index137(specs)
       end
 
-      def path(obj)
-        obj.to_s
-      end
-
       def all_specs
         Gem.source_index.all_gems.values
       end
@@ -269,10 +265,6 @@ class Transitional < Legacy
       def stub_rubygems(specs)
         stub_source_index170(specs)
       end
-
-      def path(obj)
-        obj.to_s
-      end
     end
 
   end