rubygems-update 3.3.18 → 3.4.19

data/test/rubygems/test_gem_dependency_list.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
-require_relative 'helper'
-require 'rubygems/dependency_list'
+
+require_relative "helper"
+require "rubygems/dependency_list"
 
 class TestGemDependencyList < Gem::TestCase
   def setup
@@ -9,26 +10,26 @@ class TestGemDependencyList < Gem::TestCase
     @deplist = Gem::DependencyList.new
 
     # TODO: switch to util_spec
-    @a1 = util_spec 'a', '1'
-    @a2 = util_spec 'a', '2'
-    @a3 = util_spec 'a', '3'
+    @a1 = util_spec "a", "1"
+    @a2 = util_spec "a", "2"
+    @a3 = util_spec "a", "3"
 
-    @b1 = util_spec 'b', '1' do |s|
-      s.add_dependency 'a', '>= 1'
+    @b1 = util_spec "b", "1" do |s|
+      s.add_dependency "a", ">= 1"
     end
 
-    @b2 = util_spec 'b', '2' do |s|
-      s.add_dependency 'a', '>= 1'
+    @b2 = util_spec "b", "2" do |s|
+      s.add_dependency "a", ">= 1"
     end
 
-    @c1 = util_spec 'c', '1' do |s|
-      s.add_dependency 'b', '>= 1'
+    @c1 = util_spec "c", "1" do |s|
+      s.add_dependency "b", ">= 1"
     end
 
-    @c2 = util_spec 'c', '2'
+    @c2 = util_spec "c", "2"
 
-    @d1 = util_spec 'd', '1' do |s|
-      s.add_dependency 'c', '>= 1'
+    @d1 = util_spec "d", "1" do |s|
+      s.add_dependency "c", ">= 1"
     end
   end
 
@@ -56,7 +57,7 @@ class TestGemDependencyList < Gem::TestCase
   end
 
   def test_dependency_order_circle
-    @a1.add_dependency 'c', '>= 1'
+    @a1.add_dependency "c", ">= 1"
     @deplist.add @a1, @b1, @c1
 
     order = @deplist.dependency_order
@@ -65,14 +66,14 @@ class TestGemDependencyList < Gem::TestCase
   end
 
   def test_dependency_order_development
-    e1 = util_spec 'e', '1'
-    f1 = util_spec 'f', '1'
-    g1 = util_spec 'g', '1'
+    e1 = util_spec "e", "1"
+    f1 = util_spec "f", "1"
+    g1 = util_spec "g", "1"
 
-    @a1.add_dependency 'e'
-    @a1.add_dependency 'f'
-    @a1.add_dependency 'g'
-    g1.add_development_dependency 'a'
+    @a1.add_dependency "e"
+    @a1.add_dependency "f"
+    @a1.add_dependency "g"
+    g1.add_development_dependency "a"
 
     deplist = Gem::DependencyList.new true
     deplist.add @a1, e1, f1, g1
@@ -80,7 +81,7 @@ class TestGemDependencyList < Gem::TestCase
     order = deplist.dependency_order
 
     assert_equal %w[g-1 a-1 f-1 e-1], order.map {|s| s.full_name },
-                 'development on'
+                 "development on"
 
     deplist2 = Gem::DependencyList.new
     deplist2.add @a1, e1, f1, g1
@@ -88,19 +89,19 @@ class TestGemDependencyList < Gem::TestCase
     order = deplist2.dependency_order
 
     assert_equal %w[a-1 g-1 f-1 e-1], order.map {|s| s.full_name },
-                 'development off'
+                 "development off"
   end
 
   def test_dependency_order_diamond
     util_diamond
-    e1 = util_spec 'e', '1'
+    e1 = util_spec "e", "1"
     @deplist.add e1
-    @a1.add_dependency 'e', '>= 1'
+    @a1.add_dependency "e", ">= 1"
 
     order = @deplist.dependency_order
 
     assert_equal %w[d-1 c-2 b-1 a-2 e-1], order.map {|s| s.full_name },
-                 'deps of trimmed specs not included'
+                 "deps of trimmed specs not included"
   end
 
   def test_dependency_order_no_dependencies
@@ -121,15 +122,15 @@ class TestGemDependencyList < Gem::TestCase
   end
 
   def test_ok_eh
-    assert @deplist.ok?, 'no dependencies'
+    assert @deplist.ok?, "no dependencies"
 
     @deplist.add @b2
 
-    refute @deplist.ok?, 'unsatisfied dependency'
+    refute @deplist.ok?, "unsatisfied dependency"
 
     @deplist.add @a1
 
-    assert @deplist.ok?, 'satisfied dependency'
+    assert @deplist.ok?, "satisfied dependency"
   end
 
   def test_why_not_ok_eh
@@ -147,13 +148,13 @@ class TestGemDependencyList < Gem::TestCase
   end
 
   def test_why_not_ok_eh_old_dependency
-    a  = util_spec 'a', '1',
-                  'b' => '~> 1.0'
+    a  = util_spec "a", "1",
+                  "b" => "~> 1.0"
 
-    b0 = util_spec 'b', '1.0',
-                  'd' => '>= 0'
+    b0 = util_spec "b", "1.0",
+                  "d" => ">= 0"
 
-    b1 = util_spec 'b', '1.1'
+    b1 = util_spec "b", "1.1"
 
     util_clear_gems
 
@@ -165,25 +166,25 @@ class TestGemDependencyList < Gem::TestCase
   end
 
   def test_ok_eh_mismatch
-    a1 = util_spec 'a', '1'
-    a2 = util_spec 'a', '2'
+    a1 = util_spec "a", "1"
+    a2 = util_spec "a", "2"
 
-    b = util_spec 'b', '1' do |s|
-      s.add_dependency 'a', '= 1'
+    b = util_spec "b", "1" do |s|
+      s.add_dependency "a", "= 1"
     end
 
-    c = util_spec 'c', '1' do |s|
-      s.add_dependency 'a', '= 2'
+    c = util_spec "c", "1" do |s|
+      s.add_dependency "a", "= 2"
     end
 
-    d = util_spec 'd', '1' do |s|
-      s.add_dependency 'b'
-      s.add_dependency 'c'
+    d = util_spec "d", "1" do |s|
+      s.add_dependency "b"
+      s.add_dependency "c"
     end
 
     @deplist.add a1, a2, b, c, d
 
-    assert @deplist.ok?, 'this will break on require'
+    assert @deplist.ok?, "this will break on require"
   end
 
   def test_ok_eh_redundant
@@ -256,8 +257,8 @@ class TestGemDependencyList < Gem::TestCase
   # d1 -> b1 -> a1
   # d1 -> c2 -> a2
   def util_diamond
-    @c2.add_dependency 'a', '>= 2'
-    @d1.add_dependency 'b'
+    @c2.add_dependency "a", ">= 2"
+    @d1.add_dependency "b"
 
     @deplist.add @a1, @a2, @b1, @c2, @d1
   end

data/test/rubygems/test_gem_dependency_resolution_error.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-require_relative 'helper'
+
+require_relative "helper"
 
 class TestGemDependencyResolutionError < Gem::TestCase
   def setup
@@ -7,10 +8,10 @@ class TestGemDependencyResolutionError < Gem::TestCase
 
     @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
 

data/test/rubygems/test_gem_doctor.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
-require_relative 'helper'
-require 'rubygems/doctor'
+
+require_relative "helper"
+require "rubygems/doctor"
 
 class TestGemDoctor < Gem::TestCase
   def gem(name)
@@ -15,20 +16,20 @@ class TestGemDoctor < Gem::TestCase
   end
 
   def test_doctor
-    a = gem 'a'
-    b = gem 'b'
-    c = gem 'c'
+    a = gem "a"
+    b = gem "b"
+    c = gem "c"
 
     Gem.use_paths @userhome, @gemhome
 
     FileUtils.rm b.spec_file
 
-    File.open c.spec_file, 'w' do |io|
-      io.write 'this will raise an exception when evaluated.'
+    File.open c.spec_file, "w" do |io|
+      io.write "this will raise an exception when evaluated."
     end
 
-    assert_path_exist File.join(a.gem_dir, 'Rakefile')
-    assert_path_exist File.join(a.gem_dir, 'lib', 'a.rb')
+    assert_path_exist File.join(a.gem_dir, "Rakefile")
+    assert_path_exist File.join(a.gem_dir, "lib", "a.rb")
 
     assert_path_exist b.gem_dir
     assert_path_not_exist b.spec_file
@@ -44,8 +45,8 @@ class TestGemDoctor < Gem::TestCase
       end
     end
 
-    assert_path_exist File.join(a.gem_dir, 'Rakefile')
-    assert_path_exist File.join(a.gem_dir, 'lib', 'a.rb')
+    assert_path_exist File.join(a.gem_dir, "Rakefile")
+    assert_path_exist File.join(a.gem_dir, "lib", "a.rb")
 
     assert_path_not_exist b.gem_dir
     assert_path_not_exist b.spec_file
@@ -68,20 +69,20 @@ Removed directory gems/c-2
   end
 
   def test_doctor_dry_run
-    a = gem 'a'
-    b = gem 'b'
-    c = gem 'c'
+    a = gem "a"
+    b = gem "b"
+    c = gem "c"
 
     Gem.use_paths @userhome, @gemhome
 
     FileUtils.rm b.spec_file
 
-    File.open c.spec_file, 'w' do |io|
-      io.write 'this will raise an exception when evaluated.'
+    File.open c.spec_file, "w" do |io|
+      io.write "this will raise an exception when evaluated."
     end
 
-    assert_path_exist File.join(a.gem_dir, 'Rakefile')
-    assert_path_exist File.join(a.gem_dir, 'lib', 'a.rb')
+    assert_path_exist File.join(a.gem_dir, "Rakefile")
+    assert_path_exist File.join(a.gem_dir, "lib", "a.rb")
 
     assert_path_exist b.gem_dir
     assert_path_not_exist b.spec_file
@@ -97,8 +98,8 @@ Removed directory gems/c-2
       end
     end
 
-    assert_path_exist File.join(a.gem_dir, 'Rakefile')
-    assert_path_exist File.join(a.gem_dir, 'lib', 'a.rb')
+    assert_path_exist File.join(a.gem_dir, "Rakefile")
+    assert_path_exist File.join(a.gem_dir, "lib", "a.rb")
 
     assert_path_exist b.gem_dir
     assert_path_not_exist b.spec_file
@@ -121,7 +122,7 @@ Extra directory gems/c-2
   end
 
   def test_doctor_non_gem_home
-    other_dir = File.join @tempdir, 'other', 'dir'
+    other_dir = File.join @tempdir, "other", "dir"
 
     FileUtils.mkdir_p other_dir
 
@@ -147,13 +148,13 @@ This directory does not appear to be a RubyGems repository, skipping
   def test_doctor_child_missing
     doctor = Gem::Doctor.new @gemhome
 
-    doctor.doctor_child 'missing', ''
+    doctor.doctor_child "missing", ""
 
     assert true # count
   end
 
   def test_doctor_badly_named_plugins
-    gem 'a'
+    gem "a"
 
     Gem.use_paths @gemhome.to_s
 
@@ -183,12 +184,12 @@ Removed file plugins/a_badly_named_file.rb
   def test_gem_repository_eh
     doctor = Gem::Doctor.new @gemhome
 
-    refute doctor.gem_repository?, 'no gems installed'
+    refute doctor.gem_repository?, "no gems installed"
 
-    install_specs util_spec 'a'
+    install_specs util_spec "a"
 
     doctor = Gem::Doctor.new @gemhome
 
-    assert doctor.gem_repository?, 'gems installed'
+    assert doctor.gem_repository?, "gems installed"
   end
 end

data/test/rubygems/test_gem_ext_builder.rb

@@ -1,38 +1,37 @@
 # frozen_string_literal: true
-require_relative 'helper'
-require 'rubygems/ext'
-require 'rubygems/installer'
+
+require_relative "helper"
+require "rubygems/ext"
+require "rubygems/installer"
 
 class TestGemExtBuilder < Gem::TestCase
   def setup
+    @orig_DESTDIR = ENV["DESTDIR"]
+    @orig_make = ENV["make"]
     super
 
-    @ext = File.join @tempdir, 'ext'
-    @dest_path = File.join @tempdir, 'prefix'
+    @ext = File.join @tempdir, "ext"
+    @dest_path = File.join @tempdir, "prefix"
 
     FileUtils.mkdir_p @ext
     FileUtils.mkdir_p @dest_path
 
-    @orig_DESTDIR = ENV['DESTDIR']
-    @orig_make = ENV['make']
-
-    @spec = util_spec 'a'
+    @spec = util_spec "a"
 
-    @builder = Gem::Ext::Builder.new @spec, ''
+    @builder = Gem::Ext::Builder.new @spec, ""
   end
 
   def teardown
-    ENV['DESTDIR'] = @orig_DESTDIR
-    ENV['make'] = @orig_make
-
     super
+    ENV["DESTDIR"] = @orig_DESTDIR
+    ENV["make"] = @orig_make
   end
 
   def test_class_make
-    ENV['DESTDIR'] = 'destination'
+    ENV["DESTDIR"] = "destination"
     results = []
 
-    File.open File.join(@ext, 'Makefile'), 'w' do |io|
+    File.open File.join(@ext, "Makefile"), "w" do |io|
       io.puts <<-MAKEFILE
 all:
 \t@#{Gem.ruby} -e "puts %Q{all: \#{ENV['DESTDIR']}}"
@@ -61,10 +60,10 @@ install:
   end
 
   def test_class_make_no_clean
-    ENV['DESTDIR'] = 'destination'
+    ENV["DESTDIR"] = "destination"
     results = []
 
-    File.open File.join(@ext, 'Makefile'), 'w' do |io|
+    File.open File.join(@ext, "Makefile"), "w" do |io|
       io.puts <<-MAKEFILE
 all:
 \t@#{Gem.ruby} -e "puts %Q{all: \#{ENV['DESTDIR']}}"
@@ -84,9 +83,9 @@ install:
   end
 
   def test_custom_make_with_options
-    ENV['make'] = 'make V=1'
+    ENV["make"] = "make V=1"
     results = []
-    File.open File.join(@ext, 'Makefile'), 'w' do |io|
+    File.open File.join(@ext, "Makefile"), "w" do |io|
       io.puts <<-MAKEFILE
 all:
 \t@#{Gem.ruby} -e "puts 'all: OK'"
@@ -106,16 +105,16 @@ install:
   end
 
   def test_build_extensions
-    pend if /mswin/ =~ RUBY_PLATFORM && ENV.key?('GITHUB_ACTIONS') # not working from the beginning
-    @spec.extensions << 'ext/extconf.rb'
+    pend "terminates on mswin" if vc_windows? && ruby_repo?
+    @spec.extensions << "ext/extconf.rb"
 
-    ext_dir = File.join @spec.gem_dir, 'ext'
+    ext_dir = File.join @spec.gem_dir, "ext"
 
     FileUtils.mkdir_p ext_dir
 
-    extconf_rb = File.join ext_dir, 'extconf.rb'
+    extconf_rb = File.join ext_dir, "extconf.rb"
 
-    File.open extconf_rb, 'w' do |f|
+    File.open extconf_rb, "w" do |f|
       f.write <<-'RUBY'
         require 'mkmf'
 
@@ -123,11 +122,11 @@ install:
       RUBY
     end
 
-    ext_lib_dir = File.join ext_dir, 'lib'
+    ext_lib_dir = File.join ext_dir, "lib"
     FileUtils.mkdir ext_lib_dir
-    FileUtils.touch File.join ext_lib_dir, 'a.rb'
-    FileUtils.mkdir File.join ext_lib_dir, 'a'
-    FileUtils.touch File.join ext_lib_dir, 'a', 'b.rb'
+    FileUtils.touch File.join ext_lib_dir, "a.rb"
+    FileUtils.mkdir File.join ext_lib_dir, "a"
+    FileUtils.touch File.join ext_lib_dir, "a", "b.rb"
 
     use_ui @ui do
       @builder.build_extensions
@@ -135,20 +134,20 @@ install:
 
     assert_path_exist @spec.extension_dir
     assert_path_exist @spec.gem_build_complete_path
-    assert_path_exist File.join @spec.extension_dir, 'gem_make.out'
-    assert_path_exist File.join @spec.extension_dir, 'a.rb'
-    assert_path_exist File.join @spec.gem_dir, 'lib', 'a.rb'
-    assert_path_exist File.join @spec.gem_dir, 'lib', 'a', 'b.rb'
+    assert_path_exist File.join @spec.extension_dir, "gem_make.out"
+    assert_path_exist File.join @spec.extension_dir, "a.rb"
+    assert_path_exist File.join @spec.gem_dir, "lib", "a.rb"
+    assert_path_exist File.join @spec.gem_dir, "lib", "a", "b.rb"
   end
 
   def test_build_extensions_with_gemhome_with_space
-    pend if /mswin/ =~ RUBY_PLATFORM && ENV.key?('GITHUB_ACTIONS') # not working from the beginning
-    new_gemhome = File.join @tempdir, 'gem home'
+    pend "terminates on mswin" if vc_windows? && ruby_repo?
+    new_gemhome = File.join @tempdir, "gem home"
     File.rename(@gemhome, new_gemhome)
     @gemhome = new_gemhome
     Gem.use_paths(@gemhome)
-    @spec = util_spec 'a'
-    @builder = Gem::Ext::Builder.new @spec, ''
+    @spec = util_spec "a"
+    @builder = Gem::Ext::Builder.new @spec, ""
 
     test_build_extensions
   end
@@ -163,17 +162,17 @@ install:
         false
       end
     end
-    pend if /mswin/ =~ RUBY_PLATFORM && ENV.key?('GITHUB_ACTIONS') # not working from the beginning
+    pend "terminates on mswin" if vc_windows? && ruby_repo?
 
-    @spec.extensions << 'ext/extconf.rb'
+    @spec.extensions << "ext/extconf.rb"
 
-    ext_dir = File.join @spec.gem_dir, 'ext'
+    ext_dir = File.join @spec.gem_dir, "ext"
 
     FileUtils.mkdir_p ext_dir
 
-    extconf_rb = File.join ext_dir, 'extconf.rb'
+    extconf_rb = File.join ext_dir, "extconf.rb"
 
-    File.open extconf_rb, 'w' do |f|
+    File.open extconf_rb, "w" do |f|
       f.write <<-'RUBY'
         require 'mkmf'
 
@@ -181,11 +180,11 @@ install:
       RUBY
     end
 
-    ext_lib_dir = File.join ext_dir, 'lib'
+    ext_lib_dir = File.join ext_dir, "lib"
     FileUtils.mkdir ext_lib_dir
-    FileUtils.touch File.join ext_lib_dir, 'a.rb'
-    FileUtils.mkdir File.join ext_lib_dir, 'a'
-    FileUtils.touch File.join ext_lib_dir, 'a', 'b.rb'
+    FileUtils.touch File.join ext_lib_dir, "a.rb"
+    FileUtils.mkdir File.join ext_lib_dir, "a"
+    FileUtils.touch File.join ext_lib_dir, "a", "b.rb"
 
     use_ui @ui do
       @builder.build_extensions
@@ -193,10 +192,10 @@ install:
 
     assert_path_exist @spec.extension_dir
     assert_path_exist @spec.gem_build_complete_path
-    assert_path_exist File.join @spec.extension_dir, 'gem_make.out'
-    assert_path_exist File.join @spec.extension_dir, 'a.rb'
-    assert_path_not_exist File.join @spec.gem_dir, 'lib', 'a.rb'
-    assert_path_not_exist File.join @spec.gem_dir, 'lib', 'a', 'b.rb'
+    assert_path_exist File.join @spec.extension_dir, "gem_make.out"
+    assert_path_exist File.join @spec.extension_dir, "a.rb"
+    assert_path_not_exist File.join @spec.gem_dir, "lib", "a.rb"
+    assert_path_not_exist File.join @spec.gem_dir, "lib", "a", "b.rb"
   ensure
     class << Gem
       remove_method :install_extension_in_lib
@@ -210,10 +209,10 @@ install:
       @builder.build_extensions
     end
 
-    assert_equal '', @ui.output
-    assert_equal '', @ui.error
+    assert_equal "", @ui.output
+    assert_equal "", @ui.error
 
-    assert_path_not_exist File.join @spec.extension_dir, 'gem_make.out'
+    assert_path_not_exist File.join @spec.extension_dir, "gem_make.out"
   end
 
   def test_build_extensions_rebuild_failure
@@ -234,7 +233,7 @@ install:
   def test_build_extensions_extconf_bad
     cwd = Dir.pwd
 
-    @spec.extensions << 'extconf.rb'
+    @spec.extensions << "extconf.rb"
 
     FileUtils.mkdir_p @spec.gem_dir
 
@@ -246,9 +245,9 @@ install:
 
     assert_match(/\AERROR: Failed to build gem native extension.$/, e.message)
     assert_equal "Building native extensions. This could take a while...\n", @ui.output
-    assert_equal '', @ui.error
+    assert_equal "", @ui.error
 
-    gem_make_out = File.join @spec.extension_dir, 'gem_make.out'
+    gem_make_out = File.join @spec.extension_dir, "gem_make.out"
     cmd_make_out = File.read(gem_make_out)
 
     assert_match %r{#{Regexp.escape Gem.ruby} .* extconf\.rb}, cmd_make_out
@@ -261,7 +260,7 @@ install:
 
   def test_build_extensions_unsupported
     FileUtils.mkdir_p @spec.gem_dir
-    gem_make_out = File.join @spec.extension_dir, 'gem_make.out'
+    gem_make_out = File.join @spec.extension_dir, "gem_make.out"
     @spec.extensions << nil
 
     e = assert_raise Gem::Ext::BuildError do
@@ -272,7 +271,7 @@ install:
 
     assert_match(/^\s*No builder for extension ''$/, e.message)
     assert_equal "Building native extensions. This could take a while...\n", @ui.output
-    assert_equal '', @ui.error
+    assert_equal "", @ui.error
 
     assert_equal "No builder for extension ''\n", File.read(gem_make_out)
 
@@ -284,7 +283,7 @@ install:
   def test_build_extensions_with_build_args
     args = ["--aa", "--bb"]
     @builder.build_args = args
-    @spec.extensions << 'extconf.rb'
+    @spec.extensions << "extconf.rb"
 
     FileUtils.mkdir_p @spec.gem_dir
 
@@ -315,14 +314,14 @@ install:
   end
 
   def test_initialize
-    build_info_dir = File.join @gemhome, 'build_info'
+    build_info_dir = File.join @gemhome, "build_info"
 
     FileUtils.mkdir_p build_info_dir
 
     build_info_file = File.join build_info_dir, "#{@spec.full_name}.info"
 
-    File.open build_info_file, 'w' do |io|
-      io.puts '--with-foo-dir=/nonexistent'
+    File.open build_info_file, "w" do |io|
+      io.puts "--with-foo-dir=/nonexistent"
     end
 
     builder = Gem::Ext::Builder.new @spec

data/test/rubygems/test_gem_ext_cargo_builder/custom_name/custom_name.gemspec

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 Gem::Specification.new do |s|
   s.name          = "custom_name"
   s.version       = "0.1.0"
   s.summary       = "A Rust extension for Ruby"
-  s.extensions    = ["Cargo.toml"]
+  s.extensions    = ["ext/custom_name_lib/Cargo.toml"]
   s.authors       = ["Ian Ker-Seymer"]
-  s.files         = ["Cargo.toml", "Cargo.lock", "src/lib.rs"]
-
-  s.metadata['cargo_crate_name'] = 'custom-name-ext'
+  s.files         = ["lib/custom_name.rb", "ext/custom_name_lib/Cargo.toml", "ext/custom_name_lib/Cargo.lock", "ext/custom_name_lib/src/lib.rs"]
 end