rubygems-update 3.1.6 → 3.4.10

data/test/rubygems/test_gem_resolver_installer_set.rb

@@ -1,27 +1,26 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
+require_relative "helper"
 
 class TestGemResolverInstallerSet < Gem::TestCase
-
   def test_add_always_install
     spec_fetcher do |fetcher|
-      fetcher.download 'a', 1
-      fetcher.download 'a', 2
+      fetcher.download "a", 1
+      fetcher.download "a", 2
     end
 
-    util_gem 'a', 1
+    util_gem "a", 1
 
     set = Gem::Resolver::InstallerSet.new :both
 
-    set.add_always_install dep('a')
+    set.add_always_install dep("a")
 
-    assert_equal %w[a-2], set.always_install.map { |s| s.full_name }
+    assert_equal %w[a-2], set.always_install.map {|s| s.full_name }
 
-    e = assert_raises Gem::UnsatisfiableDependencyError do
-      set.add_always_install dep('b')
+    e = assert_raise Gem::UnsatisfiableDependencyError do
+      set.add_always_install dep("b")
     end
 
-    assert_equal dep('b'), e.dependency.dependency
+    assert_equal dep("b"), e.dependency.dependency
   end
 
   def test_add_always_install_errors
@@ -30,8 +29,8 @@ class TestGemResolverInstallerSet < Gem::TestCase
 
     set = Gem::Resolver::InstallerSet.new :both
 
-    e = assert_raises Gem::UnsatisfiableDependencyError do
-      set.add_always_install dep 'a'
+    e = assert_raise Gem::UnsatisfiableDependencyError do
+      set.add_always_install dep "a"
     end
 
     refute_empty e.errors
@@ -39,46 +38,96 @@ class TestGemResolverInstallerSet < Gem::TestCase
 
   def test_add_always_install_platform
     spec_fetcher do |fetcher|
-      fetcher.download 'a', 1
-      fetcher.download 'a', 2 do |s|
-        s.platform = Gem::Platform.new 'x86-freebsd-9'
+      fetcher.download "a", 1
+      fetcher.download "a", 2 do |s|
+        s.platform = Gem::Platform.new "x86-freebsd-9"
+      end
+    end
+
+    set = Gem::Resolver::InstallerSet.new :both
+
+    set.add_always_install dep("a")
+
+    assert_equal %w[a-1], set.always_install.map {|s| s.full_name }
+  end
+
+  def test_add_always_install_platform_if_gem_platforms_modified_by_platform_flag
+    freebsd = Gem::Platform.new "x86-freebsd-9"
+
+    spec_fetcher do |fetcher|
+      fetcher.download "a", 1
+      fetcher.download "a", 1 do |s|
+        s.platform = freebsd
       end
     end
 
+    # equivalent to --platform=x86-freebsd-9
+    Gem.platforms << freebsd
     set = Gem::Resolver::InstallerSet.new :both
 
-    set.add_always_install dep('a')
+    set.add_always_install dep("a")
+
+    assert_equal %w[a-1-x86-freebsd-9], set.always_install.map {|s| s.full_name }
+  end
+
+  def test_add_always_install_index_spec_platform
+    _, a_1_local_gem = util_gem "a", 1 do |s|
+      s.platform = Gem::Platform.local
+    end
+
+    FileUtils.mv a_1_local_gem, @tempdir
+
+    set = Gem::Resolver::InstallerSet.new :both
+    set.add_always_install dep("a")
 
-    assert_equal %w[a-1], set.always_install.map { |s| s.full_name }
+    assert_equal [Gem::Platform.local], set.always_install.map {|s| s.platform }
   end
 
   def test_add_always_install_prerelease
     spec_fetcher do |fetcher|
-      fetcher.gem 'a', 1
-      fetcher.gem 'a', '3.a'
+      fetcher.gem "a", 1
+      fetcher.gem "a", "3.a"
     end
 
     set = Gem::Resolver::InstallerSet.new :both
 
-    set.add_always_install dep('a')
+    set.add_always_install dep("a")
 
-    assert_equal %w[a-1], set.always_install.map { |s| s.full_name }
+    assert_equal %w[a-1], set.always_install.map {|s| s.full_name }
+  end
+
+  def test_add_always_install_prerelease_github_problem
+    spec_fetcher do |fetcher|
+      fetcher.gem "a", 1
+    end
+
+    # Github has an issue in which it will generate a misleading prerelease output in its RubyGems server API and
+    # returns a 0 version for the gem while it doesn't exist.
+    @fetcher.data["#{@gem_repo}prerelease_specs.#{Gem.marshal_version}.gz"] = util_gzip(Marshal.dump([
+      Gem::NameTuple.new("a", Gem::Version.new(0), "ruby"),
+    ]))
+
+    set = Gem::Resolver::InstallerSet.new :both
+
+    set.add_always_install dep("a")
+
+    assert_equal %w[a-1], set.always_install.map {|s| s.full_name }
   end
 
   def test_add_always_install_prerelease_only
     spec_fetcher do |fetcher|
-      fetcher.gem 'a', '3.a'
+      fetcher.gem "a", "3.a"
     end
 
     set = Gem::Resolver::InstallerSet.new :both
 
-    assert_raises Gem::UnsatisfiableDependencyError do
-      set.add_always_install dep('a')
+    assert_raise Gem::UnsatisfiableDependencyError do
+      set.add_always_install dep("a")
     end
   end
 
   def test_add_local
-    a_1, a_1_gem = util_gem 'a', 1
+    a_1, a_1_gem = util_gem "a", 1
 
     a_1_source = Gem::Source::SpecificFile.new a_1_gem
 
@@ -91,9 +140,9 @@ class TestGemResolverInstallerSet < Gem::TestCase
     FileUtils.rm a_1_gem
     util_clear_gems
 
-    req = Gem::Resolver::DependencyRequest.new dep('a'), nil
+    req = Gem::Resolver::DependencyRequest.new dep("a"), nil
 
-    assert_equal %w[a-1], set.find_all(req).map { |spec| spec.full_name }
+    assert_equal %w[a-1], set.find_all(req).map {|spec| spec.full_name }
   end
 
   def test_consider_local_eh
@@ -129,7 +178,7 @@ class TestGemResolverInstallerSet < Gem::TestCase
 
     set.instance_variable_get(:@errors) << :a
 
-    req = Gem::Resolver::DependencyRequest.new dep('a'), nil
+    req = Gem::Resolver::DependencyRequest.new dep("a"), nil
 
     set.find_all req
 
@@ -138,42 +187,54 @@ class TestGemResolverInstallerSet < Gem::TestCase
 
   def test_find_all_always_install
     spec_fetcher do |fetcher|
-      fetcher.download 'a', 2
+      fetcher.download "a", 2
     end
 
-    util_gem 'a', 1
+    util_gem "a", 1
 
     set = Gem::Resolver::InstallerSet.new :both
 
-    set.add_always_install dep 'a'
+    set.add_always_install dep "a"
 
-    req = Gem::Resolver::DependencyRequest.new dep('a'), nil
+    req = Gem::Resolver::DependencyRequest.new dep("a"), nil
 
-    assert_equal %w[a-2], set.find_all(req).map { |spec| spec.full_name }
+    assert_equal %w[a-2], set.find_all(req).map {|spec| spec.full_name }
   end
 
   def test_find_all_prerelease
     spec_fetcher do |fetcher|
-      fetcher.download 'a', '1'
-      fetcher.download 'a', '1.a'
+      fetcher.download "a", "1"
+      fetcher.download "a", "1.a"
     end
 
     set = Gem::Resolver::InstallerSet.new :both
 
-    req = Gem::Resolver::DependencyRequest.new dep('a'), nil
+    req = Gem::Resolver::DependencyRequest.new dep("a"), nil
 
-    assert_equal %w[a-1], set.find_all(req).map { |spec| spec.full_name }
+    assert_equal %w[a-1], set.find_all(req).map {|spec| spec.full_name }
 
-    req = Gem::Resolver::DependencyRequest.new dep('a', '>= 0.a'), nil
+    req = Gem::Resolver::DependencyRequest.new dep("a", ">= 0.a"), nil
 
     assert_equal %w[a-1 a-1.a],
-                 set.find_all(req).map { |spec| spec.full_name }.sort
+                 set.find_all(req).map {|spec| spec.full_name }.sort
+  end
+
+  def test_find_all_prerelease_dependencies_with_add_local
+    activesupport_7_1_0_alpha = util_spec "activesupport", "7.1.0.alpha"
+
+    install_gem activesupport_7_1_0_alpha
+
+    set = Gem::Resolver::InstallerSet.new :both
+
+    req = Gem::Resolver::DependencyRequest.new dep("activesupport", ">= 4.2.0"), nil
+
+    assert_equal %w[activesupport-7.1.0.alpha], set.find_all(req).map {|spec| spec.full_name }
   end
 
   def test_load_spec
     specs = spec_fetcher do |fetcher|
-      fetcher.spec 'a', 2
-      fetcher.spec 'a', 2 do |s|
+      fetcher.spec "a", 2
+      fetcher.spec "a", 2 do |s|
         s.platform = Gem::Platform.local
       end
     end
@@ -183,7 +244,7 @@ class TestGemResolverInstallerSet < Gem::TestCase
 
     set = Gem::Resolver::InstallerSet.new :remote
 
-    spec = set.load_spec 'a', version, Gem::Platform.local, source
+    spec = set.load_spec "a", version, Gem::Platform.local, source
 
     assert_equal specs["a-2-#{Gem::Platform.local}"].full_name, spec.full_name
   end
@@ -193,7 +254,7 @@ class TestGemResolverInstallerSet < Gem::TestCase
     def (set.remote_set).prefetch(_)
       raise "called"
     end
-    assert_raises(RuntimeError){ set.prefetch(nil) }
+    assert_raise(RuntimeError) { set.prefetch(nil) }
 
     set = Gem::Resolver::InstallerSet.new :local
     def (set.remote_set).prefetch(_)
@@ -255,5 +316,4 @@ class TestGemResolverInstallerSet < Gem::TestCase
     refute set.consider_local?
     refute set.consider_remote?
   end
-
 end

data/test/rubygems/test_gem_resolver_local_specification.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
-require 'rubygems/available_set'
+require_relative "helper"
+require "rubygems/available_set"
 
 class TestGemResolverLocalSpecification < Gem::TestCase
-
   def setup
     super
 
@@ -12,12 +11,12 @@ class TestGemResolverLocalSpecification < Gem::TestCase
 
   def test_install
     specs = spec_fetcher do |fetcher|
-      fetcher.gem 'a', 2
+      fetcher.gem "a", 2
     end
 
-    source = Gem::Source::SpecificFile.new 'gems/a-2.gem'
+    source = Gem::Source::SpecificFile.new "gems/a-2.gem"
 
-    spec = Gem::Resolver::LocalSpecification.new @set, specs['a-2'], source
+    spec = Gem::Resolver::LocalSpecification.new @set, specs["a-2"], source
 
     called = false
 
@@ -25,13 +24,13 @@ class TestGemResolverLocalSpecification < Gem::TestCase
       called = installer
     end
 
-    assert_path_exists File.join @gemhome, 'specifications', 'a-2.gemspec'
+    assert_path_exist File.join @gemhome, "specifications", "a-2.gemspec"
 
     assert_kind_of Gem::Installer, called
   end
 
   def test_installable_platform_eh
-    b, b_gem = util_gem 'a', 1 do |s|
+    b, b_gem = util_gem "a", 1 do |s|
       s.platform = Gem::Platform.new %w[cpu other_platform 1]
     end
 
@@ -41,5 +40,4 @@ class TestGemResolverLocalSpecification < Gem::TestCase
 
     assert b_spec.installable_platform?
   end
-
 end

data/test/rubygems/test_gem_resolver_lock_set.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
+require_relative "helper"
 
 class TestGemResolverLockSet < Gem::TestCase
-
   def setup
     super
 
@@ -13,51 +12,50 @@ class TestGemResolverLockSet < Gem::TestCase
   end
 
   def test_add
-    specs = @set.add 'a', '2', Gem::Platform::RUBY
+    specs = @set.add "a", "2", Gem::Platform::RUBY
     spec = specs.first
 
-    assert_equal %w[a-2], @set.specs.map { |t| t.full_name }
+    assert_equal %w[a-2], @set.specs.map {|t| t.full_name }
 
     assert_kind_of Gem::Resolver::LockSpecification, spec
 
     assert_equal @set,                spec.set
-    assert_equal 'a',                 spec.name
+    assert_equal "a",                 spec.name
     assert_equal v(2),                spec.version
     assert_equal Gem::Platform::RUBY, spec.platform
     assert_equal @lock_source,        spec.source
   end
 
   def test_find_all
-    @set.add 'a', '1.a', Gem::Platform::RUBY
-    @set.add 'a', '2',   Gem::Platform::RUBY
-    @set.add 'b', '2',   Gem::Platform::RUBY
+    @set.add "a", "1.a", Gem::Platform::RUBY
+    @set.add "a", "2",   Gem::Platform::RUBY
+    @set.add "b", "2",   Gem::Platform::RUBY
 
-    found = @set.find_all dep 'a'
+    found = @set.find_all dep "a"
 
-    assert_equal %w[a-2], found.map { |s| s.full_name }
+    assert_equal %w[a-2], found.map {|s| s.full_name }
 
-    found = @set.find_all dep 'a', '>= 0.a'
+    found = @set.find_all dep "a", ">= 0.a"
 
-    assert_equal %w[a-1.a a-2], found.map { |s| s.full_name }
+    assert_equal %w[a-1.a a-2], found.map {|s| s.full_name }
   end
 
   def test_load_spec
     spec_fetcher do |fetcher|
-      fetcher.spec 'a', 2
+      fetcher.spec "a", 2
     end
 
     version = v(2)
-    @set.add 'a', version, Gem::Platform::RUBY
+    @set.add "a", version, Gem::Platform::RUBY
 
-    loaded = @set.load_spec 'a', version, Gem::Platform::RUBY, nil
+    loaded = @set.load_spec "a", version, Gem::Platform::RUBY, nil
 
     assert_kind_of Gem::Specification, loaded
 
-    assert_equal 'a-2', loaded.full_name
+    assert_equal "a-2", loaded.full_name
   end
 
   def test_prefetch
     assert_respond_to @set, :prefetch
   end
-
 end

data/test/rubygems/test_gem_resolver_lock_specification.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
-require 'rubygems/installer'
-require 'rubygems/resolver'
+require_relative "helper"
+require "rubygems/installer"
+require "rubygems/resolver"
 
 class TestGemResolverLockSpecification < Gem::TestCase
-
   def setup
     super
 
@@ -15,9 +14,9 @@ class TestGemResolverLockSpecification < Gem::TestCase
   end
 
   def test_initialize
-    spec = @LS.new @set, 'a', v(2), [@source], Gem::Platform::RUBY
+    spec = @LS.new @set, "a", v(2), [@source], Gem::Platform::RUBY
 
-    assert_equal 'a',                 spec.name
+    assert_equal "a",                 spec.name
     assert_equal v(2),                spec.version
     assert_equal Gem::Platform::RUBY, spec.platform
 
@@ -25,9 +24,9 @@ class TestGemResolverLockSpecification < Gem::TestCase
   end
 
   def test_add_dependency
-    l_spec = @LS.new @set, 'a', v(2), [@source], Gem::Platform::RUBY
+    l_spec = @LS.new @set, "a", v(2), [@source], Gem::Platform::RUBY
 
-    b_dep = dep('b', '>= 0')
+    b_dep = dep("b", ">= 0")
 
     l_spec.add_dependency b_dep
 
@@ -36,10 +35,10 @@ class TestGemResolverLockSpecification < Gem::TestCase
 
   def test_install
     spec_fetcher do |fetcher|
-      fetcher.download 'a', 2
+      fetcher.download "a", 2
     end
 
-    spec = @LS.new @set, 'a', v(2), [@source], Gem::Platform::RUBY
+    spec = @LS.new @set, "a", v(2), [@source], Gem::Platform::RUBY
 
     called = false
 
@@ -51,9 +50,9 @@ class TestGemResolverLockSpecification < Gem::TestCase
   end
 
   def test_install_installed
-    spec = @LS.new @set, 'a', v(2), [@source], Gem::Platform::RUBY
+    spec = @LS.new @set, "a", v(2), [@source], Gem::Platform::RUBY
 
-    FileUtils.touch File.join(@gemhome, 'specifications', spec.spec.spec_name)
+    FileUtils.touch File.join(@gemhome, "specifications", spec.spec.spec_name)
 
     called = false
 
@@ -67,17 +66,17 @@ class TestGemResolverLockSpecification < Gem::TestCase
   def test_spec
     version = v(2)
 
-    l_spec = @LS.new @set, 'a', version, [@source], Gem::Platform::RUBY
+    l_spec = @LS.new @set, "a", version, [@source], Gem::Platform::RUBY
 
-    b_dep = dep 'b', '>= 0'
-    c_dep = dep 'c', '~> 1'
+    b_dep = dep "b", ">= 0"
+    c_dep = dep "c", "~> 1"
 
     l_spec.add_dependency b_dep
     l_spec.add_dependency c_dep
 
     spec = l_spec.spec
 
-    assert_equal 'a',                 spec.name
+    assert_equal "a",                 spec.name
     assert_equal version,             spec.version
     assert_equal Gem::Platform::RUBY, spec.platform
 
@@ -85,15 +84,14 @@ class TestGemResolverLockSpecification < Gem::TestCase
   end
 
   def test_spec_loaded
-    real_spec = util_spec 'a', 2
+    real_spec = util_spec "a", 2
     install_specs real_spec
     real_spec.activate
 
     version = v(2)
 
-    l_spec = @LS.new @set, 'a', version, [@source], Gem::Platform::RUBY
+    l_spec = @LS.new @set, "a", version, [@source], Gem::Platform::RUBY
 
     assert_same real_spec, l_spec.spec
   end
-
 end

data/test/rubygems/test_gem_resolver_requirement_list.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
+require_relative "helper"
 
 class TestGemResolverRequirementList < Gem::TestCase
-
   def setup
     super
 
@@ -16,5 +15,4 @@ class TestGemResolverRequirementList < Gem::TestCase
 
     assert_equal [req], @list.each.to_a
   end
-
 end

data/test/rubygems/test_gem_resolver_specification.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
+require_relative "helper"
 
 class TestGemResolverSpecification < Gem::TestCase
-
   class TestSpec < Gem::Resolver::Specification
-
     attr_writer :source
     attr_reader :spec
 
@@ -13,37 +11,36 @@ class TestGemResolverSpecification < Gem::TestCase
 
       @spec = spec
     end
-
   end
 
   def test_install
     gemhome = "#{@gemhome}2"
     spec_fetcher do |fetcher|
-      fetcher.gem 'a', 1
+      fetcher.gem "a", 1
     end
 
-    a = util_spec 'a', 1
+    a = util_spec "a", 1
 
     a_spec = TestSpec.new a
     a_spec.source = Gem::Source.new @gem_repo
 
     a_spec.install :install_dir => gemhome
 
-    assert_path_exists File.join gemhome, 'gems', a.full_name
+    assert_path_exist File.join gemhome, "gems", a.full_name
 
-    expected = File.join gemhome, 'specifications', a.spec_name
+    expected = File.join gemhome, "specifications", a.spec_name
 
     assert_equal expected, a_spec.spec.loaded_from
   end
 
   def test_installable_platform_eh
-    a = util_spec 'a', 1
+    a = util_spec "a", 1
 
     a_spec = TestSpec.new a
 
     assert a_spec.installable_platform?
 
-    b = util_spec 'a', 1 do |s|
+    b = util_spec "a", 1 do |s|
       s.platform = Gem::Platform.new %w[cpu other_platform 1]
     end
 
@@ -53,7 +50,7 @@ class TestGemResolverSpecification < Gem::TestCase
   end
 
   def test_source
-    a = util_spec 'a', 1
+    a = util_spec "a", 1
 
     source = Gem::Source.new @gem_repo
 
@@ -62,5 +59,4 @@ class TestGemResolverSpecification < Gem::TestCase
 
     assert_equal source, a_spec.source
   end
-
 end

data/test/rubygems/test_gem_resolver_vendor_set.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
+require_relative "helper"
 
 class TestGemResolverVendorSet < Gem::TestCase
-
   def setup
     super
 
@@ -28,7 +27,7 @@ class TestGemResolverVendorSet < Gem::TestCase
 
     FileUtils.rm_r directory
 
-    e = assert_raises Gem::GemNotFoundException do
+    e = assert_raise Gem::GemNotFoundException do
       @set.add_vendor_gem name, directory
     end
 
@@ -41,7 +40,7 @@ class TestGemResolverVendorSet < Gem::TestCase
 
     @set.add_vendor_gem name, directory
 
-    dependency = dep 'a', '~> 1'
+    dependency = dep "a", "~> 1"
 
     req = Gem::Resolver::DependencyRequest.new dependency, nil
 
@@ -52,22 +51,22 @@ class TestGemResolverVendorSet < Gem::TestCase
     source = Gem::Source::Vendor.new directory
 
     expected = [
-      Gem::Resolver::VendorSpecification.new(@set, spec, source)
+      Gem::Resolver::VendorSpecification.new(@set, spec, source),
     ]
 
     assert_equal expected, found
   end
 
   def test_find_all_prerelease
-    name, _, directory = vendor_gem 'a', '1.a'
+    name, _, directory = vendor_gem "a", "1.a"
 
     @set.add_vendor_gem name, directory
 
-    req = Gem::Resolver::DependencyRequest.new dep('a'), nil
+    req = Gem::Resolver::DependencyRequest.new dep("a"), nil
 
     assert_empty @set.find_all req
 
-    req = Gem::Resolver::DependencyRequest.new dep('a', '>= 0.a'), nil
+    req = Gem::Resolver::DependencyRequest.new dep("a", ">= 0.a"), nil
 
     refute_empty @set.find_all req
   end
@@ -75,9 +74,8 @@ class TestGemResolverVendorSet < Gem::TestCase
   def test_load_spec
     error = Object.const_defined?(:KeyError) ? KeyError : IndexError
 
-    assert_raises error do
-      @set.load_spec 'b', v(1), Gem::Platform::RUBY, nil
+    assert_raise error do
+      @set.load_spec "b", v(1), Gem::Platform::RUBY, nil
     end
   end
-
 end