bundler 2.2.27 → 2.6.1

data/lib/bundler/vendor/uri/lib/uri/file.rb

@@ -33,6 +33,9 @@ module Bundler::URI
     # If an Array is used, the components must be passed in the
     # order <code>[host, path]</code>.
     #
+    # A path from e.g. the File class should be escaped before
+    # being passed.
+    #
     # Examples:
     #
     #     require 'bundler/vendor/uri/lib/uri'
@@ -44,6 +47,9 @@ module Bundler::URI
     #       :path => '/ruby/src'})
     #     uri2.to_s  # => "file://host.example.com/ruby/src"
     #
+    #     uri3 = Bundler::URI::File.build({:path => Bundler::URI::escape('/path/my file.txt')})
+    #     uri3.to_s  # => "file:///path/my%20file.txt"
+    #
     def self.build(args)
       tmp = Util::make_components_hash(self, args)
       super(tmp)
@@ -64,17 +70,17 @@ module Bundler::URI
 
     # raise InvalidURIError
     def check_userinfo(user)
-      raise Bundler::URI::InvalidURIError, "can not set userinfo for file Bundler::URI"
+      raise Bundler::URI::InvalidURIError, "cannot set userinfo for file Bundler::URI"
     end
 
     # raise InvalidURIError
     def check_user(user)
-      raise Bundler::URI::InvalidURIError, "can not set user for file Bundler::URI"
+      raise Bundler::URI::InvalidURIError, "cannot set user for file Bundler::URI"
     end
 
     # raise InvalidURIError
     def check_password(user)
-      raise Bundler::URI::InvalidURIError, "can not set password for file Bundler::URI"
+      raise Bundler::URI::InvalidURIError, "cannot set password for file Bundler::URI"
     end
 
     # do nothing
@@ -90,5 +96,5 @@ module Bundler::URI
     end
   end
 
-  @@schemes['FILE'] = File
+  register_scheme 'FILE', File
 end

data/lib/bundler/vendor/uri/lib/uri/ftp.rb

@@ -3,7 +3,6 @@
 #
 # Author:: Akira Yamada <akira@ruby-lang.org>
 # License:: You can redistribute it and/or modify it under the same term as Ruby.
-# Revision:: $Id$
 #
 # See Bundler::URI for general documentation
 #
@@ -18,7 +17,7 @@ module Bundler::URI
   # This class will be redesigned because of difference of implementations;
   # the structure of its path. draft-hoffman-ftp-uri-04 is a draft but it
   # is a good summary about the de facto spec.
-  # http://tools.ietf.org/html/draft-hoffman-ftp-uri-04
+  # https://datatracker.ietf.org/doc/html/draft-hoffman-ftp-uri-04
   #
   class FTP < Generic
     # A Default port of 21 for Bundler::URI::FTP.
@@ -263,5 +262,6 @@ module Bundler::URI
       return str
     end
   end
-  @@schemes['FTP'] = FTP
+
+  register_scheme 'FTP', FTP
 end

data/lib/bundler/vendor/uri/lib/uri/generic.rb

@@ -4,7 +4,6 @@
 #
 # Author:: Akira Yamada <akira@ruby-lang.org>
 # License:: You can redistribute it and/or modify it under the same term as Ruby.
-# Revision:: $Id$
 #
 # See Bundler::URI for general documentation
 #
@@ -83,7 +82,7 @@ module Bundler::URI
         if args.kind_of?(Array)
           return self.build(args.collect{|x|
             if x.is_a?(String)
-              DEFAULT_PARSER.escape(x)
+              Bundler::URI::RFC2396_PARSER.escape(x)
             else
               x
             end
@@ -92,7 +91,7 @@ module Bundler::URI
           tmp = {}
           args.each do |key, value|
             tmp[key] = if value
-                DEFAULT_PARSER.escape(value)
+                Bundler::URI::RFC2396_PARSER.escape(value)
               else
                 value
               end
@@ -394,7 +393,7 @@ module Bundler::URI
     def check_user(v)
       if @opaque
         raise InvalidURIError,
-          "can not set user with opaque"
+          "cannot set user with opaque"
       end
 
       return v unless v
@@ -418,7 +417,7 @@ module Bundler::URI
     def check_password(v, user = @user)
       if @opaque
         raise InvalidURIError,
-          "can not set password with opaque"
+          "cannot set password with opaque"
       end
       return v unless v
 
@@ -565,16 +564,26 @@ module Bundler::URI
       end
     end
 
-    # Returns the user component.
+    # Returns the user component (without Bundler::URI decoding).
     def user
       @user
     end
 
-    # Returns the password component.
+    # Returns the password component (without Bundler::URI decoding).
     def password
       @password
     end
 
+    # Returns the user component after Bundler::URI decoding.
+    def decoded_user
+      Bundler::URI.decode_uri_component(@user) if @user
+    end
+
+    # Returns the password component after Bundler::URI decoding.
+    def decoded_password
+      Bundler::URI.decode_uri_component(@password) if @password
+    end
+
     #
     # Checks the host +v+ component for RFC2396 compliance
     # and against the Bundler::URI::Parser Regexp for :HOST.
@@ -587,7 +596,7 @@ module Bundler::URI
 
       if @opaque
         raise InvalidURIError,
-          "can not set host with registry or opaque"
+          "cannot set host with registry or opaque"
       elsif parser.regexp[:HOST] !~ v
         raise InvalidComponentError,
           "bad component(expected host component): #{v}"
@@ -644,7 +653,7 @@ module Bundler::URI
     #
     def hostname
       v = self.host
-      /\A\[(.*)\]\z/ =~ v ? $1 : v
+      v&.start_with?('[') && v.end_with?(']') ? v[1..-2] : v
     end
 
     # Sets the host part of the Bundler::URI as the argument with brackets for IPv6 addresses.
@@ -660,7 +669,7 @@ module Bundler::URI
     # it is wrapped with brackets.
     #
     def hostname=(v)
-      v = "[#{v}]" if /\A\[.*\]\z/ !~ v && /:/ =~ v
+      v = "[#{v}]" if !(v&.start_with?('[') && v&.end_with?(']')) && v&.index(':')
       self.host = v
     end
 
@@ -676,7 +685,7 @@ module Bundler::URI
 
       if @opaque
         raise InvalidURIError,
-          "can not set port with registry or opaque"
+          "cannot set port with registry or opaque"
       elsif !v.kind_of?(Integer) && parser.regexp[:PORT] !~ v
         raise InvalidComponentError,
           "bad component(expected port component): #{v.inspect}"
@@ -724,17 +733,17 @@ module Bundler::URI
     end
 
     def check_registry(v) # :nodoc:
-      raise InvalidURIError, "can not set registry"
+      raise InvalidURIError, "cannot set registry"
     end
     private :check_registry
 
     def set_registry(v) #:nodoc:
-      raise InvalidURIError, "can not set registry"
+      raise InvalidURIError, "cannot set registry"
     end
     protected :set_registry
 
     def registry=(v)
-      raise InvalidURIError, "can not set registry"
+      raise InvalidURIError, "cannot set registry"
     end
 
     #
@@ -857,7 +866,7 @@ module Bundler::URI
       # hier_part     = ( net_path | abs_path ) [ "?" query ]
       if @host || @port || @user || @path  # userinfo = @user + ':' + @password
         raise InvalidURIError,
-          "can not set opaque with host, port, userinfo or path"
+          "cannot set opaque with host, port, userinfo or path"
       elsif v && parser.regexp[:OPAQUE] !~ v
         raise InvalidComponentError,
           "bad component(expected opaque component): #{v}"
@@ -936,7 +945,7 @@ module Bundler::URI
     # == Description
     #
     # Bundler::URI has components listed in order of decreasing significance from left to right,
-    # see RFC3986 https://tools.ietf.org/html/rfc3986 1.2.3.
+    # see RFC3986 https://www.rfc-editor.org/rfc/rfc3986 1.2.3.
     #
     # == Usage
     #
@@ -1098,7 +1107,7 @@ module Bundler::URI
     #   # => "http://my.example.com/main.rbx?page=1"
     #
     def merge(oth)
-      rel = parser.send(:convert_to_uri, oth)
+      rel = parser.__send__(:convert_to_uri, oth)
 
       if rel.absolute?
         #raise BadURIError, "both Bundler::URI are absolute" if absolute?
@@ -1183,7 +1192,7 @@ module Bundler::URI
 
     # :stopdoc:
     def route_from0(oth)
-      oth = parser.send(:convert_to_uri, oth)
+      oth = parser.__send__(:convert_to_uri, oth)
       if self.relative?
         raise BadURIError,
           "relative Bundler::URI: #{self}"
@@ -1226,7 +1235,7 @@ module Bundler::URI
         return rel, rel
       end
 
-      # you can modify `rel', but can not `oth'.
+      # you can modify `rel', but cannot `oth'.
       return oth, rel
     end
     private :route_from0
@@ -1251,7 +1260,7 @@ module Bundler::URI
     #   #=> #<Bundler::URI::Generic /main.rbx?page=1>
     #
     def route_from(oth)
-      # you can modify `rel', but can not `oth'.
+      # you can modify `rel', but cannot `oth'.
       begin
         oth, rel = route_from0(oth)
       rescue
@@ -1291,7 +1300,7 @@ module Bundler::URI
     #   #=> #<Bundler::URI::Generic /main.rbx?page=1>
     #
     def route_to(oth)
-      parser.send(:convert_to_uri, oth).route_from(self)
+      parser.__send__(:convert_to_uri, oth).route_from(self)
     end
 
     #
@@ -1355,6 +1364,9 @@ module Bundler::URI
           str << ':'
           str << @port.to_s
         end
+        if (@host || @port) && !@path.empty? && !@path.start_with?('/')
+          str << '/'
+        end
         str << @path
         if @query
           str << '?'
@@ -1367,6 +1379,7 @@ module Bundler::URI
       end
       str
     end
+    alias to_str to_s
 
     #
     # Compares two URIs.
@@ -1389,23 +1402,10 @@ module Bundler::URI
       self.component_ary.eql?(oth.component_ary)
     end
 
-=begin
-
---- Bundler::URI::Generic#===(oth)
-
-=end
-#    def ===(oth)
-#      raise NotImplementedError
-#    end
-
-=begin
-=end
-
-
     # Returns an Array of the components defined from the COMPONENT Array.
     def component_ary
       component.collect do |x|
-        self.send(x)
+        self.__send__(x)
       end
     end
     protected :component_ary
@@ -1430,7 +1430,7 @@ module Bundler::URI
     def select(*components)
       components.collect do |c|
         if component.include?(c)
-          self.send(c)
+          self.__send__(c)
         else
           raise ArgumentError,
             "expected of components of #{self.class} (#{self.class.component.join(', ')})"
@@ -1515,9 +1515,19 @@ module Bundler::URI
           proxy_uri = env["CGI_#{name.upcase}"]
         end
       elsif name == 'http_proxy'
-        unless proxy_uri = env[name]
-          if proxy_uri = env[name.upcase]
-            warn 'The environment variable HTTP_PROXY is discouraged.  Use http_proxy.', uplevel: 1
+        if RUBY_ENGINE == 'jruby' && p_addr = ENV_JAVA['http.proxyHost']
+          p_port = ENV_JAVA['http.proxyPort']
+          if p_user = ENV_JAVA['http.proxyUser']
+            p_pass = ENV_JAVA['http.proxyPass']
+            proxy_uri = "http://#{p_user}:#{p_pass}@#{p_addr}:#{p_port}"
+          else
+            proxy_uri = "http://#{p_addr}:#{p_port}"
+          end
+        else
+          unless proxy_uri = env[name]
+            if proxy_uri = env[name.upcase]
+              warn 'The environment variable HTTP_PROXY is discouraged.  Use http_proxy.', uplevel: 1
+            end
           end
         end
       else

data/lib/bundler/vendor/uri/lib/uri/http.rb

@@ -3,7 +3,6 @@
 #
 # Author:: Akira Yamada <akira@ruby-lang.org>
 # License:: You can redistribute it and/or modify it under the same term as Ruby.
-# Revision:: $Id$
 #
 # See Bundler::URI for general documentation
 #
@@ -81,8 +80,46 @@ module Bundler::URI
       url = @query ? "#@path?#@query" : @path.dup
       url.start_with?(?/.freeze) ? url : ?/ + url
     end
-  end
 
-  @@schemes['HTTP'] = HTTP
+    #
+    # == Description
+    #
+    # Returns the authority for an HTTP uri, as defined in
+    # https://www.rfc-editor.org/rfc/rfc3986#section-3.2.
+    #
+    #
+    # Example:
+    #
+    #     Bundler::URI::HTTP.build(host: 'www.example.com', path: '/foo/bar').authority #=> "www.example.com"
+    #     Bundler::URI::HTTP.build(host: 'www.example.com', port: 8000, path: '/foo/bar').authority #=> "www.example.com:8000"
+    #     Bundler::URI::HTTP.build(host: 'www.example.com', port: 80, path: '/foo/bar').authority #=> "www.example.com"
+    #
+    def authority
+      if port == default_port
+        host
+      else
+        "#{host}:#{port}"
+      end
+    end
+
+    #
+    # == Description
+    #
+    # Returns the origin for an HTTP uri, as defined in
+    # https://www.rfc-editor.org/rfc/rfc6454.
+    #
+    #
+    # Example:
+    #
+    #     Bundler::URI::HTTP.build(host: 'www.example.com', path: '/foo/bar').origin #=> "http://www.example.com"
+    #     Bundler::URI::HTTP.build(host: 'www.example.com', port: 8000, path: '/foo/bar').origin #=> "http://www.example.com:8000"
+    #     Bundler::URI::HTTP.build(host: 'www.example.com', port: 80, path: '/foo/bar').origin #=> "http://www.example.com"
+    #     Bundler::URI::HTTPS.build(host: 'www.example.com', path: '/foo/bar').origin #=> "https://www.example.com"
+    #
+    def origin
+      "#{scheme}://#{authority}"
+    end
+  end
 
+  register_scheme 'HTTP', HTTP
 end

data/lib/bundler/vendor/uri/lib/uri/https.rb

@@ -3,7 +3,6 @@
 #
 # Author:: Akira Yamada <akira@ruby-lang.org>
 # License:: You can redistribute it and/or modify it under the same term as Ruby.
-# Revision:: $Id$
 #
 # See Bundler::URI for general documentation
 #
@@ -19,5 +18,6 @@ module Bundler::URI
     # A Default port of 443 for Bundler::URI::HTTPS
     DEFAULT_PORT = 443
   end
-  @@schemes['HTTPS'] = HTTPS
+
+  register_scheme 'HTTPS', HTTPS
 end

data/lib/bundler/vendor/uri/lib/uri/ldap.rb

@@ -7,7 +7,6 @@
 # License::
 #   Bundler::URI::LDAP is copyrighted free software by Takaaki Tateishi and Akira Yamada.
 #   You can redistribute it and/or modify it under the same term as Ruby.
-# Revision:: $Id$
 #
 # See Bundler::URI for general documentation
 #
@@ -119,6 +118,7 @@ module Bundler::URI
 
     # Private method to cleanup +dn+ from using the +path+ component attribute.
     def parse_dn
+      raise InvalidURIError, 'bad LDAP URL' unless @path
       @dn = @path[1..-1]
     end
     private :parse_dn
@@ -257,5 +257,5 @@ module Bundler::URI
     end
   end
 
-  @@schemes['LDAP'] = LDAP
+  register_scheme 'LDAP', LDAP
 end

data/lib/bundler/vendor/uri/lib/uri/ldaps.rb

@@ -17,5 +17,6 @@ module Bundler::URI
     # A Default port of 636 for Bundler::URI::LDAPS
     DEFAULT_PORT = 636
   end
-  @@schemes['LDAPS'] = LDAPS
+
+  register_scheme 'LDAPS', LDAPS
 end

data/lib/bundler/vendor/uri/lib/uri/mailto.rb

@@ -3,7 +3,6 @@
 #
 # Author:: Akira Yamada <akira@ruby-lang.org>
 # License:: You can redistribute it and/or modify it under the same term as Ruby.
-# Revision:: $Id$
 #
 # See Bundler::URI for general documentation
 #
@@ -16,7 +15,7 @@ module Bundler::URI
   # RFC6068, the mailto URL scheme.
   #
   class MailTo < Generic
-    include REGEXP
+    include RFC2396_REGEXP
 
     # A Default port of nil for Bundler::URI::MailTo.
     DEFAULT_PORT = nil
@@ -290,5 +289,5 @@ module Bundler::URI
     alias to_rfc822text to_mailtext
   end
 
-  @@schemes['MAILTO'] = MailTo
+  register_scheme 'MAILTO', MailTo
 end

data/lib/bundler/vendor/uri/lib/uri/rfc2396_parser.rb

@@ -3,7 +3,6 @@
 # = uri/common.rb
 #
 # Author:: Akira Yamada <akira@ruby-lang.org>
-# Revision:: $Id$
 # License::
 #   You can redistribute it and/or modify it under the same term as Ruby.
 #
@@ -117,7 +116,7 @@ module Bundler::URI
     # See also Bundler::URI::Parser.initialize_regexp.
     attr_reader :regexp
 
-    # Returns a split Bundler::URI against regexp[:ABS_URI].
+    # Returns a split Bundler::URI against +regexp[:ABS_URI]+.
     def split(uri)
       case uri
       when ''
@@ -141,11 +140,11 @@ module Bundler::URI
 
         if !scheme
           raise InvalidURIError,
-            "bad Bundler::URI(absolute but no scheme): #{uri}"
+            "bad Bundler::URI (absolute but no scheme): #{uri}"
         end
         if !opaque && (!path && (!host && !registry))
           raise InvalidURIError,
-            "bad Bundler::URI(absolute but no path): #{uri}"
+            "bad Bundler::URI (absolute but no path): #{uri}"
         end
 
       when @regexp[:REL_URI]
@@ -174,7 +173,7 @@ module Bundler::URI
         # server        = [ [ userinfo "@" ] hostport ]
 
       else
-        raise InvalidURIError, "bad Bundler::URI(is not Bundler::URI?): #{uri}"
+        raise InvalidURIError, "bad Bundler::URI (is not Bundler::URI?): #{uri}"
       end
 
       path = '' if !path && !opaque # (see RFC2396 Section 5.2)
@@ -208,21 +207,9 @@ module Bundler::URI
     #   #=> #<Bundler::URI::LDAP ldap://ldap.example.com/dc=example?user=john>
     #
     def parse(uri)
-      scheme, userinfo, host, port,
-        registry, path, opaque, query, fragment = self.split(uri)
-
-      if scheme && Bundler::URI.scheme_list.include?(scheme.upcase)
-        Bundler::URI.scheme_list[scheme.upcase].new(scheme, userinfo, host, port,
-                                           registry, path, opaque, query,
-                                           fragment, self)
-      else
-        Generic.new(scheme, userinfo, host, port,
-                    registry, path, opaque, query,
-                    fragment, self)
-      end
+      Bundler::URI.for(*self.split(uri), self)
     end
 
-
     #
     # == Args
     #
@@ -270,8 +257,8 @@ module Bundler::URI
       end
     end
 
-    # Returns Regexp that is default self.regexp[:ABS_URI_REF],
-    # unless +schemes+ is provided. Then it is a Regexp.union with self.pattern[:X_ABS_URI].
+    # Returns Regexp that is default +self.regexp[:ABS_URI_REF]+,
+    # unless +schemes+ is provided. Then it is a Regexp.union with +self.pattern[:X_ABS_URI]+.
     def make_regexp(schemes = nil)
       unless schemes
         @regexp[:ABS_URI_REF]
@@ -290,7 +277,7 @@ module Bundler::URI
     # +str+::
     #    String to make safe
     # +unsafe+::
-    #    Regexp to apply. Defaults to self.regexp[:UNSAFE]
+    #    Regexp to apply. Defaults to +self.regexp[:UNSAFE]+
     #
     # == Description
     #
@@ -322,7 +309,7 @@ module Bundler::URI
     # +str+::
     #    String to remove escapes from
     # +escaped+::
-    #    Regexp to apply. Defaults to self.regexp[:ESCAPED]
+    #    Regexp to apply. Defaults to +self.regexp[:ESCAPED]+
     #
     # == Description
     #
@@ -335,8 +322,14 @@ module Bundler::URI
     end
 
     @@to_s = Kernel.instance_method(:to_s)
-    def inspect
-      @@to_s.bind_call(self)
+    if @@to_s.respond_to?(:bind_call)
+      def inspect
+        @@to_s.bind_call(self)
+      end
+    else
+      def inspect
+        @@to_s.bind(self).call
+      end
     end
 
     private
@@ -504,8 +497,8 @@ module Bundler::URI
       ret = {}
 
       # for Bundler::URI::split
-      ret[:ABS_URI] = Regexp.new('\A\s*' + pattern[:X_ABS_URI] + '\s*\z', Regexp::EXTENDED)
-      ret[:REL_URI] = Regexp.new('\A\s*' + pattern[:X_REL_URI] + '\s*\z', Regexp::EXTENDED)
+      ret[:ABS_URI] = Regexp.new('\A\s*+' + pattern[:X_ABS_URI] + '\s*\z', Regexp::EXTENDED)
+      ret[:REL_URI] = Regexp.new('\A\s*+' + pattern[:X_REL_URI] + '\s*\z', Regexp::EXTENDED)
 
       # for Bundler::URI::extract
       ret[:URI_REF]     = Regexp.new(pattern[:URI_REF])
@@ -543,4 +536,11 @@ module Bundler::URI
     end
 
   end # class Parser
+
+  # Backward compatibility for Bundler::URI::REGEXP::PATTERN::*
+  RFC2396_Parser.new.pattern.each_pair do |sym, str|
+    unless RFC2396_REGEXP::PATTERN.const_defined?(sym, false)
+      RFC2396_REGEXP::PATTERN.const_set(sym, str)
+    end
+  end
 end # module Bundler::URI