rubygems-update 3.3.26 → 3.4.1

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

@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "aho-corasick"
-version = "0.7.18"
+version = "0.7.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
+checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
 dependencies = [
  "memchr",
 ]
@@ -53,9 +53,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clang-sys"
-version = "1.3.3"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a050e2153c5be08febd6734e29298e844fdb0fa21aeddd63b4eb7baa106c69b"
+checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3"
 dependencies = [
  "glob",
  "libc",
@@ -82,29 +82,20 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.126"
+version = "0.2.138"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
+checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8"
 
 [[package]]
 name = "libloading"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd"
+checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
 dependencies = [
  "cfg-if",
  "winapi",
 ]
 
-[[package]]
-name = "linkify"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96dd5884008358112bc66093362197c7248ece00d46624e2cf71e50029f8cff5"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "memchr"
 version = "2.5.0"
@@ -135,48 +126,47 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.40"
+version = "1.0.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7"
+checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.20"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804"
+checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "rb-sys"
-version = "0.9.37"
+version = "0.9.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ba942b6777ea18ded013b267023a9c98994557e6539e43740de9e75084cb124"
+checksum = "02fffdb0162fc4cc1b6509b2d9b32a75f7e7ed392f58bde639e0c33b23e74b97"
 dependencies = [
  "rb-sys-build",
 ]
 
 [[package]]
 name = "rb-sys-build"
-version = "0.9.37"
+version = "0.9.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d35109e1a11ef8d1a988db242ab2ba2e80170f9f5a28f88ab30184a2cea8e09b"
+checksum = "85d1a236755f879fc155d16d9ba4cd3b1975fd52ef6a28113702ae3881b73c03"
 dependencies = [
  "bindgen",
- "linkify",
  "regex",
  "shell-words",
 ]
 
 [[package]]
 name = "regex"
-version = "1.5.6"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d83f127d94bdbcda4c8cc2e50f6f84f4b611f69c902699ca385a39c3a75f9ff1"
+checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -185,9 +175,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.26"
+version = "0.6.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64"
+checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
 
 [[package]]
 name = "rust_ruby_example"
@@ -216,9 +206,9 @@ checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.1"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c"
+checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
 
 [[package]]
 name = "winapi"

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 = "0.9.37"
+rb-sys = "0.9.52"

data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/src/lib.rs

@@ -21,6 +21,18 @@ unsafe extern "C" fn pub_reverse(_klass: VALUE, mut input: VALUE) -> VALUE {
     rb_utf8_str_new(reversed_cstring.as_ptr(), size)
 }
 
+#[cfg(rubygems)]
+#[no_mangle]
+pub extern "C" fn hello_from_rubygems() {}
+
+#[cfg(rubygems_0_0_0)]
+#[no_mangle]
+pub extern "C" fn should_never_exist() {}
+
+#[cfg(rubygems_x_x_x)]
+#[no_mangle]
+pub extern "C" fn hello_from_rubygems_version() {}
+
 #[allow(non_snake_case)]
 #[no_mangle]
 pub extern "C" fn Init_rust_ruby_example() {

data/test/rubygems/test_gem_ext_cargo_builder.rb

@@ -2,6 +2,7 @@
 
 require_relative "helper"
 require "rubygems/ext"
+require "open3"
 
 class TestGemExtCargoBuilder < Gem::TestCase
   def setup
@@ -22,25 +23,6 @@ class TestGemExtCargoBuilder < Gem::TestCase
     FileUtils.cp_r(@fixture_dir.to_s, @ext)
   end
 
-  def test_build_staticlib
-    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)
-
-    output = []
-
-    Dir.chdir @ext do
-      ENV.update(@rust_envs)
-      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
-      end
-    end
-  end
-
   def test_build_cdylib
     skip_unsupported_platforms!
     setup_rust_gem "rust_ruby_example"
@@ -57,7 +39,8 @@ class TestGemExtCargoBuilder < Gem::TestCase
     output = output.join "\n"
     bundle = File.join(@dest_path, "release/rust_ruby_example.#{RbConfig::CONFIG['DLEXT']}")
 
-    assert_match "Finished release [optimized] target(s)", output
+    assert_match(/Finished/, output)
+    assert_match(/release/, output)
     assert_ffi_handle bundle, "Init_rust_ruby_example"
   rescue Exception => e
     pp output if output
@@ -65,25 +48,27 @@ class TestGemExtCargoBuilder < Gem::TestCase
     raise(e)
   end
 
-  def test_build_dev_profile
+  def test_rubygems_cfg_passed_to_rustc
     skip_unsupported_platforms!
     setup_rust_gem "rust_ruby_example"
-
+    version_slug = Gem::VERSION.tr(".", "_")
     output = []
 
+    replace_in_rust_file("src/lib.rs", "rubygems_x_x_x", "rubygems_#{version_slug}")
+
     Dir.chdir @ext do
       ENV.update(@rust_envs)
       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
     end
 
     output = output.join "\n"
-    bundle = File.join(@dest_path, "debug/rust_ruby_example.#{RbConfig::CONFIG['DLEXT']}")
+    bundle = File.join(@dest_path, "release/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, "hello_from_rubygems"
+    assert_ffi_handle bundle, "hello_from_rubygems_version"
+    refute_ffi_handle bundle, "should_never_exist"
   rescue Exception => e
     pp output if output
 
@@ -164,7 +149,6 @@ 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 "ruby.h is not provided by ruby repo" if ruby_repo?
@@ -175,4 +159,15 @@ class TestGemExtCargoBuilder < Gem::TestCase
     dylib_handle = Fiddle.dlopen bundle
     assert_nothing_raised { dylib_handle[name] }
   end
+
+  def refute_ffi_handle(bundle, name)
+    require "fiddle"
+    dylib_handle = Fiddle.dlopen bundle
+    assert_raise { dylib_handle[name] }
+  end
+
+  def replace_in_rust_file(name, from, to)
+    content = @fixture_dir.join(name).read.gsub(from, to)
+    File.write(File.join(@ext, name), content)
+  end
 end

data/test/rubygems/test_gem_ext_cargo_builder_link_flag_converter.rb

@@ -5,22 +5,22 @@ require "rubygems/ext/cargo_builder/link_flag_converter"
 
 class TestGemExtCargoBuilderLinkFlagConverter < Gem::TestCase
   CASES = {
-    test_search_path_basic:             ["-L/usr/local/lib", ["-L", "native=/usr/local/lib"]],
-    test_search_path_space:             ["-L /usr/local/lib", ["-L", "native=/usr/local/lib"]],
-    test_search_path_space_in_path:     ["-L/usr/local/my\ lib", ["-L", "native=/usr/local/my\ lib"]],
-    test_simple_lib:                    ["-lfoo", ["-l", "foo"]],
-    test_lib_with_nonascii:             ["-lws2_32", ["-l", "ws2_32"]],
-    test_simple_lib_space:              ["-l foo", ["-l", "foo"]],
-    test_verbose_lib_space:             ["--library=foo", ["-l", "foo"]],
-    test_libstatic_with_colon:          ["-l:libssp.a", ["-l", "static=ssp"]],
-    test_libstatic_with_colon_space:    ["-l :libssp.a", ["-l", "static=ssp"]],
-    test_unconventional_lib_with_colon: ["-l:ssp.a", ["-C", "link_arg=-l:ssp.a"]],
-    test_dylib_with_colon_space:        ["-l :libssp.dylib", ["-l", "dylib=ssp"]],
-    test_so_with_colon_space:           ["-l :libssp.so", ["-l", "dylib=ssp"]],
-    test_dll_with_colon_space:          ["-l :libssp.dll", ["-l", "dylib=ssp"]],
-    test_framework:                     ["-F/some/path", ["-l", "framework=/some/path"]],
-    test_framework_space:               ["-F /some/path", ["-l", "framework=/some/path"]],
-    test_non_lib_dash_l:                ["test_rubygems_20220413-976-lemgf9/prefix", ["-C", "link_arg=test_rubygems_20220413-976-lemgf9/prefix"]],
+    test_search_path_basic: ["-L/usr/local/lib", ["-L", "native=/usr/local/lib"]],
+    test_search_path_space: ["-L /usr/local/lib", ["-L", "native=/usr/local/lib"]],
+    test_search_path_space_in_path: ["-L/usr/local/my\ lib", ["-L", "native=/usr/local/my\ lib"]],
+    test_simple_lib: ["-lfoo", ["-l", "foo"]],
+    test_lib_with_nonascii: ["-lws2_32", ["-l", "ws2_32"]],
+    test_simple_lib_space: ["-l foo", ["-l", "foo"]],
+    test_verbose_lib_space: ["--library=foo", ["-l", "foo"]],
+    test_libstatic_with_colon: ["-l:libssp.a", ["-C", "link-args=-l:libssp.a"]],
+    test_libstatic_with_colon_space: ["-l :libssp.a", ["-C", "link-args=-l :libssp.a"]],
+    test_unconventional_lib_with_colon: ["-l:ssp.a", ["-C", "link-args=-l:ssp.a"]],
+    test_dylib_with_colon_space: ["-l :libssp.dylib", ["-C", "link-args=-l :libssp.dylib"]],
+    test_so_with_colon_space: ["-l :libssp.so", ["-C", "link-args=-l :libssp.so"]],
+    test_dll_with_colon_space: ["-l :libssp.dll", ["-C", "link-args=-l :libssp.dll"]],
+    test_framework: ["-F/some/path", ["-l", "framework=/some/path"]],
+    test_framework_space: ["-F /some/path", ["-l", "framework=/some/path"]],
+    test_non_lib_dash_l: ["test_rubygems_20220413-976-lemgf9/prefix", ["-C", "link-args=test_rubygems_20220413-976-lemgf9/prefix"]],
   }.freeze
 
   CASES.each do |test_name, (arg, expected)|

data/test/rubygems/test_gem_ext_cargo_builder_unit.rb

@@ -23,16 +23,6 @@ class TestGemExtCargoBuilderUnit < Gem::TestCase
     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"
-    builder = Gem::Ext::CargoBuilder.new(spec)
-    builder.profile = :dev
-    command = builder.cargo_command(Dir.pwd, @tempdir)
-
-    assert_not_includes command, "--locked"
-  end
-
   def test_cargo_command_passes_respects_cargo_env_var
     skip_unsupported_platforms!
     old_cargo = ENV["CARGO"]

data/test/rubygems/test_gem_indexer.rb

@@ -31,15 +31,33 @@ class TestGemIndexer < Gem::TestCase
     @indexer = Gem::Indexer.new(@indexerdir)
   end
 
+  def teardown
+    FileUtils.rm_rf(@indexer.directory)
+  ensure
+    super
+  end
+
+  def with_indexer(dir, **opts)
+    indexer = Gem::Indexer.new(dir, **opts)
+    build_directory = indexer.directory
+    yield indexer
+  ensure
+    FileUtils.rm_rf(build_directory) if build_directory
+  end
+
   def test_initialize
     assert_equal @indexerdir, @indexer.dest_directory
-    assert_match %r{#{Dir.mktmpdir('gem_generate_index').match(/.*-/)}}, @indexer.directory
+    Dir.mktmpdir("gem_generate_index") do |tmpdir|
+      assert_match %r{#{tmpdir.match(/.*-/)}}, @indexer.directory
+    end
 
-    indexer = Gem::Indexer.new @indexerdir
-    assert indexer.build_modern
+    with_indexer(@indexerdir) do |indexer|
+      assert_predicate indexer, :build_modern
+    end
 
-    indexer = Gem::Indexer.new @indexerdir, :build_modern => true
-    assert indexer.build_modern
+    with_indexer(@indexerdir, :build_modern => true) do |indexer|
+      assert_predicate indexer, :build_modern
+    end
   end
 
   def test_build_indices
@@ -159,26 +177,27 @@ class TestGemIndexer < Gem::TestCase
       @indexer.generate_index
     end
 
-    @indexer = Gem::Indexer.new @indexerdir
-    @indexer.build_modern = true
+    with_indexer @indexerdir do |indexer|
+      indexer.build_modern = true
 
-    use_ui @ui do
-      @indexer.generate_index
-    end
-    quickdir = File.join @indexerdir, "quick"
-    marshal_quickdir = File.join quickdir, "Marshal.#{@marshal_version}"
+      use_ui @ui do
+        indexer.generate_index
+      end
+      quickdir = File.join @indexerdir, "quick"
+      marshal_quickdir = File.join quickdir, "Marshal.#{@marshal_version}"
 
-    assert_directory_exists quickdir
-    assert_directory_exists marshal_quickdir
+      assert_directory_exists quickdir
+      assert_directory_exists marshal_quickdir
 
-    assert_indexed marshal_quickdir, "#{File.basename(@a1.spec_file)}.rz"
-    assert_indexed marshal_quickdir, "#{File.basename(@a2.spec_file)}.rz"
+      assert_indexed marshal_quickdir, "#{File.basename(@a1.spec_file)}.rz"
+      assert_indexed marshal_quickdir, "#{File.basename(@a2.spec_file)}.rz"
 
-    assert_indexed @indexerdir, "specs.#{@marshal_version}"
-    assert_indexed @indexerdir, "specs.#{@marshal_version}.gz"
+      assert_indexed @indexerdir, "specs.#{@marshal_version}"
+      assert_indexed @indexerdir, "specs.#{@marshal_version}.gz"
 
-    assert_indexed @indexerdir, "latest_specs.#{@marshal_version}"
-    assert_indexed @indexerdir, "latest_specs.#{@marshal_version}.gz"
+      assert_indexed @indexerdir, "latest_specs.#{@marshal_version}"
+      assert_indexed @indexerdir, "latest_specs.#{@marshal_version}.gz"
+    end
   end
 
   def test_generate_index_ui

data/test/rubygems/test_gem_installer.rb

@@ -1493,7 +1493,7 @@ gem 'other', version
 
   def test_install_extension_and_script
     pend "Makefile creation crashes on jruby" if Gem.java_platform?
-    pend if /mswin/ =~ RUBY_PLATFORM && ENV.key?("GITHUB_ACTIONS") # not working from the beginning
+    pend if RUBY_PLATFORM.include?("mswin") && ENV.key?("GITHUB_ACTIONS") # not working from the beginning
 
     @spec = setup_base_spec
     @spec.extensions << "extconf.rb"
@@ -1559,7 +1559,7 @@ gem 'other', version
         write_file File.join(@tempdir, file)
       end
 
-      so = File.join(@spec.gem_dir, "#{@spec.name}.#{RbConfig::CONFIG["DLEXT"]}")
+      so = File.join(@spec.extension_dir, "#{@spec.name}.#{RbConfig::CONFIG["DLEXT"]}")
       assert_path_not_exist so
       use_ui @ui do
         path = Gem::Package.build @spec
@@ -1584,6 +1584,41 @@ gem 'other', version
     end
   end
 
+  def test_install_extension_clean_intermediate_files
+    pend "extensions don't quite work on jruby" if Gem.java_platform?
+    @spec = setup_base_spec
+    @spec.require_paths = ["."]
+    @spec.extensions << "extconf.rb"
+
+    File.write File.join(@tempdir, "extconf.rb"), <<-RUBY
+      require "mkmf"
+      CONFIG['CC'] = '$(TOUCH) $@ ||'
+      CONFIG['LDSHARED'] = '$(TOUCH) $@ ||'
+      $ruby = '#{Gem.ruby}'
+      create_makefile("#{@spec.name}")
+    RUBY
+
+    # empty depend file for no auto dependencies
+    @spec.files += %W[depend #{@spec.name}.c].each do |file|
+      write_file File.join(@tempdir, file)
+    end
+
+    shared_object = "#{@spec.name}.#{RbConfig::CONFIG["DLEXT"]}"
+    extension_file = File.join @spec.extension_dir, shared_object
+    intermediate_file = File.join @spec.gem_dir, shared_object
+
+    assert_path_not_exist extension_file, "no before installing"
+    use_ui @ui do
+      path = Gem::Package.build @spec
+
+      installer = Gem::Installer.at path
+      installer.install
+    end
+
+    assert_path_exist extension_file, "installed"
+    assert_path_not_exist intermediate_file
+  end
+
   def test_installation_satisfies_dependency_eh
     installer = setup_base_installer
 
@@ -2222,6 +2257,37 @@ gem 'other', version
     assert_equal @spec, eval(File.read(@spec.spec_file))
   end
 
+  def test_leaves_no_empty_cached_spec_when_no_more_disk_space
+    @spec = setup_base_spec
+    FileUtils.rm @spec.spec_file
+    assert_path_not_exist @spec.spec_file
+
+    @spec.files = %w[a.rb b.rb c.rb]
+
+    installer = Gem::Installer.for_spec @spec
+    installer.gem_home = @gemhome
+
+    File.class_eval do
+      alias_method :original_write, :write
+
+      def write(data)
+        raise Errno::ENOSPC
+      end
+    end
+
+    assert_raise Errno::ENOSPC do
+      installer.write_spec
+    end
+
+    assert_path_not_exist @spec.spec_file
+  ensure
+    File.class_eval do
+      remove_method :write
+      alias_method :write, :original_write # rubocop:disable Lint/DuplicateMethods
+      remove_method :original_write
+    end
+  end
+
   def test_dir
     installer = setup_base_installer
 

data/test/rubygems/test_gem_package_tar_header.rb

@@ -7,19 +7,19 @@ class TestGemPackageTarHeader < Gem::Package::TarTestCase
     super
 
     header = {
-      :name     => "x",
-      :mode     => 0644,
-      :uid      => 1000,
-      :gid      => 10000,
-      :size     => 100,
-      :mtime    => 12345,
+      :name => "x",
+      :mode => 0644,
+      :uid => 1000,
+      :gid => 10000,
+      :size => 100,
+      :mtime => 12345,
       :typeflag => "0",
       :linkname => "link",
-      :uname    => "user",
-      :gname    => "group",
+      :uname => "user",
+      :gname => "group",
       :devmajor => 1,
       :devminor => 2,
-      :prefix   => "y",
+      :prefix => "y",
     }
 
     @tar_header = Gem::Package::TarHeader.new header
@@ -76,10 +76,10 @@ class TestGemPackageTarHeader < Gem::Package::TarTestCase
 
   def test_initialize_typeflag
     header = {
-      :mode     => "",
-      :name     => "",
-      :prefix   => "",
-      :size     => "",
+      :mode => "",
+      :name => "",
+      :prefix => "",
+      :size => "",
       :typeflag => "",
     }