rubygems-update 2.6.0 → 3.4.22

data/test/rubygems/test_gem_resolver_best_set.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
 
-class TestGemResolverBestSet < Gem::TestCase
+require_relative "helper"
 
+class TestGemResolverBestSet < Gem::TestCase
   def setup
     super
 
@@ -17,53 +17,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 +74,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 +86,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 +100,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,14 +125,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
 
-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,8 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
 
-class TestGemResolverComposedSet < Gem::TestCase
+require_relative "helper"
 
+class TestGemResolverComposedSet < Gem::TestCase
   def test_errors
     index_set   = Gem::Resolver::IndexSet.new
     current_set = Gem::Resolver::CurrentSet.new
@@ -41,6 +41,4 @@ class TestGemResolverComposedSet < Gem::TestCase
     refute best_set.remote?
     refute current_set.remote?
   end
-
 end
-

data/test/rubygems/test_gem_resolver_conflict.rb

@@ -1,21 +1,17 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
 
-class TestGemResolverConflict < Gem::TestCase
-
-  def test_self_compatibility
-    assert_same Gem::Resolver::Conflict, Gem::Resolver::DependencyConflict
-  end
+require_relative "helper"
 
+class TestGemResolverConflict < Gem::TestCase
   def test_explanation
     root  =
-      dependency_request dep('net-ssh', '>= 2.0.13'), 'rye', '0.9.8'
+      dependency_request dep("net-ssh", ">= 2.0.13"), "rye", "0.9.8"
     child =
-      dependency_request dep('net-ssh', '>= 2.6.5'), 'net-ssh', '2.2.2', root
+      dependency_request dep("net-ssh", ">= 2.6.5"), "net-ssh", "2.2.2", root
 
-    dep = Gem::Resolver::DependencyRequest.new dep('net-ssh', '>= 2.0.13'), nil
+    dep = Gem::Resolver::DependencyRequest.new dep("net-ssh", ">= 2.0.13"), nil
 
-    spec = quick_spec 'net-ssh', '2.2.2'
+    spec = util_spec "net-ssh", "2.2.2"
     active =
       Gem::Resolver::ActivationRequest.new spec, dep
 
@@ -42,10 +38,10 @@ class TestGemResolverConflict < Gem::TestCase
   def test_explanation_user_request
     @DR = Gem::Resolver
 
-    spec = util_spec 'a', 2
+    spec = util_spec "a", 2
 
-    a1_req = @DR::DependencyRequest.new dep('a', '= 1'), nil
-    a2_req = @DR::DependencyRequest.new dep('a', '= 2'), nil
+    a1_req = @DR::DependencyRequest.new dep("a", "= 1"), nil
+    a2_req = @DR::DependencyRequest.new dep("a", "= 2"), nil
 
     activated = @DR::ActivationRequest.new spec, a2_req
 
@@ -68,21 +64,19 @@ class TestGemResolverConflict < Gem::TestCase
 
   def test_request_path
     root  =
-      dependency_request dep('net-ssh', '>= 2.0.13'), 'rye', '0.9.8'
+      dependency_request dep("net-ssh", ">= 2.0.13"), "rye", "0.9.8"
 
     child =
-      dependency_request dep('other', '>= 1.0'), 'net-ssh', '2.2.2', root
+      dependency_request dep("other", ">= 1.0"), "net-ssh", "2.2.2", root
 
     conflict =
       Gem::Resolver::Conflict.new nil, nil
 
     expected = [
-      'net-ssh (>= 2.0.13), 2.2.2 activated',
-      'rye (= 0.9.8), 0.9.8 activated'
+      "net-ssh (>= 2.0.13), 2.2.2 activated",
+      "rye (= 0.9.8), 0.9.8 activated",
     ]
 
     assert_equal expected, conflict.request_path(child.requester)
   end
-
 end
-

data/test/rubygems/test_gem_resolver_dependency_request.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
 
-class TestGemResolverDependencyRequest < Gem::TestCase
+require_relative "helper"
 
+class TestGemResolverDependencyRequest < Gem::TestCase
   def setup
     super
 
@@ -10,13 +10,13 @@ class TestGemResolverDependencyRequest < Gem::TestCase
   end
 
   def test_development_eh
-    a_dep = dep 'a', '>= 1'
+    a_dep = dep "a", ">= 1"
 
     a_dep_req = @DR.new a_dep, nil
 
     refute a_dep_req.development?
 
-    b_dep = dep 'b', '>= 1', :development
+    b_dep = dep "b", ">= 1", :development
 
     b_dep_req = @DR.new b_dep, nil
 
@@ -24,8 +24,8 @@ class TestGemResolverDependencyRequest < Gem::TestCase
   end
 
   def test_match_eh
-    spec = util_spec 'a', 1
-    dependency = dep 'a', '>= 1'
+    spec = util_spec "a", 1
+    dependency = dep "a", ">= 1"
 
     dr = @DR.new dependency, nil
 
@@ -33,31 +33,31 @@ class TestGemResolverDependencyRequest < Gem::TestCase
   end
 
   def test_match_eh_prerelease
-    spec = util_spec 'a', '1.a'
+    spec = util_spec "a", "1.a"
 
-    a_dep = dep 'a', '>= 1'
+    a_dep = dep "a", ">= 1"
     a_dr = @DR.new a_dep, nil
 
     refute a_dr.match? spec
 
-    a_pre_dep = dep 'a', '>= 1.a'
+    a_pre_dep = dep "a", ">= 1.a"
     a_pre_dr = @DR.new a_pre_dep, nil
 
     assert a_pre_dr.match? spec
   end
 
   def test_match_eh_prerelease_allow_prerelease
-    spec = util_spec 'a', '2.a'
+    spec = util_spec "a", "2.a"
 
-    a_dep = dep 'a', '>= 1'
+    a_dep = dep "a", ">= 1"
     a_dr = @DR.new a_dep, nil
 
     assert a_dr.match? spec, true
   end
 
   def test_matches_spec_eh
-    spec = util_spec 'a', 1
-    dependency = dep 'a', '>= 1'
+    spec = util_spec "a", 1
+    dependency = dep "a", ">= 1"
 
     dr = @DR.new dependency, nil
 
@@ -65,21 +65,19 @@ class TestGemResolverDependencyRequest < Gem::TestCase
   end
 
   def test_matches_spec_eh_prerelease
-    spec = util_spec 'a', '1.a'
+    spec = util_spec "a", "1.a"
 
-    dependency = dep 'a', '>= 0'
+    dependency = dep "a", ">= 0"
     dr = @DR.new dependency, nil
 
     assert dr.matches_spec? spec
   end
 
   def test_requirement
-    dependency = dep 'a', '>= 1'
+    dependency = dep "a", ">= 1"
 
     dr = @DR.new dependency, nil
 
     assert_equal dependency, dr.dependency
   end
-
 end
-

data/test/rubygems/test_gem_resolver_git_set.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
 
-class TestGemResolverGitSet < Gem::TestCase
+require_relative "helper"
 
+class TestGemResolverGitSet < Gem::TestCase
   def setup
     super
 
@@ -14,9 +14,9 @@ class TestGemResolverGitSet < Gem::TestCase
   def test_add_git_gem
     name, version, repository, = git_gem
 
-    @set.add_git_gem name, repository, 'master', false
+    @set.add_git_gem name, repository, nil, false
 
-    dependency = dep 'a'
+    dependency = dep "a"
 
     specs = @set.find_all dependency
 
@@ -28,9 +28,9 @@ class TestGemResolverGitSet < Gem::TestCase
   def test_add_git_gem_submodules
     name, _, repository, = git_gem
 
-    @set.add_git_gem name, repository, 'master', true
+    @set.add_git_gem name, repository, nil, true
 
-    dependency = dep 'a'
+    dependency = dep "a"
 
     refute_empty @set.find_all dependency
 
@@ -42,7 +42,7 @@ class TestGemResolverGitSet < Gem::TestCase
 
     @set.add_git_spec name, version, repository, revision, true
 
-    dependency = dep 'a'
+    dependency = dep "a"
 
     specs = @set.find_all dependency
 
@@ -52,15 +52,15 @@ class TestGemResolverGitSet < Gem::TestCase
 
     assert @set.need_submodules[repository]
 
-    refute_path_exists spec.source.repo_cache_dir
+    assert_path_not_exist spec.source.repo_cache_dir
   end
 
   def test_find_all
     name, _, repository, = git_gem
 
-    @set.add_git_gem name, repository, 'master', false
+    @set.add_git_gem name, repository, nil, false
 
-    dependency = dep 'a', '~> 1.0'
+    dependency = dep "a", "~> 1.0"
     req = Gem::Resolver::DependencyRequest.new dependency, nil
     @reqs.add req
 
@@ -68,16 +68,16 @@ class TestGemResolverGitSet < Gem::TestCase
 
     found = @set.find_all dependency
 
-    assert_equal [@set.specs['a']], found
+    assert_equal [@set.specs["a"]], found
   end
 
   def test_find_all_local
     name, _, repository, = git_gem
 
-    @set.add_git_gem name, repository, 'master', false
+    @set.add_git_gem name, repository, nil, false
     @set.remote = false
 
-    dependency = dep 'a', '~> 1.0'
+    dependency = dep "a", "~> 1.0"
     req = Gem::Resolver::DependencyRequest.new dependency, nil
     @reqs.add req
 
@@ -87,11 +87,11 @@ class TestGemResolverGitSet < Gem::TestCase
   end
 
   def test_find_all_prerelease
-    name, _, repository, = git_gem 'a', '1.a'
+    name, _, repository, = git_gem "a", "1.a"
 
-    @set.add_git_gem name, repository, 'master', false
+    @set.add_git_gem name, repository, nil, false
 
-    dependency = dep 'a', '>= 0'
+    dependency = dep "a", ">= 0"
     req = Gem::Resolver::DependencyRequest.new dependency, nil
     @reqs.add req
 
@@ -101,7 +101,7 @@ class TestGemResolverGitSet < Gem::TestCase
 
     assert_empty found
 
-    dependency = dep 'a', '>= 0.a'
+    dependency = dep "a", ">= 0.a"
     req = Gem::Resolver::DependencyRequest.new dependency, nil
     @reqs.add req
 
@@ -123,7 +123,7 @@ class TestGemResolverGitSet < Gem::TestCase
   def test_prefetch
     name, _, repository, = git_gem
 
-    @set.add_git_gem name, repository, 'master', false
+    @set.add_git_gem name, repository, nil, false
 
     dependency = dep name
     req = Gem::Resolver::DependencyRequest.new dependency, nil
@@ -137,7 +137,7 @@ class TestGemResolverGitSet < Gem::TestCase
   def test_prefetch_cache
     name, _, repository, = git_gem
 
-    @set.add_git_gem name, repository, 'master', false
+    @set.add_git_gem name, repository, nil, false
 
     dependency = dep name
     req = Gem::Resolver::DependencyRequest.new dependency, nil
@@ -155,21 +155,21 @@ class TestGemResolverGitSet < Gem::TestCase
   def test_prefetch_filter
     name, _, repository, = git_gem
 
-    @set.add_git_gem name, repository, 'master', false
+    @set.add_git_gem name, repository, nil, false
 
-    dependency = dep 'b'
+    dependency = dep "b"
     req = Gem::Resolver::DependencyRequest.new dependency, nil
     @reqs.add req
 
     @set.prefetch @reqs
 
-    refute_empty @set.specs, 'the git source does not filter'
+    refute_empty @set.specs, "the git source does not filter"
   end
 
   def test_prefetch_root_dir
     name, _, repository, = git_gem
 
-    @set.add_git_gem name, repository, 'master', false
+    @set.add_git_gem name, repository, nil, false
 
     dependency = dep name
     req = Gem::Resolver::DependencyRequest.new dependency, nil
@@ -185,6 +185,4 @@ class TestGemResolverGitSet < Gem::TestCase
 
     assert_equal "#{@gemhome}2", spec.source.root_dir
   end
-
 end
-

data/test/rubygems/test_gem_resolver_git_specification.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
-require 'rubygems/installer'
 
-class TestGemResolverGitSpecification < Gem::TestCase
+require_relative "helper"
+require "rubygems/installer"
 
+class TestGemResolverGitSpecification < Gem::TestCase
   def setup
     super
 
     @set  = Gem::Resolver::GitSet.new
-    @spec = Gem::Specification.new 'a', 1
+    @spec = Gem::Specification.new "a", 1
   end
 
   def test_equals2
@@ -16,7 +16,7 @@ class TestGemResolverGitSpecification < Gem::TestCase
 
     assert_equal g_spec_a, g_spec_a
 
-    spec_b = Gem::Specification.new 'b', 1
+    spec_b = Gem::Specification.new "b", 1
     g_spec_b = Gem::Resolver::GitSpecification.new @set, spec_b
 
     refute_equal g_spec_a, g_spec_b
@@ -29,17 +29,17 @@ class TestGemResolverGitSpecification < Gem::TestCase
     i_set  = Gem::Resolver::IndexSet.new
     source = Gem::Source.new @gem_repo
     i_spec = Gem::Resolver::IndexSpecification.new(
-      i_set, 'a', v(1), source, Gem::Platform::RUBY)
+      i_set, "a", v(1), source, Gem::Platform::RUBY)
 
     refute_equal g_spec_a, i_spec
   end
 
   def test_add_dependency
-    git_gem 'a', 1
+    git_gem "a", 1
 
     git_spec = Gem::Resolver::GitSpecification.new @set, @spec
 
-    b_dep = dep 'b'
+    b_dep = dep "b"
 
     git_spec.add_dependency b_dep
 
@@ -47,7 +47,7 @@ class TestGemResolverGitSpecification < Gem::TestCase
   end
 
   def test_install
-    git_gem 'a', 1
+    git_gem "a", 1
 
     git_spec = Gem::Resolver::GitSpecification.new @set, @spec
 
@@ -63,27 +63,29 @@ class TestGemResolverGitSpecification < Gem::TestCase
   # functional test for Gem::Ext::Builder
 
   def test_install_extension
-    name, _, repository, = git_gem 'a', 1 do |s|
-      s.extensions << 'ext/extconf.rb'
+    pend if Gem.java_platform?
+    pend "terminates on mswin" if vc_windows? && ruby_repo?
+    name, _, repository, = git_gem "a", 1 do |s|
+      s.extensions << "ext/extconf.rb"
     end
 
-    Dir.chdir 'git/a' do
-      FileUtils.mkdir_p 'ext/lib'
+    Dir.chdir "git/a" do
+      FileUtils.mkdir_p "ext/lib"
 
-      open 'ext/extconf.rb', 'w' do |io|
+      File.open "ext/extconf.rb", "w" do |io|
         io.puts 'require "mkmf"'
         io.puts 'create_makefile "a"'
       end
 
-      FileUtils.touch 'ext/lib/b.rb'
+      FileUtils.touch "ext/lib/b.rb"
 
-      system @git, 'add', 'ext/extconf.rb'
-      system @git, 'add', 'ext/lib/b.rb'
+      system @git, "add", "ext/extconf.rb"
+      system @git, "add", "ext/lib/b.rb"
 
-      system @git, 'commit', '--quiet', '-m', 'Add extension files'
+      system @git, "commit", "--quiet", "-m", "Add extension files"
     end
 
-    source = Gem::Source::Git.new name, repository, 'master', true
+    source = Gem::Source::Git.new name, repository, nil, true
 
     spec = source.specs.first
 
@@ -91,11 +93,11 @@ class TestGemResolverGitSpecification < Gem::TestCase
 
     git_spec.install({})
 
-    assert_path_exists File.join git_spec.spec.extension_dir, 'b.rb'
+    assert_path_exist File.join git_spec.spec.extension_dir, "b.rb"
   end
 
   def test_install_installed
-    git_gem 'a', 1
+    git_gem "a", 1
 
     git_spec = Gem::Resolver::GitSpecification.new @set, @spec
 
@@ -109,6 +111,4 @@ class TestGemResolverGitSpecification < Gem::TestCase
 
     assert called
   end
-
 end
-