Let automatiek convert requires that are indented to require_relative as well

Author: deivid-rodriguez

lib/rubygems/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/vendor/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.
 

lib/rubygems/vendor/optparse/lib/optparse.rb

@@ -1084,7 +1084,7 @@ def compsys(to, name = File.basename($0)) # :nodoc:
     Switch::OptionalArgument.new do |pkg|
       if pkg
         begin
-          require 'rubygems/vendor/optparse/lib/optparse/version'
+          require_relative 'optparse/version'
         rescue LoadError
         else
           show_version(*pkg.split(/,/)) or

tool/automatiek/net-http-persistent-v4.0.2.patch

@@ -11,7 +11,7 @@ index b3ebf6ecb..546409d03 100644
  require_relative '../../../../connection_pool/lib/connection_pool'
 
 -begin
--  require 'rubygems/vendor/net-http/lib/net/http/pipeline'
+-  require_relative '../../../../../../../../lib/rubygems/vendor/net-http/lib/net/http/pipeline'
 -rescue LoadError
 -end
 -

tool/automatiek/vendor.rb

@@ -33,7 +33,7 @@ def namespace_files(folder)
       contents.gsub!(/(\s)::#{namespace}/, '\1' + "::#{prefix}::#{namespace}")
       contents.gsub!(/(?<!\w|def |:)#{namespace}\b/, "#{prefix}::#{namespace}")
 
-      contents.gsub!(/^require (["'])#{Regexp.escape require_entrypoint}/, "require_relative \\1#{relative_require_target_from(file)}")
+      contents.gsub!(/^(\s*)require (["'])#{Regexp.escape require_entrypoint}/, "\\1require_relative \\2#{relative_require_target_from(file)}")
       contents.gsub!(/require (["'])#{Regexp.escape require_entrypoint}/, "require \\1#{require_target}/#{require_entrypoint}")
 
       contents.gsub!(%r{(autoload\s+[:\w]+,\s+["'])(#{Regexp.escape require_entrypoint}[\w\/]+["'])}, "\\1#{require_target}/\\2")