diff --git a/exe/bundle b/exe/bundle index aaf773745d3..fccece038b3 100755 --- a/exe/bundle +++ b/exe/bundle @@ -7,7 +7,7 @@ Signal.trap("INT") do exit 1 end -require "bundler" +require_relative "../lib/bundler" # Check if an older version of bundler is installed $LOAD_PATH.each do |path| next unless path =~ %r{/bundler-0\.(\d+)} && $1.to_i < 9 @@ -18,9 +18,9 @@ $LOAD_PATH.each do |path| abort(err) end -require "bundler/friendly_errors" +require_relative "../lib/bundler/friendly_errors" Bundler.with_friendly_errors do - require "bundler/cli" + require_relative "../lib/bundler/cli" # Allow any command to use --help flag to show help for that command help_flags = %w[--help -h] diff --git a/lib/bundler.rb b/lib/bundler.rb index d8f9462c6d7..735750f59d7 100644 --- a/lib/bundler.rb +++ b/lib/bundler.rb @@ -564,7 +564,7 @@ def reset_rubygems! private def eval_yaml_gemspec(path, contents) - Kernel.send(:require, "bundler/psyched_yaml") + require_relative "bundler/psyched_yaml" # If the YAML is invalid, Syck raises an ArgumentError, and Psych # raises a Psych::SyntaxError. See psyched_yaml.rb for more info. diff --git a/lib/bundler/vendor/thor/lib/thor.rb b/lib/bundler/vendor/thor/lib/thor.rb index 999e8b7e614..6017ee9ad82 100644 --- a/lib/bundler/vendor/thor/lib/thor.rb +++ b/lib/bundler/vendor/thor/lib/thor.rb @@ -1,5 +1,5 @@ require "set" -require "bundler/vendor/thor/lib/thor/base" +require_relative "thor/base" class Bundler::Thor class << self diff --git a/lib/bundler/vendor/thor/lib/thor/actions.rb b/lib/bundler/vendor/thor/lib/thor/actions.rb index b06feac2a02..5681d5a7c63 100644 --- a/lib/bundler/vendor/thor/lib/thor/actions.rb +++ b/lib/bundler/vendor/thor/lib/thor/actions.rb @@ -1,11 +1,11 @@ require "uri" -require "bundler/vendor/thor/lib/thor/core_ext/io_binary_read" -require "bundler/vendor/thor/lib/thor/actions/create_file" -require "bundler/vendor/thor/lib/thor/actions/create_link" -require "bundler/vendor/thor/lib/thor/actions/directory" -require "bundler/vendor/thor/lib/thor/actions/empty_directory" -require "bundler/vendor/thor/lib/thor/actions/file_manipulation" -require "bundler/vendor/thor/lib/thor/actions/inject_into_file" +require_relative "core_ext/io_binary_read" +require_relative "actions/create_file" +require_relative "actions/create_link" +require_relative "actions/directory" +require_relative "actions/empty_directory" +require_relative "actions/file_manipulation" +require_relative "actions/inject_into_file" class Bundler::Thor module Actions diff --git a/lib/bundler/vendor/thor/lib/thor/actions/create_file.rb b/lib/bundler/vendor/thor/lib/thor/actions/create_file.rb index 97d22d9bbdd..330fc08caee 100644 --- a/lib/bundler/vendor/thor/lib/thor/actions/create_file.rb +++ b/lib/bundler/vendor/thor/lib/thor/actions/create_file.rb @@ -1,4 +1,4 @@ -require "bundler/vendor/thor/lib/thor/actions/empty_directory" +require_relative "empty_directory" class Bundler::Thor module Actions diff --git a/lib/bundler/vendor/thor/lib/thor/actions/create_link.rb b/lib/bundler/vendor/thor/lib/thor/actions/create_link.rb index 3a664401b41..70504a2c1fe 100644 --- a/lib/bundler/vendor/thor/lib/thor/actions/create_link.rb +++ b/lib/bundler/vendor/thor/lib/thor/actions/create_link.rb @@ -1,4 +1,4 @@ -require "bundler/vendor/thor/lib/thor/actions/create_file" +require_relative "create_file" class Bundler::Thor module Actions diff --git a/lib/bundler/vendor/thor/lib/thor/actions/directory.rb b/lib/bundler/vendor/thor/lib/thor/actions/directory.rb index f555f7b7e0f..03c97bf630f 100644 --- a/lib/bundler/vendor/thor/lib/thor/actions/directory.rb +++ b/lib/bundler/vendor/thor/lib/thor/actions/directory.rb @@ -1,4 +1,4 @@ -require "bundler/vendor/thor/lib/thor/actions/empty_directory" +require_relative "empty_directory" class Bundler::Thor module Actions diff --git a/lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb b/lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb index 349b26ff65c..cf651a4e78d 100644 --- a/lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb +++ b/lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb @@ -1,4 +1,4 @@ -require "bundler/vendor/thor/lib/thor/actions/empty_directory" +require_relative "empty_directory" class Bundler::Thor module Actions diff --git a/lib/bundler/vendor/thor/lib/thor/base.rb b/lib/bundler/vendor/thor/lib/thor/base.rb index f55b14fbfcd..7d7cd3b5fe1 100644 --- a/lib/bundler/vendor/thor/lib/thor/base.rb +++ b/lib/bundler/vendor/thor/lib/thor/base.rb @@ -1,12 +1,12 @@ -require "bundler/vendor/thor/lib/thor/command" -require "bundler/vendor/thor/lib/thor/core_ext/hash_with_indifferent_access" -require "bundler/vendor/thor/lib/thor/core_ext/ordered_hash" -require "bundler/vendor/thor/lib/thor/error" -require "bundler/vendor/thor/lib/thor/invocation" -require "bundler/vendor/thor/lib/thor/parser" -require "bundler/vendor/thor/lib/thor/shell" -require "bundler/vendor/thor/lib/thor/line_editor" -require "bundler/vendor/thor/lib/thor/util" +require_relative "command" +require_relative "core_ext/hash_with_indifferent_access" +require_relative "core_ext/ordered_hash" +require_relative "error" +require_relative "invocation" +require_relative "parser" +require_relative "shell" +require_relative "line_editor" +require_relative "util" class Bundler::Thor autoload :Actions, File.expand_path("actions", __dir__) diff --git a/lib/bundler/vendor/thor/lib/thor/group.rb b/lib/bundler/vendor/thor/lib/thor/group.rb index 30db46529e5..7861d05345d 100644 --- a/lib/bundler/vendor/thor/lib/thor/group.rb +++ b/lib/bundler/vendor/thor/lib/thor/group.rb @@ -1,4 +1,4 @@ -require "bundler/vendor/thor/lib/thor/base" +require_relative "base" # Bundler::Thor has a special class called Bundler::Thor::Group. The main difference to Bundler::Thor class # is that it invokes all commands at once. It also include some methods that allows diff --git a/lib/bundler/vendor/thor/lib/thor/line_editor.rb b/lib/bundler/vendor/thor/lib/thor/line_editor.rb index ce81a17484d..5c0c336e7ae 100644 --- a/lib/bundler/vendor/thor/lib/thor/line_editor.rb +++ b/lib/bundler/vendor/thor/lib/thor/line_editor.rb @@ -1,5 +1,5 @@ -require "bundler/vendor/thor/lib/thor/line_editor/basic" -require "bundler/vendor/thor/lib/thor/line_editor/readline" +require_relative "line_editor/basic" +require_relative "line_editor/readline" class Bundler::Thor module LineEditor diff --git a/lib/bundler/vendor/thor/lib/thor/parser.rb b/lib/bundler/vendor/thor/lib/thor/parser.rb index 08f80e565de..45394732caa 100644 --- a/lib/bundler/vendor/thor/lib/thor/parser.rb +++ b/lib/bundler/vendor/thor/lib/thor/parser.rb @@ -1,4 +1,4 @@ -require "bundler/vendor/thor/lib/thor/parser/argument" -require "bundler/vendor/thor/lib/thor/parser/arguments" -require "bundler/vendor/thor/lib/thor/parser/option" -require "bundler/vendor/thor/lib/thor/parser/options" +require_relative "parser/argument" +require_relative "parser/arguments" +require_relative "parser/option" +require_relative "parser/options" diff --git a/lib/bundler/vendor/thor/lib/thor/runner.rb b/lib/bundler/vendor/thor/lib/thor/runner.rb index 65ae422d7f2..ed44853a003 100644 --- a/lib/bundler/vendor/thor/lib/thor/runner.rb +++ b/lib/bundler/vendor/thor/lib/thor/runner.rb @@ -1,6 +1,6 @@ -require "bundler/vendor/thor/lib/thor" -require "bundler/vendor/thor/lib/thor/group" -require "bundler/vendor/thor/lib/thor/core_ext/io_binary_read" +require_relative "../thor" +require_relative "group" +require_relative "core_ext/io_binary_read" require "yaml" require "digest/md5" @@ -111,7 +111,7 @@ def install(name) # rubocop:disable MethodLength desc "version", "Show Bundler::Thor version" def version - require "bundler/vendor/thor/lib/thor/version" + require_relative "version" say "Bundler::Thor #{Bundler::Thor::VERSION}" end diff --git a/lib/bundler/vendor/thor/lib/thor/shell/color.rb b/lib/bundler/vendor/thor/lib/thor/shell/color.rb index da289cb50cf..6c821d4a091 100644 --- a/lib/bundler/vendor/thor/lib/thor/shell/color.rb +++ b/lib/bundler/vendor/thor/lib/thor/shell/color.rb @@ -1,4 +1,4 @@ -require "bundler/vendor/thor/lib/thor/shell/basic" +require_relative "basic" class Bundler::Thor module Shell diff --git a/lib/bundler/vendor/thor/lib/thor/shell/html.rb b/lib/bundler/vendor/thor/lib/thor/shell/html.rb index 83d20549882..55262f19cc5 100644 --- a/lib/bundler/vendor/thor/lib/thor/shell/html.rb +++ b/lib/bundler/vendor/thor/lib/thor/shell/html.rb @@ -1,4 +1,4 @@ -require "bundler/vendor/thor/lib/thor/shell/basic" +require_relative "basic" class Bundler::Thor module Shell diff --git a/lib/bundler/vendored_thor.rb b/lib/bundler/vendored_thor.rb index b0b7e7be844..0666cfc9b9b 100644 --- a/lib/bundler/vendored_thor.rb +++ b/lib/bundler/vendored_thor.rb @@ -2,7 +2,7 @@ module Bundler def self.require_thor_actions - Kernel.send(:require, "bundler/vendor/thor/lib/thor/actions") + require_relative "vendor/thor/lib/thor/actions" end end require_relative "vendor/thor/lib/thor"