Bump vendored uri to 1.0.2

Author: deivid-rodriguez

bundler/lib/bundler/vendor/uri/lib/uri/common.rb

@@ -31,15 +31,10 @@ def self.parser=(parser = RFC3986_PARSER)
     if Parser == RFC2396_Parser
       const_set("REGEXP", Bundler::URI::RFC2396_REGEXP)
       const_set("PATTERN", Bundler::URI::RFC2396_REGEXP::PATTERN)
-      Parser.new.pattern.each_pair do |sym, str|
-        unless REGEXP::PATTERN.const_defined?(sym)
-          REGEXP::PATTERN.const_set(sym, str)
-        end
-      end
     end
 
     Parser.new.regexp.each_pair do |sym, str|
-      remove_const(sym) if const_defined?(sym)
+      remove_const(sym) if const_defined?(sym, false)
       const_set(sym, str)
     end
   end

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

@@ -536,4 +536,11 @@ def convert_to_uri(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

bundler/lib/bundler/vendor/uri/lib/uri/rfc3986_parser.rb

@@ -142,25 +142,25 @@ def join(*uris) # :nodoc:
 
     # Compatibility for RFC2396 parser
     def extract(str, schemes = nil, &block) # :nodoc:
-      warn "Bundler::URI::RFC3986_PARSER.extract is obsoleted. Use Bundler::URI::RFC2396_PARSER.extract explicitly.", uplevel: 1 if $VERBOSE
+      warn "Bundler::URI::RFC3986_PARSER.extract is obsolete. Use Bundler::URI::RFC2396_PARSER.extract explicitly.", uplevel: 1 if $VERBOSE
       RFC2396_PARSER.extract(str, schemes, &block)
     end
 
     # Compatibility for RFC2396 parser
     def make_regexp(schemes = nil) # :nodoc:
-      warn "Bundler::URI::RFC3986_PARSER.make_regexp is obsoleted. Use Bundler::URI::RFC2396_PARSER.make_regexp explicitly.", uplevel: 1 if $VERBOSE
+      warn "Bundler::URI::RFC3986_PARSER.make_regexp is obsolete. Use Bundler::URI::RFC2396_PARSER.make_regexp explicitly.", uplevel: 1 if $VERBOSE
       RFC2396_PARSER.make_regexp(schemes)
     end
 
     # Compatibility for RFC2396 parser
     def escape(str, unsafe = nil) # :nodoc:
-      warn "Bundler::URI::RFC3986_PARSER.escape is obsoleted. Use Bundler::URI::RFC2396_PARSER.escape explicitly.", uplevel: 1 if $VERBOSE
+      warn "Bundler::URI::RFC3986_PARSER.escape is obsolete. Use Bundler::URI::RFC2396_PARSER.escape explicitly.", uplevel: 1 if $VERBOSE
       unsafe ? RFC2396_PARSER.escape(str, unsafe) : RFC2396_PARSER.escape(str)
     end
 
     # Compatibility for RFC2396 parser
     def unescape(str, escaped = nil) # :nodoc:
-      warn "Bundler::URI::RFC3986_PARSER.unescape is obsoleted. Use Bundler::URI::RFC2396_PARSER.unescape explicitly.", uplevel: 1 if $VERBOSE
+      warn "Bundler::URI::RFC3986_PARSER.unescape is obsolete. Use Bundler::URI::RFC2396_PARSER.unescape explicitly.", uplevel: 1 if $VERBOSE
       escaped ? RFC2396_PARSER.unescape(str, escaped) : RFC2396_PARSER.unescape(str)
     end
 

bundler/lib/bundler/vendor/uri/lib/uri/version.rb

@@ -1,6 +1,6 @@
 module Bundler::URI
   # :stopdoc:
-  VERSION_CODE = '010001'.freeze
+  VERSION_CODE = '010002'.freeze
   VERSION = VERSION_CODE.scan(/../).collect{|n| n.to_i}.join('.').freeze
   # :startdoc:
 end

lib/rubygems/vendor/uri/lib/uri/common.rb

@@ -31,15 +31,10 @@ def self.parser=(parser = RFC3986_PARSER)
     if Parser == RFC2396_Parser
       const_set("REGEXP", Gem::URI::RFC2396_REGEXP)
       const_set("PATTERN", Gem::URI::RFC2396_REGEXP::PATTERN)
-      Parser.new.pattern.each_pair do |sym, str|
-        unless REGEXP::PATTERN.const_defined?(sym)
-          REGEXP::PATTERN.const_set(sym, str)
-        end
-      end
     end
 
     Parser.new.regexp.each_pair do |sym, str|
-      remove_const(sym) if const_defined?(sym)
+      remove_const(sym) if const_defined?(sym, false)
       const_set(sym, str)
     end
   end

lib/rubygems/vendor/uri/lib/uri/rfc2396_parser.rb

@@ -536,4 +536,11 @@ def convert_to_uri(uri)
     end
 
   end # class Parser
+
+  # Backward compatibility for Gem::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 Gem::URI

lib/rubygems/vendor/uri/lib/uri/rfc3986_parser.rb

@@ -142,25 +142,25 @@ def join(*uris) # :nodoc:
 
     # Compatibility for RFC2396 parser
     def extract(str, schemes = nil, &block) # :nodoc:
-      warn "Gem::URI::RFC3986_PARSER.extract is obsoleted. Use Gem::URI::RFC2396_PARSER.extract explicitly.", uplevel: 1 if $VERBOSE
+      warn "Gem::URI::RFC3986_PARSER.extract is obsolete. Use Gem::URI::RFC2396_PARSER.extract explicitly.", uplevel: 1 if $VERBOSE
       RFC2396_PARSER.extract(str, schemes, &block)
     end
 
     # Compatibility for RFC2396 parser
     def make_regexp(schemes = nil) # :nodoc:
-      warn "Gem::URI::RFC3986_PARSER.make_regexp is obsoleted. Use Gem::URI::RFC2396_PARSER.make_regexp explicitly.", uplevel: 1 if $VERBOSE
+      warn "Gem::URI::RFC3986_PARSER.make_regexp is obsolete. Use Gem::URI::RFC2396_PARSER.make_regexp explicitly.", uplevel: 1 if $VERBOSE
       RFC2396_PARSER.make_regexp(schemes)
     end
 
     # Compatibility for RFC2396 parser
     def escape(str, unsafe = nil) # :nodoc:
-      warn "Gem::URI::RFC3986_PARSER.escape is obsoleted. Use Gem::URI::RFC2396_PARSER.escape explicitly.", uplevel: 1 if $VERBOSE
+      warn "Gem::URI::RFC3986_PARSER.escape is obsolete. Use Gem::URI::RFC2396_PARSER.escape explicitly.", uplevel: 1 if $VERBOSE
       unsafe ? RFC2396_PARSER.escape(str, unsafe) : RFC2396_PARSER.escape(str)
     end
 
     # Compatibility for RFC2396 parser
     def unescape(str, escaped = nil) # :nodoc:
-      warn "Gem::URI::RFC3986_PARSER.unescape is obsoleted. Use Gem::URI::RFC2396_PARSER.unescape explicitly.", uplevel: 1 if $VERBOSE
+      warn "Gem::URI::RFC3986_PARSER.unescape is obsolete. Use Gem::URI::RFC2396_PARSER.unescape explicitly.", uplevel: 1 if $VERBOSE
       escaped ? RFC2396_PARSER.unescape(str, escaped) : RFC2396_PARSER.unescape(str)
     end
 

lib/rubygems/vendor/uri/lib/uri/version.rb

@@ -1,6 +1,6 @@
 module Gem::URI
   # :stopdoc:
-  VERSION_CODE = '010001'.freeze
+  VERSION_CODE = '010002'.freeze
   VERSION = VERSION_CODE.scan(/../).collect{|n| n.to_i}.join('.').freeze
   # :startdoc:
 end

tool/bundler/vendor_gems.rb

@@ -14,4 +14,4 @@
 gem "timeout", "0.4.2"
 gem "thor", "1.3.2"
 gem "tsort", "0.2.0"
-gem "uri", "1.0.1"
+gem "uri", "1.0.2"

tool/bundler/vendor_gems.rb.lock

@@ -27,7 +27,7 @@ GEM
     thor (1.3.2)
     timeout (0.4.2)
     tsort (0.2.0)
-    uri (1.0.1)
+    uri (1.0.2)
 
 PLATFORMS
   java
@@ -50,7 +50,7 @@ DEPENDENCIES
   thor (= 1.3.2)
   timeout (= 0.4.2)
   tsort (= 0.2.0)
-  uri (= 1.0.1)
+  uri (= 1.0.2)
 
 CHECKSUMS
   connection_pool (2.4.1) sha256=0f40cf997091f1f04ff66da67eabd61a9fe0d4928b9a3645228532512fab62f4
@@ -66,7 +66,7 @@ CHECKSUMS
   thor (1.3.2) sha256=eef0293b9e24158ccad7ab383ae83534b7ad4ed99c09f96f1a6b036550abbeda
   timeout (0.4.2) sha256=8aca2d5ff98eb2f7a501c03f8c3622065932cc58bc58f725cd50a09e63b4cc19
   tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f
-  uri (1.0.1) sha256=3970958370c64d325f715e10fe7af77215d1a33a8a80cc7829e5309cf9c342f2
+  uri (1.0.2) sha256=b303504ceb7e5905771fa7fa14b649652fa949df18b5880d69cfb12494791e27
 
 BUNDLED WITH
    2.6.0.dev