rubygems-update 3.5.5 → 3.6.9

data/lib/rubygems/{net-http → vendor/net-http}/lib/net/http.rb

@@ -21,7 +21,7 @@
 #
 
 require_relative '../../../net-protocol/lib/net/protocol'
-require 'uri'
+require_relative '../../../uri/lib/uri'
 require_relative '../../../resolv/lib/resolv'
 autoload :OpenSSL, 'openssl'
 
@@ -67,6 +67,8 @@ module Gem::Net   #:nodoc:
   #     Gem::Net::HTTP.post(uri, data)
   #     params = {title: 'foo', body: 'bar', userId: 1}
   #     Gem::Net::HTTP.post_form(uri, params)
+  #     data = '{"title": "foo", "body": "bar", "userId": 1}'
+  #     Gem::Net::HTTP.put(uri, data)
   #
   # - If performance is important, consider using sessions, which lower request overhead.
   #   This {session}[rdoc-ref:Gem::Net::HTTP@Sessions] has multiple requests for
@@ -106,20 +108,20 @@ module Gem::Net   #:nodoc:
   # It consists of some or all of: scheme, hostname, path, query, and fragment;
   # see {URI syntax}[https://en.wikipedia.org/wiki/Uniform_Resource_Identifier#Syntax].
   #
-  # A Ruby {URI::Generic}[https://docs.ruby-lang.org/en/master/URI/Generic.html] object
+  # A Ruby {Gem::URI::Generic}[https://docs.ruby-lang.org/en/master/Gem/URI/Generic.html] object
   # represents an internet URI.
   # It provides, among others, methods
   # +scheme+, +hostname+, +path+, +query+, and +fragment+.
   #
   # === Schemes
   #
-  # An internet \URI has
+  # An internet \Gem::URI has
   # a {scheme}[https://en.wikipedia.org/wiki/List_of_URI_schemes].
   #
   # The two schemes supported in \Gem::Net::HTTP are <tt>'https'</tt> and <tt>'http'</tt>:
   #
   #   uri.scheme                       # => "https"
-  #   URI('http://example.com').scheme # => "http"
+  #   Gem::URI('http://example.com').scheme # => "http"
   #
   # === Hostnames
   #
@@ -146,8 +148,8 @@ module Gem::Net   #:nodoc:
   #
   #   _uri = uri.dup
   #   params = {userId: 1, completed: false}
-  #   _uri.query = URI.encode_www_form(params)
-  #   _uri # => #<URI::HTTPS https://jsonplaceholder.typicode.com?userId=1&completed=false>
+  #   _uri.query = Gem::URI.encode_www_form(params)
+  #   _uri # => #<Gem::URI::HTTPS https://jsonplaceholder.typicode.com?userId=1&completed=false>
   #   Gem::Net::HTTP.get(_uri)
   #
   # === Fragments
@@ -273,7 +275,7 @@ module Gem::Net   #:nodoc:
   #     # You should choose a better exception.
   #     raise ArgumentError, 'Too many HTTP redirects' if limit == 0
   #
-  #     res = Gem::Net::HTTP.get_response(URI(uri))
+  #     res = Gem::Net::HTTP.get_response(Gem::URI(uri))
   #     case res
   #     when Gem::Net::HTTPSuccess     # Any success class.
   #       res
@@ -327,9 +329,9 @@ module Gem::Net   #:nodoc:
   #
   # Or if you simply want to make a GET request, you may pass in a URI
   # object that has an \HTTPS URL. \Gem::Net::HTTP automatically turns on TLS
-  # verification if the URI object has a 'https' URI scheme:
+  # verification if the URI object has a 'https' :URI scheme:
   #
-  #   uri # => #<URI::HTTPS https://jsonplaceholder.typicode.com/>
+  #   uri # => #<Gem::URI::HTTPS https://jsonplaceholder.typicode.com/>
   #   Gem::Net::HTTP.get(uri)
   #
   # == Proxy Server
@@ -371,9 +373,9 @@ module Gem::Net   #:nodoc:
   # === Proxy Using '<tt>ENV['http_proxy']</tt>'
   #
   # When environment variable <tt>'http_proxy'</tt>
-  # is set to a \URI string,
+  # is set to a \Gem::URI string,
   # the returned +http+ will have the server at that URI as its proxy;
-  # note that the \URI string must have a protocol
+  # note that the \Gem::URI string must have a protocol
   # such as <tt>'http'</tt> or <tt>'https'</tt>:
   #
   #   ENV['http_proxy'] = 'http://example.com'
@@ -386,7 +388,7 @@ module Gem::Net   #:nodoc:
   #   http.proxy_user      # => nil
   #   http.proxy_pass      # => nil
   #
-  # The \URI string may include proxy username, password, and port number:
+  # The \Gem::URI string may include proxy username, password, and port number:
   #
   #   ENV['http_proxy'] = 'http://pname:ppass@example.com:8000'
   #   http = Gem::Net::HTTP.new(hostname)
@@ -456,6 +458,10 @@ module Gem::Net   #:nodoc:
   #
   # == What's Here
   #
+  # First, what's elsewhere. Class Gem::Net::HTTP:
+  #
+  # - Inherits from {class Object}[https://docs.ruby-lang.org/en/master/Object.html#class-Object-label-What-27s+Here].
+  #
   # This is a categorized summary of methods and attributes.
   #
   # === \Gem::Net::HTTP Objects
@@ -520,6 +526,8 @@ module Gem::Net   #:nodoc:
   #   Sends a POST request with form data and returns a response object.
   # - {::post}[rdoc-ref:Gem::Net::HTTP.post]:
   #   Sends a POST request with data and returns a response object.
+  # - {::put}[rdoc-ref:Gem::Net::HTTP.put]:
+  #   Sends a PUT request with data and returns a response object.
   # - {#copy}[rdoc-ref:Gem::Net::HTTP#copy]:
   #   Sends a COPY request and returns a response object.
   # - {#delete}[rdoc-ref:Gem::Net::HTTP#delete]:
@@ -722,7 +730,7 @@ module Gem::Net   #:nodoc:
   class HTTP < Protocol
 
     # :stopdoc:
-    VERSION = "0.4.0"
+    VERSION = "0.6.0"
     HTTPVersion = '1.1'
     begin
       require 'zlib'
@@ -790,7 +798,7 @@ module Gem::Net   #:nodoc:
     #
     # With URI object +uri+ and optional hash argument +headers+:
     #
-    #   uri = URI('https://jsonplaceholder.typicode.com/todos/1')
+    #   uri = Gem::URI('https://jsonplaceholder.typicode.com/todos/1')
     #   headers = {'Content-type' => 'application/json; charset=UTF-8'}
     #   Gem::Net::HTTP.get(uri, headers)
     #
@@ -889,6 +897,39 @@ module Gem::Net   #:nodoc:
       }
     end
 
+    # Sends a PUT request to the server; returns a Gem::Net::HTTPResponse object.
+    #
+    # Argument +url+ must be a URL;
+    # argument +data+ must be a string:
+    #
+    #   _uri = uri.dup
+    #   _uri.path = '/posts'
+    #   data = '{"title": "foo", "body": "bar", "userId": 1}'
+    #   headers = {'content-type': 'application/json'}
+    #   res = Gem::Net::HTTP.put(_uri, data, headers) # => #<Gem::Net::HTTPCreated 201 Created readbody=true>
+    #   puts res.body
+    #
+    # Output:
+    #
+    #   {
+    #     "title": "foo",
+    #     "body": "bar",
+    #     "userId": 1,
+    #     "id": 101
+    #   }
+    #
+    # Related:
+    #
+    # - Gem::Net::HTTP::Put: request class for \HTTP method +PUT+.
+    # - Gem::Net::HTTP#put: convenience method for \HTTP method +PUT+.
+    #
+    def HTTP.put(url, data, header = nil)
+      start(url.hostname, url.port,
+            :use_ssl => url.scheme == 'https' ) {|http|
+        http.put(url, data, header)
+      }
+    end
+
     #
     # \HTTP session management
     #
@@ -1062,7 +1103,7 @@ module Gem::Net   #:nodoc:
     # For proxy-defining arguments +p_addr+ through +p_no_proxy+,
     # see {Proxy Server}[rdoc-ref:Gem::Net::HTTP@Proxy+Server].
     #
-    def HTTP.new(address, port = nil, p_addr = :ENV, p_port = nil, p_user = nil, p_pass = nil, p_no_proxy = nil)
+    def HTTP.new(address, port = nil, p_addr = :ENV, p_port = nil, p_user = nil, p_pass = nil, p_no_proxy = nil, p_use_ssl = nil)
       http = super address, port
 
       if proxy_class? then # from Gem::Net::HTTP::Proxy()
@@ -1071,10 +1112,11 @@ module Gem::Net   #:nodoc:
         http.proxy_port     = @proxy_port
         http.proxy_user     = @proxy_user
         http.proxy_pass     = @proxy_pass
+        http.proxy_use_ssl  = @proxy_use_ssl
       elsif p_addr == :ENV then
         http.proxy_from_env = true
       else
-        if p_addr && p_no_proxy && !URI::Generic.use_proxy?(address, address, port, p_no_proxy)
+        if p_addr && p_no_proxy && !Gem::URI::Generic.use_proxy?(address, address, port, p_no_proxy)
           p_addr = nil
           p_port = nil
         end
@@ -1082,34 +1124,67 @@ module Gem::Net   #:nodoc:
         http.proxy_port    = p_port || default_port
         http.proxy_user    = p_user
         http.proxy_pass    = p_pass
+        http.proxy_use_ssl = p_use_ssl
       end
 
       http
     end
 
+    class << HTTP
+      # Allows to set the default configuration that will be used
+      # when creating a new connection.
+      #
+      # Example:
+      #
+      #   Gem::Net::HTTP.default_configuration = {
+      #     read_timeout: 1,
+      #     write_timeout: 1
+      #   }
+      #   http = Gem::Net::HTTP.new(hostname)
+      #   http.open_timeout   # => 60
+      #   http.read_timeout   # => 1
+      #   http.write_timeout  # => 1
+      #
+      attr_accessor :default_configuration
+    end
+
     # Creates a new \Gem::Net::HTTP object for the specified server address,
     # without opening the TCP connection or initializing the \HTTP session.
     # The +address+ should be a DNS hostname or IP address.
     def initialize(address, port = nil) # :nodoc:
+      defaults = {
+        keep_alive_timeout: 2,
+        close_on_empty_response: false,
+        open_timeout: 60,
+        read_timeout: 60,
+        write_timeout: 60,
+        continue_timeout: nil,
+        max_retries: 1,
+        debug_output: nil,
+        response_body_encoding: false,
+        ignore_eof: true
+      }
+      options = defaults.merge(self.class.default_configuration || {})
+
       @address = address
       @port    = (port || HTTP.default_port)
       @ipaddr = nil
       @local_host = nil
       @local_port = nil
       @curr_http_version = HTTPVersion
-      @keep_alive_timeout = 2
+      @keep_alive_timeout = options[:keep_alive_timeout]
       @last_communicated = nil
-      @close_on_empty_response = false
+      @close_on_empty_response = options[:close_on_empty_response]
       @socket  = nil
       @started = false
-      @open_timeout = 60
-      @read_timeout = 60
-      @write_timeout = 60
-      @continue_timeout = nil
-      @max_retries = 1
-      @debug_output = nil
-      @response_body_encoding = false
-      @ignore_eof = true
+      @open_timeout = options[:open_timeout]
+      @read_timeout = options[:read_timeout]
+      @write_timeout = options[:write_timeout]
+      @continue_timeout = options[:continue_timeout]
+      @max_retries = options[:max_retries]
+      @debug_output = options[:debug_output]
+      @response_body_encoding = options[:response_body_encoding]
+      @ignore_eof = options[:ignore_eof]
 
       @proxy_from_env = false
       @proxy_uri      = nil
@@ -1117,6 +1192,7 @@ module Gem::Net   #:nodoc:
       @proxy_port     = nil
       @proxy_user     = nil
       @proxy_pass     = nil
+      @proxy_use_ssl  = nil
 
       @use_ssl = false
       @ssl_context = nil
@@ -1251,6 +1327,7 @@ module Gem::Net   #:nodoc:
     # Sets the proxy password;
     # see {Proxy Server}[rdoc-ref:Gem::Net::HTTP@Proxy+Server].
     attr_writer :proxy_pass
+    attr_writer :proxy_use_ssl
 
     # Returns the IP address for the connection.
     #
@@ -1440,23 +1517,6 @@ module Gem::Net   #:nodoc:
       @use_ssl = flag
     end
 
-    SSL_IVNAMES = [
-      :@ca_file,
-      :@ca_path,
-      :@cert,
-      :@cert_store,
-      :@ciphers,
-      :@extra_chain_cert,
-      :@key,
-      :@ssl_timeout,
-      :@ssl_version,
-      :@min_version,
-      :@max_version,
-      :@verify_callback,
-      :@verify_depth,
-      :@verify_mode,
-      :@verify_hostname,
-    ] # :nodoc:
     SSL_ATTRIBUTES = [
       :ca_file,
       :ca_path,
@@ -1475,6 +1535,8 @@ module Gem::Net   #:nodoc:
       :verify_hostname,
     ] # :nodoc:
 
+    SSL_IVNAMES = SSL_ATTRIBUTES.map { |a| "@#{a}".to_sym } # :nodoc:
+
     # Sets or returns the path to a CA certification file in PEM format.
     attr_accessor :ca_file
 
@@ -1610,7 +1672,13 @@ module Gem::Net   #:nodoc:
       debug "opened"
       if use_ssl?
         if proxy?
-          plain_sock = BufferedIO.new(s, read_timeout: @read_timeout,
+          if @proxy_use_ssl
+            proxy_sock = OpenSSL::SSL::SSLSocket.new(s)
+            ssl_socket_connect(proxy_sock, @open_timeout)
+          else
+            proxy_sock = s
+          end
+          proxy_sock = BufferedIO.new(proxy_sock, read_timeout: @read_timeout,
                                       write_timeout: @write_timeout,
                                       continue_timeout: @continue_timeout,
                                       debug_output: @debug_output)
@@ -1621,8 +1689,8 @@ module Gem::Net   #:nodoc:
             buf << "Proxy-Authorization: Basic #{credential}\r\n"
           end
           buf << "\r\n"
-          plain_sock.write(buf)
-          HTTPResponse.read_new(plain_sock).value
+          proxy_sock.write(buf)
+          HTTPResponse.read_new(proxy_sock).value
           # assuming nothing left in buffers after successful CONNECT response
         end
 
@@ -1730,13 +1798,14 @@ module Gem::Net   #:nodoc:
     @proxy_port = nil
     @proxy_user = nil
     @proxy_pass = nil
+    @proxy_use_ssl = nil
 
     # Creates an \HTTP proxy class which behaves like \Gem::Net::HTTP, but
     # performs all access via the specified proxy.
     #
     # This class is obsolete.  You may pass these same parameters directly to
     # \Gem::Net::HTTP.new.  See Gem::Net::HTTP.new for details of the arguments.
-    def HTTP.Proxy(p_addr = :ENV, p_port = nil, p_user = nil, p_pass = nil) #:nodoc:
+    def HTTP.Proxy(p_addr = :ENV, p_port = nil, p_user = nil, p_pass = nil, p_use_ssl = nil) #:nodoc:
       return self unless p_addr
 
       Class.new(self) {
@@ -1754,6 +1823,7 @@ module Gem::Net   #:nodoc:
 
         @proxy_user = p_user
         @proxy_pass = p_pass
+        @proxy_use_ssl = p_use_ssl
       }
     end
 
@@ -1778,6 +1848,9 @@ module Gem::Net   #:nodoc:
       # Returns the password for accessing the proxy, or +nil+ if none;
       # see Gem::Net::HTTP@Proxy+Server.
       attr_reader :proxy_pass
+
+      # Use SSL when talking to the proxy. If Gem::Net::HTTP does not use a proxy, nil.
+      attr_reader :proxy_use_ssl
     end
 
     # Returns +true+ if a proxy server is defined, +false+ otherwise;
@@ -1796,7 +1869,7 @@ module Gem::Net   #:nodoc:
     # The proxy URI determined from the environment for this connection.
     def proxy_uri # :nodoc:
       return if @proxy_uri == false
-      @proxy_uri ||= URI::HTTP.new(
+      @proxy_uri ||= Gem::URI::HTTP.new(
         "http", nil, address, port, nil, nil, nil, nil, nil
       ).find_proxy || false
       @proxy_uri || nil
@@ -2012,6 +2085,11 @@ module Gem::Net   #:nodoc:
     #   http = Gem::Net::HTTP.new(hostname)
     #   http.put('/todos/1', data) # => #<Gem::Net::HTTPOK 200 OK readbody=true>
     #
+    # Related:
+    #
+    # - Gem::Net::HTTP::Put: request class for \HTTP method PUT.
+    # - Gem::Net::HTTP.put: sends PUT request, returns response body.
+    #
     def put(path, data, initheader = nil)
       request(Put.new(path, initheader), data)
     end
@@ -2350,7 +2428,10 @@ module Gem::Net   #:nodoc:
           res
         }
         res.reading_body(@socket, req.response_body_permitted?) {
-          yield res if block_given?
+          if block_given?
+            count = max_retries # Don't restart in the middle of a download
+            yield res
+          end
         }
       rescue Gem::Net::OpenTimeout
         raise
@@ -2478,6 +2559,11 @@ module Gem::Net   #:nodoc:
     alias_method :D, :debug
   end
 
+  # for backward compatibility until Ruby 3.5
+  # https://bugs.ruby-lang.org/issues/20900
+  # https://github.com/bblimke/webmock/pull/1081
+  HTTPSession = HTTP
+  deprecate_constant :HTTPSession
 end
 
 require_relative 'http/exceptions'
@@ -2492,5 +2578,3 @@ require_relative 'http/response'
 require_relative 'http/responses'
 
 require_relative 'http/proxy_delta'
-
-require_relative 'http/backward'

data/lib/rubygems/{net-http → vendor/net-http}/lib/net/https.rb

@@ -4,7 +4,7 @@
 = net/https -- SSL/TLS enhancement for Gem::Net::HTTP.
 
   This file has been merged with net/http.  There is no longer any need to
-  require 'rubygems/net-http/lib/net/https' to use HTTPS.
+  require_relative 'https' to use HTTPS.
 
   See Gem::Net::HTTP for details on how to make HTTPS connections.
 

data/lib/rubygems/vendor/optparse/COPYING

@@ -0,0 +1,56 @@
+Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.jp>.
+You can redistribute it and/or modify it under either the terms of the
+2-clause BSDL (see the file BSDL), or the conditions below:
+
+1. You may make and give away verbatim copies of the source form of the
+   software without restriction, provided that you duplicate all of the
+   original copyright notices and associated disclaimers.
+
+2. You may modify your copy of the software in any way, provided that
+   you do at least ONE of the following:
+
+   a. place your modifications in the Public Domain or otherwise
+      make them Freely Available, such as by posting said
+      modifications to Usenet or an equivalent medium, or by allowing
+      the author to include your modifications in the software.
+
+   b. use the modified software only within your corporation or
+      organization.
+
+   c. give non-standard binaries non-standard names, with
+      instructions on where to get the original software distribution.
+
+   d. make other distribution arrangements with the author.
+
+3. You may distribute the software in object code or binary form,
+   provided that you do at least ONE of the following:
+
+   a. distribute the binaries and library files of the software,
+      together with instructions (in the manual page or equivalent)
+      on where to get the original distribution.
+
+   b. accompany the distribution with the machine-readable source of
+      the software.
+
+   c. give non-standard binaries non-standard names, with
+      instructions on where to get the original software distribution.
+
+   d. make other distribution arrangements with the author.
+
+4. You may modify and include the part of the software into any other
+   software (possibly commercial).  But some files in the distribution
+   are not written by the author, so that they are not under these terms.
+
+   For the list of those files and their copying conditions, see the
+   file LEGAL.
+
+5. The scripts and library files supplied as input to or produced as
+   output from the software do not automatically fall under the
+   copyright of the software, but belong to whomever generated them,
+   and may be sold commercially, and may be aggregated with this
+   software.
+
+6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+   IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+   WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+   PURPOSE.

data/lib/rubygems/{optparse → vendor/optparse}/lib/optparse/ac.rb

@@ -1,7 +1,11 @@
 # frozen_string_literal: false
 require_relative '../optparse'
 
+#
+# autoconf-like options.
+#
 class Gem::OptionParser::AC < Gem::OptionParser
+  # :stopdoc:
   private
 
   def _check_ac_args(name, block)
@@ -14,6 +18,7 @@ class Gem::OptionParser::AC < Gem::OptionParser
   end
 
   ARG_CONV = proc {|val| val.nil? ? true : val}
+  private_constant :ARG_CONV
 
   def _ac_arg_enable(prefix, name, help_string, block)
     _check_ac_args(name, block)
@@ -29,16 +34,27 @@ class Gem::OptionParser::AC < Gem::OptionParser
     enable
   end
 
+  # :startdoc:
+
   public
 
+  # Define <tt>--enable</tt> / <tt>--disable</tt> style option
+  #
+  # Appears as <tt>--enable-<i>name</i></tt> in help message.
   def ac_arg_enable(name, help_string, &block)
     _ac_arg_enable("enable", name, help_string, block)
   end
 
+  # Define <tt>--enable</tt> / <tt>--disable</tt> style option
+  #
+  # Appears as <tt>--disable-<i>name</i></tt> in help message.
   def ac_arg_disable(name, help_string, &block)
     _ac_arg_enable("disable", name, help_string, block)
   end
 
+  # Define <tt>--with</tt> / <tt>--without</tt> style option
+  #
+  # Appears as <tt>--with-<i>name</i></tt> in help message.
   def ac_arg_with(name, help_string, &block)
     _check_ac_args(name, block)
 

data/lib/rubygems/{optparse → vendor/optparse}/lib/optparse/kwargs.rb

@@ -7,12 +7,17 @@ class Gem::OptionParser
   #
   # :include: ../../doc/optparse/creates_option.rdoc
   #
-  def define_by_keywords(options, meth, **opts)
-    meth.parameters.each do |type, name|
+  # Defines options which set in to _options_ for keyword parameters
+  # of _method_.
+  #
+  # Parameters for each keywords are given as elements of _params_.
+  #
+  def define_by_keywords(options, method, **params)
+    method.parameters.each do |type, name|
       case type
       when :key, :keyreq
         op, cl = *(type == :key ? %w"[ ]" : ["", ""])
-        define("--#{name}=#{op}#{name.upcase}#{cl}", *opts[name]) do |o|
+        define("--#{name}=#{op}#{name.upcase}#{cl}", *params[name]) do |o|
           options[name] = o
         end
       end

data/lib/rubygems/vendor/optparse/lib/optparse/uri.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: false
+# -*- ruby -*-
+
+require_relative '../optparse'
+require_relative '../../../uri/lib/uri'
+
+Gem::OptionParser.accept(Gem::URI) {|s,| Gem::URI.parse(s) if s}

data/lib/rubygems/{optparse → vendor/optparse}/lib/optparse/version.rb

@@ -2,6 +2,11 @@
 # Gem::OptionParser internal utility
 
 class << Gem::OptionParser
+  #
+  # Shows version string in packages if Version is defined.
+  #
+  # +pkgs+:: package list
+  #
   def show_version(*pkgs)
     progname = ARGV.options.program_name
     result = false
@@ -47,6 +52,8 @@ class << Gem::OptionParser
     result
   end
 
+  # :stopdoc:
+
   def each_const(path, base = ::Object)
     path.split(/::|\//).inject(base) do |klass, name|
       raise NameError, path unless Module === klass
@@ -68,4 +75,6 @@ class << Gem::OptionParser
       end
     end
   end
+
+  # :startdoc:
 end