ruby-changes:13442
From: nobu <ko1@a...>
Date: Sun, 4 Oct 2009 00:59:55 +0900 (JST)
Subject: [ruby-changes:13442] Ruby:r25215 (trunk): * test/rubygems: use require_relative.
nobu 2009-10-04 00:59:29 +0900 (Sun, 04 Oct 2009) New Revision: 25215 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=25215 Log: * test/rubygems: use require_relative. Modified files: trunk/test/rubygems/gem_installer_test_case.rb trunk/test/rubygems/gem_package_tar_test_case.rb trunk/test/rubygems/gemutilities.rb trunk/test/rubygems/test_config.rb trunk/test/rubygems/test_gem.rb trunk/test/rubygems/test_gem_builder.rb trunk/test/rubygems/test_gem_command.rb trunk/test/rubygems/test_gem_command_manager.rb trunk/test/rubygems/test_gem_commands_build_command.rb trunk/test/rubygems/test_gem_commands_cert_command.rb trunk/test/rubygems/test_gem_commands_check_command.rb trunk/test/rubygems/test_gem_commands_contents_command.rb trunk/test/rubygems/test_gem_commands_dependency_command.rb trunk/test/rubygems/test_gem_commands_environment_command.rb trunk/test/rubygems/test_gem_commands_fetch_command.rb trunk/test/rubygems/test_gem_commands_generate_index_command.rb trunk/test/rubygems/test_gem_commands_install_command.rb trunk/test/rubygems/test_gem_commands_list_command.rb trunk/test/rubygems/test_gem_commands_lock_command.rb trunk/test/rubygems/test_gem_commands_mirror_command.rb trunk/test/rubygems/test_gem_commands_outdated_command.rb trunk/test/rubygems/test_gem_commands_pristine_command.rb trunk/test/rubygems/test_gem_commands_query_command.rb trunk/test/rubygems/test_gem_commands_server_command.rb trunk/test/rubygems/test_gem_commands_sources_command.rb trunk/test/rubygems/test_gem_commands_specification_command.rb trunk/test/rubygems/test_gem_commands_stale_command.rb trunk/test/rubygems/test_gem_commands_uninstall_command.rb trunk/test/rubygems/test_gem_commands_unpack_command.rb trunk/test/rubygems/test_gem_commands_update_command.rb trunk/test/rubygems/test_gem_config_file.rb trunk/test/rubygems/test_gem_dependency.rb trunk/test/rubygems/test_gem_dependency_installer.rb trunk/test/rubygems/test_gem_dependency_list.rb trunk/test/rubygems/test_gem_digest.rb trunk/test/rubygems/test_gem_doc_manager.rb trunk/test/rubygems/test_gem_ext_configure_builder.rb trunk/test/rubygems/test_gem_ext_ext_conf_builder.rb trunk/test/rubygems/test_gem_ext_rake_builder.rb trunk/test/rubygems/test_gem_format.rb trunk/test/rubygems/test_gem_gem_path_searcher.rb trunk/test/rubygems/test_gem_gem_runner.rb trunk/test/rubygems/test_gem_indexer.rb trunk/test/rubygems/test_gem_install_update_options.rb trunk/test/rubygems/test_gem_installer.rb trunk/test/rubygems/test_gem_local_remote_options.rb trunk/test/rubygems/test_gem_package_tar_header.rb trunk/test/rubygems/test_gem_package_tar_input.rb trunk/test/rubygems/test_gem_package_tar_output.rb trunk/test/rubygems/test_gem_package_tar_reader.rb trunk/test/rubygems/test_gem_package_tar_reader_entry.rb trunk/test/rubygems/test_gem_package_tar_writer.rb trunk/test/rubygems/test_gem_package_task.rb trunk/test/rubygems/test_gem_platform.rb trunk/test/rubygems/test_gem_remote_fetcher.rb trunk/test/rubygems/test_gem_requirement.rb trunk/test/rubygems/test_gem_server.rb trunk/test/rubygems/test_gem_source_index.rb trunk/test/rubygems/test_gem_source_info_cache.rb trunk/test/rubygems/test_gem_source_info_cache_entry.rb trunk/test/rubygems/test_gem_spec_fetcher.rb trunk/test/rubygems/test_gem_specification.rb trunk/test/rubygems/test_gem_stream_ui.rb trunk/test/rubygems/test_gem_uninstaller.rb trunk/test/rubygems/test_gem_validator.rb trunk/test/rubygems/test_gem_version.rb trunk/test/rubygems/test_gem_version_option.rb Index: test/rubygems/test_gem_commands_uninstall_command.rb =================================================================== --- test/rubygems/test_gem_commands_uninstall_command.rb (revision 25214) +++ test/rubygems/test_gem_commands_uninstall_command.rb (revision 25215) @@ -1,6 +1,5 @@ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') -require File.join(File.expand_path(File.dirname(__FILE__)), - 'gem_installer_test_case') +require_relative 'gemutilities' +require_relative 'gem_installer_test_case' require 'rubygems/commands/uninstall_command' class TestGemCommandsUninstallCommand < GemInstallerTestCase Index: test/rubygems/test_gem_spec_fetcher.rb =================================================================== --- test/rubygems/test_gem_spec_fetcher.rb (revision 25214) +++ test/rubygems/test_gem_spec_fetcher.rb (revision 25215) @@ -1,4 +1,4 @@ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/spec_fetcher' class TestGemSpecFetcher < RubyGemTestCase Index: test/rubygems/test_gem_dependency_installer.rb =================================================================== --- test/rubygems/test_gem_dependency_installer.rb (revision 25214) +++ test/rubygems/test_gem_dependency_installer.rb (revision 25215) @@ -1,4 +1,4 @@ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/dependency_installer' class TestGemDependencyInstaller < RubyGemTestCase Index: test/rubygems/test_gem_source_info_cache.rb =================================================================== --- test/rubygems/test_gem_source_info_cache.rb (revision 25214) +++ test/rubygems/test_gem_source_info_cache.rb (revision 25215) @@ -4,7 +4,7 @@ # See LICENSE.txt for permissions. #++ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/source_info_cache' class Gem::SourceIndex Index: test/rubygems/test_gem_uninstaller.rb =================================================================== --- test/rubygems/test_gem_uninstaller.rb (revision 25214) +++ test/rubygems/test_gem_uninstaller.rb (revision 25215) @@ -1,5 +1,4 @@ -require File.join(File.expand_path(File.dirname(__FILE__)), - 'gem_installer_test_case') +require_relative 'gem_installer_test_case' require 'rubygems/uninstaller' class TestGemUninstaller < GemInstallerTestCase Index: test/rubygems/test_gem_commands_generate_index_command.rb =================================================================== --- test/rubygems/test_gem_commands_generate_index_command.rb (revision 25214) +++ test/rubygems/test_gem_commands_generate_index_command.rb (revision 25215) @@ -1,4 +1,4 @@ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/indexer' require 'rubygems/commands/generate_index_command' Index: test/rubygems/test_gem_gem_path_searcher.rb =================================================================== --- test/rubygems/test_gem_gem_path_searcher.rb (revision 25214) +++ test/rubygems/test_gem_gem_path_searcher.rb (revision 25215) @@ -1,4 +1,4 @@ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/gem_path_searcher' class Gem::GemPathSearcher Index: test/rubygems/test_gem_gem_runner.rb =================================================================== --- test/rubygems/test_gem_gem_runner.rb (revision 25214) +++ test/rubygems/test_gem_gem_runner.rb (revision 25215) @@ -1,4 +1,4 @@ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/gem_runner' class TestGemGemRunner < RubyGemTestCase Index: test/rubygems/test_gem_commands_lock_command.rb =================================================================== --- test/rubygems/test_gem_commands_lock_command.rb (revision 25214) +++ test/rubygems/test_gem_commands_lock_command.rb (revision 25215) @@ -1,4 +1,4 @@ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/commands/lock_command' class TestGemCommandsLockCommand < RubyGemTestCase Index: test/rubygems/test_gem_ext_configure_builder.rb =================================================================== --- test/rubygems/test_gem_ext_configure_builder.rb (revision 25214) +++ test/rubygems/test_gem_ext_configure_builder.rb (revision 25215) @@ -1,4 +1,4 @@ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/ext' class TestGemExtConfigureBuilder < RubyGemTestCase Index: test/rubygems/test_gem_command_manager.rb =================================================================== --- test/rubygems/test_gem_command_manager.rb (revision 25214) +++ test/rubygems/test_gem_command_manager.rb (revision 25215) @@ -4,7 +4,7 @@ # See LICENSE.txt for permissions. #++ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/command_manager' class TestGemCommandManager < RubyGemTestCase Index: test/rubygems/test_gem_dependency_list.rb =================================================================== --- test/rubygems/test_gem_dependency_list.rb (revision 25214) +++ test/rubygems/test_gem_dependency_list.rb (revision 25215) @@ -4,7 +4,7 @@ # See LICENSE.txt for permissions. #++ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/dependency_list' class TestGemDependencyList < RubyGemTestCase Index: test/rubygems/test_gem_package_tar_header.rb =================================================================== --- test/rubygems/test_gem_package_tar_header.rb (revision 25214) +++ test/rubygems/test_gem_package_tar_header.rb (revision 25215) @@ -4,8 +4,7 @@ # See LICENSE.txt for permissions. #++ -require File.join(File.expand_path(File.dirname(__FILE__)), - 'gem_package_tar_test_case') +require_relative 'gem_package_tar_test_case' require 'rubygems/package' class TestGemPackageTarHeader < TarTestCase Index: test/rubygems/test_gem_commands_contents_command.rb =================================================================== --- test/rubygems/test_gem_commands_contents_command.rb (revision 25214) +++ test/rubygems/test_gem_commands_contents_command.rb (revision 25215) @@ -1,4 +1,4 @@ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/commands/contents_command' class TestGemCommandsContentsCommand < RubyGemTestCase Index: test/rubygems/test_gem_version_option.rb =================================================================== --- test/rubygems/test_gem_version_option.rb (revision 25214) +++ test/rubygems/test_gem_version_option.rb (revision 25215) @@ -1,4 +1,4 @@ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/command' require 'rubygems/version_option' Index: test/rubygems/test_gem_commands_build_command.rb =================================================================== --- test/rubygems/test_gem_commands_build_command.rb (revision 25214) +++ test/rubygems/test_gem_commands_build_command.rb (revision 25215) @@ -1,4 +1,4 @@ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/commands/build_command' require 'rubygems/format' Index: test/rubygems/test_gem_package_tar_reader.rb =================================================================== --- test/rubygems/test_gem_package_tar_reader.rb (revision 25214) +++ test/rubygems/test_gem_package_tar_reader.rb (revision 25215) @@ -4,8 +4,7 @@ # See LICENSE.txt for permissions. #++ -require File.join(File.expand_path(File.dirname(__FILE__)), - 'gem_package_tar_test_case') +require_relative 'gem_package_tar_test_case' require 'rubygems/package' class TestGemPackageTarReader < TarTestCase Index: test/rubygems/test_gem_commands_environment_command.rb =================================================================== --- test/rubygems/test_gem_commands_environment_command.rb (revision 25214) +++ test/rubygems/test_gem_commands_environment_command.rb (revision 25215) @@ -1,4 +1,4 @@ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/commands/environment_command' class TestGemCommandsEnvironmentCommand < RubyGemTestCase Index: test/rubygems/test_gem_builder.rb =================================================================== --- test/rubygems/test_gem_builder.rb (revision 25214) +++ test/rubygems/test_gem_builder.rb (revision 25215) @@ -4,7 +4,7 @@ # See LICENSE.txt for permissions. #++ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/builder' class TestGemBuilder < RubyGemTestCase Index: test/rubygems/test_gem_commands_stale_command.rb =================================================================== --- test/rubygems/test_gem_commands_stale_command.rb (revision 25214) +++ test/rubygems/test_gem_commands_stale_command.rb (revision 25215) @@ -1,4 +1,4 @@ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/commands/stale_command' class TestGemCommandsStaleCommand < RubyGemTestCase Index: test/rubygems/gem_installer_test_case.rb =================================================================== --- test/rubygems/gem_installer_test_case.rb (revision 25214) +++ test/rubygems/gem_installer_test_case.rb (revision 25215) @@ -1,4 +1,4 @@ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/installer' class Gem::Installer Index: test/rubygems/test_gem_stream_ui.rb =================================================================== --- test/rubygems/test_gem_stream_ui.rb (revision 25214) +++ test/rubygems/test_gem_stream_ui.rb (revision 25215) @@ -1,4 +1,4 @@ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/user_interaction' class TestGemStreamUI < RubyGemTestCase Index: test/rubygems/test_gem_remote_fetcher.rb =================================================================== --- test/rubygems/test_gem_remote_fetcher.rb (revision 25214) +++ test/rubygems/test_gem_remote_fetcher.rb (revision 25215) @@ -4,7 +4,7 @@ # See LICENSE.txt for permissions. #++ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'webrick' require 'zlib' require 'rubygems/remote_fetcher' Index: test/rubygems/test_gem_package_tar_writer.rb =================================================================== --- test/rubygems/test_gem_package_tar_writer.rb (revision 25214) +++ test/rubygems/test_gem_package_tar_writer.rb (revision 25215) @@ -4,8 +4,7 @@ # See LICENSE.txt for permissions. #++ -require File.join(File.expand_path(File.dirname(__FILE__)), - 'gem_package_tar_test_case') +require_relative 'gem_package_tar_test_case' require 'rubygems/package/tar_writer' class TestTarWriter < TarTestCase Index: test/rubygems/test_gem_commands_sources_command.rb =================================================================== --- test/rubygems/test_gem_commands_sources_command.rb (revision 25214) +++ test/rubygems/test_gem_commands_sources_command.rb (revision 25215) @@ -1,4 +1,4 @@ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/commands/sources_command' class TestGemCommandsSourcesCommand < RubyGemTestCase Index: test/rubygems/test_gem_config_file.rb =================================================================== --- test/rubygems/test_gem_config_file.rb (revision 25214) +++ test/rubygems/test_gem_config_file.rb (revision 25215) @@ -4,7 +4,7 @@ # See LICENSE.txt for permissions. #++ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/config_file' class TestGemConfigFile < RubyGemTestCase Index: test/rubygems/test_gem_package_tar_reader_entry.rb =================================================================== --- test/rubygems/test_gem_package_tar_reader_entry.rb (revision 25214) +++ test/rubygems/test_gem_package_tar_reader_entry.rb (revision 25215) @@ -4,8 +4,7 @@ # See LICENSE.txt for permissions. #++ -require File.join(File.expand_path(File.dirname(__FILE__)), - 'gem_package_tar_test_case') +require_relative 'gem_package_tar_test_case' require 'rubygems/package' class TestGemPackageTarReaderEntry < TarTestCase Index: test/rubygems/test_gem_commands_pristine_command.rb =================================================================== --- test/rubygems/test_gem_commands_pristine_command.rb (revision 25214) +++ test/rubygems/test_gem_commands_pristine_command.rb (revision 25215) @@ -1,4 +1,4 @@ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/commands/pristine_command' class TestGemCommandsPristineCommand < RubyGemTestCase Index: test/rubygems/test_gem_digest.rb =================================================================== --- test/rubygems/test_gem_digest.rb (revision 25214) +++ test/rubygems/test_gem_digest.rb (revision 25215) @@ -4,7 +4,7 @@ # See LICENSE.txt for permissions. #++ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require "rubygems/digest/md5" require "rubygems/digest/sha1" require "rubygems/digest/sha2" Index: test/rubygems/test_gem.rb =================================================================== --- test/rubygems/test_gem.rb (revision 25214) +++ test/rubygems/test_gem.rb (revision 25215) @@ -1,4 +1,4 @@ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems' require 'rubygems/gem_openssl' require 'rubygems/installer' Index: test/rubygems/test_gem_commands_query_command.rb =================================================================== --- test/rubygems/test_gem_commands_query_command.rb (revision 25214) +++ test/rubygems/test_gem_commands_query_command.rb (revision 25215) @@ -1,4 +1,4 @@ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/commands/query_command' class TestGemCommandsQueryCommand < RubyGemTestCase Index: test/rubygems/test_gem_commands_install_command.rb =================================================================== --- test/rubygems/test_gem_commands_install_command.rb (revision 25214) +++ test/rubygems/test_gem_commands_install_command.rb (revision 25215) @@ -1,4 +1,4 @@ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/commands/install_command' class TestGemCommandsInstallCommand < RubyGemTestCase Index: test/rubygems/test_gem_format.rb =================================================================== --- test/rubygems/test_gem_format.rb (revision 25214) +++ test/rubygems/test_gem_format.rb (revision 25215) @@ -4,8 +4,8 @@ # See LICENSE.txt for permissions. #++ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') -require File.join(File.expand_path(File.dirname(__FILE__)), 'simple_gem') +require_relative 'gemutilities' +require_relative 'simple_gem' require 'rubygems/format' class TestGemFormat < RubyGemTestCase Index: test/rubygems/test_gem_commands_list_command.rb =================================================================== --- test/rubygems/test_gem_commands_list_command.rb (revision 25214) +++ test/rubygems/test_gem_commands_list_command.rb (revision 25215) @@ -1,4 +1,4 @@ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/commands/list_command' class TestGemCommandsListCommand < RubyGemTestCase Index: test/rubygems/test_gem_ext_ext_conf_builder.rb =================================================================== --- test/rubygems/test_gem_ext_ext_conf_builder.rb (revision 25214) +++ test/rubygems/test_gem_ext_ext_conf_builder.rb (revision 25215) @@ -1,4 +1,4 @@ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/ext' class TestGemExtExtConfBuilder < RubyGemTestCase Index: test/rubygems/test_gem_commands_check_command.rb =================================================================== --- test/rubygems/test_gem_commands_check_command.rb (revision 25214) +++ test/rubygems/test_gem_commands_check_command.rb (revision 25215) @@ -4,7 +4,7 @@ # See LICENSE.txt for permissions. #++ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/commands/check_command' class TestGemCommandsCheckCommand < RubyGemTestCase Index: test/rubygems/gem_package_tar_test_case.rb =================================================================== --- test/rubygems/gem_package_tar_test_case.rb (revision 25214) +++ test/rubygems/gem_package_tar_test_case.rb (revision 25215) @@ -1,4 +1,4 @@ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/package' class TarTestCase < RubyGemTestCase Index: test/rubygems/test_gem_installer.rb =================================================================== --- test/rubygems/test_gem_installer.rb (revision 25214) +++ test/rubygems/test_gem_installer.rb (revision 25215) @@ -4,8 +4,7 @@ # See LICENSE.txt for permissions. #++ -require File.join(File.expand_path(File.dirname(__FILE__)), - 'gem_installer_test_case') +require_relative 'gem_installer_test_case' class TestGemInstaller < GemInstallerTestCase Index: test/rubygems/test_gem_commands_specification_command.rb =================================================================== --- test/rubygems/test_gem_commands_specification_command.rb (revision 25214) +++ test/rubygems/test_gem_commands_specification_command.rb (revision 25215) @@ -1,4 +1,4 @@ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/commands/specification_command' class TestGemCommandsSpecificationCommand < RubyGemTestCase Index: test/rubygems/test_gem_requirement.rb =================================================================== --- test/rubygems/test_gem_requirement.rb (revision 25214) +++ test/rubygems/test_gem_requirement.rb (revision 25215) @@ -4,7 +4,7 @@ # See LICENSE.txt for permissions. #++ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/version' class TestGemRequirement < RubyGemTestCase Index: test/rubygems/test_gem_ext_rake_builder.rb =================================================================== --- test/rubygems/test_gem_ext_rake_builder.rb (revision 25214) +++ test/rubygems/test_gem_ext_rake_builder.rb (revision 25215) @@ -1,4 +1,4 @@ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/ext' class TestGemExtRakeBuilder < RubyGemTestCase Index: test/rubygems/gemutilities.rb =================================================================== --- test/rubygems/gemutilities.rb (revision 25214) +++ test/rubygems/gemutilities.rb (revision 25215) @@ -34,7 +34,7 @@ require 'rdoc/rdoc' -require File.join(File.expand_path(File.dirname(__FILE__)), 'mockgemui') +require_relative 'mockgemui' module Gem def self.searcher=(searcher) Index: test/rubygems/test_config.rb =================================================================== --- test/rubygems/test_config.rb (revision 25214) +++ test/rubygems/test_config.rb (revision 25215) @@ -4,7 +4,7 @@ # See LICENSE.txt for permissions. #++ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rbconfig' require 'rubygems' Index: test/rubygems/test_gem_package_task.rb =================================================================== --- test/rubygems/test_gem_package_task.rb (revision 25214) +++ test/rubygems/test_gem_package_task.rb (revision 25215) @@ -19,7 +19,7 @@ # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems' require 'rubygems/package_task' Index: test/rubygems/test_gem_command.rb =================================================================== --- test/rubygems/test_gem_command.rb (revision 25214) +++ test/rubygems/test_gem_command.rb (revision 25215) @@ -5,7 +5,7 @@ # See LICENSE.txt for permissions. #++ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/command' class Gem::Command Index: test/rubygems/test_gem_source_info_cache_entry.rb =================================================================== --- test/rubygems/test_gem_source_info_cache_entry.rb (revision 25214) +++ test/rubygems/test_gem_source_info_cache_entry.rb (revision 25215) @@ -1,4 +1,4 @@ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/source_info_cache_entry' class TestGemSourceInfoCacheEntry < RubyGemTestCase Index: test/rubygems/test_gem_package_tar_input.rb =================================================================== --- test/rubygems/test_gem_package_tar_input.rb (revision 25214) +++ test/rubygems/test_gem_package_tar_input.rb (revision 25215) @@ -4,8 +4,7 @@ # See LICENSE.txt for permissions. #++ -require File.join(File.expand_path(File.dirname(__FILE__)), - 'gem_package_tar_test_case') +require_relative 'gem_package_tar_test_case' require 'rubygems/package/tar_input' class TestGemPackageTarInput < TarTestCase Index: test/rubygems/test_gem_package_tar_output.rb =================================================================== --- test/rubygems/test_gem_package_tar_output.rb (revision 25214) +++ test/rubygems/test_gem_package_tar_output.rb (revision 25215) @@ -4,8 +4,7 @@ # See LICENSE.txt for permissions. #++ -require File.join(File.expand_path(File.dirname(__FILE__)), - 'gem_package_tar_test_case') +require_relative 'gem_package_tar_test_case' require 'rubygems/package/tar_output' class TestGemPackageTarOutput < TarTestCase Index: test/rubygems/test_gem_platform.rb =================================================================== --- test/rubygems/test_gem_platform.rb (revision 25214) +++ test/rubygems/test_gem_platform.rb (revision 25215) @@ -1,4 +1,4 @@ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/platform' require 'rbconfig' Index: test/rubygems/test_gem_validator.rb =================================================================== --- test/rubygems/test_gem_validator.rb (revision 25214) +++ test/rubygems/test_gem_validator.rb (revision 25215) @@ -4,8 +4,8 @@ # See LICENSE.txt for permissions. #++ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') -require File.join(File.expand_path(File.dirname(__FILE__)), 'simple_gem') +require_relative 'gemutilities' +require_relative 'simple_gem' require 'rubygems/validator' class TestGemValidator < RubyGemTestCase Index: test/rubygems/test_gem_commands_server_command.rb =================================================================== --- test/rubygems/test_gem_commands_server_command.rb (revision 25214) +++ test/rubygems/test_gem_commands_server_command.rb (revision 25215) @@ -1,4 +1,4 @@ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/commands/server_command' class TestGemCommandsServerCommand < RubyGemTestCase Index: test/rubygems/test_gem_source_index.rb =================================================================== --- test/rubygems/test_gem_source_index.rb (revision 25214) +++ test/rubygems/test_gem_source_index.rb (revision 25215) @@ -4,7 +4,7 @@ # See LICENSE.txt for permissions. #++ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/source_index' require 'rubygems/config_file' Index: test/rubygems/test_gem_commands_outdated_command.rb =================================================================== --- test/rubygems/test_gem_commands_outdated_command.rb (revision 25214) +++ test/rubygems/test_gem_commands_outdated_command.rb (revision 25215) @@ -1,4 +1,4 @@ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/commands/outdated_command' class TestGemCommandsOutdatedCommand < RubyGemTestCase Index: test/rubygems/test_gem_commands_mirror_command.rb =================================================================== --- test/rubygems/test_gem_commands_mirror_command.rb (revision 25214) +++ test/rubygems/test_gem_commands_mirror_command.rb (revision 25215) @@ -1,4 +1,4 @@ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/indexer' require 'rubygems/commands/mirror_command' Index: test/rubygems/test_gem_commands_dependency_command.rb =================================================================== --- test/rubygems/test_gem_commands_dependency_command.rb (revision 25214) +++ test/rubygems/test_gem_commands_dependency_command.rb (revision 25215) @@ -1,4 +1,4 @@ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/commands/dependency_command' class TestGemCommandsDependencyCommand < RubyGemTestCase Index: test/rubygems/test_gem_indexer.rb =================================================================== --- test/rubygems/test_gem_indexer.rb (revision 25214) +++ test/rubygems/test_gem_indexer.rb (revision 25215) @@ -4,7 +4,7 @@ # See LICENSE.txt for permissions. #++ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/indexer' Index: test/rubygems/test_gem_doc_manager.rb =================================================================== --- test/rubygems/test_gem_doc_manager.rb (revision 25214) +++ test/rubygems/test_gem_doc_manager.rb (revision 25215) @@ -4,7 +4,7 @@ # See LICENSE.txt for permissions. #++ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/doc_manager' class TestGemDocManager < RubyGemTestCase Index: test/rubygems/test_gem_commands_unpack_command.rb =================================================================== --- test/rubygems/test_gem_commands_unpack_command.rb (revision 25214) +++ test/rubygems/test_gem_commands_unpack_command.rb (revision 25215) @@ -1,4 +1,4 @@ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/commands/unpack_command' class TestGemCommandsUnpackCommand < RubyGemTestCase Index: test/rubygems/test_gem_commands_update_command.rb =================================================================== --- test/rubygems/test_gem_commands_update_command.rb (revision 25214) +++ test/rubygems/test_gem_commands_update_command.rb (revision 25215) @@ -1,4 +1,4 @@ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/commands/update_command' class TestGemCommandsUpdateCommand < RubyGemTestCase Index: test/rubygems/test_gem_server.rb =================================================================== --- test/rubygems/test_gem_server.rb (revision 25214) +++ test/rubygems/test_gem_server.rb (revision 25215) @@ -1,4 +1,4 @@ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/server' require 'stringio' Index: test/rubygems/test_gem_commands_fetch_command.rb =================================================================== --- test/rubygems/test_gem_commands_fetch_command.rb (revision 25214) +++ test/rubygems/test_gem_commands_fetch_command.rb (revision 25215) @@ -1,4 +1,4 @@ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/package' require 'rubygems/security' require 'rubygems/commands/fetch_command' Index: test/rubygems/test_gem_commands_cert_command.rb =================================================================== --- test/rubygems/test_gem_commands_cert_command.rb (revision 25214) +++ test/rubygems/test_gem_commands_cert_command.rb (revision 25215) @@ -1,4 +1,4 @@ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/commands/cert_command' Index: test/rubygems/test_gem_dependency.rb =================================================================== --- test/rubygems/test_gem_dependency.rb (revision 25214) +++ test/rubygems/test_gem_dependency.rb (revision 25215) @@ -4,7 +4,7 @@ # See LICENSE.txt for permissions. #++ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/version' class TestGemDependency < RubyGemTestCase Index: test/rubygems/test_gem_local_remote_options.rb =================================================================== --- test/rubygems/test_gem_local_remote_options.rb (revision 25214) +++ test/rubygems/test_gem_local_remote_options.rb (revision 25215) @@ -1,4 +1,4 @@ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/local_remote_options' require 'rubygems/command' Index: test/rubygems/test_gem_specification.rb =================================================================== --- test/rubygems/test_gem_specification.rb (revision 25214) +++ test/rubygems/test_gem_specification.rb (revision 25215) @@ -5,7 +5,7 @@ #++ require 'stringio' -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/specification' class TestGemSpecification < RubyGemTestCase Index: test/rubygems/test_gem_install_update_options.rb =================================================================== --- test/rubygems/test_gem_install_update_options.rb (revision 25214) +++ test/rubygems/test_gem_install_update_options.rb (revision 25215) @@ -1,5 +1,4 @@ -require File.join(File.expand_path(File.dirname(__FILE__)), - 'gem_installer_test_case') +require_relative 'gem_installer_test_case' require 'rubygems/install_update_options' require 'rubygems/command' Index: test/rubygems/test_gem_version.rb =================================================================== --- test/rubygems/test_gem_version.rb (revision 25214) +++ test/rubygems/test_gem_version.rb (revision 25215) @@ -4,7 +4,7 @@ # See LICENSE.txt for permissions. #++ -require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities') +require_relative 'gemutilities' require 'rubygems/version' class TestGemVersion < RubyGemTestCase -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/