Merge pull request #8080 from rubygems/deivid-rodriguez/multi-source-gem-install

Fix error in one source when fetching dependency APIs clearing results from all sources

(cherry picked from commit 459974a)

Author: deivid-rodriguez

lib/rubygems/resolver/api_set.rb

@@ -104,16 +104,21 @@ def versions(name) # :nodoc:
     end
 
     uri = @dep_uri + name
-    str = Gem::RemoteFetcher.fetcher.fetch_path uri
 
-    lines(str).each do |ver|
-      number, platform, dependencies, requirements = parse_gem(ver)
+    begin
+      str = Gem::RemoteFetcher.fetcher.fetch_path uri
+    rescue Gem::RemoteFetcher::FetchError
+      @data[name] = []
+    else
+      lines(str).each do |ver|
+        number, platform, dependencies, requirements = parse_gem(ver)
 
-      platform ||= "ruby"
-      dependencies = dependencies.map {|dep_name, reqs| [dep_name, reqs.join(", ")] }
-      requirements = requirements.map {|req_name, reqs| [req_name.to_sym, reqs] }.to_h
+        platform ||= "ruby"
+        dependencies = dependencies.map {|dep_name, reqs| [dep_name, reqs.join(", ")] }
+        requirements = requirements.map {|req_name, reqs| [req_name.to_sym, reqs] }.to_h
 
-      @data[name] << { name: name, number: number, platform: platform, dependencies: dependencies, requirements: requirements }
+        @data[name] << { name: name, number: number, platform: platform, dependencies: dependencies, requirements: requirements }
+      end
     end
 
     @data[name]

lib/rubygems/resolver/best_set.rb

@@ -29,8 +29,6 @@ def find_all(req) # :nodoc:
     pick_sets if @remote && @sets.empty?
 
     super
-  rescue Gem::RemoteFetcher::FetchError
-    []
   end
 
   def prefetch(reqs) # :nodoc:

test/rubygems/test_gem_resolver_api_set.rb

@@ -136,6 +136,25 @@ def test_find_all_missing
     assert_empty set.find_all(a_dep)
   end
 
+  def test_find_all_not_found
+    spec_fetcher
+
+    @fetcher.data["#{@dep_uri}/a"] =
+      proc do
+        raise Gem::RemoteFetcher::FetchError
+      end
+
+    set = Gem::Resolver::APISet.new @dep_uri
+
+    a_dep = Gem::Resolver::DependencyRequest.new dep("a"), nil
+
+    assert_empty set.find_all(a_dep)
+
+    @fetcher.data.delete "#{@dep_uri}a"
+
+    assert_empty set.find_all(a_dep)
+  end
+
   def test_prefetch
     spec_fetcher