From fb587b9ebbcf82cb0a65bb333236ca09103a89b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Fri, 2 Aug 2019 13:23:20 +0200 Subject: Last relative requires --- lib/bundler/plugin.rb | 10 +++++----- .../vendor/net-http-persistent/lib/net/http/persistent.rb | 6 +++--- .../vendor/net-http-persistent/lib/net/http/persistent/pool.rb | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/bundler/plugin.rb b/lib/bundler/plugin.rb index ffb3ee9883..f4dd435df4 100644 --- a/lib/bundler/plugin.rb +++ b/lib/bundler/plugin.rb @@ -4,11 +4,11 @@ require_relative "plugin/api" module Bundler module Plugin - autoload :DSL, "bundler/plugin/dsl" - autoload :Events, "bundler/plugin/events" - autoload :Index, "bundler/plugin/index" - autoload :Installer, "bundler/plugin/installer" - autoload :SourceList, "bundler/plugin/source_list" + autoload :DSL, File.expand_path("plugin/dsl", __dir__) + autoload :Events, File.expand_path("plugin/events", __dir__) + autoload :Index, File.expand_path("plugin/index", __dir__) + autoload :Installer, File.expand_path("plugin/installer", __dir__) + autoload :SourceList, File.expand_path("plugin/source_list", __dir__) class MalformattedPlugin < PluginError; end class UndefinedCommandError < PluginError; end diff --git a/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb b/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb index f3382465a7..327cb0f8c2 100644 --- a/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +++ b/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb @@ -1,7 +1,7 @@ require 'net/http' require 'uri' require 'cgi' # for escaping -require 'bundler/vendor/connection_pool/lib/connection_pool' +require_relative '../../../../connection_pool/lib/connection_pool' begin require 'net/http/pipeline' @@ -1197,6 +1197,6 @@ application: end -require 'bundler/vendor/net-http-persistent/lib/net/http/persistent/connection' -require 'bundler/vendor/net-http-persistent/lib/net/http/persistent/pool' +require_relative 'persistent/connection' +require_relative 'persistent/pool' diff --git a/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/pool.rb b/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/pool.rb index fb1816de83..9dfa6ffdb1 100644 --- a/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/pool.rb +++ b/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/pool.rb @@ -49,5 +49,5 @@ class Bundler::Persistent::Net::HTTP::Persistent::Pool < Bundler::ConnectionPool end end -require 'bundler/vendor/net-http-persistent/lib/net/http/persistent/timed_stack_multi' +require_relative 'timed_stack_multi' -- cgit v1.2.1