rubygems-update 3.4.19 → 3.4.21

data/lib/rubygems/util/licenses.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+# This is generated by generate_spdx_license_list.rb, any edits to this
+# file will be discarded.
+
 require_relative "../text"
 
 class Gem::Licenses
@@ -36,7 +39,10 @@ class Gem::Licenses
     APSL-1.1
     APSL-1.2
     APSL-2.0
+    ASWF-Digital-Assets-1.0
+    ASWF-Digital-Assets-1.1
     Abstyles
+    AdaCore-doc
     Adobe-2006
     Adobe-Glyph
     Afmparse
@@ -44,6 +50,8 @@ class Gem::Licenses
     Apache-1.0
     Apache-1.1
     Apache-2.0
+    App-s2p
+    Arphic-1999
     Artistic-1.0
     Artistic-1.0-Perl
     Artistic-1.0-cl8
@@ -67,17 +75,26 @@ class Gem::Licenses
     BSD-4-Clause
     BSD-4-Clause-Shortened
     BSD-4-Clause-UC
+    BSD-4.3RENO
+    BSD-4.3TAHOE
+    BSD-Advertising-Acknowledgement
+    BSD-Attribution-HPND-disclaimer
     BSD-Protection
     BSD-Source-Code
     BSL-1.0
     BUSL-1.1
+    Baekmuk
     Bahyph
     Barr
     Beerware
     BitTorrent-1.0
     BitTorrent-1.1
+    Bitstream-Charter
+    Bitstream-Vera
     BlueOak-1.0.0
+    Boehm-GC
     Borceux
+    Brian-Gladman-3-Clause
     C-UDA-1.0
     CAL-1.0
     CAL-1.0-Combined-Work-Exception
@@ -85,30 +102,42 @@ class Gem::Licenses
     CC-BY-1.0
     CC-BY-2.0
     CC-BY-2.5
+    CC-BY-2.5-AU
     CC-BY-3.0
     CC-BY-3.0-AT
+    CC-BY-3.0-DE
+    CC-BY-3.0-IGO
+    CC-BY-3.0-NL
     CC-BY-3.0-US
     CC-BY-4.0
     CC-BY-NC-1.0
     CC-BY-NC-2.0
     CC-BY-NC-2.5
     CC-BY-NC-3.0
+    CC-BY-NC-3.0-DE
     CC-BY-NC-4.0
     CC-BY-NC-ND-1.0
     CC-BY-NC-ND-2.0
     CC-BY-NC-ND-2.5
     CC-BY-NC-ND-3.0
+    CC-BY-NC-ND-3.0-DE
     CC-BY-NC-ND-3.0-IGO
     CC-BY-NC-ND-4.0
     CC-BY-NC-SA-1.0
     CC-BY-NC-SA-2.0
+    CC-BY-NC-SA-2.0-DE
+    CC-BY-NC-SA-2.0-FR
+    CC-BY-NC-SA-2.0-UK
     CC-BY-NC-SA-2.5
     CC-BY-NC-SA-3.0
+    CC-BY-NC-SA-3.0-DE
+    CC-BY-NC-SA-3.0-IGO
     CC-BY-NC-SA-4.0
     CC-BY-ND-1.0
     CC-BY-ND-2.0
     CC-BY-ND-2.5
     CC-BY-ND-3.0
+    CC-BY-ND-3.0-DE
     CC-BY-ND-4.0
     CC-BY-SA-1.0
     CC-BY-SA-2.0
@@ -117,6 +146,8 @@ class Gem::Licenses
     CC-BY-SA-2.5
     CC-BY-SA-3.0
     CC-BY-SA-3.0-AT
+    CC-BY-SA-3.0-DE
+    CC-BY-SA-3.0-IGO
     CC-BY-SA-4.0
     CC-PDDC
     CC0-1.0
@@ -124,6 +155,7 @@ class Gem::Licenses
     CDDL-1.1
     CDL-1.0
     CDLA-Permissive-1.0
+    CDLA-Permissive-2.0
     CDLA-Sharing-1.0
     CECILL-1.0
     CECILL-1.1
@@ -136,20 +168,27 @@ class Gem::Licenses
     CERN-OHL-P-2.0
     CERN-OHL-S-2.0
     CERN-OHL-W-2.0
+    CFITSIO
+    CMU-Mach
     CNRI-Jython
     CNRI-Python
     CNRI-Python-GPL-Compatible
+    COIL-1.0
     CPAL-1.0
     CPL-1.0
     CPOL-1.02
     CUA-OPL-1.0
     Caldera
     ClArtistic
+    Clips
+    Community-Spec-1.0
     Condor-1.1
+    Cornell-Lossless-JPEG
     Crossword
     CrystalStacker
     Cube
     D-FSL-1.0
+    DL-DE-BY-2.0
     DOC
     DRL-1.0
     DSDP
@@ -165,12 +204,15 @@ class Gem::Licenses
     EUPL-1.0
     EUPL-1.1
     EUPL-1.2
+    Elastic-2.0
     Entessa
     ErlPL-1.1
     Eurosym
+    FDK-AAC
     FSFAP
     FSFUL
     FSFULLR
+    FSFULLRWD
     FTL
     Fair
     Frameworx-1.0
@@ -222,26 +264,38 @@ class Gem::Licenses
     Giftware
     Glide
     Glulxe
+    Graphics-Gems
+    HP-1986
     HPND
+    HPND-Markus-Kuhn
+    HPND-export-US
     HPND-sell-variant
+    HPND-sell-variant-MIT-disclaimer
     HTMLTIDY
     HaskellReport
     Hippocratic-2.1
     IBM-pibs
     ICU
+    IEC-Code-Components-EULA
     IJG
+    IJG-short
     IPA
     IPL-1.0
     ISC
     ImageMagick
     Imlib2
     Info-ZIP
+    Inner-Net-2.0
     Intel
     Intel-ACPI
     Interbase-1.0
+    JPL-image
     JPNIC
     JSON
+    Jam
     JasPer-2.0
+    Kazlib
+    Knuth-CTAN
     LAL-1.2
     LAL-1.3
     LGPL-2.0
@@ -257,6 +311,7 @@ class Gem::Licenses
     LGPL-3.0-only
     LGPL-3.0-or-later
     LGPLLR
+    LOOP
     LPL-1.0
     LPL-1.02
     LPPL-1.0
@@ -264,17 +319,26 @@ class Gem::Licenses
     LPPL-1.2
     LPPL-1.3a
     LPPL-1.3c
+    LZMA-SDK-9.11-to-9.20
+    LZMA-SDK-9.22
     Latex2e
+    Latex2e-translated-notice
     Leptonica
     LiLiQ-P-1.1
     LiLiQ-R-1.1
     LiLiQ-Rplus-1.1
     Libpng
     Linux-OpenIB
+    Linux-man-pages-1-para
+    Linux-man-pages-copyleft
+    Linux-man-pages-copyleft-2-para
+    Linux-man-pages-copyleft-var
     MIT
     MIT-0
     MIT-CMU
+    MIT-Festival
     MIT-Modern-Variant
+    MIT-Wu
     MIT-advertising
     MIT-enna
     MIT-feh
@@ -284,10 +348,13 @@ class Gem::Licenses
     MPL-1.1
     MPL-2.0
     MPL-2.0-no-copyleft-exception
+    MS-LPL
     MS-PL
     MS-RL
     MTLL
     MakeIndex
+    Martin-Birgmeier
+    Minpack
     MirOS
     Motosoto
     MulanPSL-1.0
@@ -300,9 +367,12 @@ class Gem::Licenses
     NCGL-UK-2.0
     NCSA
     NGPL
+    NICTA-1.0
     NIST-PD
     NIST-PD-fallback
+    NIST-Software
     NLOD-1.0
+    NLOD-2.0
     NLPL
     NOSL
     NPL-1.0
@@ -323,6 +393,7 @@ class Gem::Licenses
     OCLC-2.0
     ODC-By-1.0
     ODbL-1.0
+    OFFIS
     OFL-1.0
     OFL-1.0-RFN
     OFL-1.0-no-RFN
@@ -352,14 +423,18 @@ class Gem::Licenses
     OLDAP-2.6
     OLDAP-2.7
     OLDAP-2.8
+    OLFL-1.3
     OML
     OPL-1.0
+    OPL-UK-3.0
+    OPUBL-1.0
     OSET-PL-2.1
     OSL-1.0
     OSL-1.1
     OSL-2.0
     OSL-2.1
     OSL-3.0
+    OpenPBS-2.3
     OpenSSL
     PDDL-1.0
     PHP-3.0
@@ -372,7 +447,9 @@ class Gem::Licenses
     PolyForm-Small-Business-1.0.0
     PostgreSQL
     Python-2.0
+    Python-2.0.1
     QPL-1.0
+    QPL-1.0-INRIA-2004
     Qhull
     RHeCos-1.1
     RPL-1.1
@@ -387,6 +464,7 @@ class Gem::Licenses
     SGI-B-1.0
     SGI-B-1.1
     SGI-B-2.0
+    SGP4
     SHL-0.5
     SHL-0.51
     SISSL
@@ -400,6 +478,7 @@ class Gem::Licenses
     SSPL-1.0
     SWL
     Saxpath
+    SchemeReport
     Sendmail
     Sendmail-8.23
     SimPL-2.0
@@ -409,19 +488,27 @@ class Gem::Licenses
     Spencer-99
     StandardML-NJ
     SugarCRM-1.1.3
+    SunPro
+    Symlinks
     TAPR-OHL-1.0
     TCL
     TCP-wrappers
     TMate
     TORQUE-1.1
     TOSL
+    TPDL
+    TPL-1.0
+    TTWL
     TU-Berlin-1.0
     TU-Berlin-2.0
+    TermReadKey
+    UCAR
     UCL-1.0
     UPL-1.0
     Unicode-DFS-2015
     Unicode-DFS-2016
     Unicode-TOU
+    UnixCrypt
     Unlicense
     VOSTROM
     VSL-1.0
@@ -431,11 +518,15 @@ class Gem::Licenses
     W3C-20150513
     WTFPL
     Watcom-1.0
+    Widget-Workshop
     Wsuipa
     X11
+    X11-distribute-modifications-variant
     XFree86-1.1
     XSkat
+    Xdebug-1.03
     Xerox
+    Xfig
     Xnet
     YPL-1.0
     YPL-1.1
@@ -450,10 +541,12 @@ class Gem::Licenses
     blessing
     bzip2-1.0.5
     bzip2-1.0.6
+    checkmk
     copyleft-next-0.3.0
     copyleft-next-0.3.1
     curl
     diffmark
+    dtoa
     dvipdfm
     eCos-2.0
     eGenix
@@ -464,11 +557,18 @@ class Gem::Licenses
     libpng-2.0
     libselinux-1.0
     libtiff
+    libutil-David-Nugent
+    metamail
+    mpi-permissive
     mpich2
+    mplus
     psfrag
     psutils
+    snprintf
+    w3m
     wxWindows
     xinetd
+    xlock
     xpp
     zlib-acknowledgement
   ].freeze
@@ -476,8 +576,11 @@ class Gem::Licenses
   # exception identifiers
   EXCEPTION_IDENTIFIERS = %w[
     389-exception
+    Asterisk-exception
     Autoconf-exception-2.0
     Autoconf-exception-3.0
+    Autoconf-exception-generic
+    Autoconf-exception-macro
     Bison-exception-2.2
     Bootloader-exception
     CLISP-exception-2.0
@@ -488,10 +591,16 @@ class Gem::Licenses
     Font-exception-2.0
     GCC-exception-2.0
     GCC-exception-3.1
+    GNAT-exception
+    GPL-3.0-interface-exception
     GPL-3.0-linking-exception
     GPL-3.0-linking-source-exception
     GPL-CC-1.0
+    GStreamer-exception-2005
+    GStreamer-exception-2008
+    KiCad-libraries-exception
     LGPL-3.0-linking-exception
+    LLGPL
     LLVM-exception
     LZMA-exception
     Libtool-exception
@@ -501,21 +610,27 @@ class Gem::Licenses
     OCaml-LGPL-linking-exception
     OpenJDK-assembly-exception-1.0
     PS-or-PDF-font-exception-20170817
+    QPL-1.0-INRIA-2004-exception
     Qt-GPL-exception-1.0
     Qt-LGPL-exception-1.1
     Qwt-exception-1.0
     SHL-2.0
     SHL-2.1
+    SWI-exception
     Swift-exception
     Universal-FOSS-exception-1.0
     WxWindows-exception-3.1
+    cryptsetup-OpenSSL-exception
     eCos-exception-2.0
     freertos-exception-2.0
     gnu-javamail-exception
     i2p-gpl-java-exception
+    libpri-OpenH323-exception
     mif-exception
     openvpn-openssl-exception
     u-boot-exception-2.0
+    vsftpd-openssl-exception
+    x11vnc-openssl-exception
   ].freeze
 
   REGEXP = %r{

data/lib/rubygems/util.rb

@@ -85,7 +85,11 @@ module Gem::Util
 
     here = File.expand_path directory
     loop do
-      Dir.chdir here, &block rescue Errno::EACCES
+      begin
+        Dir.chdir here, &block
+      rescue StandardError
+        Errno::EACCES
+      end
 
       new_here = File.expand_path("..", here)
       return if new_here == here # toplevel

data/lib/rubygems/validator.rb

@@ -108,15 +108,13 @@ class Gem::Validator
           end
 
           good.each do |entry, data|
-            begin
-              next unless data # HACK `gem check -a mkrf`
+            next unless data # HACK `gem check -a mkrf`
 
-              source = File.join gem_directory, entry["path"]
+            source = File.join gem_directory, entry["path"]
 
-              File.open source, Gem.binary_mode do |f|
-                unless f.read == data
-                  errors[gem_name][entry["path"]] = "Modified from original"
-                end
+            File.open source, Gem.binary_mode do |f|
+              unless f.read == data
+                errors[gem_name][entry["path"]] = "Modified from original"
               end
             end
           end

data/lib/rubygems/version.rb

@@ -131,7 +131,7 @@ require_relative "deprecate"
 #
 # == Preventing Version Catastrophe:
 #
-# From: http://blog.zenspider.com/2008/10/rubygems-howto-preventing-cata.html
+# From: https://www.zenspider.com/ruby/2008/10/rubygems-how-to-preventing-catastrophe.html
 #
 # Let's say you're depending on the fnord gem version 2.y.z. If you
 # specify your dependency as ">= 2.0.0" then, you're good, right? What
@@ -366,7 +366,8 @@ class Gem::Version
     i = 0
 
     while i <= limit
-      lhs, rhs = lhsegments[i] || 0, rhsegments[i] || 0
+      lhs = lhsegments[i] || 0
+      rhs = rhsegments[i] || 0
       i += 1
 
       next      if lhs == rhs

data/lib/rubygems/yaml_serializer.rb

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+module Gem
+  # A stub yaml serializer that can handle only hashes and strings (as of now).
+  module YAMLSerializer
+    module_function
+
+    def dump(hash)
+      yaml = String.new("---")
+      yaml << dump_hash(hash)
+    end
+
+    def dump_hash(hash)
+      yaml = String.new("\n")
+      hash.each do |k, v|
+        yaml << k << ":"
+        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"
+        else
+          yaml << " " << v.to_s.gsub(/\s+/, " ").inspect << "\n"
+        end
+      end
+      yaml
+    end
+
+    ARRAY_REGEX = /
+      ^
+      (?:[ ]*-[ ]) # '- ' before array items
+      (['"]?) # optional opening quote
+      (.*) # value
+      \1 # matching closing quote
+      $
+    /xo.freeze
+
+    HASH_REGEX = /
+      ^
+      ([ ]*) # indentations
+      (.+) # key
+      (?::(?=(?:\s|$))) # :  (without the lookahead the #key includes this when : is present in value)
+      [ ]?
+      (['"]?) # optional opening quote
+      (.*) # value
+      \3 # matching closing quote
+      $
+    /xo.freeze
+
+    def load(str)
+      res = {}
+      stack = [res]
+      last_hash = nil
+      last_empty_key = nil
+      str.split(/\r?\n/).each do |line|
+        if match = HASH_REGEX.match(line)
+          indent, key, quote, val = match.captures
+          convert_to_backward_compatible_key!(key)
+          depth = indent.size / 2
+          if quote.empty? && val.empty?
+            new_hash = {}
+            stack[depth][key] = new_hash
+            stack[depth + 1] = new_hash
+            last_empty_key = key
+            last_hash = stack[depth]
+          else
+            stack[depth][key] = val
+          end
+        elsif match = ARRAY_REGEX.match(line)
+          _, val = match.captures
+          last_hash[last_empty_key] = [] unless last_hash[last_empty_key].is_a?(Array)
+
+          last_hash[last_empty_key].push(val)
+        end
+      end
+      res
+    end
+
+    # for settings' keys
+    def convert_to_backward_compatible_key!(key)
+      key << "/" if /https?:/i.match?(key) && !%r{/\Z}.match?(key)
+      key.gsub!(".", "__")
+    end
+
+    class << self
+      private :dump_hash, :convert_to_backward_compatible_key!
+    end
+  end
+end

data/lib/rubygems.rb

@@ -9,7 +9,7 @@
 require "rbconfig"
 
 module Gem
-  VERSION = "3.4.19"
+  VERSION = "3.4.21"
 end
 
 # Must be first since it unloads the prelude from 1.9.2
@@ -439,7 +439,7 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
 
   def self.ensure_subdirectories(dir, mode, subdirs) # :nodoc:
     old_umask = File.umask
-    File.umask old_umask | 002
+    File.umask old_umask | 0o02
 
     options = {}
 
@@ -582,7 +582,7 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
 
   ##
   # The number of paths in the +$LOAD_PATH+ from activated gems. Used to
-  # prioritize +-I+ and +ENV['RUBYLIB']+ entries during +require+.
+  # prioritize +-I+ and <code>ENV['RUBYLIB']</code> entries during +require+.
 
   def self.activated_gem_paths
     @activated_gem_paths ||= 0
@@ -914,7 +914,7 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
   # Glob pattern for require-able path suffixes.
 
   def self.suffix_pattern
-    @suffix_pattern ||= "{#{suffixes.join(',')}}"
+    @suffix_pattern ||= "{#{suffixes.join(",")}}"
   end
 
   ##
@@ -1102,13 +1102,11 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
     require "bundler"
     begin
       Gem::DefaultUserInteraction.use_ui(ui) do
-        begin
-          Bundler.ui.silence do
-            @gemdeps = Bundler.setup
-          end
-        ensure
-          Gem::DefaultUserInteraction.ui.close
+        Bundler.ui.silence do
+          @gemdeps = Bundler.setup
         end
+      ensure
+        Gem::DefaultUserInteraction.ui.close
       end
     rescue Bundler::BundlerError => e
       warn e.message

data/rubygems-update.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "rubygems-update"
-  s.version = "3.4.19"
+  s.version = "3.4.21"
   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/setup.rb

@@ -7,6 +7,8 @@
 # See LICENSE.txt for permissions.
 #++
 
+abort "RubyGems only supports Ruby 2.6 or higher" if RUBY_VERSION < "2.6.0"
+
 # Make sure rubygems isn't already loaded.
 if ENV["RUBYOPT"] || defined? Gem
   ENV.delete "RUBYOPT"

data/test/rubygems/bundler_test_gem.rb

@@ -384,8 +384,10 @@ You may need to `bundle install` to install missing gems
   end
 
   def with_path_and_rubyopt(path_value, rubyopt_value)
-    path, ENV["PATH"] = ENV["PATH"], path_value
-    rubyopt, ENV["RUBYOPT"] = ENV["RUBYOPT"], rubyopt_value
+    path = ENV["PATH"]
+    ENV["PATH"] = path_value
+    rubyopt = ENV["RUBYOPT"]
+    ENV["RUBYOPT"] = rubyopt_value
 
     yield
   ensure
@@ -394,7 +396,8 @@ You may need to `bundle install` to install missing gems
   end
 
   def with_rubygems_gemdeps(value)
-    rubygems_gemdeps, ENV["RUBYGEMS_GEMDEPS"] = ENV["RUBYGEMS_GEMDEPS"], value
+    rubygems_gemdeps = ENV["RUBYGEMS_GEMDEPS"]
+    ENV["RUBYGEMS_GEMDEPS"] = value
 
     yield
   ensure