rubygems-update 3.4.21 → 3.5.0

data/lib/rubygems/user_interaction.rb

@@ -14,7 +14,6 @@ require_relative "text"
 # module will have access to the +ui+ method that returns the default UI.
 
 module Gem::DefaultUserInteraction
-
   include Gem::Text
 
   ##
@@ -69,7 +68,6 @@ module Gem::DefaultUserInteraction
   def use_ui(new_ui, &block)
     Gem::DefaultUserInteraction.use_ui(new_ui, &block)
   end
-
 end
 
 ##
@@ -92,7 +90,6 @@ end
 #   end
 
 module Gem::UserInteraction
-
   include Gem::DefaultUserInteraction
 
   ##
@@ -196,7 +193,7 @@ class Gem::StreamUI
   # then special operations (like asking for passwords) will use the TTY
   # commands to disable character echo.
 
-  def initialize(in_stream, out_stream, err_stream=STDERR, usetty=true)
+  def initialize(in_stream, out_stream, err_stream=$stderr, usetty=true)
     @ins = in_stream
     @outs = out_stream
     @errs = err_stream
@@ -241,7 +238,7 @@ class Gem::StreamUI
 
     result = result.strip.to_i - 1
     return nil, nil unless (0...list.size) === result
-    return list[result], result
+    [list[result], result]
   end
 
   ##
@@ -260,26 +257,25 @@ class Gem::StreamUI
     end
 
     default_answer = case default
-    when nil
-      "yn"
-    when true
-      "Yn"
-    else
-      "yN"
+                     when nil
+                       "yn"
+                     when true
+                       "Yn"
+                     else
+                       "yN"
     end
 
     result = nil
 
     while result.nil? do
       result = case ask "#{question} [#{default_answer}]"
-      when /^y/i then true
-      when /^n/i then false
-      when /^$/  then default
-      else            nil
+               when /^y/i then true
+               when /^n/i then false
+               when /^$/  then default
       end
     end
 
-    return result
+    result
   end
 
   ##
@@ -430,8 +426,7 @@ class Gem::StreamUI
     # +size+ items.  Shows the given +initial_message+ when progress starts
     # and the +terminal_message+ when it is complete.
 
-    def initialize(out_stream, size, initial_message,
-                   terminal_message = "complete")
+    def initialize(out_stream, size, initial_message, terminal_message = "complete")
       @out = out_stream
       @total = size
       @count = 0
@@ -473,8 +468,7 @@ class Gem::StreamUI
     # +size+ items.  Shows the given +initial_message+ when progress starts
     # and the +terminal_message+ when it is complete.
 
-    def initialize(out_stream, size, initial_message,
-                   terminal_message = "complete")
+    def initialize(out_stream, size, initial_message, terminal_message = "complete")
       @out = out_stream
       @total = size
       @count = 0
@@ -597,8 +591,8 @@ class Gem::StreamUI
 end
 
 ##
-# Subclass of StreamUI that instantiates the user interaction using STDIN,
-# STDOUT, and STDERR.
+# Subclass of StreamUI that instantiates the user interaction using $stdin,
+# $stdout, and $stderr.
 
 class Gem::ConsoleUI < Gem::StreamUI
   ##
@@ -606,7 +600,7 @@ class Gem::ConsoleUI < Gem::StreamUI
   # stdin, output to stdout and warnings or errors to stderr.
 
   def initialize
-    super STDIN, STDOUT, STDERR, true
+    super $stdin, $stdout, $stderr, true
   end
 end
 

data/lib/rubygems/util/licenses.rb

@@ -22,10 +22,8 @@ class Gem::Licenses
     AFL-2.0
     AFL-2.1
     AFL-3.0
-    AGPL-1.0
     AGPL-1.0-only
     AGPL-1.0-or-later
-    AGPL-3.0
     AGPL-3.0-only
     AGPL-3.0-or-later
     AMDPLPA
@@ -45,6 +43,7 @@ class Gem::Licenses
     AdaCore-doc
     Adobe-2006
     Adobe-Glyph
+    Adobe-Utopia
     Afmparse
     Aladdin
     Apache-1.0
@@ -58,13 +57,12 @@ class Gem::Licenses
     Artistic-2.0
     BSD-1-Clause
     BSD-2-Clause
-    BSD-2-Clause-FreeBSD
-    BSD-2-Clause-NetBSD
     BSD-2-Clause-Patent
     BSD-2-Clause-Views
     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 +70,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 +79,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 +186,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 +212,7 @@ class Gem::Licenses
     Entessa
     ErlPL-1.1
     Eurosym
+    FBM
     FDK-AAC
     FSFAP
     FSFUL
@@ -215,25 +220,24 @@ class Gem::Licenses
     FSFULLRWD
     FTL
     Fair
+    Ferguson-Twofish
     Frameworx-1.0
     FreeBSD-DOC
     FreeImage
+    Furuseth
     GD
-    GFDL-1.1
     GFDL-1.1-invariants-only
     GFDL-1.1-invariants-or-later
     GFDL-1.1-no-invariants-only
     GFDL-1.1-no-invariants-or-later
     GFDL-1.1-only
     GFDL-1.1-or-later
-    GFDL-1.2
     GFDL-1.2-invariants-only
     GFDL-1.2-invariants-or-later
     GFDL-1.2-no-invariants-only
     GFDL-1.2-no-invariants-or-later
     GFDL-1.2-only
     GFDL-1.2-or-later
-    GFDL-1.3
     GFDL-1.3-invariants-only
     GFDL-1.3-invariants-or-later
     GFDL-1.3-no-invariants-only
@@ -242,33 +246,28 @@ class Gem::Licenses
     GFDL-1.3-or-later
     GL2PS
     GLWTPL
-    GPL-1.0
-    GPL-1.0+
     GPL-1.0-only
     GPL-1.0-or-later
-    GPL-2.0
-    GPL-2.0+
     GPL-2.0-only
     GPL-2.0-or-later
-    GPL-2.0-with-GCC-exception
-    GPL-2.0-with-autoconf-exception
-    GPL-2.0-with-bison-exception
-    GPL-2.0-with-classpath-exception
-    GPL-2.0-with-font-exception
-    GPL-3.0
-    GPL-3.0+
     GPL-3.0-only
     GPL-3.0-or-later
-    GPL-3.0-with-GCC-exception
-    GPL-3.0-with-autoconf-exception
     Giftware
     Glide
     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,20 +293,15 @@ class Gem::Licenses
     JSON
     Jam
     JasPer-2.0
+    Kastrup
     Kazlib
     Knuth-CTAN
     LAL-1.2
     LAL-1.3
-    LGPL-2.0
-    LGPL-2.0+
     LGPL-2.0-only
     LGPL-2.0-or-later
-    LGPL-2.1
-    LGPL-2.1+
     LGPL-2.1-only
     LGPL-2.1-or-later
-    LGPL-3.0
-    LGPL-3.0+
     LGPL-3.0-only
     LGPL-3.0-or-later
     LGPLLR
@@ -333,6 +327,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 +338,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 +352,7 @@ class Gem::Licenses
     MTLL
     MakeIndex
     Martin-Birgmeier
+    McPhee-slideshow
     Minpack
     MirOS
     Motosoto
@@ -387,7 +386,6 @@ class Gem::Licenses
     Newsletr
     Nokia
     Noweb
-    Nunit
     O-UDA-1.0
     OCCT-PL
     OCLC-2.0
@@ -436,6 +434,7 @@ class Gem::Licenses
     OSL-3.0
     OpenPBS-2.3
     OpenSSL
+    PADL
     PDDL-1.0
     PHP-3.0
     PHP-3.01
@@ -464,11 +463,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,10 +484,10 @@ class Gem::Licenses
     Sendmail-8.23
     SimPL-2.0
     Sleepycat
+    Soundex
     Spencer-86
     Spencer-94
     Spencer-99
-    StandardML-NJ
     SugarCRM-1.1.3
     SunPro
     Symlinks
@@ -499,12 +500,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,13 +537,14 @@ class Gem::Licenses
     ZPL-2.0
     ZPL-2.1
     Zed
+    Zeeff
     Zend-2.0
     Zimbra-1.3
     Zimbra-1.4
     Zlib
     blessing
-    bzip2-1.0.5
     bzip2-1.0.6
+    check-cvs
     checkmk
     copyleft-next-0.3.0
     copyleft-next-0.3.1
@@ -548,9 +552,9 @@ class Gem::Licenses
     diffmark
     dtoa
     dvipdfm
-    eCos-2.0
     eGenix
     etalab-2.0
+    fwlw
     gSOAP-1.3b
     gnuplot
     iMatix
@@ -558,21 +562,61 @@ 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
     xlock
     xpp
     zlib-acknowledgement
   ].freeze
 
+  DEPRECATED_LICENSE_IDENTIFIERS = %w[
+    AGPL-1.0
+    AGPL-3.0
+    BSD-2-Clause-FreeBSD
+    BSD-2-Clause-NetBSD
+    GFDL-1.1
+    GFDL-1.2
+    GFDL-1.3
+    GPL-1.0
+    GPL-1.0+
+    GPL-2.0
+    GPL-2.0+
+    GPL-2.0-with-GCC-exception
+    GPL-2.0-with-autoconf-exception
+    GPL-2.0-with-bison-exception
+    GPL-2.0-with-classpath-exception
+    GPL-2.0-with-font-exception
+    GPL-3.0
+    GPL-3.0+
+    GPL-3.0-with-GCC-exception
+    GPL-3.0-with-autoconf-exception
+    LGPL-2.0
+    LGPL-2.0+
+    LGPL-2.1
+    LGPL-2.1+
+    LGPL-3.0
+    LGPL-3.0+
+    Nunit
+    StandardML-NJ
+    bzip2-1.0.5
+    eCos-2.0
+    wxWindows
+  ].freeze
+
   # exception identifiers
   EXCEPTION_IDENTIFIERS = %w[
     389-exception
@@ -580,6 +624,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 +635,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
@@ -605,7 +652,6 @@ class Gem::Licenses
     LZMA-exception
     Libtool-exception
     Linux-syscall-note
-    Nokia-Qt-exception-1.1
     OCCT-exception-1.0
     OCaml-LGPL-linking-exception
     OpenJDK-assembly-exception-1.0
@@ -614,10 +660,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,12 +677,17 @@ class Gem::Licenses
     libpri-OpenH323-exception
     mif-exception
     openvpn-openssl-exception
+    stunnel-exception
     u-boot-exception-2.0
     vsftpd-openssl-exception
     x11vnc-openssl-exception
   ].freeze
 
-  REGEXP = %r{
+  DEPRECATED_EXCEPTION_IDENTIFIERS = %w[
+    Nokia-Qt-exception-1.1
+  ].freeze
+
+  VALID_REGEXP = /
     \A
     (?:
       #{Regexp.union(LICENSE_IDENTIFIERS)}
@@ -643,10 +697,34 @@ class Gem::Licenses
       | #{LICENSE_REF}
     )
     \Z
-  }ox.freeze
+  /ox
+
+  DEPRECATED_LICENSE_REGEXP = /
+    \A
+    #{Regexp.union(DEPRECATED_LICENSE_IDENTIFIERS)}
+    \+?
+    (?:\s WITH \s .+?)?
+    \Z
+  /ox
+
+  DEPRECATED_EXCEPTION_REGEXP = /
+    \A
+    .+?
+    \+?
+    (?:\s WITH \s #{Regexp.union(DEPRECATED_EXCEPTION_IDENTIFIERS)})
+    \Z
+  /ox
 
   def self.match?(license)
-    !REGEXP.match(license).nil?
+    VALID_REGEXP.match?(license)
+  end
+
+  def self.deprecated_license_id?(license)
+    DEPRECATED_LICENSE_REGEXP.match?(license)
+  end
+
+  def self.deprecated_exception_id?(license)
+    DEPRECATED_EXCEPTION_REGEXP.match?(license)
   end
 
   def self.suggestions(license)

data/lib/rubygems/util/list.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 module Gem
-  class List
+  # The Gem::List class is currently unused and will be removed in the next major rubygems version
+  class List # :nodoc:
     include Enumerable
     attr_accessor :value, :tail
 
@@ -35,4 +36,5 @@ module Gem
       List.new value, list
     end
   end
+  deprecate_constant :List
 end

data/lib/rubygems/util.rb

@@ -6,7 +6,6 @@ require_relative "deprecate"
 # This module contains various utility methods as module methods.
 
 module Gem::Util
-
   ##
   # Zlib::GzipReader wrapper that unzips +data+.
 
@@ -61,7 +60,7 @@ module Gem::Util
   # Invokes system, but silences all output.
 
   def self.silent_system(*command)
-    opt = { :out => IO::NULL, :err => [:child, :out] }
+    opt = { out: IO::NULL, err: [:child, :out] }
     if Hash === command.last
       opt.update(command.last)
       cmds = command[0...-1]
@@ -110,11 +109,10 @@ module Gem::Util
   # comes with a leading slash.
 
   def self.correct_for_windows_path(path)
-    if path[0].chr == "/" && path[1].chr =~ /[a-z]/i && path[2].chr == ":"
+    if path[0].chr == "/" && path[1].chr.match?(/[a-z]/i) && path[2].chr == ":"
       path[1..-1]
     else
       path
     end
   end
-
 end

data/lib/rubygems/validator.rb

@@ -25,7 +25,7 @@ class Gem::Validator
     installed_files = []
 
     Find.find gem_directory do |file_name|
-      fn = file_name[gem_directory.size..file_name.size - 1].sub(/^\//, "")
+      fn = file_name[gem_directory.size..file_name.size - 1].sub(%r{^/}, "")
       installed_files << fn unless
         fn.empty? || fn.include?("CVS") || File.directory?(file_name)
     end
@@ -63,7 +63,9 @@ class Gem::Validator
     errors = Hash.new {|h,k| h[k] = {} }
 
     Gem::Specification.each do |spec|
-      next unless gems.include? spec.name unless gems.empty?
+      unless gems.empty?
+        next unless gems.include? spec.name
+      end
       next if spec.default_gem?
 
       gem_name      = spec.file_name
@@ -88,7 +90,7 @@ class Gem::Validator
 
         good, gone, unreadable = nil, nil, nil, nil
 
-        File.open gem_path, Gem.binary_mode do |file|
+        File.open gem_path, Gem.binary_mode do |_file|
           package = Gem::Package.new gem_path
 
           good, gone = package.contents.partition do |file_name|
@@ -108,7 +110,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"]