From 54ae3f587ed42f425edc7ec741702ac764429c5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Mon, 22 Apr 2019 13:56:16 +0200 Subject: [rubygems/rubygems] Prefer `require_relative` to `require` for internal requires https://github.com/rubygems/rubygems/commit/c74fc58695 --- lib/rubygems/commands/setup_command.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/rubygems/commands/setup_command.rb') diff --git a/lib/rubygems/commands/setup_command.rb b/lib/rubygems/commands/setup_command.rb index 8b1098f63f..edb3498eec 100644 --- a/lib/rubygems/commands/setup_command.rb +++ b/lib/rubygems/commands/setup_command.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require 'rubygems/command' +require_relative '../command' ## # Installs RubyGems itself. This command is ordinarily only available from a @@ -348,7 +348,7 @@ By default, this RubyGems will install gem as: rm_rf dir end - require 'rubygems/rdoc' + require_relative '../rdoc' fake_spec = Gem::Specification.new 'rubygems', Gem::VERSION def fake_spec.full_gem_path @@ -407,7 +407,7 @@ By default, this RubyGems will install gem as: cp File.join("bundler", bundler_spec.bindir, e), File.join(bundler_bin_dir, e) end - require 'rubygems/installer' + require_relative '../installer' Dir.chdir("bundler") do built_gem = Gem::Package.build(bundler_spec) @@ -584,7 +584,7 @@ abort "#{deprecation_message}" end def uninstall_old_gemcutter - require 'rubygems/uninstaller' + require_relative '../uninstaller' ui = Gem::Uninstaller.new('gemcutter', :all => true, :ignore => true, :version => '< 0.4') @@ -593,7 +593,7 @@ abort "#{deprecation_message}" end def regenerate_binstubs - require "rubygems/commands/pristine_command" + require_relative "pristine_command" say "Regenerating binstubs" args = %w[--all --only-executables --silent] -- cgit v1.2.3