rubygems-update 3.1.6 → 3.4.10

data/test/rubygems/test_gem_resolver_api_set.rb

@@ -1,56 +1,84 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
+require_relative "helper"
 
 class TestGemResolverAPISet < Gem::TestCase
-
   def setup
     super
 
     @DR = Gem::Resolver
-    @dep_uri = URI "#{@gem_repo}api/v1/dependencies"
+    @dep_uri = URI "#{@gem_repo}info/"
   end
 
   def test_initialize
     set = @DR::APISet.new
 
-    assert_equal URI('https://rubygems.org/api/v1/dependencies'), set.dep_uri
-    assert_equal URI('https://rubygems.org'),                     set.uri
-    assert_equal Gem::Source.new(URI('https://rubygems.org')),    set.source
+    assert_equal URI("https://index.rubygems.org/info/"),            set.dep_uri
+    assert_equal URI("https://index.rubygems.org/"),                 set.uri
+    assert_equal Gem::Source.new(URI("https://index.rubygems.org")), set.source
   end
 
   def test_initialize_deeper_uri
-    set = @DR::APISet.new 'https://rubygemsserver.com/mygems/api/v1/dependencies'
+    set = @DR::APISet.new "https://rubygemsserver.com/mygems/info"
 
-    assert_equal URI('https://rubygemsserver.com/mygems/api/v1/dependencies'), set.dep_uri
-    assert_equal URI('https://rubygemsserver.com/mygems/'),                    set.uri
-    assert_equal Gem::Source.new(URI('https://rubygemsserver.com/mygems/')),    set.source
+    assert_equal URI("https://rubygemsserver.com/mygems/info"),       set.dep_uri
+    assert_equal URI("https://rubygemsserver.com/"),                  set.uri
+    assert_equal Gem::Source.new(URI("https://rubygemsserver.com/")), set.source
   end
 
   def test_initialize_uri
     set = @DR::APISet.new @dep_uri
 
-    assert_equal URI("#{@gem_repo}api/v1/dependencies"), set.dep_uri
-    assert_equal URI("#{@gem_repo}"),                     set.uri
+    assert_equal URI("#{@gem_repo}info/"), set.dep_uri
+    assert_equal URI("#{@gem_repo}"), set.uri
   end
 
   def test_find_all
     spec_fetcher
 
     data = [
-      { :name         => 'a',
-        :number       => '1',
-        :platform     => 'ruby',
-        :dependencies => [], },
+      { :name => "a",
+        :number => "1",
+        :platform => "ruby",
+        :dependencies => [] },
     ]
 
-    @fetcher.data["#{@dep_uri}?gems=a"] = Marshal.dump data
+    @fetcher.data["#{@dep_uri}a"] = "---\n1  "
 
     set = @DR::APISet.new @dep_uri
 
-    a_dep = @DR::DependencyRequest.new dep('a'), nil
+    a_dep = @DR::DependencyRequest.new dep("a"), nil
 
     expected = [
-      @DR::APISpecification.new(set, data.first)
+      @DR::APISpecification.new(set, data.first),
+    ]
+
+    assert_equal expected, set.find_all(a_dep)
+  end
+
+  def test_find_all_prereleases
+    spec_fetcher
+
+    data = [
+      { :name => "a",
+        :number => "1",
+        :platform => "ruby",
+        :dependencies => [] },
+      { :name => "a",
+        :number => "2.a",
+        :platform => "ruby",
+        :dependencies => [] },
+    ]
+
+    @fetcher.data["#{@dep_uri}a"] = "---\n1\n2.a"
+
+    set = @DR::APISet.new @dep_uri
+    set.prerelease = true
+
+    a_dep = @DR::DependencyRequest.new dep("a"), nil
+
+    expected = [
+      @DR::APISpecification.new(set, data.first),
+      @DR::APISpecification.new(set, data.last),
     ]
 
     assert_equal expected, set.find_all(a_dep)
@@ -60,34 +88,34 @@ class TestGemResolverAPISet < Gem::TestCase
     spec_fetcher
 
     data = [
-      { :name         => 'a',
-        :number       => '1',
-        :platform     => 'ruby',
-        :dependencies => [], },
+      { :name => "a",
+        :number => "1",
+        :platform => "ruby",
+        :dependencies => [] },
     ]
 
-    @fetcher.data["#{@dep_uri}?gems=a"] = Marshal.dump data
+    @fetcher.data["#{@dep_uri}a"] = "---\n1  "
 
     set = @DR::APISet.new @dep_uri
 
-    a_dep = @DR::DependencyRequest.new dep('a'), nil
+    a_dep = @DR::DependencyRequest.new dep("a"), nil
 
     set.prefetch [a_dep]
 
     expected = [
-      @DR::APISpecification.new(set, data.first)
+      @DR::APISpecification.new(set, data.first),
     ]
 
     assert_equal expected, set.find_all(a_dep)
 
-    @fetcher.data.delete "#{@dep_uri}?gems=a"
+    @fetcher.data.delete "#{@dep_uri}a"
   end
 
   def test_find_all_local
     set = @DR::APISet.new @dep_uri
     set.remote = false
 
-    a_dep = @DR::DependencyRequest.new dep('a'), nil
+    a_dep = @DR::DependencyRequest.new dep("a"), nil
 
     assert_empty set.find_all(a_dep)
   end
@@ -95,15 +123,15 @@ class TestGemResolverAPISet < Gem::TestCase
   def test_find_all_missing
     spec_fetcher
 
-    @fetcher.data["#{@dep_uri}?gems=a"] = Marshal.dump []
+    @fetcher.data["#{@dep_uri}a"] = "---"
 
     set = @DR::APISet.new @dep_uri
 
-    a_dep = @DR::DependencyRequest.new dep('a'), nil
+    a_dep = @DR::DependencyRequest.new dep("a"), nil
 
     assert_empty set.find_all(a_dep)
 
-    @fetcher.data.delete "#{@dep_uri}?gems=a"
+    @fetcher.data.delete "#{@dep_uri}a"
 
     assert_empty set.find_all(a_dep)
   end
@@ -111,48 +139,34 @@ class TestGemResolverAPISet < Gem::TestCase
   def test_prefetch
     spec_fetcher
 
-    data = [
-      { :name         => 'a',
-        :number       => '1',
-        :platform     => 'ruby',
-        :dependencies => [], },
-    ]
-
-    @fetcher.data["#{@dep_uri}?gems=a,b"] = Marshal.dump data
-    @fetcher.data["#{@dep_uri}?gems=b"]   = Marshal.dump []
+    @fetcher.data["#{@dep_uri}a"] = "---\n1  \n"
+    @fetcher.data["#{@dep_uri}b"] = "---"
 
     set = @DR::APISet.new @dep_uri
 
-    a_dep = @DR::DependencyRequest.new dep('a'), nil
-    b_dep = @DR::DependencyRequest.new dep('b'), nil
+    a_dep = @DR::DependencyRequest.new dep("a"), nil
+    b_dep = @DR::DependencyRequest.new dep("b"), nil
 
     set.prefetch [a_dep, b_dep]
 
-    assert_equal %w[a-1], set.find_all(a_dep).map { |s| s.full_name }
+    assert_equal %w[a-1], set.find_all(a_dep).map {|s| s.full_name }
     assert_empty          set.find_all(b_dep)
   end
 
   def test_prefetch_cache
     spec_fetcher
 
-    data = [
-      { :name         => 'a',
-        :number       => '1',
-        :platform     => 'ruby',
-        :dependencies => [], },
-    ]
-
-    @fetcher.data["#{@dep_uri}?gems=a"] = Marshal.dump data
+    @fetcher.data["#{@dep_uri}a"] = "---\n1  \n"
 
     set = @DR::APISet.new @dep_uri
 
-    a_dep = @DR::DependencyRequest.new dep('a'), nil
-    b_dep = @DR::DependencyRequest.new dep('b'), nil
+    a_dep = @DR::DependencyRequest.new dep("a"), nil
+    b_dep = @DR::DependencyRequest.new dep("b"), nil
 
     set.prefetch [a_dep]
 
-    @fetcher.data.delete "#{@dep_uri}?gems=a"
-    @fetcher.data["#{@dep_uri}?gems=b"]   = Marshal.dump []
+    @fetcher.data.delete "#{@dep_uri}a"
+    @fetcher.data["#{@dep_uri}?b"] = "---"
 
     set.prefetch [a_dep, b_dep]
   end
@@ -160,23 +174,18 @@ class TestGemResolverAPISet < Gem::TestCase
   def test_prefetch_cache_missing
     spec_fetcher
 
-    data = [
-      { :name         => 'a',
-        :number       => '1',
-        :platform     => 'ruby',
-        :dependencies => [], },
-    ]
-
-    @fetcher.data["#{@dep_uri}?gems=a,b"] = Marshal.dump data
+    @fetcher.data["#{@dep_uri}a"] = "---\n1  \n"
+    @fetcher.data["#{@dep_uri}b"] = "---"
 
     set = @DR::APISet.new @dep_uri
 
-    a_dep = @DR::DependencyRequest.new dep('a'), nil
-    b_dep = @DR::DependencyRequest.new dep('b'), nil
+    a_dep = @DR::DependencyRequest.new dep("a"), nil
+    b_dep = @DR::DependencyRequest.new dep("b"), nil
 
     set.prefetch [a_dep, b_dep]
 
-    @fetcher.data.delete "#{@dep_uri}?gems=a,b"
+    @fetcher.data.delete "#{@dep_uri}a"
+    @fetcher.data.delete "#{@dep_uri}b"
 
     set.prefetch [a_dep, b_dep]
   end
@@ -184,25 +193,17 @@ class TestGemResolverAPISet < Gem::TestCase
   def test_prefetch_local
     spec_fetcher
 
-    data = [
-      { :name         => 'a',
-        :number       => '1',
-        :platform     => 'ruby',
-        :dependencies => [], },
-    ]
-
-    @fetcher.data["#{@dep_uri}?gems=a,b"] = Marshal.dump data
-    @fetcher.data["#{@dep_uri}?gems=b"]   = Marshal.dump []
+    @fetcher.data["#{@dep_uri}a"] = "---\n1  \n"
+    @fetcher.data["#{@dep_uri}b"] = "---"
 
     set = @DR::APISet.new @dep_uri
     set.remote = false
 
-    a_dep = @DR::DependencyRequest.new dep('a'), nil
-    b_dep = @DR::DependencyRequest.new dep('b'), nil
+    a_dep = @DR::DependencyRequest.new dep("a"), nil
+    b_dep = @DR::DependencyRequest.new dep("b"), nil
 
     set.prefetch [a_dep, b_dep]
 
     assert_empty set.instance_variable_get :@data
   end
-
 end

data/test/rubygems/test_gem_resolver_api_specification.rb

@@ -1,29 +1,28 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
+require_relative "helper"
 
 class TestGemResolverAPISpecification < Gem::TestCase
-
   def test_initialize
     set = Gem::Resolver::APISet.new
     data = {
-      :name     => 'rails',
-      :number   => '3.0.3',
+      :name => "rails",
+      :number => "3.0.3",
       :platform => Gem::Platform.local.to_s,
       :dependencies => [
-        ['bundler',  '~> 1.0'],
-        ['railties', '= 3.0.3'],
+        ["bundler",  "~> 1.0"],
+        ["railties", "= 3.0.3"],
       ],
     }
 
     spec = Gem::Resolver::APISpecification.new set, data
 
-    assert_equal 'rails',                   spec.name
-    assert_equal Gem::Version.new('3.0.3'), spec.version
+    assert_equal "rails",                   spec.name
+    assert_equal Gem::Version.new("3.0.3"), spec.version
     assert_equal Gem::Platform.local,       spec.platform
 
     expected = [
-      Gem::Dependency.new('bundler',  '~> 1.0'),
-      Gem::Dependency.new('railties', '= 3.0.3'),
+      Gem::Dependency.new("bundler",  "~> 1.0"),
+      Gem::Dependency.new("railties", "= 3.0.3"),
     ]
 
     assert_equal expected, spec.dependencies
@@ -31,26 +30,26 @@ class TestGemResolverAPISpecification < Gem::TestCase
 
   def test_fetch_development_dependencies
     specs = spec_fetcher do |fetcher|
-      fetcher.spec 'rails', '3.0.3' do |s|
-        s.add_runtime_dependency 'bundler',  '~> 1.0'
-        s.add_runtime_dependency 'railties', '= 3.0.3'
-        s.add_development_dependency 'a',    '= 1'
+      fetcher.spec "rails", "3.0.3" do |s|
+        s.add_runtime_dependency "bundler",  "~> 1.0"
+        s.add_runtime_dependency "railties", "= 3.0.3"
+        s.add_development_dependency "a",    "= 1"
       end
     end
 
-    rails = specs['rails-3.0.3']
+    rails = specs["rails-3.0.3"]
 
-    repo = @gem_repo + 'api/v1/dependencies'
+    repo = @gem_repo + "info"
 
     set = Gem::Resolver::APISet.new repo
 
     data = {
-      :name     => 'rails',
-      :number   => '3.0.3',
-      :platform => 'ruby',
+      :name => "rails",
+      :number => "3.0.3",
+      :platform => "ruby",
       :dependencies => [
-        ['bundler',  '~> 1.0'],
-        ['railties', '= 3.0.3'],
+        ["bundler",  "~> 1.0"],
+        ["railties", "= 3.0.3"],
       ],
     }
 
@@ -61,9 +60,9 @@ class TestGemResolverAPISpecification < Gem::TestCase
     spec.fetch_development_dependencies
 
     expected = [
-      Gem::Dependency.new('bundler',  '~> 1.0'),
-      Gem::Dependency.new('railties', '= 3.0.3'),
-      Gem::Dependency.new('a',        '= 1', :development),
+      Gem::Dependency.new("bundler",  "~> 1.0"),
+      Gem::Dependency.new("railties", "= 3.0.3"),
+      Gem::Dependency.new("a",        "= 1", :development),
     ]
 
     assert_equal expected, spec.dependencies
@@ -72,9 +71,9 @@ class TestGemResolverAPISpecification < Gem::TestCase
   def test_installable_platform_eh
     set = Gem::Resolver::APISet.new
     data = {
-      :name     => 'a',
-      :number   => '1',
-      :platform => 'ruby',
+      :name => "a",
+      :number => "1",
+      :platform => "ruby",
       :dependencies => [],
     }
 
@@ -83,9 +82,9 @@ class TestGemResolverAPISpecification < Gem::TestCase
     assert a_spec.installable_platform?
 
     data = {
-      :name     => 'b',
-      :number   => '1',
-      :platform => 'cpu-other_platform-1',
+      :name => "b",
+      :number => "1",
+      :platform => "cpu-other_platform-1",
       :dependencies => [],
     }
 
@@ -94,8 +93,8 @@ class TestGemResolverAPISpecification < Gem::TestCase
     refute b_spec.installable_platform?
 
     data = {
-      :name     => 'c',
-      :number   => '1',
+      :name => "c",
+      :number => "1",
       :platform => Gem::Platform.local.to_s,
       :dependencies => [],
     }
@@ -108,9 +107,9 @@ class TestGemResolverAPISpecification < Gem::TestCase
   def test_source
     set = Gem::Resolver::APISet.new
     data = {
-      :name         => 'a',
-      :number       => '1',
-      :platform     => 'ruby',
+      :name => "a",
+      :number => "1",
+      :platform => "ruby",
       :dependencies => [],
     }
 
@@ -121,15 +120,15 @@ class TestGemResolverAPISpecification < Gem::TestCase
 
   def test_spec
     spec_fetcher do |fetcher|
-      fetcher.spec 'a', 1
+      fetcher.spec "a", 1
     end
 
-    dep_uri = URI(@gem_repo) + 'api/v1/dependencies'
+    dep_uri = URI(@gem_repo) + "info"
     set = Gem::Resolver::APISet.new dep_uri
     data = {
-      :name         => 'a',
-      :number       => '1',
-      :platform     => 'ruby',
+      :name => "a",
+      :number => "1",
+      :platform => "ruby",
       :dependencies => [],
     }
 
@@ -138,22 +137,22 @@ class TestGemResolverAPISpecification < Gem::TestCase
     spec = api_spec.spec
 
     assert_kind_of Gem::Specification, spec
-    assert_equal 'a-1', spec.full_name
+    assert_equal "a-1", spec.full_name
   end
 
   def test_spec_jruby_platform
     spec_fetcher do |fetcher|
-      fetcher.gem 'j', 1 do |spec|
-        spec.platform = 'jruby'
+      fetcher.gem "j", 1 do |spec|
+        spec.platform = "jruby"
       end
     end
 
-    dep_uri = URI(@gem_repo) + 'api/v1/dependencies'
+    dep_uri = URI(@gem_repo) + "info"
     set = Gem::Resolver::APISet.new dep_uri
     data = {
-      :name         => 'j',
-      :number       => '1',
-      :platform     => 'jruby',
+      :name => "j",
+      :number => "1",
+      :platform => "jruby",
       :dependencies => [],
     }
 
@@ -162,7 +161,6 @@ class TestGemResolverAPISpecification < Gem::TestCase
     spec = api_spec.spec
 
     assert_kind_of Gem::Specification, spec
-    assert_equal 'j-1-java', spec.full_name
+    assert_equal "j-1-java", spec.full_name
   end
-
 end

data/test/rubygems/test_gem_resolver_best_set.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
+require_relative "helper"
 
 class TestGemResolverBestSet < Gem::TestCase
-
   def setup
     super
 
@@ -17,53 +16,53 @@ class TestGemResolverBestSet < Gem::TestCase
 
   def test_find_all_index
     spec_fetcher do |fetcher|
-      fetcher.spec 'a', 1
-      fetcher.spec 'a', 2
-      fetcher.spec 'b', 1
+      fetcher.spec "a", 1
+      fetcher.spec "a", 2
+      fetcher.spec "b", 1
     end
 
     set = @DR::BestSet.new
 
-    dependency = dep 'a', '~> 1'
+    dependency = dep "a", "~> 1"
 
     req = @DR::DependencyRequest.new dependency, nil
 
     found = set.find_all req
 
-    assert_equal %w[a-1], found.map { |s| s.full_name }
+    assert_equal %w[a-1], found.map {|s| s.full_name }
   end
 
   def test_find_all_fallback
     spec_fetcher do |fetcher|
-      fetcher.spec 'a', 1
+      fetcher.spec "a", 1
     end
 
     set = @DR::BestSet.new
 
-    api_uri = URI(@gem_repo) + './api/v1/dependencies'
+    api_uri = URI(@gem_repo)
 
     set.sets << Gem::Resolver::APISet.new(api_uri)
 
-    dependency = dep 'a', '~> 1'
+    dependency = dep "a", "~> 1"
 
     req = @DR::DependencyRequest.new dependency, nil
 
     found = set.find_all req
 
-    assert_equal %w[a-1], found.map { |s| s.full_name }
+    assert_equal %w[a-1], found.map {|s| s.full_name }
   end
 
   def test_find_all_local
     spec_fetcher do |fetcher|
-      fetcher.spec 'a', 1
-      fetcher.spec 'a', 2
-      fetcher.spec 'b', 1
+      fetcher.spec "a", 1
+      fetcher.spec "a", 2
+      fetcher.spec "b", 1
     end
 
     set = @DR::BestSet.new
     set.remote = false
 
-    dependency = dep 'a', '~> 1'
+    dependency = dep "a", "~> 1"
 
     req = @DR::DependencyRequest.new dependency, nil
 
@@ -74,7 +73,7 @@ class TestGemResolverBestSet < Gem::TestCase
 
   def test_prefetch
     spec_fetcher do |fetcher|
-      fetcher.spec 'a', 1
+      fetcher.spec "a", 1
     end
 
     set = @DR::BestSet.new
@@ -86,7 +85,7 @@ class TestGemResolverBestSet < Gem::TestCase
 
   def test_prefetch_local
     spec_fetcher do |fetcher|
-      fetcher.spec 'a', 1
+      fetcher.spec "a", 1
     end
 
     set = @DR::BestSet.new
@@ -100,14 +99,14 @@ class TestGemResolverBestSet < Gem::TestCase
   def test_replace_failed_api_set
     set = @DR::BestSet.new
 
-    api_uri = URI(@gem_repo) + './api/v1/dependencies'
+    api_uri = URI(@gem_repo) + "./info/"
     api_set = Gem::Resolver::APISet.new api_uri
 
     set.sets << api_set
 
-    error_uri = api_uri + '?gems=a'
+    error_uri = api_uri + "a"
 
-    error = Gem::RemoteFetcher::FetchError.new 'bogus', error_uri
+    error = Gem::RemoteFetcher::FetchError.new "bogus", error_uri
 
     set.replace_failed_api_set error
 
@@ -125,13 +124,35 @@ class TestGemResolverBestSet < Gem::TestCase
 
     set.sets << index_set
 
-    error = Gem::RemoteFetcher::FetchError.new 'bogus', @gem_repo
+    error = Gem::RemoteFetcher::FetchError.new "bogus", @gem_repo
 
-    e = assert_raises Gem::RemoteFetcher::FetchError do
+    e = assert_raise Gem::RemoteFetcher::FetchError do
       set.replace_failed_api_set error
     end
 
     assert_equal error, e
   end
 
+  def test_replace_failed_api_set_uri_with_credentials
+    set = @DR::BestSet.new
+
+    api_uri = URI(@gem_repo) + "./info/"
+    api_uri.user = "user"
+    api_uri.password = "pass"
+    api_set = Gem::Resolver::APISet.new api_uri
+
+    set.sets << api_set
+
+    error_uri = api_uri + "a"
+
+    error = Gem::RemoteFetcher::FetchError.new "bogus", error_uri
+
+    set.replace_failed_api_set error
+
+    assert_equal 1, set.sets.size
+
+    refute_includes set.sets, api_set
+
+    assert_kind_of Gem::Resolver::IndexSet, set.sets.first
+  end
 end

data/test/rubygems/test_gem_resolver_composed_set.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
+require_relative "helper"
 
 class TestGemResolverComposedSet < Gem::TestCase
-
   def test_errors
     index_set   = Gem::Resolver::IndexSet.new
     current_set = Gem::Resolver::CurrentSet.new
@@ -41,5 +40,4 @@ class TestGemResolverComposedSet < Gem::TestCase
     refute best_set.remote?
     refute current_set.remote?
   end
-
 end