Merge RubyGems-3.4.18 and Bundler-2.4.18

ruby · Aug 18, 2023 · af007a3 · af007a3
1 parent 05f13db
commit af007a3
Show file tree

Hide file tree

Showing 308 changed files with 3,967 additions and 545 deletions.
diff --git a/lib/bundler/man/bundle-outdated.1 b/lib/bundler/man/bundle-outdated.1
@@ -83,9 +83,10 @@ If the regular output shows the following:
 .
 .nf
 
-* faker (newest 1\.6\.6, installed 1\.6\.5, requested ~> 1\.4) in groups "development, test"
-* hashie (newest 3\.4\.6, installed 1\.2\.0, requested = 1\.2\.0) in groups "default"
-* headless (newest 2\.3\.1, installed 2\.2\.3) in groups "test"
+* Gem       Current  Latest  Requested  Groups
+* faker     1\.6\.5    1\.6\.6   ~> 1\.4     development, test
+* hashie    1\.2\.0    3\.4\.6   = 1\.2\.0    default
+* headless  2\.2\.3    2\.3\.1   = 2\.2\.3    test
 .
 .fi
 .
@@ -98,7 +99,8 @@ If the regular output shows the following:
 .
 .nf
 
-* hashie (newest 3\.4\.6, installed 1\.2\.0, requested = 1\.2\.0) in groups "default"
+* Gem       Current  Latest  Requested  Groups
+* hashie    1\.2\.0    3\.4\.6   = 1\.2\.0    default
 .
 .fi
 .
@@ -111,7 +113,8 @@ If the regular output shows the following:
 .
 .nf
 
-* headless (newest 2\.3\.1, installed 2\.2\.3) in groups "test"
+* Gem       Current  Latest  Requested  Groups
+* headless  2\.2\.3    2\.3\.1   = 2\.2\.3    test
 .
 .fi
 .
@@ -124,7 +127,8 @@ If the regular output shows the following:
 .
 .nf
 
-* faker (newest 1\.6\.6, installed 1\.6\.5, requested ~> 1\.4) in groups "development, test"
+* Gem       Current  Latest  Requested  Groups
+* faker     1\.6\.5    1\.6\.6   ~> 1\.4     development, test
 .
 .fi
 .
@@ -137,8 +141,8 @@ Filter options can be combined\. \fB\-\-filter\-minor\fR and \fB\-\-filter\-patc
 .
 .nf
 
-* faker (newest 1\.6\.6, installed 1\.6\.5, requested ~> 1\.4) in groups "development, test"
-* headless (newest 2\.3\.1, installed 2\.2\.3) in groups "test"
+* Gem       Current  Latest  Requested  Groups
+* faker     1\.6\.5    1\.6\.6   ~> 1\.4     development, test
 .
 .fi
 .

diff --git a/lib/bundler/man/bundle-outdated.1.ronn b/lib/bundler/man/bundle-outdated.1.ronn
@@ -78,25 +78,28 @@ in the output.
 
 If the regular output shows the following:
 
-    * faker (newest 1.6.6, installed 1.6.5, requested ~> 1.4) in groups "development, test"
-    * hashie (newest 3.4.6, installed 1.2.0, requested = 1.2.0) in groups "default"
-    * headless (newest 2.3.1, installed 2.2.3) in groups "test"
+    * Gem       Current  Latest  Requested  Groups
+    * faker     1.6.5    1.6.6   ~> 1.4     development, test
+    * hashie    1.2.0    3.4.6   = 1.2.0    default
+    * headless  2.2.3    2.3.1   = 2.2.3    test
 
 `--filter-major` would only show:
 
-    * hashie (newest 3.4.6, installed 1.2.0, requested = 1.2.0) in groups "default"
+    * Gem       Current  Latest  Requested  Groups
+    * hashie    1.2.0    3.4.6   = 1.2.0    default
 
 `--filter-minor` would only show:
 
-    * headless (newest 2.3.1, installed 2.2.3) in groups "test"
+    * Gem       Current  Latest  Requested  Groups
+    * headless  2.2.3    2.3.1   = 2.2.3    test
 
 `--filter-patch` would only show:
 
-    * faker (newest 1.6.6, installed 1.6.5, requested ~> 1.4) in groups "development, test"
+    * Gem       Current  Latest  Requested  Groups
+    * faker     1.6.5    1.6.6   ~> 1.4     development, test
 
 Filter options can be combined. `--filter-minor` and `--filter-patch` would show:
 
-    * faker (newest 1.6.6, installed 1.6.5, requested ~> 1.4) in groups "development, test"
-    * headless (newest 2.3.1, installed 2.2.3) in groups "test"
-
+    * Gem       Current  Latest  Requested  Groups
+    * faker     1.6.5    1.6.6   ~> 1.4     development, test
 Combining all three `filter` options would be the same result as providing none of them.
diff --git a/lib/bundler/templates/newgem/ext/newgem/Cargo.toml.tt b/lib/bundler/templates/newgem/ext/newgem/Cargo.toml.tt
@@ -12,4 +12,4 @@ publish = false
 crate-type = ["cdylib"]
 
 [dependencies]
-magnus = { version = "0.4" }
+magnus = { version = "0.6" }
diff --git a/lib/bundler/templates/newgem/ext/newgem/src/lib.rs.tt b/lib/bundler/templates/newgem/ext/newgem/src/lib.rs.tt
@@ -1,12 +1,12 @@
-use magnus::{define_module, function, prelude::*, Error};
+use magnus::{function, prelude::*, Error, Ruby};
 
 fn hello(subject: String) -> String {
-    format!("Hello from Rust, {}!", subject)
+    format!("Hello from Rust, {subject}!")
 }
 
 #[magnus::init]
-fn init() -> Result<(), Error> {
-    let module = <%= config[:constant_array].map {|c| "define_module(#{c.dump})?"}.join(".") %>;
+fn init(ruby: &Ruby) -> Result<(), Error> {
+    let module = ruby.<%= config[:constant_array].map {|c| "define_module(#{c.dump})?"}.join(".") %>;
     module.define_singleton_method("hello", function!(hello, 1))?;
     Ok(())
 }
diff --git a/lib/bundler/vendor/fileutils/lib/fileutils.rb b/lib/bundler/vendor/fileutils/lib/fileutils.rb
@@ -3,7 +3,7 @@
 begin
   require 'rbconfig'
 rescue LoadError
-  # for make mjit-headers
+  # for make rjit-headers
 end
 
 # Namespace for file utility methods for copying, moving, removing, etc.

diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 
 module Bundler
-  VERSION = "2.4.17".freeze
+  VERSION = "2.4.18".freeze
 
   def self.bundler_major_version
     @bundler_major_version ||= VERSION.split(".").first.to_i

diff --git a/lib/rubygems.rb b/lib/rubygems.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 #--
 # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
 # All rights reserved.
@@ -8,7 +9,7 @@
 require "rbconfig"
 
 module Gem
-  VERSION = "3.4.17"
+  VERSION = "3.4.18"
 end
 
 # Must be first since it unloads the prelude from 1.9.2

diff --git a/lib/rubygems/available_set.rb b/lib/rubygems/available_set.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Gem::AvailableSet
   include Enumerable
 

diff --git a/lib/rubygems/basic_specification.rb b/lib/rubygems/basic_specification.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 ##
 # BasicSpecification is an abstract class which implements some common code
 # used by both Specification and StubSpecification.

diff --git a/lib/rubygems/command.rb b/lib/rubygems/command.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 #--
 # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
 # All rights reserved.

diff --git a/lib/rubygems/command_manager.rb b/lib/rubygems/command_manager.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 #--
 # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
 # All rights reserved.

diff --git a/lib/rubygems/commands/build_command.rb b/lib/rubygems/commands/build_command.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../command"
 require_relative "../package"
 require_relative "../version_option"

diff --git a/lib/rubygems/commands/cert_command.rb b/lib/rubygems/commands/cert_command.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../command"
 require_relative "../security"
 

diff --git a/lib/rubygems/commands/check_command.rb b/lib/rubygems/commands/check_command.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../command"
 require_relative "../version_option"
 require_relative "../validator"

diff --git a/lib/rubygems/commands/cleanup_command.rb b/lib/rubygems/commands/cleanup_command.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../command"
 require_relative "../dependency_list"
 require_relative "../uninstaller"

diff --git a/lib/rubygems/commands/contents_command.rb b/lib/rubygems/commands/contents_command.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../command"
 require_relative "../version_option"
 

diff --git a/lib/rubygems/commands/dependency_command.rb b/lib/rubygems/commands/dependency_command.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../command"
 require_relative "../local_remote_options"
 require_relative "../version_option"

diff --git a/lib/rubygems/commands/environment_command.rb b/lib/rubygems/commands/environment_command.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../command"
 
 class Gem::Commands::EnvironmentCommand < Gem::Command

diff --git a/lib/rubygems/commands/exec_command.rb b/lib/rubygems/commands/exec_command.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../command"
 require_relative "../dependency_installer"
 require_relative "../gem_runner"

diff --git a/lib/rubygems/commands/fetch_command.rb b/lib/rubygems/commands/fetch_command.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../command"
 require_relative "../local_remote_options"
 require_relative "../version_option"

diff --git a/lib/rubygems/commands/generate_index_command.rb b/lib/rubygems/commands/generate_index_command.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../command"
 require_relative "../indexer"
 

diff --git a/lib/rubygems/commands/help_command.rb b/lib/rubygems/commands/help_command.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../command"
 
 class Gem::Commands::HelpCommand < Gem::Command

diff --git a/lib/rubygems/commands/install_command.rb b/lib/rubygems/commands/install_command.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../command"
 require_relative "../install_update_options"
 require_relative "../dependency_installer"

diff --git a/lib/rubygems/commands/list_command.rb b/lib/rubygems/commands/list_command.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../command"
 require_relative "../query_utils"
 

diff --git a/lib/rubygems/commands/lock_command.rb b/lib/rubygems/commands/lock_command.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../command"
 
 class Gem::Commands::LockCommand < Gem::Command

diff --git a/lib/rubygems/commands/mirror_command.rb b/lib/rubygems/commands/mirror_command.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../command"
 
 unless defined? Gem::Commands::MirrorCommand

diff --git a/lib/rubygems/commands/open_command.rb b/lib/rubygems/commands/open_command.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../command"
 require_relative "../version_option"
 

diff --git a/lib/rubygems/commands/outdated_command.rb b/lib/rubygems/commands/outdated_command.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../command"
 require_relative "../local_remote_options"
 require_relative "../spec_fetcher"

diff --git a/lib/rubygems/commands/owner_command.rb b/lib/rubygems/commands/owner_command.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../command"
 require_relative "../local_remote_options"
 require_relative "../gemcutter_utilities"

diff --git a/lib/rubygems/commands/pristine_command.rb b/lib/rubygems/commands/pristine_command.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../command"
 require_relative "../package"
 require_relative "../installer"

diff --git a/lib/rubygems/commands/push_command.rb b/lib/rubygems/commands/push_command.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../command"
 require_relative "../local_remote_options"
 require_relative "../gemcutter_utilities"

diff --git a/lib/rubygems/commands/query_command.rb b/lib/rubygems/commands/query_command.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../command"
 require_relative "../query_utils"
 require_relative "../deprecate"

diff --git a/lib/rubygems/commands/rdoc_command.rb b/lib/rubygems/commands/rdoc_command.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../command"
 require_relative "../version_option"
 require_relative "../rdoc"

diff --git a/lib/rubygems/commands/search_command.rb b/lib/rubygems/commands/search_command.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../command"
 require_relative "../query_utils"
 

diff --git a/lib/rubygems/commands/server_command.rb b/lib/rubygems/commands/server_command.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../command"
 
 unless defined? Gem::Commands::ServerCommand

diff --git a/lib/rubygems/commands/setup_command.rb b/lib/rubygems/commands/setup_command.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../command"
 
 ##
@@ -244,7 +245,7 @@ def execute
   def install_executables(bin_dir)
     prog_mode = options[:prog_mode] || 0755
 
-    executables = { "gem" => "bin" }
+    executables = { "gem" => "exe" }
     executables.each do |tool, path|
       say "Installing #{tool} executable" if @verbose
 

diff --git a/lib/rubygems/commands/signin_command.rb b/lib/rubygems/commands/signin_command.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../command"
 require_relative "../gemcutter_utilities"
 

diff --git a/lib/rubygems/commands/signout_command.rb b/lib/rubygems/commands/signout_command.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../command"
 
 class Gem::Commands::SignoutCommand < Gem::Command

diff --git a/lib/rubygems/commands/sources_command.rb b/lib/rubygems/commands/sources_command.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../command"
 require_relative "../remote_fetcher"
 require_relative "../spec_fetcher"

diff --git a/lib/rubygems/commands/specification_command.rb b/lib/rubygems/commands/specification_command.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../command"
 require_relative "../local_remote_options"
 require_relative "../version_option"

diff --git a/lib/rubygems/commands/stale_command.rb b/lib/rubygems/commands/stale_command.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../command"
 
 class Gem::Commands::StaleCommand < Gem::Command

diff --git a/lib/rubygems/commands/uninstall_command.rb b/lib/rubygems/commands/uninstall_command.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../command"
 require_relative "../version_option"
 require_relative "../uninstaller"

diff --git a/lib/rubygems/commands/unpack_command.rb b/lib/rubygems/commands/unpack_command.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../command"
 require_relative "../version_option"
 require_relative "../security_option"

diff --git a/lib/rubygems/commands/update_command.rb b/lib/rubygems/commands/update_command.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../command"
 require_relative "../command_manager"
 require_relative "../dependency_installer"

diff --git a/lib/rubygems/commands/which_command.rb b/lib/rubygems/commands/which_command.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../command"
 
 class Gem::Commands::WhichCommand < Gem::Command

diff --git a/lib/rubygems/commands/yank_command.rb b/lib/rubygems/commands/yank_command.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../command"
 require_relative "../local_remote_options"
 require_relative "../version_option"

diff --git a/lib/rubygems/config_file.rb b/lib/rubygems/config_file.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 #--
 # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
 # All rights reserved.