rubygems-update 3.4.21 → 3.4.22

data/lib/rubygems/util/licenses.rb

@@ -45,6 +45,7 @@ class Gem::Licenses
     AdaCore-doc
     Adobe-2006
     Adobe-Glyph
+    Adobe-Utopia
     Afmparse
     Aladdin
     Apache-1.0
@@ -65,6 +66,7 @@ class Gem::Licenses
     BSD-3-Clause
     BSD-3-Clause-Attribution
     BSD-3-Clause-Clear
+    BSD-3-Clause-HP
     BSD-3-Clause-LBNL
     BSD-3-Clause-Modification
     BSD-3-Clause-No-Military-License
@@ -72,6 +74,8 @@ class Gem::Licenses
     BSD-3-Clause-No-Nuclear-License-2014
     BSD-3-Clause-No-Nuclear-Warranty
     BSD-3-Clause-Open-MPI
+    BSD-3-Clause-Sun
+    BSD-3-Clause-flex
     BSD-4-Clause
     BSD-4-Clause-Shortened
     BSD-4-Clause-UC
@@ -79,8 +83,10 @@ class Gem::Licenses
     BSD-4.3TAHOE
     BSD-Advertising-Acknowledgement
     BSD-Attribution-HPND-disclaimer
+    BSD-Inferno-Nettverk
     BSD-Protection
     BSD-Source-Code
+    BSD-Systemics
     BSL-1.0
     BUSL-1.1
     Baekmuk
@@ -184,11 +190,13 @@ class Gem::Licenses
     Community-Spec-1.0
     Condor-1.1
     Cornell-Lossless-JPEG
+    Cronyx
     Crossword
     CrystalStacker
     Cube
     D-FSL-1.0
     DL-DE-BY-2.0
+    DL-DE-ZERO-2.0
     DOC
     DRL-1.0
     DSDP
@@ -208,6 +216,7 @@ class Gem::Licenses
     Entessa
     ErlPL-1.1
     Eurosym
+    FBM
     FDK-AAC
     FSFAP
     FSFUL
@@ -215,9 +224,11 @@ class Gem::Licenses
     FSFULLRWD
     FTL
     Fair
+    Ferguson-Twofish
     Frameworx-1.0
     FreeBSD-DOC
     FreeImage
+    Furuseth
     GD
     GFDL-1.1
     GFDL-1.1-invariants-only
@@ -266,9 +277,17 @@ class Gem::Licenses
     Glulxe
     Graphics-Gems
     HP-1986
+    HP-1989
     HPND
+    HPND-DEC
     HPND-Markus-Kuhn
+    HPND-Pbmplus
+    HPND-UC
+    HPND-doc
+    HPND-doc-sell
     HPND-export-US
+    HPND-export-US-modify
+    HPND-sell-regexpr
     HPND-sell-variant
     HPND-sell-variant-MIT-disclaimer
     HTMLTIDY
@@ -294,6 +313,7 @@ class Gem::Licenses
     JSON
     Jam
     JasPer-2.0
+    Kastrup
     Kazlib
     Knuth-CTAN
     LAL-1.2
@@ -333,6 +353,7 @@ class Gem::Licenses
     Linux-man-pages-copyleft
     Linux-man-pages-copyleft-2-para
     Linux-man-pages-copyleft-var
+    Lucida-Bitmap-Fonts
     MIT
     MIT-0
     MIT-CMU
@@ -343,7 +364,10 @@ class Gem::Licenses
     MIT-enna
     MIT-feh
     MIT-open-group
+    MIT-testregex
     MITNFA
+    MMIXware
+    MPEG-SSG
     MPL-1.0
     MPL-1.1
     MPL-2.0
@@ -354,6 +378,7 @@ class Gem::Licenses
     MTLL
     MakeIndex
     Martin-Birgmeier
+    McPhee-slideshow
     Minpack
     MirOS
     Motosoto
@@ -436,6 +461,7 @@ class Gem::Licenses
     OSL-3.0
     OpenPBS-2.3
     OpenSSL
+    PADL
     PDDL-1.0
     PHP-3.0
     PHP-3.01
@@ -464,11 +490,13 @@ class Gem::Licenses
     SGI-B-1.0
     SGI-B-1.1
     SGI-B-2.0
+    SGI-OpenGL
     SGP4
     SHL-0.5
     SHL-0.51
     SISSL
     SISSL-1.2
+    SL
     SMLNJ
     SMPPL
     SNIA
@@ -483,6 +511,7 @@ class Gem::Licenses
     Sendmail-8.23
     SimPL-2.0
     Sleepycat
+    Soundex
     Spencer-86
     Spencer-94
     Spencer-99
@@ -499,12 +528,14 @@ class Gem::Licenses
     TPDL
     TPL-1.0
     TTWL
+    TTYP0
     TU-Berlin-1.0
     TU-Berlin-2.0
     TermReadKey
     UCAR
     UCL-1.0
     UPL-1.0
+    URT-RLE
     Unicode-DFS-2015
     Unicode-DFS-2016
     Unicode-TOU
@@ -534,6 +565,7 @@ class Gem::Licenses
     ZPL-2.0
     ZPL-2.1
     Zed
+    Zeeff
     Zend-2.0
     Zimbra-1.3
     Zimbra-1.4
@@ -541,6 +573,7 @@ class Gem::Licenses
     blessing
     bzip2-1.0.5
     bzip2-1.0.6
+    check-cvs
     checkmk
     copyleft-next-0.3.0
     copyleft-next-0.3.1
@@ -551,6 +584,7 @@ class Gem::Licenses
     eCos-2.0
     eGenix
     etalab-2.0
+    fwlw
     gSOAP-1.3b
     gnuplot
     iMatix
@@ -558,13 +592,20 @@ class Gem::Licenses
     libselinux-1.0
     libtiff
     libutil-David-Nugent
+    lsof
+    magaz
     metamail
     mpi-permissive
     mpich2
     mplus
+    pnmstitch
     psfrag
     psutils
+    python-ldap
     snprintf
+    ssh-keyscan
+    swrule
+    ulem
     w3m
     wxWindows
     xinetd
@@ -580,6 +621,7 @@ class Gem::Licenses
     Autoconf-exception-2.0
     Autoconf-exception-3.0
     Autoconf-exception-generic
+    Autoconf-exception-generic-3.0
     Autoconf-exception-macro
     Bison-exception-2.2
     Bootloader-exception
@@ -590,8 +632,10 @@ class Gem::Licenses
     Fawkes-Runtime-exception
     Font-exception-2.0
     GCC-exception-2.0
+    GCC-exception-2.0-note
     GCC-exception-3.1
     GNAT-exception
+    GNU-compiler-exception
     GPL-3.0-interface-exception
     GPL-3.0-linking-exception
     GPL-3.0-linking-source-exception
@@ -614,10 +658,13 @@ class Gem::Licenses
     Qt-GPL-exception-1.0
     Qt-LGPL-exception-1.1
     Qwt-exception-1.0
+    SANE-exception
     SHL-2.0
     SHL-2.1
     SWI-exception
     Swift-exception
+    Texinfo-exception
+    UBDL-exception
     Universal-FOSS-exception-1.0
     WxWindows-exception-3.1
     cryptsetup-OpenSSL-exception
@@ -628,6 +675,7 @@ class Gem::Licenses
     libpri-OpenH323-exception
     mif-exception
     openvpn-openssl-exception
+    stunnel-exception
     u-boot-exception-2.0
     vsftpd-openssl-exception
     x11vnc-openssl-exception

data/lib/rubygems/validator.rb

@@ -108,7 +108,7 @@ class Gem::Validator
           end
 
           good.each do |entry, data|
-            next unless data # HACK `gem check -a mkrf`
+            next unless data # HACK: `gem check -a mkrf`
 
             source = File.join gem_directory, entry["path"]
 

data/lib/rubygems/version.rb

@@ -377,7 +377,7 @@ class Gem::Version
       return lhs <=> rhs
     end
 
-    return 0
+    0
   end
 
   def canonical_segments
@@ -405,7 +405,7 @@ class Gem::Version
     # since this version object is cached in @@all, its @segments should be frozen
 
     @segments ||= @version.scan(/[0-9]+|[a-z]+/i).map do |s|
-      /^\d+$/ =~ s ? s.to_i : s
+      /^\d+$/.match?(s) ? s.to_i : s
     end.freeze
   end
 
@@ -413,6 +413,6 @@ class Gem::Version
     string_start = _segments.index {|s| s.is_a?(String) }
     string_segments = segments
     numeric_segments = string_segments.slice!(0, string_start || string_segments.size)
-    return numeric_segments, string_segments
+    [numeric_segments, string_segments]
   end
 end

data/lib/rubygems/yaml_serializer.rb

@@ -17,7 +17,11 @@ module Gem
         if v.is_a?(Hash)
           yaml << dump_hash(v).gsub(/^(?!$)/, "  ") # indent all non-empty lines
         elsif v.is_a?(Array) # Expected to be array of strings
-          yaml << "\n- " << v.map {|s| s.to_s.gsub(/\s+/, " ").inspect }.join("\n- ") << "\n"
+          if v.empty?
+            yaml << " []\n"
+          else
+            yaml << "\n- " << v.map {|s| s.to_s.gsub(/\s+/, " ").inspect }.join("\n- ") << "\n"
+          end
         else
           yaml << " " << v.to_s.gsub(/\s+/, " ").inspect << "\n"
         end
@@ -63,6 +67,7 @@ module Gem
             last_empty_key = key
             last_hash = stack[depth]
           else
+            val = [] if val == "[]" # empty array
             stack[depth][key] = val
           end
         elsif match = ARRAY_REGEX.match(line)

data/lib/rubygems.rb

@@ -9,7 +9,7 @@
 require "rbconfig"
 
 module Gem
-  VERSION = "3.4.21"
+  VERSION = "3.4.22"
 end
 
 # Must be first since it unloads the prelude from 1.9.2
@@ -211,7 +211,7 @@ module Gem
       end
     end
 
-    return true
+    true
   end
 
   def self.needs
@@ -499,7 +499,7 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
     # the spec dirs directly, so we prune.
     files.uniq! if check_load_path
 
-    return files
+    files
   end
 
   def self.find_files_from_load_path(glob) # :nodoc:
@@ -534,7 +534,7 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
     # the spec dirs directly, so we prune.
     files.uniq! if check_load_path
 
-    return files
+    files
   end
 
   ##
@@ -809,7 +809,7 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
     if @ruby.nil?
       @ruby = RbConfig.ruby
 
-      @ruby = "\"#{@ruby}\"" if @ruby =~ /\s/
+      @ruby = "\"#{@ruby}\"" if /\s/.match?(@ruby)
     end
 
     @ruby
@@ -1023,7 +1023,7 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
       # Skip older versions of the GemCutter plugin: Its commands are in
       # RubyGems proper now.
 
-      next if plugin =~ /gemcutter-0\.[0-3]/
+      next if /gemcutter-0\.[0-3]/.match?(plugin)
 
       begin
         load plugin

data/rubygems-update.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "rubygems-update"
-  s.version = "3.4.21"
+  s.version = "3.4.22"
   s.authors = ["Jim Weirich", "Chad Fowler", "Eric Hodel", "Luis Lavena", "Aaron Patterson", "Samuel Giddins", "André Arko", "Evan Phoenix", "Hiroshi SHIBATA"]
   s.email = ["", "", "drbrain@segment7.net", "luislavena@gmail.com", "aaron@tenderlovemaking.com", "segiddins@segiddins.me", "andre@arko.net", "evan@phx.io", "hsbt@ruby-lang.org"]
 

data/test/rubygems/helper.rb

@@ -576,7 +576,7 @@ class Gem::TestCase < Test::Unit::TestCase
       head = Gem::Util.popen(@git, "rev-parse", "HEAD").strip
     end
 
-    return name, git_spec.version, directory, head
+    [name, git_spec.version, directory, head]
   end
 
   ##
@@ -734,7 +734,7 @@ class Gem::TestCase < Test::Unit::TestCase
 
     Gem::Specification.reset
 
-    return spec
+    spec
   end
 
   ##
@@ -869,7 +869,7 @@ class Gem::TestCase < Test::Unit::TestCase
       FileUtils.rm spec.spec_file
     end
 
-    return spec
+    spec
   end
 
   ##
@@ -1047,7 +1047,7 @@ Also, a list:
       spec_fetcher.prerelease_specs[@uri] << spec.name_tuple
     end
 
-    # HACK for test_download_to_cache
+    # HACK: for test_download_to_cache
     unless Gem::RemoteFetcher === @fetcher
       v = Gem.marshal_version
 
@@ -1345,7 +1345,7 @@ Also, a list:
 
     def escape_path(*path)
       path = File.join(*path)
-      if %r{\A[-+:/=@,.\w]+\z} =~ path
+      if %r{\A[-+:/=@,.\w]+\z}.match?(path)
         path
       else
         "\"#{path.gsub(/[`$"]/, '\\&')}\""
@@ -1460,7 +1460,7 @@ Also, a list:
       io.write vendor_spec.to_ruby
     end
 
-    return name, vendor_spec.version, directory
+    [name, vendor_spec.version, directory]
   end
 
   ##

data/test/rubygems/test_gem_command_manager.rb

@@ -177,7 +177,7 @@ class TestGemCommandManager < Gem::TestCase
     assert_match(/invalid option: --bad-arg/i, @ui.error)
   end
 
-  # HACK move to install command test
+  # HACK: move to install command test
   def test_process_args_install
     #capture all install options
     use_ui @ui do
@@ -228,7 +228,7 @@ class TestGemCommandManager < Gem::TestCase
     end
   end
 
-  # HACK move to uninstall command test
+  # HACK: move to uninstall command test
   def test_process_args_uninstall
     #capture all uninstall options
     check_options = nil
@@ -248,7 +248,7 @@ class TestGemCommandManager < Gem::TestCase
     assert_equal Gem::Requirement.new("3.0"), check_options[:version]
   end
 
-  # HACK move to check command test
+  # HACK: move to check command test
   def test_process_args_check
     #capture all check options
     check_options = nil
@@ -267,7 +267,7 @@ class TestGemCommandManager < Gem::TestCase
     assert_equal true, check_options[:alien]
   end
 
-  # HACK move to build command test
+  # HACK: move to build command test
   def test_process_args_build
     #capture all build options
     check_options = nil
@@ -286,7 +286,7 @@ class TestGemCommandManager < Gem::TestCase
     assert_equal "foobar.rb", check_options[:args].first
   end
 
-  # HACK move to query command test
+  # HACK: move to query command test
   def test_process_args_query
     #capture all query options
     check_options = nil
@@ -327,7 +327,7 @@ class TestGemCommandManager < Gem::TestCase
     assert_equal :both, check_options[:domain]
   end
 
-  # HACK move to update command test
+  # HACK: move to update command test
   def test_process_args_update
     #capture all update options
     check_options = nil

data/test/rubygems/test_gem_commands_cert_command.rb

@@ -47,7 +47,7 @@ class TestGemCommandsCertCommand < Gem::TestCase
 
     matches = @cmd.certificates_matching ""
 
-    # HACK OpenSSL::X509::Certificate#== is Object#==, so do this the hard way
+    # HACK: OpenSSL::X509::Certificate#== is Object#==, so do this the hard way
     match = matches.next
     assert_equal ALTERNATE_CERT.to_pem, match.first.to_pem
     assert_equal @trust_dir.cert_path(ALTERNATE_CERT), match.last

data/test/rubygems/test_gem_commands_install_command.rb

@@ -233,7 +233,7 @@ ERROR:  Could not find a valid gem 'bar' (= 0.5) (required by 'foo' (>= 0)) in a
       assert_equal 2, e.exit_code
     end
 
-    # HACK no repository was checked
+    # HACK: no repository was checked
     assert_match(/ould not find a valid gem 'no_such_gem'/, @ui.error)
   end
 
@@ -252,7 +252,7 @@ ERROR:  Could not find a valid gem 'bar' (= 0.5) (required by 'foo' (>= 0)) in a
       assert_equal 2, e.exit_code
     end
 
-    # HACK no repository was checked
+    # HACK: no repository was checked
     assert_match(/ould not find a valid gem 'no_such_gem'/, @ui.error)
   end
 

data/test/rubygems/test_gem_commands_uninstall_command.rb

@@ -229,6 +229,26 @@ class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
     assert File.exist? File.join(@gemhome, "bin", "executable")
   end
 
+  def test_execute_with_multiple_version_specified_as_colon
+    initial_install
+
+    ui = Gem::MockGemUi.new "y\n"
+
+    util_make_gems
+
+    assert_equal 3, Gem::Specification.find_all_by_name("a").length
+
+    @cmd.options[:force] = true
+    @cmd.options[:args] = ["a:1", "a:2"]
+
+    use_ui ui do
+      @cmd.execute
+    end
+
+    assert_equal 1, Gem::Specification.find_all_by_name("a").length
+    assert_equal Gem::Version.new("3.a"), Gem::Specification.find_by_name("a").version
+  end
+
   def test_uninstall_selection
     ui = Gem::MockGemUi.new "1\n"
 

data/test/rubygems/test_gem_ext_builder.rb

@@ -52,7 +52,7 @@ install:
     assert_match %r{DESTDIR\\=#{ENV['DESTDIR']}$},         results
     assert_match %r{DESTDIR\\=#{ENV['DESTDIR']} install$}, results
 
-    if /nmake/ !~ results
+    unless /nmake/.match?(results)
       assert_match %r{^clean: destination$},   results
       assert_match %r{^all: destination$},     results
       assert_match %r{^install: destination$}, results

data/test/rubygems/test_gem_installer.rb

@@ -498,7 +498,7 @@ gem 'other', version
 
     wrapper = File.read installed_exec
     assert_match %r{generated by RubyGems}, wrapper
-    # HACK some gems don't have #! in their executables, restore 2008/06
+    # HACK: some gems don't have #! in their executables, restore 2008/06
     #assert_no_match %r|generated by RubyGems|, wrapper
   end
 

data/test/rubygems/test_gem_package_tar_reader.rb

@@ -25,6 +25,21 @@ class TestGemPackageTarReader < Gem::Package::TarTestCase
     io.close!
   end
 
+  def test_each_with_not_a_tar
+    text = "Hello, world!!?\n" * 256 # 4 KiB
+    io = TempIO.new text
+
+    Gem::Package::TarReader.new io do |tar|
+      assert_raise Gem::Package::TarInvalidError do
+        tar.each do
+          flunk "TarInvalidError was expected to occur, but an entry was found"
+        end
+      end
+    end
+  ensure
+    io.close!
+  end
+
   def test_rewind
     content = ("a".."z").to_a.join(" ")
 

data/test/rubygems/test_gem_security_policy.rb

@@ -33,7 +33,7 @@ class TestGemSecurityPolicy < Gem::TestCase
     end
 
     @digest = OpenSSL::Digest.new Gem::Security::DIGEST_NAME
-    @trust_dir = Gem::Security.trust_dir.dir # HACK use the object
+    @trust_dir = Gem::Security.trust_dir.dir # HACK: use the object
 
     @no        = Gem::Security::NoSecurity
     @almost_no = Gem::Security::AlmostNoSecurity
@@ -530,6 +530,6 @@ class TestGemSecurityPolicy < Gem::TestCase
     digests    = { Gem::Security::DIGEST_NAME => { 0 => data } }
     signatures = { 0 => sign(data, key) }
 
-    return digests, signatures
+    [digests, signatures]
   end
 end if Gem::HAVE_OPENSSL

data/test/rubygems/test_gem_stream_ui.rb

@@ -14,7 +14,7 @@ class TestGemStreamUI < Gem::TestCase
 
     def tty?
       @tty = true unless defined? @tty
-      return @tty
+      @tty
     end
 
     alias_method :isatty, :tty?

data/test/rubygems/utilities.rb

@@ -120,7 +120,7 @@ class Gem::FakeFetcher
     path = path.to_s
     @paths << path
 
-    raise ArgumentError, "need full URI" unless path =~ %r{^http://}
+    raise ArgumentError, "need full URI" unless %r{^http://}.match?(path)
 
     unless @data.key? path
       raise Gem::RemoteFetcher::FetchError.new("no data for #{path}", path)
@@ -141,7 +141,7 @@ class Gem::FakeFetcher
 
     path = File.join path, name
 
-    if source_uri =~ /^http/
+    if /^http/.match?(source_uri)
       File.open(path, "wb") do |f|
         f.write fetch_path(File.join(source_uri, "gems", name))
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-update
 version: !ruby/object:Gem::Version
-  version: 3.4.21
+  version: 3.4.22
 platform: ruby
 authors:
 - Jim Weirich
@@ -16,7 +16,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-17 00:00:00.000000000 Z
+date: 2023-11-09 00:00:00.000000000 Z
 dependencies: []
 description: |-
   A package (also known as a library) contains a set of functionality
@@ -384,7 +384,12 @@ files:
 - bundler/lib/bundler/vendor/thor/lib/thor/shell.rb
 - bundler/lib/bundler/vendor/thor/lib/thor/shell/basic.rb
 - bundler/lib/bundler/vendor/thor/lib/thor/shell/color.rb
+- bundler/lib/bundler/vendor/thor/lib/thor/shell/column_printer.rb
 - bundler/lib/bundler/vendor/thor/lib/thor/shell/html.rb
+- bundler/lib/bundler/vendor/thor/lib/thor/shell/lcs_diff.rb
+- bundler/lib/bundler/vendor/thor/lib/thor/shell/table_printer.rb
+- bundler/lib/bundler/vendor/thor/lib/thor/shell/terminal.rb
+- bundler/lib/bundler/vendor/thor/lib/thor/shell/wrapped_printer.rb
 - bundler/lib/bundler/vendor/thor/lib/thor/util.rb
 - bundler/lib/bundler/vendor/thor/lib/thor/version.rb
 - bundler/lib/bundler/vendor/tsort/LICENSE.txt
@@ -873,7 +878,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.21
+rubygems_version: 3.4.22
 signing_key:
 specification_version: 4
 summary: RubyGems is a package management framework for Ruby. This gem is downloaded