rubygems-update 3.4.18 → 3.4.20

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.18"
+  VERSION = "3.4.20"
 end
 
 # Must be first since it unloads the prelude from 1.9.2
@@ -856,8 +856,7 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
   # Returns the version of the latest release-version of gem +name+
 
   def self.latest_version_for(name)
-    spec = latest_spec_for name
-    spec && spec.version
+    latest_spec_for(name)&.version
   end
 
   ##
@@ -1103,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.18"
+  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"]
 
@@ -23,12 +23,12 @@ Gem::Specification.new do |s|
   s.require_paths = ["hide_lib_for_update"]
   s.rdoc_options = ["--main", "README.md", "--title=RubyGems Update Documentation"]
   s.extra_rdoc_files = [
-    "CHANGELOG.md", "LICENSE.txt", "MAINTAINERS.txt",
+    "LICENSE.txt", "MAINTAINERS.txt",
     "MIT.txt", "Manifest.txt", "README.md",
     "UPGRADING.md", "POLICIES.md", "CODE_OF_CONDUCT.md",
-    "CONTRIBUTING.md", "bundler/CHANGELOG.md",
+    "CONTRIBUTING.md",
     "bundler/LICENSE.md", "bundler/README.md",
-    "hide_lib_for_update/note.txt", *Dir["bundler/man/*.1"]
+    "hide_lib_for_update/note.txt", *Dir["bundler/lib/bundler/man/*.1"]
   ]
 
   s.required_ruby_version = Gem::Requirement.new(">= 2.6.0")

data/test/rubygems/helper.rb

@@ -118,30 +118,28 @@ class Gem::TestCase < Test::Unit::TestCase
   # https://github.com/seattlerb/minitest/blob/21d9e804b63c619f602f3f4ece6c71b48974707a/lib/minitest/assertions.rb#L546
   def capture_subprocess_io
     _synchronize do
-      begin
-        require "tempfile"
+      require "tempfile"
 
-        captured_stdout, captured_stderr = Tempfile.new("out"), Tempfile.new("err")
+      captured_stdout, captured_stderr = Tempfile.new("out"), Tempfile.new("err")
 
-        orig_stdout, orig_stderr = $stdout.dup, $stderr.dup
-        $stdout.reopen captured_stdout
-        $stderr.reopen captured_stderr
+      orig_stdout, orig_stderr = $stdout.dup, $stderr.dup
+      $stdout.reopen captured_stdout
+      $stderr.reopen captured_stderr
 
-        yield
+      yield
 
-        $stdout.rewind
-        $stderr.rewind
+      $stdout.rewind
+      $stderr.rewind
 
-        return captured_stdout.read, captured_stderr.read
-      ensure
-        $stdout.reopen orig_stdout
-        $stderr.reopen orig_stderr
+      return captured_stdout.read, captured_stderr.read
+    ensure
+      $stdout.reopen orig_stdout
+      $stderr.reopen orig_stderr
 
-        orig_stdout.close
-        orig_stderr.close
-        captured_stdout.close!
-        captured_stderr.close!
-      end
+      orig_stdout.close
+      orig_stderr.close
+      captured_stdout.close!
+      captured_stderr.close!
     end
   end
 
@@ -935,7 +933,7 @@ class Gem::TestCase < Test::Unit::TestCase
     @a1 = quick_gem "a", "1" do |s|
       s.files = %w[lib/code.rb]
       s.require_paths = %w[lib]
-      s.date = Gem::Specification::TODAY - 86400
+      s.date = Gem::Specification::TODAY - 86_400
       s.homepage = "http://a.example.com"
       s.email = %w[example@example.com example2@example.com]
       s.authors = %w[Example Example2]
@@ -1625,7 +1623,7 @@ class Object
       if val_or_callable.respond_to? :call
         val_or_callable.call(*args, &blk)
       else
-        blk.call(*block_args) if blk
+        blk&.call(*block_args)
         val_or_callable
       end
     end

data/test/rubygems/test_gem.rb

@@ -1053,7 +1053,7 @@ class TestGem < Gem::TestCase
   end
 
   def test_self_ruby_version_with_non_mri_implementations
-    util_set_RUBY_VERSION "2.5.0", 0, 60928, "jruby 9.2.0.0 (2.5.0) 2018-05-24 81156a8 OpenJDK 64-Bit Server VM 25.171-b11 on 1.8.0_171-8u171-b11-0ubuntu0.16.04.1-b11 [linux-x86_64]"
+    util_set_RUBY_VERSION "2.5.0", 0, 60_928, "jruby 9.2.0.0 (2.5.0) 2018-05-24 81156a8 OpenJDK 64-Bit Server VM 25.171-b11 on 1.8.0_171-8u171-b11-0ubuntu0.16.04.1-b11 [linux-x86_64]"
 
     assert_equal Gem::Version.new("2.5.0"), Gem.ruby_version
   ensure
@@ -1061,7 +1061,7 @@ class TestGem < Gem::TestCase
   end
 
   def test_self_ruby_version_with_svn_prerelease
-    util_set_RUBY_VERSION "2.6.0", -1, 63539, "ruby 2.6.0preview2 (2018-05-31 trunk 63539) [x86_64-linux]"
+    util_set_RUBY_VERSION "2.6.0", -1, 63_539, "ruby 2.6.0preview2 (2018-05-31 trunk 63539) [x86_64-linux]"
 
     assert_equal Gem::Version.new("2.6.0.preview2"), Gem.ruby_version
   ensure
@@ -1077,7 +1077,7 @@ class TestGem < Gem::TestCase
   end
 
   def test_self_ruby_version_with_non_mri_implementations_with_mri_prerelase_compatibility
-    util_set_RUBY_VERSION "2.6.0", -1, 63539, "weirdjruby 9.2.0.0 (2.6.0preview2) 2018-05-24 81156a8 OpenJDK 64-Bit Server VM 25.171-b11 on 1.8.0_171-8u171-b11-0ubuntu0.16.04.1-b11 [linux-x86_64]", "weirdjruby", "9.2.0.0"
+    util_set_RUBY_VERSION "2.6.0", -1, 63_539, "weirdjruby 9.2.0.0 (2.6.0preview2) 2018-05-24 81156a8 OpenJDK 64-Bit Server VM 25.171-b11 on 1.8.0_171-8u171-b11-0ubuntu0.16.04.1-b11 [linux-x86_64]", "weirdjruby", "9.2.0.0"
 
     assert_equal Gem::Version.new("2.6.0.preview2"), Gem.ruby_version
   ensure
@@ -1085,7 +1085,7 @@ class TestGem < Gem::TestCase
   end
 
   def test_self_ruby_version_with_svn_trunk
-    util_set_RUBY_VERSION "1.9.2", -1, 23493, "ruby 1.9.2dev (2009-05-20 trunk 23493) [x86_64-linux]"
+    util_set_RUBY_VERSION "1.9.2", -1, 23_493, "ruby 1.9.2dev (2009-05-20 trunk 23493) [x86_64-linux]"
 
     assert_equal Gem::Version.new("1.9.2.dev"), Gem.ruby_version
   ensure

data/test/rubygems/test_gem_commands_build_command.rb

@@ -199,7 +199,8 @@ class TestGemCommandsBuildCommand < Gem::TestCase
 
     error = @ui.error.split "\n"
     assert_equal "WARNING:  licenses is empty, but is recommended.  Use a license identifier from", error.shift
-    assert_equal "http://spdx.org/licenses or 'Nonstandard' for a nonstandard license.", error.shift
+    assert_equal "http://spdx.org/licenses or 'Nonstandard' for a nonstandard license,", error.shift
+    assert_equal "or set it to nil if you don't want to specify a license.", error.shift
     assert_equal "WARNING:  See https://guides.rubygems.org/specification-reference/ for help", error.shift
     assert_equal [], error
 

data/test/rubygems/test_gem_commands_stale_command.rb

@@ -29,7 +29,7 @@ class TestGemCommandsStaleCommand < Gem::TestCase
 
       filename = File.join(foo_bar.full_gem_path, file)
       FileUtils.mkdir_p File.dirname filename
-      FileUtils.touch(filename, :mtime => Time.now - 86400)
+      FileUtils.touch(filename, :mtime => Time.now - 86_400)
     end
 
     use_ui @stub_ui do