rubygems-update 3.3.18 → 3.3.22

data/test/rubygems/test_gem_ext_cargo_builder/custom_name/build.rb

@@ -1,17 +1,17 @@
-if ENV['RUBYOPT'] or defined? Gem
-  ENV.delete 'RUBYOPT'
+if ENV["RUBYOPT"] || defined? Gem
+  ENV.delete "RUBYOPT"
 
-  require 'rbconfig'
-  cmd = [RbConfig.ruby, '--disable-gems', 'build.rb', *ARGV]
+  require "rbconfig"
+  cmd = [RbConfig.ruby, "--disable-gems", "build.rb", *ARGV]
 
   exec(*cmd)
 end
 
-require 'tmpdir'
+require "tmpdir"
 
-lp = File.expand_path('../../../../lib', __dir__)
-gem = ["ruby", "-I#{lp}", File.expand_path('../../../../bin/gem', __dir__)]
-gemspec = File.expand_path('custom_name.gemspec', __dir__)
+lp = File.expand_path("../../../../lib", __dir__)
+gem = ["ruby", "-I#{lp}", File.expand_path("../../../../bin/gem", __dir__)]
+gemspec = File.expand_path("custom_name.gemspec", __dir__)
 
 Dir.mktmpdir("custom_name") do |dir|
   built_gem = File.expand_path(File.join(dir, "custom_name.gem"))

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

@@ -6,5 +6,5 @@ Gem::Specification.new do |s|
   s.authors       = ["Ian Ker-Seymer"]
   s.files         = ["Cargo.toml", "Cargo.lock", "src/lib.rs"]
 
-  s.metadata['cargo_crate_name'] = 'custom-name-ext'
+  s.metadata["cargo_crate_name"] = "custom-name-ext"
 end

data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.lock

@@ -98,9 +98,9 @@ dependencies = [
 
 [[package]]
 name = "linkify"
-version = "0.8.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d9967eb7d0bc31c39c6f52e8fce42991c0cd1f7a2078326f0b7a399a584c8d"
+checksum = "96dd5884008358112bc66093362197c7248ece00d46624e2cf71e50029f8cff5"
 dependencies = [
  "memchr",
 ]
@@ -153,9 +153,9 @@ dependencies = [
 
 [[package]]
 name = "rb-sys"
-version = "0.9.19"
+version = "0.9.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8df6990035ed930322a6b8a73783ea6af88acffd2b4322932b0eb0766a5a8673"
+checksum = "24b22a374fc2e92eb6f49d7efe4eb7663655c6e9455d9259ed3342cc1599da85"
 dependencies = [
  "bindgen",
  "linkify",
@@ -164,9 +164,9 @@ dependencies = [
 
 [[package]]
 name = "rb-sys-build"
-version = "0.9.19"
+version = "0.9.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9c3c88da760bbc2f26bbfd1acbfe9de3faa87be55feaf3413a33539d066ff3c"
+checksum = "3cd23b6dd929b7d50ccb35a6d3aa77dec364328ab9cb304dd32c629332491671"
 dependencies = [
  "regex",
  "shell-words",

data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.toml

@@ -7,4 +7,4 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
-rb-sys = { version = "0.9.19", features = ["gem"] }
+rb-sys = { version = "0.9.30", features = ["gem"] }

data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/build.rb

@@ -1,17 +1,17 @@
-if ENV['RUBYOPT'] or defined? Gem
-  ENV.delete 'RUBYOPT'
+if ENV["RUBYOPT"] || defined? Gem
+  ENV.delete "RUBYOPT"
 
-  require 'rbconfig'
-  cmd = [RbConfig.ruby, '--disable-gems', 'build.rb', *ARGV]
+  require "rbconfig"
+  cmd = [RbConfig.ruby, "--disable-gems", "build.rb", *ARGV]
 
   exec(*cmd)
 end
 
-require 'tmpdir'
+require "tmpdir"
 
-lp = File.expand_path('../../../../lib', __dir__)
-gem = ["ruby", "-I#{lp}", File.expand_path('../../../../bin/gem', __dir__)]
-gemspec = File.expand_path('rust_ruby_example.gemspec', __dir__)
+lp = File.expand_path("../../../../lib", __dir__)
+gem = ["ruby", "-I#{lp}", File.expand_path("../../../../bin/gem", __dir__)]
+gemspec = File.expand_path("rust_ruby_example.gemspec", __dir__)
 
 Dir.mktmpdir("rust_ruby_example") do |dir|
   built_gem = File.expand_path(File.join(dir, "rust_ruby_example.gem"))

data/test/rubygems/test_gem_ext_cargo_builder.rb

@@ -1,21 +1,21 @@
 # frozen_string_literal: true
 
-require_relative 'helper'
-require 'rubygems/ext'
+require_relative "helper"
+require "rubygems/ext"
 
 class TestGemExtCargoBuilder < Gem::TestCase
   def setup
     super
 
     @rust_envs = {
-      'CARGO_HOME' => ENV.fetch('CARGO_HOME', File.join(@orig_env['HOME'], '.cargo')),
-      'RUSTUP_HOME' => ENV.fetch('RUSTUP_HOME', File.join(@orig_env['HOME'], '.rustup')),
+      "CARGO_HOME" => ENV.fetch("CARGO_HOME", File.join(@orig_env["HOME"], ".cargo")),
+      "RUSTUP_HOME" => ENV.fetch("RUSTUP_HOME", File.join(@orig_env["HOME"], ".rustup")),
     }
   end
 
   def setup_rust_gem(name)
-    @ext = File.join(@tempdir, 'ext')
-    @dest_path = File.join(@tempdir, 'prefix')
+    @ext = File.join(@tempdir, "ext")
+    @dest_path = File.join(@tempdir, "prefix")
     @fixture_dir = Pathname.new(File.expand_path("test_gem_ext_cargo_builder/#{name}/", __dir__))
 
     FileUtils.mkdir_p @dest_path
@@ -26,14 +26,14 @@ class TestGemExtCargoBuilder < Gem::TestCase
     skip_unsupported_platforms!
     setup_rust_gem "rust_ruby_example"
 
-    content = @fixture_dir.join('Cargo.toml').read.gsub("cdylib", "staticlib")
-    File.write(File.join(@ext, 'Cargo.toml'), content)
+    content = @fixture_dir.join("Cargo.toml").read.gsub("cdylib", "staticlib")
+    File.write(File.join(@ext, "Cargo.toml"), content)
 
     output = []
 
     Dir.chdir @ext do
       ENV.update(@rust_envs)
-      spec = Gem::Specification.new 'rust_ruby_example', '0.1.0'
+      spec = Gem::Specification.new "rust_ruby_example", "0.1.0"
       builder = Gem::Ext::CargoBuilder.new(spec)
       assert_raise(Gem::Ext::CargoBuilder::DylibNotFoundError) do
         builder.build nil, @dest_path, output
@@ -49,7 +49,7 @@ class TestGemExtCargoBuilder < Gem::TestCase
 
     Dir.chdir @ext do
       ENV.update(@rust_envs)
-      spec = Gem::Specification.new 'rust_ruby_example', '0.1.0'
+      spec = Gem::Specification.new "rust_ruby_example", "0.1.0"
       builder = Gem::Ext::CargoBuilder.new(spec)
       builder.build nil, @dest_path, output
     end
@@ -58,7 +58,7 @@ class TestGemExtCargoBuilder < Gem::TestCase
     bundle = File.join(@dest_path, "release/rust_ruby_example.#{RbConfig::CONFIG['DLEXT']}")
 
     assert_match "Finished release [optimized] target(s)", output
-    assert_ffi_handle bundle, 'Init_rust_ruby_example'
+    assert_ffi_handle bundle, "Init_rust_ruby_example"
   rescue Exception => e
     pp output if output
 
@@ -73,7 +73,7 @@ class TestGemExtCargoBuilder < Gem::TestCase
 
     Dir.chdir @ext do
       ENV.update(@rust_envs)
-      spec = Gem::Specification.new 'rust_ruby_example', '0.1.0'
+      spec = Gem::Specification.new "rust_ruby_example", "0.1.0"
       builder = Gem::Ext::CargoBuilder.new(spec)
       builder.profile = :dev
       builder.build nil, @dest_path, output
@@ -83,7 +83,7 @@ class TestGemExtCargoBuilder < Gem::TestCase
     bundle = File.join(@dest_path, "debug/rust_ruby_example.#{RbConfig::CONFIG['DLEXT']}")
 
     assert_match "Finished dev [unoptimized + debuginfo] target(s)", output
-    assert_ffi_handle bundle, 'Init_rust_ruby_example'
+    assert_ffi_handle bundle, "Init_rust_ruby_example"
   rescue Exception => e
     pp output if output
 
@@ -96,12 +96,12 @@ class TestGemExtCargoBuilder < Gem::TestCase
 
     output = []
 
-    FileUtils.rm(File.join(@ext, 'src/lib.rs'))
+    FileUtils.rm(File.join(@ext, "src/lib.rs"))
 
     error = assert_raise(Gem::InstallError) do
       Dir.chdir @ext do
         ENV.update(@rust_envs)
-        spec = Gem::Specification.new 'rust_ruby_example', '0.1.0'
+        spec = Gem::Specification.new "rust_ruby_example", "0.1.0"
         builder = Gem::Ext::CargoBuilder.new(spec)
         builder.build nil, @dest_path, output
       end
@@ -109,20 +109,20 @@ class TestGemExtCargoBuilder < Gem::TestCase
 
     output = output.join "\n"
 
-    assert_match 'cargo failed', error.message
+    assert_match "cargo failed", error.message
   end
 
   def test_full_integration
     skip_unsupported_platforms!
     setup_rust_gem "rust_ruby_example"
 
-    require 'open3'
+    require "open3"
 
     Dir.chdir @ext do
-      require 'tmpdir'
+      require "tmpdir"
 
       env_for_subprocess = @rust_envs.merge("GEM_HOME" => Gem.paths.home)
-      gem = [env_for_subprocess, *ruby_with_rubygems_in_load_path, File.expand_path('../../bin/gem', __dir__)]
+      gem = [env_for_subprocess, *ruby_with_rubygems_in_load_path, File.expand_path("../../bin/gem", __dir__)]
 
       Dir.mktmpdir("rust_ruby_example") do |dir|
         built_gem = File.expand_path(File.join(dir, "rust_ruby_example.gem"))
@@ -141,10 +141,10 @@ class TestGemExtCargoBuilder < Gem::TestCase
     setup_rust_gem "custom_name"
 
     Dir.chdir @ext do
-      require 'tmpdir'
+      require "tmpdir"
 
       env_for_subprocess = @rust_envs.merge("GEM_HOME" => Gem.paths.home)
-      gem = [env_for_subprocess, *ruby_with_rubygems_in_load_path, File.expand_path('../../bin/gem', __dir__)]
+      gem = [env_for_subprocess, *ruby_with_rubygems_in_load_path, File.expand_path("../../bin/gem", __dir__)]
 
       Dir.mktmpdir("custom_name") do |dir|
         built_gem = File.expand_path(File.join(dir, "custom_name.gem"))
@@ -163,15 +163,15 @@ class TestGemExtCargoBuilder < Gem::TestCase
 
   def skip_unsupported_platforms!
     pend "jruby not supported" if java_platform?
-    pend "truffleruby not supported (yet)" if RUBY_ENGINE == 'truffleruby'
-    pend "mswin not supported (yet)" if /mswin/ =~ RUBY_PLATFORM && ENV.key?('GITHUB_ACTIONS')
-    system(@rust_envs, 'cargo', '-V', out: IO::NULL, err: [:child, :out])
-    pend 'cargo not present' unless $?.success?
+    pend "truffleruby not supported (yet)" if RUBY_ENGINE == "truffleruby"
+    pend "mswin not supported (yet)" if /mswin/ =~ RUBY_PLATFORM && ENV.key?("GITHUB_ACTIONS")
+    system(@rust_envs, "cargo", "-V", out: IO::NULL, err: [:child, :out])
+    pend "cargo not present" unless $?.success?
     pend "ruby.h is not provided by ruby repo" if ruby_repo?
   end
 
   def assert_ffi_handle(bundle, name)
-    require 'fiddle'
+    require "fiddle"
     dylib_handle = Fiddle.dlopen bundle
     assert_nothing_raised { dylib_handle[name] }
   end

data/test/rubygems/test_gem_ext_cargo_builder_link_flag_converter.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
-require_relative 'helper'
-require 'rubygems/ext'
-require 'rubygems/ext/cargo_builder/link_flag_converter'
+require_relative "helper"
+require "rubygems/ext"
+require "rubygems/ext/cargo_builder/link_flag_converter"
 
 class TestGemExtCargoBuilderLinkFlagConverter < Gem::TestCase
   CASES = {

data/test/rubygems/test_gem_ext_cargo_builder_unit.rb

@@ -1,72 +1,72 @@
 # frozen_string_literal: true
 
-require_relative 'helper'
-require 'rubygems/ext'
+require_relative "helper"
+require "rubygems/ext"
 
 class TestGemExtCargoBuilderUnit < Gem::TestCase
   def test_cargo_command_passes_args
     skip_unsupported_platforms!
-    spec = Gem::Specification.new 'rust_ruby_example', '0.1.0'
+    spec = Gem::Specification.new "rust_ruby_example", "0.1.0"
     builder = Gem::Ext::CargoBuilder.new(spec)
-    command = builder.cargo_command(Dir.pwd, @tempdir, ['--all-features'])
+    command = builder.cargo_command(Dir.pwd, @tempdir, ["--all-features"])
 
-    assert_includes command, '--all-features'
+    assert_includes command, "--all-features"
   end
 
   def test_cargo_command_locks_in_release_profile
     skip_unsupported_platforms!
-    spec = Gem::Specification.new 'rust_ruby_example', '0.1.0'
+    spec = Gem::Specification.new "rust_ruby_example", "0.1.0"
     builder = Gem::Ext::CargoBuilder.new(spec)
     builder.profile = :release
     command = builder.cargo_command(Dir.pwd, @tempdir)
 
-    assert_includes command, '--locked'
+    assert_includes command, "--locked"
   end
 
   def test_cargo_command_does_not_lock_in_dev_profile
     skip_unsupported_platforms!
-    spec = Gem::Specification.new 'rust_ruby_example', '0.1.0'
+    spec = Gem::Specification.new "rust_ruby_example", "0.1.0"
     builder = Gem::Ext::CargoBuilder.new(spec)
     builder.profile = :dev
     command = builder.cargo_command(Dir.pwd, @tempdir)
 
-    assert_not_includes command, '--locked'
+    assert_not_includes command, "--locked"
   end
 
   def test_cargo_command_passes_respects_cargo_env_var
     skip_unsupported_platforms!
-    old_cargo = ENV['CARGO']
-    ENV['CARGO'] = 'mycargo'
-    spec = Gem::Specification.new 'rust_ruby_example', '0.1.0'
+    old_cargo = ENV["CARGO"]
+    ENV["CARGO"] = "mycargo"
+    spec = Gem::Specification.new "rust_ruby_example", "0.1.0"
     builder = Gem::Ext::CargoBuilder.new(spec)
     command = builder.cargo_command(Dir.pwd, @tempdir)
 
-    assert_includes command, 'mycargo'
+    assert_includes command, "mycargo"
   ensure
-    ENV['CARGO'] = old_cargo
+    ENV["CARGO"] = old_cargo
   end
 
   def test_build_env_includes_rbconfig
     skip_unsupported_platforms!
-    spec = Gem::Specification.new 'rust_ruby_example', '0.1.0'
+    spec = Gem::Specification.new "rust_ruby_example", "0.1.0"
     builder = Gem::Ext::CargoBuilder.new(spec)
     env = builder.build_env
 
-    assert_equal env.fetch('RBCONFIG_RUBY_SO_NAME'), RbConfig::CONFIG['RUBY_SO_NAME']
+    assert_equal env.fetch("RBCONFIG_RUBY_SO_NAME"), RbConfig::CONFIG["RUBY_SO_NAME"]
   end
 
   def test_cargo_command_passes_respects_cargo_build_target
     skip_unsupported_platforms!
-    old_cargo = ENV['CARGO_BUILD_TARGET']
-    ENV['CARGO_BUILD_TARGET'] = 'x86_64-unknown-linux-gnu'
-    spec = Gem::Specification.new 'rust_ruby_example', '0.1.0'
+    old_cargo = ENV["CARGO_BUILD_TARGET"]
+    ENV["CARGO_BUILD_TARGET"] = "x86_64-unknown-linux-gnu"
+    spec = Gem::Specification.new "rust_ruby_example", "0.1.0"
     builder = Gem::Ext::CargoBuilder.new(spec)
-    command = builder.cargo_command(Dir.pwd, @tempdir, ['--locked'])
+    command = builder.cargo_command(Dir.pwd, @tempdir, ["--locked"])
 
-    assert_includes command, '--target'
-    assert_includes command, 'x86_64-unknown-linux-gnu'
+    assert_includes command, "--target"
+    assert_includes command, "x86_64-unknown-linux-gnu"
   ensure
-    ENV['CARGO_BUILD_TARGET'] = old_cargo
+    ENV["CARGO_BUILD_TARGET"] = old_cargo
   end
 
   def skip_unsupported_platforms!

data/test/rubygems/test_gem_ext_cmake_builder.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-require_relative 'helper'
-require 'rubygems/ext'
+require_relative "helper"
+require "rubygems/ext"
 
 class TestGemExtCmakeBuilder < Gem::TestCase
   def setup
@@ -12,21 +12,21 @@ class TestGemExtCmakeBuilder < Gem::TestCase
     require "open3"
 
     begin
-      _, status = Open3.capture2e('cmake')
-      pend 'cmake not present' unless status.success?
+      _, status = Open3.capture2e("cmake")
+      pend "cmake not present" unless status.success?
     rescue Errno::ENOENT
-      pend 'cmake not present'
+      pend "cmake not present"
     end
 
-    @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
   end
 
   def test_self_build
-    File.open File.join(@ext, 'CMakeLists.txt'), 'w' do |cmakelists|
+    File.open File.join(@ext, "CMakeLists.txt"), "w" do |cmakelists|
       cmakelists.write <<-EO_CMAKE
 cmake_minimum_required(VERSION 2.6)
 project(self_build NONE)
@@ -34,7 +34,7 @@ install (FILES test.txt DESTINATION bin)
       EO_CMAKE
     end
 
-    FileUtils.touch File.join(@ext, 'test.txt')
+    FileUtils.touch File.join(@ext, "test.txt")
 
     output = []
 
@@ -44,8 +44,8 @@ install (FILES test.txt DESTINATION bin)
 
     assert_match %r{^cmake \. -DCMAKE_INSTALL_PREFIX\\=#{Regexp.escape @dest_path}}, output
     assert_match %r{#{Regexp.escape @ext}}, output
-    assert_contains_make_command '', output
-    assert_contains_make_command 'install', output
+    assert_contains_make_command "", output
+    assert_contains_make_command "install", output
     assert_match %r{test\.txt}, output
   end
 
@@ -60,14 +60,14 @@ install (FILES test.txt DESTINATION bin)
 
     shell_error_msg = %r{(CMake Error: .*)}
 
-    assert_match 'cmake failed', error.message
+    assert_match "cmake failed", error.message
 
     assert_match %r{^cmake . -DCMAKE_INSTALL_PREFIX\\=#{Regexp.escape @dest_path}}, output
     assert_match %r{#{shell_error_msg}}, output
   end
 
   def test_self_build_has_makefile
-    File.open File.join(@ext, 'Makefile'), 'w' do |makefile|
+    File.open File.join(@ext, "Makefile"), "w" do |makefile|
       makefile.puts "all:\n\t@echo ok\ninstall:\n\t@echo ok"
     end
 
@@ -77,7 +77,7 @@ install (FILES test.txt DESTINATION bin)
 
     output = output.join "\n"
 
-    assert_contains_make_command '', output
-    assert_contains_make_command 'install', output
+    assert_contains_make_command "", output
+    assert_contains_make_command "install", output
   end
 end

data/test/rubygems/test_gem_ext_configure_builder.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-require_relative 'helper'
-require 'rubygems/ext'
+require_relative "helper"
+require "rubygems/ext"
 
 class TestGemExtConfigureBuilder < Gem::TestCase
   def setup
@@ -9,8 +9,8 @@ class TestGemExtConfigureBuilder < Gem::TestCase
     @makefile_body =
       "clean:\n\t@echo ok\nall:\n\t@echo ok\ninstall:\n\t@echo ok"
 
-    @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
@@ -19,7 +19,7 @@ class TestGemExtConfigureBuilder < Gem::TestCase
   def test_self_build
     pend("test_self_build skipped on MS Windows (VC++)") if vc_windows?
 
-    File.open File.join(@ext, './configure'), 'w' do |configure|
+    File.open File.join(@ext, "./configure"), "w" do |configure|
       configure.puts "#!/bin/sh\necho \"#{@makefile_body}\" > Makefile"
     end
 
@@ -31,13 +31,13 @@ class TestGemExtConfigureBuilder < Gem::TestCase
     assert_equal "sh ./configure --prefix\\=#{@dest_path}", output.shift
     assert_equal "", output.shift
     assert_match(/^current directory:/, output.shift)
-    assert_contains_make_command 'clean', output.shift
+    assert_contains_make_command "clean", output.shift
     assert_match(/^ok$/m, output.shift)
     assert_match(/^current directory:/, output.shift)
-    assert_contains_make_command '', output.shift
+    assert_contains_make_command "", output.shift
     assert_match(/^ok$/m, output.shift)
     assert_match(/^current directory:/, output.shift)
-    assert_contains_make_command 'install', output.shift
+    assert_contains_make_command "install", output.shift
     assert_match(/^ok$/m, output.shift)
   end
 
@@ -52,7 +52,7 @@ class TestGemExtConfigureBuilder < Gem::TestCase
     shell_error_msg = %r{(\./configure: .*)|((?:[Cc]an't|cannot) open '?\./configure'?(?:: No such file or directory)?)}
     sh_prefix_configure = "sh ./configure --prefix\\="
 
-    assert_match 'configure failed', error.message
+    assert_match "configure failed", error.message
 
     assert_match(/^current directory:/, output.shift)
     assert_equal "#{sh_prefix_configure}#{@dest_path}", output.shift
@@ -65,15 +65,15 @@ class TestGemExtConfigureBuilder < Gem::TestCase
       pend("test_self_build_has_makefile skipped - nmake not found")
     end
 
-    File.open File.join(@ext, 'Makefile'), 'w' do |makefile|
+    File.open File.join(@ext, "Makefile"), "w" do |makefile|
       makefile.puts @makefile_body
     end
 
     output = []
     Gem::Ext::ConfigureBuilder.build nil, @dest_path, output, [], nil, @ext
 
-    assert_contains_make_command 'clean', output[1]
-    assert_contains_make_command '', output[4]
-    assert_contains_make_command 'install', output[7]
+    assert_contains_make_command "clean", output[1]
+    assert_contains_make_command "", output[4]
+    assert_contains_make_command "install", output[7]
   end
 end