mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/rubygems: Update to RubyGems 2.4.1 master(713ab65)
Complete history at: https://github.com/rubygems/rubygems/blob/master/History.txt#L3-L216 * test/rubygems: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47582 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
e548c09d42
commit
4de117a615
153 changed files with 5400 additions and 981 deletions
|
@ -78,15 +78,21 @@ class Gem::Source
|
|||
# Returns a Set that can fetch specifications from this source.
|
||||
|
||||
def dependency_resolver_set # :nodoc:
|
||||
return Gem::Resolver::IndexSet.new self if 'file' == api_uri.scheme
|
||||
|
||||
bundler_api_uri = api_uri + './api/v1/dependencies'
|
||||
|
||||
begin
|
||||
fetcher = Gem::RemoteFetcher.fetcher
|
||||
fetcher.fetch_path bundler_api_uri, nil, true
|
||||
response = fetcher.fetch_path bundler_api_uri, nil, true
|
||||
rescue Gem::RemoteFetcher::FetchError
|
||||
Gem::Resolver::IndexSet.new self
|
||||
else
|
||||
Gem::Resolver::APISet.new bundler_api_uri
|
||||
if response.respond_to? :uri then
|
||||
Gem::Resolver::APISet.new response.uri
|
||||
else
|
||||
Gem::Resolver::APISet.new bundler_api_uri
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -100,6 +106,8 @@ class Gem::Source
|
|||
def cache_dir(uri)
|
||||
# Correct for windows paths
|
||||
escaped_path = uri.path.sub(/^\/([a-z]):\//i, '/\\1-/')
|
||||
escaped_path.untaint
|
||||
|
||||
File.join Gem.spec_cache_dir, "#{uri.host}%#{uri.port}", File.dirname(escaped_path)
|
||||
end
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue