rubygems-update 3.5.6 → 3.5.7

data/bundler/lib/bundler/templates/newgem/newgem.gemspec.tt

@@ -27,9 +27,10 @@ Gem::Specification.new do |spec|
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(__dir__) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      (File.expand_path(f) == __FILE__) ||
+  gemspec = File.basename(__FILE__)
+  spec.files = IO.popen(%w[git ls-files -z], chdir: __dir__, err: IO::NULL) do |ls|
+    ls.readlines("\x0", chomp: true).reject do |f|
+      (f == gemspec) ||
         f.start_with?(*%w[bin/ test/ spec/ features/ .git <%= config[:ci_config_path] %>appveyor Gemfile])
     end
   end

data/bundler/lib/bundler/templates/newgem/rubocop.yml.tt

@@ -2,12 +2,7 @@ AllCops:
   TargetRubyVersion: <%= ::Gem::Version.new(config[:required_ruby_version]).segments[0..1].join(".") %>
 
 Style/StringLiterals:
-  Enabled: true
   EnforcedStyle: double_quotes
 
 Style/StringLiteralsInInterpolation:
-  Enabled: true
   EnforcedStyle: double_quotes
-
-Layout/LineLength:
-  Max: 120

data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/static_package_source.rb

@@ -1,4 +1,5 @@
 require_relative 'package'
+require_relative 'rubygems'
 require_relative 'version_constraint'
 require_relative 'incompatibility'
 require_relative 'basic_package_source'

data/bundler/lib/bundler/vendored_net_http.rb

@@ -1,8 +1,12 @@
 # frozen_string_literal: true
 
 begin
-  require "rubygems/net/http"
+  require "rubygems/vendored_net_http"
 rescue LoadError
-  require "net/http"
-  Gem::Net = Net
+  begin
+    require "rubygems/net/http"
+  rescue LoadError
+    require "net/http"
+    Gem::Net = Net
+  end
 end

data/bundler/lib/bundler/vendored_timeout.rb

@@ -1,8 +1,12 @@
 # frozen_string_literal: true
 
 begin
-  require "rubygems/timeout"
+  require "rubygems/vendored_timeout"
 rescue LoadError
-  require "timeout"
-  Gem::Timeout = Timeout
+  begin
+    require "rubygems/timeout"
+  rescue LoadError
+    require "timeout"
+    Gem::Timeout = Timeout
+  end
 end

data/bundler/lib/bundler/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 
 module Bundler
-  VERSION = "2.5.6".freeze
+  VERSION = "2.5.7".freeze
 
   def self.bundler_major_version
     @bundler_major_version ||= VERSION.split(".").first.to_i

data/lib/rubygems/command.rb

@@ -6,7 +6,7 @@
 # See LICENSE.txt for permissions.
 #++
 
-require_relative "optparse"
+require_relative "vendored_optparse"
 require_relative "requirement"
 require_relative "user_interaction"
 

data/lib/rubygems/command_manager.rb

@@ -106,7 +106,7 @@ class Gem::CommandManager
   # Register all the subcommands supported by the gem command.
 
   def initialize
-    require_relative "timeout"
+    require_relative "vendored_timeout"
     @commands = {}
 
     BUILTIN_COMMANDS.each do |name|

data/lib/rubygems/commands/help_command.rb

@@ -59,7 +59,7 @@ multiple environments.  The RubyGems implementation is designed to be
 compatible with Bundler's Gemfile format.  You can see additional
 documentation on the format at:
 
-  http://bundler.io
+  https://bundler.io
 
 RubyGems automatically looks for these gem dependencies files:
 
@@ -172,7 +172,7 @@ and #platforms methods:
 See the bundler Gemfile manual page for a list of platforms supported in a gem
 dependencies file.:
 
-  http://bundler.io/v1.6/man/gemfile.5.html
+  https://bundler.io/v2.5/man/gemfile.5.html
 
 Ruby Version and Engine Dependency
 ==================================

data/lib/rubygems/commands/rdoc_command.rb

@@ -84,14 +84,7 @@ Use --overwrite to force rebuilding of documentation.
         FileUtils.rm_rf File.join(spec.doc_dir, "rdoc")
       end
 
-      begin
-        doc.generate
-      rescue Errno::ENOENT => e
-        match = / - /.match(e.message)
-        alert_error "Unable to document #{spec.full_name}, " \
-                    " #{match.post_match} is missing, skipping"
-        terminate_interaction 1 if specs.length == 1
-      end
+      doc.generate
     end
   end
 end

data/lib/rubygems/defaults.rb

@@ -112,7 +112,7 @@ module Gem
   # The path to standard location of the user's configuration directory.
 
   def self.config_home
-    @config_home ||= (ENV["XDG_CONFIG_HOME"] || File.join(Gem.user_home, ".config"))
+    @config_home ||= ENV["XDG_CONFIG_HOME"] || File.join(Gem.user_home, ".config")
   end
 
   ##
@@ -145,21 +145,21 @@ module Gem
   # The path to standard location of the user's cache directory.
 
   def self.cache_home
-    @cache_home ||= (ENV["XDG_CACHE_HOME"] || File.join(Gem.user_home, ".cache"))
+    @cache_home ||= ENV["XDG_CACHE_HOME"] || File.join(Gem.user_home, ".cache")
   end
 
   ##
   # The path to standard location of the user's data directory.
 
   def self.data_home
-    @data_home ||= (ENV["XDG_DATA_HOME"] || File.join(Gem.user_home, ".local", "share"))
+    @data_home ||= ENV["XDG_DATA_HOME"] || File.join(Gem.user_home, ".local", "share")
   end
 
   ##
   # The path to standard location of the user's state directory.
 
   def self.state_home
-    @state_home ||= (ENV["XDG_STATE_HOME"] || File.join(Gem.user_home, ".local", "state"))
+    @state_home ||= ENV["XDG_STATE_HOME"] || File.join(Gem.user_home, ".local", "state")
   end
 
   ##

data/lib/rubygems/dependency.rb

@@ -328,9 +328,9 @@ class Gem::Dependency
     return active if active
 
     unless prerelease?
-      # Move prereleases to the end of the list for >= 0 requirements
+      # Consider prereleases only as a fallback
       pre, matches = matches.partition {|spec| spec.version.prerelease? }
-      matches += pre if requirement == Gem::Requirement.default
+      matches = pre if matches.empty?
     end
 
     matches.first

data/lib/rubygems/dependency_list.rb

@@ -6,7 +6,7 @@
 # See LICENSE.txt for permissions.
 #++
 
-require_relative "tsort"
+require_relative "vendored_tsort"
 require_relative "deprecate"
 
 ##

data/lib/rubygems/ext/cargo_builder.rb

@@ -293,7 +293,7 @@ EOF
 
     case var_name
     # On windows, it is assumed that mkmf has setup an exports file for the
-    # extension, so we have to to create one ourselves.
+    # extension, so we have to create one ourselves.
     when "DEFFILE"
       write_deffile(dest_dir, crate_name)
     else

data/lib/rubygems/gemcutter_utilities.rb

@@ -85,7 +85,7 @@ module Gem::GemcutterUtilities
   # If +allowed_push_host+ metadata is present, then it will only allow that host.
 
   def rubygems_api_request(method, path, host = nil, allowed_push_host = nil, scope: nil, credentials: {}, &block)
-    require_relative "net/http"
+    require_relative "vendored_net_http"
 
     self.host = host if host
     unless self.host

data/lib/rubygems/remote_fetcher.rb

@@ -74,7 +74,7 @@ class Gem::RemoteFetcher
 
   def initialize(proxy=nil, dns=nil, headers={})
     require_relative "core_ext/tcpsocket_init" if Gem.configuration.ipv4_fallback_enabled
-    require_relative "net/http"
+    require_relative "vendored_net_http"
     require "stringio"
     require_relative "vendor/uri/lib/uri"
 

data/lib/rubygems/request.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "net/http"
+require_relative "vendored_net_http"
 require_relative "user_interaction"
 
 class Gem::Request

data/lib/rubygems/request_set.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "tsort"
+require_relative "vendored_tsort"
 
 ##
 # A RequestSet groups a request to activate a set of dependencies.

data/lib/rubygems/s3_uri_signer.rb

@@ -140,7 +140,7 @@ class Gem::S3URISigner
   end
 
   def ec2_metadata_credentials_json
-    require_relative "net/http"
+    require_relative "vendored_net_http"
     require_relative "request"
     require_relative "request/connection_pools"
     require "json"

data/lib/rubygems/safe_yaml.rb

@@ -25,8 +25,17 @@ module Gem
       runtime
     ].freeze
 
+    @aliases_enabled = true
+    def self.aliases_enabled=(value) # :nodoc:
+      @aliases_enabled = !!value
+    end
+
+    def self.aliases_enabled? # :nodoc:
+      @aliases_enabled
+    end
+
     def self.safe_load(input)
-      ::Psych.safe_load(input, permitted_classes: PERMITTED_CLASSES, permitted_symbols: PERMITTED_SYMBOLS, aliases: true)
+      ::Psych.safe_load(input, permitted_classes: PERMITTED_CLASSES, permitted_symbols: PERMITTED_SYMBOLS, aliases: @aliases_enabled)
     end
 
     def self.load(input)

data/lib/rubygems/security.rb

@@ -323,7 +323,7 @@ require_relative "openssl"
 # == Original author
 #
 # Paul Duncan <pabs@pablotron.org>
-# http://pablotron.org/
+# https://pablotron.org/
 
 module Gem::Security
   ##

data/lib/rubygems/specification.rb

@@ -341,7 +341,7 @@ class Gem::Specification < Gem::BasicSpecification
   # https://opensource.org/licenses/ approved.
   #
   # The most commonly used OSI-approved licenses are MIT and Apache-2.0.
-  # GitHub also provides a license picker at http://choosealicense.com/.
+  # GitHub also provides a license picker at https://choosealicense.com/.
   #
   # You can also use a custom license file along with your gemspec and specify
   # a LicenseRef-<idstring>, where idstring is the name of the file containing

data/lib/rubygems/specification_policy.rb

@@ -7,7 +7,7 @@ class Gem::SpecificationPolicy
 
   VALID_NAME_PATTERN = /\A[a-zA-Z0-9\.\-\_]+\z/ # :nodoc:
 
-  SPECIAL_CHARACTERS = /\A[#{Regexp.escape('.-_')}]+/ # :nodoc:
+  SPECIAL_CHARACTERS = /\A[#{Regexp.escape(".-_")}]+/ # :nodoc:
 
   VALID_URI_PATTERN = %r{\Ahttps?:\/\/([^\s:@]+:[^\s:@]*@)?[A-Za-z\d\-]+(\.[A-Za-z\d\-]+)+\.?(:\d{1,5})?([\/?]\S*)?\z} # :nodoc:
 
@@ -103,6 +103,8 @@ class Gem::SpecificationPolicy
 
     validate_dependencies
 
+    validate_required_ruby_version
+
     validate_extensions
 
     validate_removed_attributes
@@ -227,6 +229,12 @@ duplicate dependency on #{dep}, (#{prev.requirement}) use:
     end
   end
 
+  def validate_required_ruby_version
+    if @specification.required_ruby_version.requirements == [Gem::Requirement::DefaultRequirement]
+      warning "make sure you specify the oldest ruby version constraint (like \">= 3.0\") that you want your gem to support by setting the `required_ruby_version` gemspec attribute"
+    end
+  end
+
   ##
   # Issues a warning for each file to be packaged which is world-readable.
   #

data/lib/rubygems/util/licenses.rb

@@ -28,6 +28,7 @@ class Gem::Licenses
     AGPL-3.0-or-later
     AMDPLPA
     AML
+    AML-glslang
     AMPAS
     ANTLR-PD
     ANTLR-PD-fallback
@@ -42,6 +43,7 @@ class Gem::Licenses
     Abstyles
     AdaCore-doc
     Adobe-2006
+    Adobe-Display-PostScript
     Adobe-Glyph
     Adobe-Utopia
     Afmparse
@@ -57,6 +59,7 @@ class Gem::Licenses
     Artistic-2.0
     BSD-1-Clause
     BSD-2-Clause
+    BSD-2-Clause-Darwin
     BSD-2-Clause-Patent
     BSD-2-Clause-Views
     BSD-3-Clause
@@ -71,6 +74,7 @@ class Gem::Licenses
     BSD-3-Clause-No-Nuclear-Warranty
     BSD-3-Clause-Open-MPI
     BSD-3-Clause-Sun
+    BSD-3-Clause-acpica
     BSD-3-Clause-flex
     BSD-4-Clause
     BSD-4-Clause-Shortened
@@ -82,7 +86,9 @@ class Gem::Licenses
     BSD-Inferno-Nettverk
     BSD-Protection
     BSD-Source-Code
+    BSD-Source-beginning-file
     BSD-Systemics
+    BSD-Systemics-W3Works
     BSL-1.0
     BUSL-1.1
     Baekmuk
@@ -96,6 +102,7 @@ class Gem::Licenses
     BlueOak-1.0.0
     Boehm-GC
     Borceux
+    Brian-Gladman-2-Clause
     Brian-Gladman-3-Clause
     C-UDA-1.0
     CAL-1.0
@@ -107,6 +114,7 @@ class Gem::Licenses
     CC-BY-2.5-AU
     CC-BY-3.0
     CC-BY-3.0-AT
+    CC-BY-3.0-AU
     CC-BY-3.0-DE
     CC-BY-3.0-IGO
     CC-BY-3.0-NL
@@ -172,6 +180,7 @@ class Gem::Licenses
     CERN-OHL-W-2.0
     CFITSIO
     CMU-Mach
+    CMU-Mach-nodoc
     CNRI-Jython
     CNRI-Python
     CNRI-Python-GPL-Compatible
@@ -181,6 +190,7 @@ class Gem::Licenses
     CPOL-1.02
     CUA-OPL-1.0
     Caldera
+    Caldera-no-preamble
     ClArtistic
     Clips
     Community-Spec-1.0
@@ -191,10 +201,12 @@ class Gem::Licenses
     CrystalStacker
     Cube
     D-FSL-1.0
+    DEC-3-Clause
     DL-DE-BY-2.0
     DL-DE-ZERO-2.0
     DOC
     DRL-1.0
+    DRL-1.1
     DSDP
     Dotseqn
     ECL-1.0
@@ -215,6 +227,7 @@ class Gem::Licenses
     FBM
     FDK-AAC
     FSFAP
+    FSFAP-no-warranty-disclaimer
     FSFUL
     FSFULLR
     FSFULLRWD
@@ -225,6 +238,7 @@ class Gem::Licenses
     FreeBSD-DOC
     FreeImage
     Furuseth
+    GCR-docs
     GD
     GFDL-1.1-invariants-only
     GFDL-1.1-invariants-or-later
@@ -260,6 +274,10 @@ class Gem::Licenses
     HP-1989
     HPND
     HPND-DEC
+    HPND-Fenneberg-Livingston
+    HPND-INRIA-IMAG
+    HPND-Kevlin-Henney
+    HPND-MIT-disclaimer
     HPND-Markus-Kuhn
     HPND-Pbmplus
     HPND-UC
@@ -267,6 +285,7 @@ class Gem::Licenses
     HPND-doc-sell
     HPND-export-US
     HPND-export-US-modify
+    HPND-sell-MIT-disclaimer-xserver
     HPND-sell-regexpr
     HPND-sell-variant
     HPND-sell-variant-MIT-disclaimer
@@ -281,6 +300,7 @@ class Gem::Licenses
     IPA
     IPL-1.0
     ISC
+    ISC-Veillard
     ImageMagick
     Imlib2
     Info-ZIP
@@ -306,6 +326,7 @@ class Gem::Licenses
     LGPL-3.0-or-later
     LGPLLR
     LOOP
+    LPD-document
     LPL-1.0
     LPL-1.02
     LPPL-1.0
@@ -350,6 +371,8 @@ class Gem::Licenses
     MS-PL
     MS-RL
     MTLL
+    Mackerras-3-Clause
+    Mackerras-3-Clause-acknowledgment
     MakeIndex
     Martin-Birgmeier
     McPhee-slideshow
@@ -434,6 +457,8 @@ class Gem::Licenses
     OSL-3.0
     OpenPBS-2.3
     OpenSSL
+    OpenSSL-standalone
+    OpenVision
     PADL
     PDDL-1.0
     PHP-3.0
@@ -441,6 +466,7 @@ class Gem::Licenses
     PSF-2.0
     Parity-6.0.0
     Parity-7.0.0
+    Pixar
     Plexus
     PolyForm-Noncommercial-1.0.0
     PolyForm-Small-Business-1.0.0
@@ -459,6 +485,7 @@ class Gem::Licenses
     Rdisc
     Ruby
     SAX-PD
+    SAX-PD-2.0
     SCEA
     SGI-B-1.0
     SGI-B-1.1
@@ -476,6 +503,7 @@ class Gem::Licenses
     SPL-1.0
     SSH-OpenSSH
     SSH-short
+    SSLeay-standalone
     SSPL-1.0
     SWL
     Saxpath
@@ -489,11 +517,13 @@ class Gem::Licenses
     Spencer-94
     Spencer-99
     SugarCRM-1.1.3
+    Sun-PPP
     SunPro
     Symlinks
     TAPR-OHL-1.0
     TCL
     TCP-wrappers
+    TGPPL-1.0
     TMate
     TORQUE-1.1
     TOSL
@@ -506,8 +536,10 @@ class Gem::Licenses
     TermReadKey
     UCAR
     UCL-1.0
+    UMich-Merit
     UPL-1.0
     URT-RLE
+    Unicode-3.0
     Unicode-DFS-2015
     Unicode-DFS-2016
     Unicode-TOU
@@ -542,6 +574,7 @@ class Gem::Licenses
     Zimbra-1.3
     Zimbra-1.4
     Zlib
+    bcrypt-Solar-Designer
     blessing
     bzip2-1.0.6
     check-cvs
@@ -557,6 +590,8 @@ class Gem::Licenses
     fwlw
     gSOAP-1.3b
     gnuplot
+    gtkbook
+    hdparm
     iMatix
     libpng-2.0
     libselinux-1.0
@@ -564,6 +599,7 @@ class Gem::Licenses
     libutil-David-Nugent
     lsof
     magaz
+    mailprio
     metamail
     mpi-permissive
     mpich2
@@ -572,12 +608,15 @@ class Gem::Licenses
     psfrag
     psutils
     python-ldap
+    radvd
     snprintf
+    softSurfer
     ssh-keyscan
     swrule
     ulem
     w3m
     xinetd
+    xkeyboard-config-Zinoviev
     xlock
     xpp
     zlib-acknowledgement
@@ -626,6 +665,7 @@ class Gem::Licenses
     Autoconf-exception-generic
     Autoconf-exception-generic-3.0
     Autoconf-exception-macro
+    Bison-exception-1.24
     Bison-exception-2.2
     Bootloader-exception
     CLISP-exception-2.0
@@ -638,6 +678,7 @@ class Gem::Licenses
     GCC-exception-2.0-note
     GCC-exception-3.1
     GNAT-exception
+    GNOME-examples-exception
     GNU-compiler-exception
     GPL-3.0-interface-exception
     GPL-3.0-linking-exception
@@ -645,6 +686,7 @@ class Gem::Licenses
     GPL-CC-1.0
     GStreamer-exception-2005
     GStreamer-exception-2008
+    Gmsh-exception
     KiCad-libraries-exception
     LGPL-3.0-linking-exception
     LLGPL
@@ -671,6 +713,7 @@ class Gem::Licenses
     WxWindows-exception-3.1
     cryptsetup-OpenSSL-exception
     eCos-exception-2.0
+    fmt-exception
     freertos-exception-2.0
     gnu-javamail-exception
     i2p-gpl-java-exception

data/lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../../../../tsort'
+require_relative '../../../../vendored_tsort'
 
 require_relative 'dependency_graph/log'
 require_relative 'dependency_graph/vertex'

data/lib/rubygems/vendored_net_http.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+# Ruby 3.3 and RubyGems 3.5 is already load Gem::Timeout from lib/rubygems/net/http.rb
+# We should avoid to load it again
+require_relative "vendor/net-http/lib/net/http" unless defined?(Gem::Net::HTTP)

data/lib/rubygems/vendored_timeout.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+# Ruby 3.3 and RubyGems 3.5 is already load Gem::Timeout from lib/rubygems/timeout.rb
+# We should avoid to load it again
+require_relative "vendor/timeout/lib/timeout" unless defined?(Gem::Timeout)

data/lib/rubygems.rb

@@ -9,7 +9,7 @@
 require "rbconfig"
 
 module Gem
-  VERSION = "3.5.6"
+  VERSION = "3.5.7"
 end
 
 # Must be first since it unloads the prelude from 1.9.2
@@ -1225,7 +1225,7 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
 
     def find_unresolved_default_spec(path)
       default_spec = @path_to_default_spec_map[path]
-      return default_spec if default_spec && loaded_specs[default_spec.name] != default_spec
+      default_spec if default_spec && loaded_specs[default_spec.name] != default_spec
     end
 
     ##

data/rubygems-update.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "rubygems-update"
-  s.version = "3.5.6"
+  s.version = "3.5.7"
   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"]