lib/bundler/rubygems_ext.rb in bundler-1.0.19.rc vs lib/bundler/rubygems_ext.rb in bundler-1.0.20.rc

@@ -38,10 +38,11 @@
         end
       end
     end
 
     # RubyGems 1.8+ used only.
+    remove_method :gem_dir if method_defined? :gem_dir
     def gem_dir
       full_gem_path
     end
 
     def groups
@@ -121,11 +122,11 @@
     end
 
     def to_lock
       out = "  #{name}"
       unless requirement == Gem::Requirement.default
-        reqs = requirement.requirements.map{|o,v| "#{o} #{v}" }
+        reqs = requirement.requirements.map{|o,v| "#{o} #{v}" }.sort.reverse
         out << " (#{reqs.join(', ')})"
       end
       out
     end
 
@@ -149,9 +150,10 @@
   class Platform
     JAVA  = Gem::Platform.new('java')
     MSWIN = Gem::Platform.new('mswin32')
     MINGW = Gem::Platform.new('x86-mingw32')
 
+    undef_method :hash if method_defined? :hash
     def hash
       @cpu.hash ^ @os.hash ^ @version.hash
     end
 
     alias eql? ==