We might not need to vendor these

rubygems · Dec 4, 2019 · af504fb · af504fb
1 parent aa3a25d
commit af504fb
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 853 deletions.
diff --git a/Rakefile b/Rakefile
@@ -260,6 +260,7 @@ else
     lib.namespace = "URI"
     lib.prefix = "Bundler"
     lib.vendor_lib = "lib/bundler/vendor/uri"
+    lib.exclusions = ["lib/uri/ftp.rb", "lib/uri/ldap.rb", "lib/uri/ldaps.rb", "lib/uri/mailto.rb"]
   end
 
   # We currently cherry-pick changes to use `require_relative` internally

diff --git a/lib/bundler/vendor/uri/lib/uri.rb b/lib/bundler/vendor/uri/lib/uri.rb
@@ -92,13 +92,9 @@
 module Bundler::URI
 end
 
-require_relative 'uri/version'
-require_relative 'uri/common'
-require_relative 'uri/generic'
-require_relative 'uri/file'
-require_relative 'uri/ftp'
-require_relative 'uri/http'
-require_relative 'uri/https'
-require_relative 'uri/ldap'
-require_relative 'uri/ldaps'
-require_relative 'uri/mailto'
+require 'bundler/vendor/uri/lib/uri/version'
+require 'bundler/vendor/uri/lib/uri/common'
+require 'bundler/vendor/uri/lib/uri/generic'
+require 'bundler/vendor/uri/lib/uri/file'
+require 'bundler/vendor/uri/lib/uri/http'
+require 'bundler/vendor/uri/lib/uri/https'
diff --git a/lib/bundler/vendor/uri/lib/uri/ftp.rb b/lib/bundler/vendor/uri/lib/uri/ftp.rb