1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

Revert r42938 "* lib/rubygems: Update to RubyGems 2.1.3"

It breaks build.
20130913T200302Z.diff.html.gz

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42941 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2013-09-14 08:59:02 +00:00
parent 2614d9ba2f
commit 269503b544
110 changed files with 4928 additions and 3479 deletions

View file

@ -25,14 +25,23 @@ class Gem::Source
end
def <=>(other)
if !@uri
return 0 unless other.uri
return -1
case other
when Gem::Source::Installed,
Gem::Source::Local,
Gem::Source::SpecificFile then
-1
when Gem::Source then
if !@uri
return 0 unless other.uri
return 1
end
return -1 if !other.uri
@uri.to_s <=> other.uri.to_s
else
nil
end
return 1 if !other.uri
@uri.to_s <=> other.uri.to_s
end
include Comparable
@ -58,8 +67,7 @@ class Gem::Source
def cache_dir(uri)
# Correct for windows paths
escaped_path = uri.path.sub(/^\/([a-z]):\//i, '/\\1-/')
root = File.join Gem.user_home, '.gem', 'specs'
File.join root, "#{uri.host}%#{uri.port}", File.dirname(escaped_path)
File.join Gem.spec_cache_dir, "#{uri.host}%#{uri.port}", File.dirname(escaped_path)
end
def update_cache?
@ -141,4 +149,16 @@ class Gem::Source
fetcher = Gem::RemoteFetcher.fetcher
fetcher.download spec, @uri.to_s, dir
end
def pretty_print q # :nodoc:
q.group 2, '[Remote:', ']' do
q.breakable
q.text @uri.to_s
end
end
end
require 'rubygems/source/installed'
require 'rubygems/source/specific_file'
require 'rubygems/source/local'