mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/rubygems: Update to RubyGems 2.1.3
Fixed installing platform gems Restored concurrent requires Fixed installing gems with extensions with --install-dir Fixed `gem fetch -v` to install the latest version Fixed installing gems with "./" in their files entries * test/rubygems/test_gem_package.rb: Tests for the above. * NEWS: Updated for RubyGems 2.1.3 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42938 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
85995e88d4
commit
1daa0b113d
110 changed files with 3493 additions and 4942 deletions
|
@ -25,23 +25,14 @@ class Gem::Source
|
|||
end
|
||||
|
||||
def <=>(other)
|
||||
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
|
||||
if !@uri
|
||||
return 0 unless other.uri
|
||||
return -1
|
||||
end
|
||||
|
||||
return 1 if !other.uri
|
||||
|
||||
@uri.to_s <=> other.uri.to_s
|
||||
end
|
||||
|
||||
include Comparable
|
||||
|
@ -67,7 +58,8 @@ class Gem::Source
|
|||
def cache_dir(uri)
|
||||
# Correct for windows paths
|
||||
escaped_path = uri.path.sub(/^\/([a-z]):\//i, '/\\1-/')
|
||||
File.join Gem.spec_cache_dir, "#{uri.host}%#{uri.port}", File.dirname(escaped_path)
|
||||
root = File.join Gem.user_home, '.gem', 'specs'
|
||||
File.join root, "#{uri.host}%#{uri.port}", File.dirname(escaped_path)
|
||||
end
|
||||
|
||||
def update_cache?
|
||||
|
@ -149,16 +141,4 @@ 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'
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue