rubygems-update 3.4.19 → 3.4.20

data/lib/rubygems/specification_policy.rb

@@ -127,7 +127,7 @@ class Gem::SpecificationPolicy
 
     metadata.each do |key, value|
       entry = "metadata['#{key}']"
-      if !key.kind_of?(String)
+      unless key.is_a?(String)
         error "metadata keys must be a String"
       end
 
@@ -135,7 +135,7 @@ class Gem::SpecificationPolicy
         error "metadata key is too large (#{key.size} > 128)"
       end
 
-      if !value.kind_of?(String)
+      unless value.is_a?(String)
         error "#{entry} value must be a String"
       end
 
@@ -143,10 +143,9 @@ class Gem::SpecificationPolicy
         error "#{entry} value is too large (#{value.size} > 1024)"
       end
 
-      if METADATA_LINK_KEYS.include? key
-        if value !~ VALID_URI_PATTERN
-          error "#{entry} has invalid link: #{value.inspect}"
-        end
+      next unless METADATA_LINK_KEYS.include? key
+      if value !~ VALID_URI_PATTERN
+        error "#{entry} has invalid link: #{value.inspect}"
       end
     end
   end
@@ -198,28 +197,27 @@ duplicate dependency on #{dep}, (#{prev.requirement}) use:
         !version.prerelease? && (op == ">" || op == ">=")
       end
 
-      if open_ended
-        op, dep_version = dep.requirement.requirements.first
-
-        segments = dep_version.segments
+      next unless open_ended
+      op, dep_version = dep.requirement.requirements.first
 
-        base = segments.first 2
+      segments = dep_version.segments
 
-        recommendation = if (op == ">" || op == ">=") && segments == [0]
-          "  use a bounded requirement, such as '~> x.y'"
-        else
-          bugfix = if op == ">"
-            ", '> #{dep_version}'"
-          elsif op == ">=" && base != segments
-            ", '>= #{dep_version}'"
-          end
+      base = segments.first 2
 
-          "  if #{dep.name} is semantically versioned, use:\n" \
-          "    add_#{dep.type}_dependency '#{dep.name}', '~> #{base.join '.'}'#{bugfix}"
+      recommendation = if (op == ">" || op == ">=") && segments == [0]
+        "  use a bounded requirement, such as '~> x.y'"
+      else
+        bugfix = if op == ">"
+          ", '> #{dep_version}'"
+        elsif op == ">=" && base != segments
+          ", '>= #{dep_version}'"
         end
 
-        warning_messages << ["open-ended dependency on #{dep} is not recommended", recommendation].join("\n") + "\n"
+        "  if #{dep.name} is semantically versioned, use:\n" \
+        "    add_#{dep.type}_dependency '#{dep.name}', '~> #{base.join '.'}'#{bugfix}"
       end
+
+      warning_messages << ["open-ended dependency on #{dep} is not recommended", recommendation].join("\n") + "\n"
     end
     if warning_messages.any?
       warning_messages.each {|warning_message| warning warning_message }
@@ -345,7 +343,7 @@ duplicate dependency on #{dep}, (#{prev.requirement}) use:
       String
     end
 
-    unless Array === val && val.all? {|x| x.kind_of?(klass) }
+    unless Array === val && val.all? {|x| x.is_a?(klass) || (field == :licenses && x.nil?) }
       error "#{field} must be an Array of #{klass}"
     end
   end
@@ -360,6 +358,8 @@ duplicate dependency on #{dep}, (#{prev.requirement}) use:
     licenses = @specification.licenses
 
     licenses.each do |license|
+      next if license.nil?
+
       if license.length > 64
         error "each license must be 64 characters or less"
       end
@@ -370,20 +370,21 @@ duplicate dependency on #{dep}, (#{prev.requirement}) use:
     licenses = @specification.licenses
 
     licenses.each do |license|
-      if !Gem::Licenses.match?(license)
-        suggestions = Gem::Licenses.suggestions(license)
-        message = <<-WARNING
+      next if Gem::Licenses.match?(license) || license.nil?
+      suggestions = Gem::Licenses.suggestions(license)
+      message = <<-WARNING
 license value '#{license}' is invalid.  Use a license identifier from
-http://spdx.org/licenses or '#{Gem::Licenses::NONSTANDARD}' for a nonstandard license.
-        WARNING
-        message += "Did you mean #{suggestions.map {|s| "'#{s}'" }.join(', ')}?\n" unless suggestions.nil?
-        warning(message)
-      end
+http://spdx.org/licenses or '#{Gem::Licenses::NONSTANDARD}' for a nonstandard license,
+or set it to nil if you don't want to specify a license.
+      WARNING
+      message += "Did you mean #{suggestions.map {|s| "'#{s}'" }.join(', ')}?\n" unless suggestions.nil?
+      warning(message)
     end
 
     warning <<-WARNING if licenses.empty?
 licenses is empty, but is recommended.  Use a license identifier from
-http://spdx.org/licenses or '#{Gem::Licenses::NONSTANDARD}' for a nonstandard license.
+http://spdx.org/licenses or '#{Gem::Licenses::NONSTANDARD}' for a nonstandard license,
+or set it to nil if you don't want to specify a license.
     WARNING
   end
 

data/lib/rubygems/stub_specification.rb

@@ -35,7 +35,7 @@ class Gem::StubSpecification < Gem::BasicSpecification
 
     def initialize(data, extensions)
       parts          = data[PREFIX.length..-1].split(" ", 4)
-      @name          = parts[0].freeze
+      @name          = -parts[0]
       @version       = if Gem::Version.correct?(parts[1])
         Gem::Version.new(parts[1])
       else
@@ -112,20 +112,23 @@ class Gem::StubSpecification < Gem::BasicSpecification
         saved_lineno = $.
 
         Gem.open_file loaded_from, OPEN_MODE do |file|
-          begin
-            file.readline # discard encoding line
-            stubline = file.readline.chomp
-            if stubline.start_with?(PREFIX)
-              extensions = if /\A#{PREFIX}/ =~ file.readline.chomp
-                $'.split "\0"
+          file.readline # discard encoding line
+          stubline = file.readline
+          if stubline.start_with?(PREFIX)
+            extline = file.readline
+
+            extensions =
+              if extline.delete_prefix!(PREFIX)
+                extline.chomp!
+                extline.split "\0"
               else
                 StubLine::NO_EXTENSIONS
               end
 
-              @data = StubLine.new stubline, extensions
-            end
-          rescue EOFError
+            stubline.chomp! # readline(chomp: true) allocates 3x as much as .readline.chomp!
+            @data = StubLine.new stubline, extensions
           end
+        rescue EOFError
         end
       ensure
         $. = saved_lineno

data/lib/rubygems/uninstaller.rb

@@ -135,7 +135,7 @@ class Gem::Uninstaller
 
       if index == list.size
         remove_all list
-      elsif index >= 0 && index < list.size
+      elsif index && index >= 0 && index < list.size
         uninstall_gem list[index]
       else
         say "Error: must enter a number [1-#{list.size + 1}]"

data/lib/rubygems/user_interaction.rb

@@ -286,7 +286,7 @@ class Gem::StreamUI
   # Ask a question.  Returns an answer if connected to a tty, nil otherwise.
 
   def ask(question)
-    return nil if !tty?
+    return nil unless tty?
 
     @outs.print(question + "  ")
     @outs.flush
@@ -300,7 +300,7 @@ class Gem::StreamUI
   # Ask for a password. Does not echo response to terminal.
 
   def ask_for_password(question)
-    return nil if !tty?
+    return nil unless tty?
 
     @outs.print(question, "  ")
     @outs.flush

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/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.rb

@@ -9,7 +9,7 @@
 require "rbconfig"
 
 module Gem
-  VERSION = "3.4.19"
+  VERSION = "3.4.20"
 end
 
 # Must be first since it unloads the prelude from 1.9.2
@@ -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.20"
   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"]