rubygems-update 3.1.0 → 3.2.0.rc.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CODE_OF_CONDUCT.md +55 -19
- data/CONTRIBUTING.md +2 -3
- data/History.txt +195 -7
- data/Manifest.txt +11 -23
- data/POLICIES.md +2 -9
- data/README.md +5 -5
- data/Rakefile +38 -35
- data/bin/update_rubygems +2 -2
- data/bundler/CHANGELOG.md +846 -728
- data/bundler/README.md +6 -8
- data/bundler/UPGRADING.md +16 -30
- data/bundler/bundler.gemspec +3 -3
- data/bundler/exe/bundle +3 -0
- data/bundler/lib/bundler.rb +15 -4
- data/bundler/lib/bundler/build_metadata.rb +2 -2
- data/bundler/lib/bundler/cli.rb +29 -9
- data/bundler/lib/bundler/cli/console.rb +1 -1
- data/bundler/lib/bundler/cli/exec.rb +3 -12
- data/bundler/lib/bundler/cli/gem.rb +74 -10
- data/bundler/lib/bundler/cli/info.rb +6 -3
- data/bundler/lib/bundler/cli/init.rb +1 -1
- data/bundler/lib/bundler/cli/install.rb +8 -16
- data/bundler/lib/bundler/cli/issue.rb +2 -2
- data/bundler/lib/bundler/cli/outdated.rb +5 -5
- data/bundler/lib/bundler/cli/plugin.rb +10 -0
- data/bundler/lib/bundler/definition.rb +32 -32
- data/bundler/lib/bundler/dependency.rb +0 -9
- data/bundler/lib/bundler/dsl.rb +1 -5
- data/bundler/lib/bundler/environment_preserver.rb +26 -2
- data/bundler/lib/bundler/errors.rb +1 -0
- data/bundler/lib/bundler/feature_flag.rb +0 -2
- data/bundler/lib/bundler/fetcher.rb +1 -0
- data/bundler/lib/bundler/friendly_errors.rb +4 -10
- data/bundler/lib/bundler/gem_helper.rb +18 -12
- data/bundler/lib/bundler/gem_version_promoter.rb +1 -1
- data/bundler/lib/bundler/injector.rb +14 -3
- data/bundler/lib/bundler/inline.rb +2 -2
- data/bundler/lib/bundler/installer.rb +29 -28
- data/bundler/lib/bundler/installer/gem_installer.rb +2 -2
- data/bundler/lib/bundler/installer/parallel_installer.rb +9 -9
- data/bundler/lib/bundler/lazy_specification.rb +16 -3
- data/bundler/lib/bundler/plugin.rb +26 -0
- data/bundler/lib/bundler/plugin/index.rb +9 -0
- data/bundler/lib/bundler/psyched_yaml.rb +0 -15
- data/bundler/lib/bundler/remote_specification.rb +4 -1
- data/bundler/lib/bundler/resolver.rb +31 -8
- data/bundler/lib/bundler/resolver/spec_group.rb +26 -5
- data/bundler/lib/bundler/rubygems_ext.rb +7 -8
- data/bundler/lib/bundler/rubygems_gem_installer.rb +1 -7
- data/bundler/lib/bundler/rubygems_integration.rb +13 -19
- data/bundler/lib/bundler/runtime.rb +2 -12
- data/bundler/lib/bundler/settings.rb +0 -3
- data/bundler/lib/bundler/setup.rb +5 -0
- data/bundler/lib/bundler/shared_helpers.rb +1 -1
- data/bundler/lib/bundler/source/git/git_proxy.rb +53 -58
- data/bundler/lib/bundler/source/path.rb +5 -1
- data/bundler/lib/bundler/source/path/installer.rb +7 -9
- data/bundler/lib/bundler/source/rubygems.rb +11 -14
- data/bundler/lib/bundler/stub_specification.rb +16 -4
- data/bundler/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt +57 -47
- data/bundler/lib/bundler/templates/newgem/Gemfile.tt +7 -2
- data/bundler/lib/bundler/templates/newgem/Rakefile.tt +12 -5
- data/bundler/lib/bundler/templates/newgem/bin/console.tt +2 -0
- data/bundler/lib/bundler/templates/newgem/circleci/config.yml.tt +13 -0
- data/bundler/lib/bundler/templates/newgem/ext/newgem/extconf.rb.tt +2 -0
- data/bundler/lib/bundler/templates/newgem/github/workflows/main.yml.tt +18 -0
- data/bundler/lib/bundler/templates/newgem/gitlab-ci.yml.tt +9 -0
- data/bundler/lib/bundler/templates/newgem/lib/newgem.rb.tt +2 -0
- data/bundler/lib/bundler/templates/newgem/lib/newgem/version.rb.tt +2 -0
- data/bundler/lib/bundler/templates/newgem/newgem.gemspec.tt +5 -3
- data/bundler/lib/bundler/templates/newgem/rubocop.yml.tt +10 -0
- data/bundler/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt +2 -0
- data/bundler/lib/bundler/templates/newgem/spec/spec_helper.rb.tt +2 -0
- data/bundler/lib/bundler/templates/newgem/test/{newgem_test.rb.tt → minitest/newgem_test.rb.tt} +2 -0
- data/bundler/lib/bundler/templates/newgem/test/{test_helper.rb.tt → minitest/test_helper.rb.tt} +2 -0
- data/bundler/lib/bundler/templates/newgem/test/test-unit/newgem_test.rb.tt +15 -0
- data/bundler/lib/bundler/templates/newgem/test/test-unit/test_helper.rb.tt +6 -0
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +72 -208
- data/bundler/lib/bundler/vendor/thor/lib/thor.rb +0 -7
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/create_link.rb +2 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/base.rb +9 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/version.rb +1 -1
- data/bundler/lib/bundler/version.rb +1 -1
- data/bundler/man/bundle-add.1 +1 -1
- data/bundler/man/bundle-add.1.txt +15 -15
- data/bundler/man/bundle-binstubs.1 +1 -1
- data/bundler/man/bundle-binstubs.1.txt +10 -10
- data/bundler/man/bundle-cache.1 +1 -1
- data/bundler/man/bundle-cache.1.txt +15 -15
- data/bundler/man/bundle-check.1 +1 -1
- data/bundler/man/bundle-check.1.txt +8 -8
- data/bundler/man/bundle-clean.1 +1 -1
- data/bundler/man/bundle-clean.1.txt +6 -6
- data/bundler/man/bundle-config.1 +3 -9
- data/bundler/man/bundle-config.1.txt +271 -272
- data/bundler/man/bundle-config.ronn +5 -9
- data/bundler/man/bundle-doctor.1 +1 -1
- data/bundler/man/bundle-doctor.1.txt +9 -9
- data/bundler/man/bundle-exec.1 +1 -1
- data/bundler/man/bundle-exec.1.txt +84 -81
- data/bundler/man/bundle-gem.1 +25 -3
- data/bundler/man/bundle-gem.1.txt +65 -39
- data/bundler/man/bundle-gem.ronn +30 -7
- data/bundler/man/bundle-info.1 +1 -1
- data/bundler/man/bundle-info.1.txt +2 -2
- data/bundler/man/bundle-init.1 +1 -1
- data/bundler/man/bundle-init.1.txt +9 -9
- data/bundler/man/bundle-inject.1 +1 -1
- data/bundler/man/bundle-inject.1.txt +4 -4
- data/bundler/man/bundle-install.1 +1 -1
- data/bundler/man/bundle-install.1.txt +169 -169
- data/bundler/man/bundle-list.1 +1 -1
- data/bundler/man/bundle-list.1.txt +7 -7
- data/bundler/man/bundle-lock.1 +1 -1
- data/bundler/man/bundle-lock.1.txt +28 -28
- data/bundler/man/bundle-open.1 +1 -1
- data/bundler/man/bundle-open.1.txt +3 -3
- data/bundler/man/bundle-outdated.1 +1 -1
- data/bundler/man/bundle-outdated.1.txt +34 -34
- data/bundler/man/bundle-platform.1 +1 -1
- data/bundler/man/bundle-platform.1.txt +16 -16
- data/bundler/man/bundle-pristine.1 +1 -1
- data/bundler/man/bundle-pristine.1.txt +8 -8
- data/bundler/man/bundle-remove.1 +1 -1
- data/bundler/man/bundle-remove.1.txt +9 -9
- data/bundler/man/bundle-show.1 +1 -1
- data/bundler/man/bundle-show.1.txt +8 -8
- data/bundler/man/bundle-update.1 +1 -1
- data/bundler/man/bundle-update.1.txt +149 -148
- data/bundler/man/bundle-viz.1 +1 -1
- data/bundler/man/bundle-viz.1.txt +11 -11
- data/bundler/man/bundle.1 +1 -1
- data/bundler/man/bundle.1.txt +31 -31
- data/bundler/man/gemfile.5 +1 -1
- data/bundler/man/gemfile.5.txt +218 -216
- data/lib/rubygems.rb +135 -185
- data/lib/rubygems/available_set.rb +4 -4
- data/lib/rubygems/basic_specification.rb +12 -6
- data/lib/rubygems/bundler_version_finder.rb +14 -9
- data/lib/rubygems/command.rb +17 -15
- data/lib/rubygems/command_manager.rb +4 -3
- data/lib/rubygems/commands/cert_command.rb +1 -1
- data/lib/rubygems/commands/cleanup_command.rb +3 -3
- data/lib/rubygems/commands/contents_command.rb +4 -4
- data/lib/rubygems/commands/dependency_command.rb +6 -6
- data/lib/rubygems/commands/fetch_command.rb +2 -2
- data/lib/rubygems/commands/help_command.rb +2 -2
- data/lib/rubygems/commands/info_command.rb +9 -4
- data/lib/rubygems/commands/install_command.rb +3 -3
- data/lib/rubygems/commands/list_command.rb +9 -6
- data/lib/rubygems/commands/lock_command.rb +1 -1
- data/lib/rubygems/commands/open_command.rb +0 -2
- data/lib/rubygems/commands/pristine_command.rb +10 -2
- data/lib/rubygems/commands/push_command.rb +4 -42
- data/lib/rubygems/commands/query_command.rb +7 -352
- data/lib/rubygems/commands/search_command.rb +8 -6
- data/lib/rubygems/commands/setup_command.rb +156 -45
- data/lib/rubygems/commands/sources_command.rb +3 -3
- data/lib/rubygems/commands/specification_command.rb +2 -2
- data/lib/rubygems/commands/stale_command.rb +1 -1
- data/lib/rubygems/commands/uninstall_command.rb +2 -2
- data/lib/rubygems/commands/unpack_command.rb +1 -1
- data/lib/rubygems/commands/update_command.rb +40 -10
- data/lib/rubygems/config_file.rb +11 -2
- data/lib/rubygems/core_ext/kernel_require.rb +26 -36
- data/lib/rubygems/defaults.rb +99 -5
- data/lib/rubygems/dependency.rb +2 -5
- data/lib/rubygems/dependency_installer.rb +1 -73
- data/lib/rubygems/dependency_list.rb +7 -7
- data/lib/rubygems/deprecate.rb +46 -1
- data/lib/rubygems/doctor.rb +4 -2
- data/lib/rubygems/errors.rb +3 -2
- data/lib/rubygems/exceptions.rb +2 -13
- data/lib/rubygems/ext.rb +6 -6
- data/lib/rubygems/ext/build_error.rb +2 -0
- data/lib/rubygems/ext/builder.rb +4 -2
- data/lib/rubygems/ext/cmake_builder.rb +1 -1
- data/lib/rubygems/ext/ext_conf_builder.rb +6 -7
- data/lib/rubygems/gem_runner.rb +3 -8
- data/lib/rubygems/gemcutter_utilities.rb +1 -1
- data/lib/rubygems/indexer.rb +1 -19
- data/lib/rubygems/install_update_options.rb +5 -5
- data/lib/rubygems/installer.rb +45 -42
- data/lib/rubygems/installer_test_case.rb +19 -2
- data/lib/rubygems/installer_uninstaller_utils.rb +24 -0
- data/lib/rubygems/local_remote_options.rb +1 -1
- data/lib/rubygems/name_tuple.rb +2 -4
- data/lib/rubygems/package.rb +8 -13
- data/lib/rubygems/package/old.rb +1 -1
- data/lib/rubygems/package/tar_header.rb +3 -3
- data/lib/rubygems/package/tar_reader.rb +0 -1
- data/lib/rubygems/package/tar_reader/entry.rb +0 -1
- data/lib/rubygems/package/tar_test_case.rb +1 -1
- data/lib/rubygems/package/tar_writer.rb +2 -6
- data/lib/rubygems/package_task.rb +1 -5
- data/lib/rubygems/path_support.rb +1 -1
- data/lib/rubygems/platform.rb +3 -3
- data/lib/rubygems/query_utils.rb +362 -0
- data/lib/rubygems/rdoc.rb +0 -12
- data/lib/rubygems/remote_fetcher.rb +5 -19
- data/lib/rubygems/request/connection_pools.rb +1 -1
- data/lib/rubygems/request_set.rb +5 -5
- data/lib/rubygems/request_set/gem_dependency_api.rb +2 -2
- data/lib/rubygems/request_set/lockfile.rb +8 -8
- data/lib/rubygems/request_set/lockfile/tokenizer.rb +1 -1
- data/lib/rubygems/requirement.rb +14 -15
- data/lib/rubygems/resolver.rb +7 -8
- data/lib/rubygems/resolver/api_set.rb +4 -4
- data/lib/rubygems/resolver/api_specification.rb +1 -1
- data/lib/rubygems/resolver/composed_set.rb +3 -3
- data/lib/rubygems/resolver/conflict.rb +1 -1
- data/lib/rubygems/resolver/index_set.rb +1 -1
- data/lib/rubygems/resolver/installer_set.rb +3 -3
- data/lib/rubygems/resolver/lock_set.rb +1 -1
- data/lib/rubygems/safe_yaml.rb +4 -4
- data/lib/rubygems/security.rb +25 -25
- data/lib/rubygems/security/policy.rb +3 -3
- data/lib/rubygems/security/signer.rb +4 -4
- data/lib/rubygems/security/trust_dir.rb +1 -1
- data/lib/rubygems/server.rb +9 -9
- data/lib/rubygems/source/git.rb +7 -6
- data/lib/rubygems/source/local.rb +2 -2
- data/lib/rubygems/source_list.rb +6 -5
- data/lib/rubygems/spec_fetcher.rb +18 -15
- data/lib/rubygems/specification.rb +91 -112
- data/lib/rubygems/specification_policy.rb +88 -28
- data/lib/rubygems/test_case.rb +122 -81
- data/lib/rubygems/test_utilities.rb +6 -6
- data/lib/rubygems/uninstaller.rb +35 -14
- data/lib/rubygems/user_interaction.rb +1 -10
- data/lib/rubygems/util.rb +17 -3
- data/lib/rubygems/util/licenses.rb +4 -4
- data/lib/rubygems/validator.rb +1 -1
- data/lib/rubygems/version.rb +5 -5
- data/rubygems-update.gemspec +2 -2
- data/setup.rb +2 -7
- data/test/rubygems/specifications/bar-0.0.2.gemspec +0 -2
- data/test/rubygems/specifications/rubyforge-0.0.1.gemspec +12 -0
- data/test/rubygems/test_bundled_ca.rb +1 -5
- data/test/rubygems/test_deprecate.rb +43 -4
- data/test/rubygems/test_gem.rb +150 -101
- data/test/rubygems/test_gem_available_set.rb +3 -3
- data/test/rubygems/test_gem_bundler_version_finder.rb +19 -1
- data/test/rubygems/test_gem_command.rb +24 -3
- data/test/rubygems/test_gem_command_manager.rb +37 -4
- data/test/rubygems/test_gem_commands_build_command.rb +25 -3
- data/test/rubygems/test_gem_commands_cert_command.rb +2 -2
- data/test/rubygems/test_gem_commands_cleanup_command.rb +1 -1
- data/test/rubygems/test_gem_commands_contents_command.rb +48 -15
- data/test/rubygems/test_gem_commands_environment_command.rb +21 -21
- data/test/rubygems/test_gem_commands_generate_index_command.rb +1 -5
- data/test/rubygems/test_gem_commands_info_command.rb +6 -6
- data/test/rubygems/test_gem_commands_install_command.rb +31 -31
- data/test/rubygems/test_gem_commands_mirror.rb +1 -1
- data/test/rubygems/test_gem_commands_open_command.rb +4 -4
- data/test/rubygems/test_gem_commands_owner_command.rb +11 -3
- data/test/rubygems/test_gem_commands_pristine_command.rb +41 -8
- data/test/rubygems/test_gem_commands_push_command.rb +7 -2
- data/test/rubygems/test_gem_commands_query_command.rb +9 -5
- data/test/rubygems/test_gem_commands_setup_command.rb +212 -114
- data/test/rubygems/test_gem_commands_signin_command.rb +6 -4
- data/test/rubygems/test_gem_commands_signout_command.rb +0 -5
- data/test/rubygems/test_gem_commands_sources_command.rb +39 -1
- data/test/rubygems/test_gem_commands_specification_command.rb +18 -18
- data/test/rubygems/test_gem_commands_uninstall_command.rb +2 -1
- data/test/rubygems/test_gem_commands_update_command.rb +68 -5
- data/test/rubygems/test_gem_commands_which_command.rb +3 -3
- data/test/rubygems/test_gem_commands_yank_command.rb +14 -6
- data/test/rubygems/test_gem_config_file.rb +7 -10
- data/test/rubygems/test_gem_dependency_installer.rb +52 -189
- data/test/rubygems/test_gem_dependency_list.rb +8 -8
- data/test/rubygems/test_gem_dependency_resolution_error.rb +1 -1
- data/test/rubygems/test_gem_doctor.rb +28 -0
- data/test/rubygems/test_gem_ext_builder.rb +14 -25
- data/test/rubygems/test_gem_ext_cmake_builder.rb +13 -12
- data/test/rubygems/test_gem_ext_configure_builder.rb +1 -9
- data/test/rubygems/test_gem_ext_ext_conf_builder.rb +0 -1
- data/test/rubygems/test_gem_ext_rake_builder.rb +9 -9
- data/test/rubygems/test_gem_gem_runner.rb +42 -0
- data/test/rubygems/test_gem_gemcutter_utilities.rb +5 -0
- data/test/rubygems/test_gem_indexer.rb +9 -13
- data/test/rubygems/test_gem_installer.rb +158 -67
- data/test/rubygems/test_gem_package.rb +16 -20
- data/test/rubygems/test_gem_package_tar_header.rb +19 -0
- data/test/rubygems/test_gem_package_tar_writer.rb +8 -3
- data/test/rubygems/test_gem_package_task.rb +46 -11
- data/test/rubygems/test_gem_remote_fetcher.rb +152 -190
- data/test/rubygems/test_gem_request.rb +11 -11
- data/test/rubygems/test_gem_request_set.rb +72 -20
- data/test/rubygems/test_gem_request_set_gem_dependency_api.rb +3 -3
- data/test/rubygems/test_gem_request_set_lockfile_parser.rb +9 -9
- data/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb +118 -118
- data/test/rubygems/test_gem_requirement.rb +2 -2
- data/test/rubygems/test_gem_resolver.rb +6 -6
- data/test/rubygems/test_gem_resolver_api_set.rb +3 -3
- data/test/rubygems/test_gem_resolver_best_set.rb +2 -2
- data/test/rubygems/test_gem_resolver_index_set.rb +2 -2
- data/test/rubygems/test_gem_resolver_installer_set.rb +7 -7
- data/test/rubygems/test_gem_resolver_lock_set.rb +3 -3
- data/test/rubygems/test_gem_security.rb +20 -20
- data/test/rubygems/test_gem_security_policy.rb +5 -8
- data/test/rubygems/test_gem_security_signer.rb +8 -8
- data/test/rubygems/test_gem_security_trust_dir.rb +2 -2
- data/test/rubygems/test_gem_server.rb +10 -10
- data/test/rubygems/test_gem_source.rb +12 -14
- data/test/rubygems/test_gem_source_git.rb +12 -11
- data/test/rubygems/test_gem_source_installed.rb +7 -7
- data/test/rubygems/test_gem_source_local.rb +8 -8
- data/test/rubygems/test_gem_source_lock.rb +10 -10
- data/test/rubygems/test_gem_source_specific_file.rb +7 -7
- data/test/rubygems/test_gem_source_vendor.rb +7 -7
- data/test/rubygems/test_gem_spec_fetcher.rb +11 -2
- data/test/rubygems/test_gem_specification.rb +169 -119
- data/test/rubygems/test_gem_stream_ui.rb +3 -1
- data/test/rubygems/test_gem_stub_specification.rb +0 -1
- data/test/rubygems/test_gem_text.rb +1 -1
- data/test/rubygems/test_gem_uninstaller.rb +134 -10
- data/test/rubygems/test_gem_util.rb +7 -5
- data/test/rubygems/test_gem_version.rb +1 -1
- data/test/rubygems/test_kernel.rb +25 -8
- data/test/rubygems/test_project_sanity.rb +8 -1
- data/test/rubygems/test_require.rb +242 -40
- metadata +33 -46
- data/.bundle/config +0 -2
- data/.rubocop.yml +0 -91
- data/Gemfile +0 -8
- data/Gemfile.lock +0 -43
- data/bundler/CODE_OF_CONDUCT.md +0 -136
- data/lib/rubygems/source_local.rb +0 -7
- data/lib/rubygems/source_specific_file.rb +0 -6
- data/lib/ubygems.rb +0 -14
- data/tmp/.keep +0 -0
- data/util/CL2notes +0 -55
- data/util/bisect +0 -10
- data/util/ci.sh +0 -62
- data/util/cops/deprecations.rb +0 -52
- data/util/create_certs.rb +0 -171
- data/util/create_certs.sh +0 -27
- data/util/create_encrypted_key.rb +0 -16
- data/util/generate_spdx_license_list.rb +0 -63
- data/util/patch_with_prs.rb +0 -77
- data/util/rubocop +0 -8
- data/util/update_bundled_ca_certificates.rb +0 -139
- data/util/update_changelog.rb +0 -67
@@ -5,7 +5,9 @@ require 'timeout'
|
|
5
5
|
|
6
6
|
class TestGemStreamUI < Gem::TestCase
|
7
7
|
|
8
|
-
|
8
|
+
# increase timeout with MJIT for --jit-wait testing
|
9
|
+
mjit_enabled = defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled?
|
10
|
+
SHORT_TIMEOUT = (RUBY_ENGINE == "ruby" && !mjit_enabled) ? 0.1 : 1.0
|
9
11
|
|
10
12
|
module IsTty
|
11
13
|
attr_accessor :tty
|
@@ -4,7 +4,6 @@ require "rubygems/stub_specification"
|
|
4
4
|
|
5
5
|
class TestStubSpecification < Gem::TestCase
|
6
6
|
|
7
|
-
SPECIFICATIONS = File.expand_path(File.join("..", "specifications"), __FILE__)
|
8
7
|
FOO = File.join SPECIFICATIONS, "foo-0.0.1-x86-mswin32.gemspec"
|
9
8
|
BAR = File.join SPECIFICATIONS, "bar-0.0.2.gemspec"
|
10
9
|
|
@@ -23,7 +23,7 @@ class TestGemText < Gem::TestCase
|
|
23
23
|
end
|
24
24
|
|
25
25
|
def test_format_text_no_space
|
26
|
-
assert_equal "texttowr\nap",
|
26
|
+
assert_equal "texttowr\nap", format_text("texttowrap", 8)
|
27
27
|
end
|
28
28
|
|
29
29
|
def test_format_text_trailing # for two spaces after .
|
@@ -27,7 +27,7 @@ class TestGemUninstaller < Gem::InstallerTestCase
|
|
27
27
|
FileUtils.mkdir_p 'foo/bar'
|
28
28
|
uninstaller = Gem::Uninstaller.new nil, :install_dir => 'foo//bar'
|
29
29
|
|
30
|
-
assert_match %r
|
30
|
+
assert_match %r{foo/bar$}, uninstaller.instance_variable_get(:@gem_home)
|
31
31
|
end
|
32
32
|
|
33
33
|
def test_ask_if_ok
|
@@ -154,6 +154,8 @@ class TestGemUninstaller < Gem::InstallerTestCase
|
|
154
154
|
end
|
155
155
|
|
156
156
|
def test_remove_symlinked_gem_home
|
157
|
+
skip "Symlinks not supported or not enabled" unless symlink_supported?
|
158
|
+
|
157
159
|
Dir.mktmpdir("gem_home") do |dir|
|
158
160
|
symlinked_gem_home = "#{dir}/#{File.basename(@gemhome)}"
|
159
161
|
|
@@ -169,6 +171,59 @@ class TestGemUninstaller < Gem::InstallerTestCase
|
|
169
171
|
end
|
170
172
|
end
|
171
173
|
|
174
|
+
def test_remove_plugins
|
175
|
+
write_file File.join(@tempdir, 'lib', 'rubygems_plugin.rb') do |io|
|
176
|
+
io.write "puts __FILE__"
|
177
|
+
end
|
178
|
+
|
179
|
+
@spec.files += %w[lib/rubygems_plugin.rb]
|
180
|
+
|
181
|
+
Gem::Installer.at(Gem::Package.build(@spec)).install
|
182
|
+
|
183
|
+
plugin_path = File.join Gem.plugindir, 'a_plugin.rb'
|
184
|
+
assert File.exist?(plugin_path), 'plugin not written'
|
185
|
+
|
186
|
+
Gem::Uninstaller.new(nil).remove_plugins @spec
|
187
|
+
|
188
|
+
refute File.exist?(plugin_path), 'plugin not removed'
|
189
|
+
end
|
190
|
+
|
191
|
+
def test_remove_plugins_with_install_dir
|
192
|
+
write_file File.join(@tempdir, 'lib', 'rubygems_plugin.rb') do |io|
|
193
|
+
io.write "puts __FILE__"
|
194
|
+
end
|
195
|
+
|
196
|
+
@spec.files += %w[lib/rubygems_plugin.rb]
|
197
|
+
|
198
|
+
Gem::Installer.at(Gem::Package.build(@spec)).install
|
199
|
+
|
200
|
+
plugin_path = File.join Gem.plugindir, 'a_plugin.rb'
|
201
|
+
assert File.exist?(plugin_path), 'plugin not written'
|
202
|
+
|
203
|
+
Dir.mkdir "#{@gemhome}2"
|
204
|
+
Gem::Uninstaller.new(nil, :install_dir => "#{@gemhome}2").remove_plugins @spec
|
205
|
+
|
206
|
+
assert File.exist?(plugin_path), 'plugin unintentionally removed'
|
207
|
+
end
|
208
|
+
|
209
|
+
def test_regenerate_plugins_for
|
210
|
+
write_file File.join(@tempdir, 'lib', 'rubygems_plugin.rb') do |io|
|
211
|
+
io.write "puts __FILE__"
|
212
|
+
end
|
213
|
+
|
214
|
+
@spec.files += %w[lib/rubygems_plugin.rb]
|
215
|
+
|
216
|
+
Gem::Installer.at(Gem::Package.build(@spec)).install
|
217
|
+
|
218
|
+
plugin_path = File.join Gem.plugindir, 'a_plugin.rb'
|
219
|
+
assert File.exist?(plugin_path), 'plugin not written'
|
220
|
+
|
221
|
+
FileUtils.rm plugin_path
|
222
|
+
Gem::Uninstaller.new(nil).regenerate_plugins_for @spec, Gem.plugindir
|
223
|
+
|
224
|
+
assert File.exist?(plugin_path), 'plugin not regenerated'
|
225
|
+
end
|
226
|
+
|
172
227
|
def test_path_ok_eh
|
173
228
|
uninstaller = Gem::Uninstaller.new nil
|
174
229
|
|
@@ -405,12 +460,12 @@ create_makefile '#{@spec.name}'
|
|
405
460
|
lines = ui.output.split("\n")
|
406
461
|
lines.shift
|
407
462
|
|
408
|
-
assert_match %r
|
463
|
+
assert_match %r{You have requested to uninstall the gem:}, lines.shift
|
409
464
|
lines.shift
|
410
465
|
lines.shift
|
411
466
|
|
412
|
-
assert_match %r
|
413
|
-
assert_match %r
|
467
|
+
assert_match %r{r-1 depends on q \(= 1\)}, lines.shift
|
468
|
+
assert_match %r{Successfully uninstalled q-1}, lines.last
|
414
469
|
end
|
415
470
|
|
416
471
|
def test_uninstall_only_lists_unsatisfied_deps
|
@@ -435,12 +490,12 @@ create_makefile '#{@spec.name}'
|
|
435
490
|
lines = ui.output.split("\n")
|
436
491
|
lines.shift
|
437
492
|
|
438
|
-
assert_match %r
|
493
|
+
assert_match %r{You have requested to uninstall the gem:}, lines.shift
|
439
494
|
lines.shift
|
440
495
|
lines.shift
|
441
496
|
|
442
|
-
assert_match %r
|
443
|
-
assert_match %r
|
497
|
+
assert_match %r{x-1 depends on q \(= 1.0\)}, lines.shift
|
498
|
+
assert_match %r{Successfully uninstalled q-1.0}, lines.last
|
444
499
|
end
|
445
500
|
|
446
501
|
def test_uninstall_doesnt_prompt_when_other_gem_satisfies_requirement
|
@@ -516,12 +571,41 @@ create_makefile '#{@spec.name}'
|
|
516
571
|
lines = ui.output.split("\n")
|
517
572
|
lines.shift
|
518
573
|
|
519
|
-
assert_match %r
|
574
|
+
assert_match %r{You have requested to uninstall the gem:}, lines.shift
|
520
575
|
lines.shift
|
521
576
|
lines.shift
|
522
577
|
|
523
|
-
assert_match %r
|
524
|
-
assert_match %r
|
578
|
+
assert_match %r{r-1 depends on q \(= 1, development\)}, lines.shift
|
579
|
+
assert_match %r{Successfully uninstalled q-1}, lines.last
|
580
|
+
end
|
581
|
+
|
582
|
+
def test_uninstall_prompt_only_lists_the_dependents_that_prevented_uninstallation
|
583
|
+
quick_gem 'r', '1' do |s|
|
584
|
+
s.add_development_dependency 'q', '= 1'
|
585
|
+
end
|
586
|
+
|
587
|
+
quick_gem 's', '1' do |s|
|
588
|
+
s.add_dependency 'q', '= 1'
|
589
|
+
end
|
590
|
+
|
591
|
+
quick_gem 'q', '1'
|
592
|
+
|
593
|
+
un = Gem::Uninstaller.new('q', :check_dev => false)
|
594
|
+
ui = Gem::MockGemUi.new("y\n")
|
595
|
+
|
596
|
+
use_ui ui do
|
597
|
+
un.uninstall
|
598
|
+
end
|
599
|
+
|
600
|
+
lines = ui.output.split("\n")
|
601
|
+
lines.shift
|
602
|
+
|
603
|
+
assert_match %r{You have requested to uninstall the gem:}, lines.shift
|
604
|
+
lines.shift
|
605
|
+
lines.shift
|
606
|
+
|
607
|
+
assert_match %r{s-1 depends on q \(= 1\)}, lines.shift
|
608
|
+
assert_match %r{Successfully uninstalled q-1}, lines.last
|
525
609
|
end
|
526
610
|
|
527
611
|
def test_uninstall_no_permission
|
@@ -542,4 +626,44 @@ create_makefile '#{@spec.name}'
|
|
542
626
|
end
|
543
627
|
end
|
544
628
|
|
629
|
+
def test_uninstall_keeps_plugins_up_to_date
|
630
|
+
write_file File.join(@tempdir, 'lib', 'rubygems_plugin.rb') do |io|
|
631
|
+
io.write "puts __FILE__"
|
632
|
+
end
|
633
|
+
|
634
|
+
plugin_path = File.join Gem.plugindir, 'a_plugin.rb'
|
635
|
+
|
636
|
+
@spec.version = '1'
|
637
|
+
Gem::Installer.at(Gem::Package.build(@spec)).install
|
638
|
+
|
639
|
+
refute File.exist?(plugin_path), 'version without plugin installed, but plugin written'
|
640
|
+
|
641
|
+
@spec.files += %w[lib/rubygems_plugin.rb]
|
642
|
+
@spec.version = '2'
|
643
|
+
Gem::Installer.at(Gem::Package.build(@spec)).install
|
644
|
+
|
645
|
+
assert File.exist?(plugin_path), 'version with plugin installed, but plugin not written'
|
646
|
+
assert_match %r{\Arequire.*a-2/lib/rubygems_plugin\.rb}, File.read(plugin_path), 'written plugin has incorrect content'
|
647
|
+
|
648
|
+
@spec.version = '3'
|
649
|
+
Gem::Installer.at(Gem::Package.build(@spec)).install
|
650
|
+
|
651
|
+
assert File.exist?(plugin_path), 'version with plugin installed, but plugin removed'
|
652
|
+
assert_match %r{\Arequire.*a-3/lib/rubygems_plugin\.rb}, File.read(plugin_path), 'old version installed, but plugin updated'
|
653
|
+
|
654
|
+
Gem::Uninstaller.new('a', :version => '1', :executables => true).uninstall
|
655
|
+
|
656
|
+
assert File.exist?(plugin_path), 'plugin removed when old version uninstalled'
|
657
|
+
assert_match %r{\Arequire.*a-3/lib/rubygems_plugin\.rb}, File.read(plugin_path), 'old version uninstalled, but plugin updated'
|
658
|
+
|
659
|
+
Gem::Uninstaller.new('a', version: '3', :executables => true).uninstall
|
660
|
+
|
661
|
+
assert File.exist?(plugin_path), 'plugin removed when old version uninstalled and another version with plugin still present'
|
662
|
+
assert_match %r{\Arequire.*a-2/lib/rubygems_plugin\.rb}, File.read(plugin_path), 'latest version uninstalled, but plugin not updated to previous version'
|
663
|
+
|
664
|
+
Gem::Uninstaller.new('a', version: '2', :executables => true).uninstall
|
665
|
+
|
666
|
+
refute File.exist?(plugin_path), 'last version uninstalled, but plugin still present'
|
667
|
+
end
|
668
|
+
|
545
669
|
end
|
@@ -6,7 +6,7 @@ class TestGemUtil < Gem::TestCase
|
|
6
6
|
|
7
7
|
def test_class_popen
|
8
8
|
skip "popen with a block does not behave well on jruby" if Gem.java_platform?
|
9
|
-
assert_equal "0\n", Gem::Util.popen(
|
9
|
+
assert_equal "0\n", Gem::Util.popen(*ruby_with_rubygems_in_load_path, '-e', 'p 0')
|
10
10
|
|
11
11
|
assert_raises Errno::ECHILD do
|
12
12
|
Process.wait(-1)
|
@@ -15,8 +15,10 @@ class TestGemUtil < Gem::TestCase
|
|
15
15
|
|
16
16
|
def test_silent_system
|
17
17
|
skip if Gem.java_platform?
|
18
|
-
|
19
|
-
|
18
|
+
Gem::Deprecate.skip_during do
|
19
|
+
assert_silent do
|
20
|
+
Gem::Util.silent_system(*ruby_with_rubygems_in_load_path, '-e', 'puts "hello"; warn "hello"')
|
21
|
+
end
|
20
22
|
end
|
21
23
|
end
|
22
24
|
|
@@ -56,8 +58,8 @@ class TestGemUtil < Gem::TestCase
|
|
56
58
|
list = [1,2,3,4,5].inject(Gem::List.new(0)) do |m,o|
|
57
59
|
Gem::List.new o, m
|
58
60
|
end
|
59
|
-
assert_equal 5, list.find {
|
60
|
-
assert_equal 4, list.find {
|
61
|
+
assert_equal 5, list.find {|x| x == 5 }
|
62
|
+
assert_equal 4, list.find {|x| x == 4 }
|
61
63
|
end
|
62
64
|
|
63
65
|
def test_glob_files_in_dir
|
@@ -236,7 +236,7 @@ class TestGemVersion < Gem::TestCase
|
|
236
236
|
assert_equal expected, v(version).approximate_recommendation
|
237
237
|
end
|
238
238
|
|
239
|
-
# Assert that the "approximate" recommendation for +version+
|
239
|
+
# Assert that the "approximate" recommendation for +version+ satisfies +version+.
|
240
240
|
|
241
241
|
def assert_approximate_satisfies_itself(version)
|
242
242
|
gem_version = v(version)
|
@@ -19,7 +19,7 @@ class TestKernel < Gem::TestCase
|
|
19
19
|
|
20
20
|
def test_gem
|
21
21
|
assert gem('a', '= 1'), "Should load"
|
22
|
-
assert $:.any? {
|
22
|
+
assert $:.any? {|p| %r{a-1/lib} =~ p }
|
23
23
|
end
|
24
24
|
|
25
25
|
def test_gem_default
|
@@ -49,13 +49,13 @@ class TestKernel < Gem::TestCase
|
|
49
49
|
def test_gem_redundant
|
50
50
|
assert gem('a', '= 1'), "Should load"
|
51
51
|
refute gem('a', '= 1'), "Should not load"
|
52
|
-
assert_equal 1, $:.select {
|
52
|
+
assert_equal 1, $:.select {|p| %r{a-1/lib} =~ p }.size
|
53
53
|
end
|
54
54
|
|
55
55
|
def test_gem_overlapping
|
56
56
|
assert gem('a', '= 1'), "Should load"
|
57
57
|
refute gem('a', '>= 1'), "Should not load"
|
58
|
-
assert_equal 1, $:.select {
|
58
|
+
assert_equal 1, $:.select {|p| %r{a-1/lib} =~ p }.size
|
59
59
|
end
|
60
60
|
|
61
61
|
def test_gem_prerelease
|
@@ -82,13 +82,30 @@ class TestKernel < Gem::TestCase
|
|
82
82
|
assert_match(/activated a-1/, ex.message)
|
83
83
|
assert_equal 'a', ex.name
|
84
84
|
|
85
|
-
assert $:.any? {
|
86
|
-
refute $:.any? {
|
85
|
+
assert $:.any? {|p| %r{a-1/lib} =~ p }
|
86
|
+
refute $:.any? {|p| %r{a-2/lib} =~ p }
|
87
87
|
end
|
88
88
|
|
89
89
|
def test_gem_not_adding_bin
|
90
90
|
assert gem('a', '= 1'), "Should load"
|
91
|
-
refute $:.any? {
|
91
|
+
refute $:.any? {|p| %r{a-1/bin} =~ p }
|
92
|
+
end
|
93
|
+
|
94
|
+
def test_gem_failing_inside_require_doesnt_cause_double_exceptions
|
95
|
+
File.write("activate.rb", "gem('a', '= 999')\n")
|
96
|
+
|
97
|
+
require "open3"
|
98
|
+
|
99
|
+
output, _ = Open3.capture2e(
|
100
|
+
{ "GEM_HOME" => Gem.paths.home },
|
101
|
+
*ruby_with_rubygems_in_load_path,
|
102
|
+
"-r",
|
103
|
+
"./activate.rb"
|
104
|
+
)
|
105
|
+
|
106
|
+
load_errors = output.split("\n").select {|line| line.include?("Could not find") }
|
107
|
+
|
108
|
+
assert_equal 1, load_errors.size
|
92
109
|
end
|
93
110
|
|
94
111
|
def test_gem_bundler
|
@@ -96,7 +113,7 @@ class TestKernel < Gem::TestCase
|
|
96
113
|
quick_gem 'bundler', '2.a'
|
97
114
|
|
98
115
|
assert gem('bundler')
|
99
|
-
assert $:.any? {
|
116
|
+
assert $:.any? {|p| %r{bundler-1/lib} =~ p }
|
100
117
|
end
|
101
118
|
|
102
119
|
def test_gem_bundler_missing_bundler_version
|
@@ -117,7 +134,7 @@ class TestKernel < Gem::TestCase
|
|
117
134
|
quick_gem 'bundler', '2.a'
|
118
135
|
|
119
136
|
assert gem('bundler', '>= 0.a')
|
120
|
-
assert $:.any? {
|
137
|
+
assert $:.any? {|p| %r{bundler-1/lib} =~ p }
|
121
138
|
end
|
122
139
|
end
|
123
140
|
|
@@ -1,8 +1,9 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
+
require "rubygems/test_case"
|
3
4
|
require "open3"
|
4
5
|
|
5
|
-
class TestProjectSanity <
|
6
|
+
class TestProjectSanity < Gem::TestCase
|
6
7
|
|
7
8
|
def test_manifest_is_up_to_date
|
8
9
|
skip unless File.exist?(File.expand_path("../../../Rakefile", __FILE__))
|
@@ -12,4 +13,10 @@ class TestProjectSanity < Minitest::Test
|
|
12
13
|
assert status.success?, "Expected Manifest.txt to be up to date, but it's not. Run `rake update_manifest` to sync it."
|
13
14
|
end
|
14
15
|
|
16
|
+
def test_require_rubygems_package
|
17
|
+
err, status = Open3.capture2e(*ruby_with_rubygems_in_load_path, "--disable-gems", "-e", "'require \"rubygems/package\"'")
|
18
|
+
|
19
|
+
assert status.success?, err
|
20
|
+
end
|
21
|
+
|
15
22
|
end
|
@@ -45,6 +45,35 @@ class TestGemRequire < Gem::TestCase
|
|
45
45
|
refute require(path), "'#{path}' was not yet required"
|
46
46
|
end
|
47
47
|
|
48
|
+
def test_respect_loaded_features_caching_like_standard_require
|
49
|
+
dir = Dir.mktmpdir("test_require", @tempdir)
|
50
|
+
|
51
|
+
lp1 = File.join dir, 'foo1'
|
52
|
+
foo1 = File.join lp1, 'foo.rb'
|
53
|
+
|
54
|
+
FileUtils.mkdir_p lp1
|
55
|
+
File.open(foo1, 'w') {|f| f.write "class Object; HELLO = 'foo1' end" }
|
56
|
+
|
57
|
+
lp = $LOAD_PATH.dup
|
58
|
+
|
59
|
+
$LOAD_PATH.unshift lp1
|
60
|
+
assert_require 'foo'
|
61
|
+
assert_equal "foo1", ::Object::HELLO
|
62
|
+
|
63
|
+
lp2 = File.join dir, 'foo2'
|
64
|
+
foo2 = File.join lp2, 'foo.rb'
|
65
|
+
|
66
|
+
FileUtils.mkdir_p lp2
|
67
|
+
File.open(foo2, 'w') {|f| f.write "class Object; HELLO = 'foo2' end" }
|
68
|
+
|
69
|
+
$LOAD_PATH.unshift lp2
|
70
|
+
refute_require 'foo'
|
71
|
+
assert_equal "foo1", ::Object::HELLO
|
72
|
+
ensure
|
73
|
+
$LOAD_PATH.replace lp
|
74
|
+
Object.send :remove_const, :HELLO if Object.const_defined? :HELLO
|
75
|
+
end
|
76
|
+
|
48
77
|
# Providing -I on the commandline should always beat gems
|
49
78
|
def test_dash_i_beats_gems
|
50
79
|
a1 = util_spec "a", "1", {"b" => "= 1"}, "lib/test_gem_require_a.rb"
|
@@ -60,7 +89,7 @@ class TestGemRequire < Gem::TestCase
|
|
60
89
|
c_rb = File.join dash_i_arg, 'b', 'c.rb'
|
61
90
|
|
62
91
|
FileUtils.mkdir_p File.dirname c_rb
|
63
|
-
File.open(c_rb, 'w') {
|
92
|
+
File.open(c_rb, 'w') {|f| f.write "class Object; HELLO = 'world' end" }
|
64
93
|
|
65
94
|
lp = $LOAD_PATH.dup
|
66
95
|
|
@@ -70,7 +99,7 @@ class TestGemRequire < Gem::TestCase
|
|
70
99
|
assert_require 'test_gem_require_a'
|
71
100
|
assert_require 'b/c' # this should be required from -I
|
72
101
|
assert_equal "world", ::Object::HELLO
|
73
|
-
assert_equal %w
|
102
|
+
assert_equal %w[a-1 b-1], loaded_spec_names
|
74
103
|
ensure
|
75
104
|
$LOAD_PATH.replace lp
|
76
105
|
Object.send :remove_const, :HELLO if Object.const_defined? :HELLO
|
@@ -102,7 +131,7 @@ class TestGemRequire < Gem::TestCase
|
|
102
131
|
c_rb = File.join dash_i_arg, 'c', 'c.rb'
|
103
132
|
|
104
133
|
FileUtils.mkdir_p File.dirname c_rb
|
105
|
-
File.open(c_rb, 'w') {
|
134
|
+
File.open(c_rb, 'w') {|f| f.write "class Object; HELLO = 'world' end" }
|
106
135
|
|
107
136
|
assert_require 'test_gem_require_a'
|
108
137
|
|
@@ -114,12 +143,31 @@ class TestGemRequire < Gem::TestCase
|
|
114
143
|
assert_require 'b/c'
|
115
144
|
assert_require 'c/c' # this should be required from -I
|
116
145
|
assert_equal "world", ::Object::HELLO
|
117
|
-
assert_equal %w
|
146
|
+
assert_equal %w[a-1 b-1], loaded_spec_names
|
118
147
|
ensure
|
119
148
|
$LOAD_PATH.replace lp
|
120
149
|
Object.send :remove_const, :HELLO if Object.const_defined? :HELLO
|
121
150
|
end
|
122
151
|
|
152
|
+
def test_dash_i_respects_default_library_extension_priority
|
153
|
+
skip "extensions don't quite work on jruby" if Gem.java_platform?
|
154
|
+
skip "not installed yet" unless RbConfig::TOPDIR
|
155
|
+
|
156
|
+
dash_i_ext_arg = util_install_extension_file('a')
|
157
|
+
dash_i_lib_arg = util_install_ruby_file('a')
|
158
|
+
|
159
|
+
lp = $LOAD_PATH.dup
|
160
|
+
|
161
|
+
begin
|
162
|
+
$LOAD_PATH.unshift dash_i_lib_arg
|
163
|
+
$LOAD_PATH.unshift dash_i_ext_arg
|
164
|
+
assert_require 'a'
|
165
|
+
assert_match(/a\.rb$/, $LOADED_FEATURES.last)
|
166
|
+
ensure
|
167
|
+
$LOAD_PATH.replace lp
|
168
|
+
end
|
169
|
+
end
|
170
|
+
|
123
171
|
def test_concurrent_require
|
124
172
|
Object.const_set :FILE_ENTERED_LATCH, Latch.new(2)
|
125
173
|
Object.const_set :FILE_EXIT_LATCH, Latch.new(1)
|
@@ -153,11 +201,11 @@ class TestGemRequire < Gem::TestCase
|
|
153
201
|
install_specs b1, b2, a1
|
154
202
|
|
155
203
|
assert_require 'test_gem_require_a'
|
156
|
-
assert_equal %w
|
204
|
+
assert_equal %w[a-1 b-1], loaded_spec_names
|
157
205
|
assert_equal unresolved_names, []
|
158
206
|
|
159
207
|
assert_require "b/c"
|
160
|
-
assert_equal %w
|
208
|
+
assert_equal %w[a-1 b-1], loaded_spec_names
|
161
209
|
end
|
162
210
|
|
163
211
|
def test_require_is_lazy_with_inexact_req
|
@@ -168,11 +216,11 @@ class TestGemRequire < Gem::TestCase
|
|
168
216
|
install_specs b1, b2, a1
|
169
217
|
|
170
218
|
assert_require 'test_gem_require_a'
|
171
|
-
assert_equal %w
|
219
|
+
assert_equal %w[a-1], loaded_spec_names
|
172
220
|
assert_equal unresolved_names, ["b (>= 1)"]
|
173
221
|
|
174
222
|
assert_require "b/c"
|
175
|
-
assert_equal %w
|
223
|
+
assert_equal %w[a-1 b-2], loaded_spec_names
|
176
224
|
end
|
177
225
|
|
178
226
|
def test_require_is_not_lazy_with_one_possible
|
@@ -182,11 +230,11 @@ class TestGemRequire < Gem::TestCase
|
|
182
230
|
install_specs b1, a1
|
183
231
|
|
184
232
|
assert_require 'test_gem_require_a'
|
185
|
-
assert_equal %w
|
233
|
+
assert_equal %w[a-1 b-1], loaded_spec_names
|
186
234
|
assert_equal unresolved_names, []
|
187
235
|
|
188
236
|
assert_require "b/c"
|
189
|
-
assert_equal %w
|
237
|
+
assert_equal %w[a-1 b-1], loaded_spec_names
|
190
238
|
end
|
191
239
|
|
192
240
|
def test_require_can_use_a_pathname_object
|
@@ -195,7 +243,7 @@ class TestGemRequire < Gem::TestCase
|
|
195
243
|
install_specs a1
|
196
244
|
|
197
245
|
assert_require Pathname.new 'test_gem_require_a'
|
198
|
-
assert_equal %w
|
246
|
+
assert_equal %w[a-1], loaded_spec_names
|
199
247
|
assert_equal unresolved_names, []
|
200
248
|
end
|
201
249
|
|
@@ -205,32 +253,77 @@ class TestGemRequire < Gem::TestCase
|
|
205
253
|
stdlib one is already in $LOADED_FEATURES?. Reproducible by running the
|
206
254
|
spaceship_specific_file test before this one" if java_platform?
|
207
255
|
|
208
|
-
|
209
|
-
|
210
|
-
|
256
|
+
skip "not installed yet" unless RbConfig::TOPDIR
|
257
|
+
|
258
|
+
lib_dir = File.expand_path("../../lib", File.dirname(__FILE__))
|
259
|
+
rubylibdir = File.realdirpath(RbConfig::CONFIG["rubylibdir"])
|
260
|
+
if rubylibdir == lib_dir
|
261
|
+
# testing in the ruby repository where RubyGems' lib/ == stdlib lib/
|
262
|
+
# In that case we want to move the stdlib lib/ to still be after b-2 in $LOAD_PATH
|
263
|
+
lp = $LOAD_PATH.dup
|
211
264
|
$LOAD_PATH.delete lib_dir
|
212
265
|
$LOAD_PATH.push lib_dir
|
266
|
+
load_path_changed = true
|
213
267
|
end
|
214
268
|
|
269
|
+
require 'benchmark' # the stdlib
|
270
|
+
|
215
271
|
a1 = util_spec "a", "1", {"b" => ">= 1"}, "lib/test_gem_require_a.rb"
|
216
272
|
b1 = util_spec "b", "1", nil, "lib/benchmark.rb"
|
217
273
|
b2 = util_spec "b", "2", nil, "lib/benchmark.rb"
|
218
274
|
|
219
275
|
install_specs b1, b2, a1
|
220
276
|
|
277
|
+
# Activates a-1, but not b-1 and b-2
|
221
278
|
assert_require 'test_gem_require_a'
|
279
|
+
assert_equal %w[a-1], loaded_spec_names
|
280
|
+
assert $LOAD_PATH.include? a1.load_paths[0]
|
281
|
+
refute $LOAD_PATH.include? b1.load_paths[0]
|
282
|
+
refute $LOAD_PATH.include? b2.load_paths[0]
|
283
|
+
|
222
284
|
assert_equal unresolved_names, ["b (>= 1)"]
|
223
285
|
|
224
|
-
|
286
|
+
# The require('benchmark') below will activate b-2. However, its
|
287
|
+
# lib/benchmark.rb won't ever be loaded. The reason is MRI sees that even
|
288
|
+
# though b-2 is earlier in $LOAD_PATH it already loaded a benchmark.rb file
|
289
|
+
# and that still exists in $LOAD_PATH (further down),
|
290
|
+
# and as a result #gem_original_require returns false.
|
291
|
+
refute require('benchmark'), "the benchmark stdlib should be recognized as already loaded"
|
292
|
+
|
293
|
+
assert_includes $LOAD_PATH, b2.load_paths[0]
|
294
|
+
assert_includes $LOAD_PATH, rubylibdir
|
295
|
+
message = proc {
|
296
|
+
"this test relies on the b-2 gem lib/ to be before stdlib to make sense\n" +
|
297
|
+
$LOAD_PATH.pretty_inspect
|
298
|
+
}
|
299
|
+
assert_operator $LOAD_PATH.index(b2.load_paths[0]), :<, $LOAD_PATH.index(rubylibdir), message
|
225
300
|
|
226
301
|
# We detected that we should activate b-2, so we did so, but
|
227
|
-
# then
|
228
|
-
# This case is fine because our lazy loading
|
302
|
+
# then #gem_original_require decided "I've already got some benchmark.rb" loaded.
|
303
|
+
# This case is fine because our lazy loading provided exactly
|
229
304
|
# the same behavior as eager loading would have.
|
230
305
|
|
231
|
-
assert_equal %w
|
306
|
+
assert_equal %w[a-1 b-2], loaded_spec_names
|
232
307
|
ensure
|
233
|
-
$LOAD_PATH.replace lp
|
308
|
+
$LOAD_PATH.replace lp if load_path_changed
|
309
|
+
end
|
310
|
+
|
311
|
+
def test_activate_via_require_respects_loaded_default_from_default_gems
|
312
|
+
a1 = new_default_spec "a", "1", nil, "a.rb"
|
313
|
+
|
314
|
+
# simulate requiring a default gem before rubygems is loaded
|
315
|
+
Kernel.send(:gem_original_require, "a")
|
316
|
+
|
317
|
+
# simulate registering default specs on loading rubygems
|
318
|
+
install_default_gems a1
|
319
|
+
|
320
|
+
a2 = util_spec "a", "2", nil, "lib/a.rb"
|
321
|
+
|
322
|
+
install_specs a2
|
323
|
+
|
324
|
+
refute_require 'a'
|
325
|
+
|
326
|
+
assert_equal %w[a-1], loaded_spec_names
|
234
327
|
end
|
235
328
|
|
236
329
|
def test_already_activated_direct_conflict
|
@@ -244,12 +337,12 @@ class TestGemRequire < Gem::TestCase
|
|
244
337
|
|
245
338
|
a1.activate
|
246
339
|
c1.activate
|
247
|
-
assert_equal %w
|
340
|
+
assert_equal %w[a-1 c-1], loaded_spec_names
|
248
341
|
assert_equal ["b (> 0)"], unresolved_names
|
249
342
|
|
250
343
|
assert require("ib")
|
251
344
|
|
252
|
-
assert_equal %w
|
345
|
+
assert_equal %w[a-1 b-1 c-1], loaded_spec_names
|
253
346
|
assert_equal [], unresolved_names
|
254
347
|
end
|
255
348
|
|
@@ -266,7 +359,7 @@ class TestGemRequire < Gem::TestCase
|
|
266
359
|
|
267
360
|
a1.activate
|
268
361
|
c1.activate
|
269
|
-
assert_equal %w
|
362
|
+
assert_equal %w[a-1 c-1], loaded_spec_names
|
270
363
|
assert_equal ["b (> 0)", "x (> 0)"], unresolved_names
|
271
364
|
|
272
365
|
e = assert_raises(Gem::LoadError) do
|
@@ -289,7 +382,7 @@ class TestGemRequire < Gem::TestCase
|
|
289
382
|
|
290
383
|
a1.activate
|
291
384
|
c1.activate
|
292
|
-
assert_equal %w
|
385
|
+
assert_equal %w[a-1 c-1], loaded_spec_names
|
293
386
|
assert_equal ["b (> 0)"], unresolved_names
|
294
387
|
|
295
388
|
e = assert_raises(Gem::LoadError) do
|
@@ -320,21 +413,21 @@ class TestGemRequire < Gem::TestCase
|
|
320
413
|
|
321
414
|
# Require gems that have not been removed.
|
322
415
|
assert_require 'a/b'
|
323
|
-
assert_equal %w
|
416
|
+
assert_equal %w[a-1.0], loaded_spec_names
|
324
417
|
assert_require 'b/d'
|
325
|
-
assert_equal %w
|
418
|
+
assert_equal %w[a-1.0 b-2.0], loaded_spec_names
|
326
419
|
end
|
327
420
|
|
328
421
|
def test_require_doesnt_traverse_development_dependencies
|
329
422
|
a = util_spec("a#{$$}", "1", nil, "lib/a#{$$}.rb")
|
330
423
|
z = util_spec("z", "1", "w" => "> 0")
|
331
|
-
w1 = util_spec("w", "1") {
|
332
|
-
w2 = util_spec("w", "2") {
|
424
|
+
w1 = util_spec("w", "1") {|s| s.add_development_dependency "non-existent" }
|
425
|
+
w2 = util_spec("w", "2") {|s| s.add_development_dependency "non-existent" }
|
333
426
|
|
334
427
|
install_specs a, w1, w2, z
|
335
428
|
|
336
429
|
assert gem("z")
|
337
|
-
assert_equal %w
|
430
|
+
assert_equal %w[z-1], loaded_spec_names
|
338
431
|
assert_equal ["w (> 0)"], unresolved_names
|
339
432
|
|
340
433
|
assert require("a#{$$}")
|
@@ -345,7 +438,7 @@ class TestGemRequire < Gem::TestCase
|
|
345
438
|
nil, "default/gem.rb")
|
346
439
|
install_default_specs(default_gem_spec)
|
347
440
|
assert_require "default/gem"
|
348
|
-
assert_equal %w
|
441
|
+
assert_equal %w[default-2.0.0.0], loaded_spec_names
|
349
442
|
end
|
350
443
|
|
351
444
|
def test_default_gem_require_activates_just_once
|
@@ -364,6 +457,17 @@ class TestGemRequire < Gem::TestCase
|
|
364
457
|
assert_equal 0, times_called
|
365
458
|
end
|
366
459
|
|
460
|
+
def test_second_gem_require_does_not_resolve_path_manually_before_going_through_standard_require
|
461
|
+
a1 = util_spec "a", "1", nil, "lib/test_gem_require_a.rb"
|
462
|
+
install_gem a1
|
463
|
+
|
464
|
+
assert_require "test_gem_require_a"
|
465
|
+
|
466
|
+
stub(:gem_original_require, ->(path) { assert_equal "test_gem_require_a", path }) do
|
467
|
+
require "test_gem_require_a"
|
468
|
+
end
|
469
|
+
end
|
470
|
+
|
367
471
|
def test_realworld_default_gem
|
368
472
|
testing_ruby_repo = !ENV["GEM_COMMAND"].nil?
|
369
473
|
skip "this test can't work under ruby-core setup" if testing_ruby_repo || java_platform?
|
@@ -373,10 +477,35 @@ class TestGemRequire < Gem::TestCase
|
|
373
477
|
require "json"
|
374
478
|
puts Gem.loaded_specs["json"]
|
375
479
|
RUBY
|
376
|
-
output = Gem::Util.popen(
|
480
|
+
output = Gem::Util.popen(*ruby_with_rubygems_in_load_path, "-e", cmd).strip
|
481
|
+
assert $?.success?
|
377
482
|
refute_empty output
|
378
483
|
end
|
379
484
|
|
485
|
+
def test_realworld_upgraded_default_gem
|
486
|
+
testing_ruby_repo = !ENV["GEM_COMMAND"].nil?
|
487
|
+
skip "this test can't work under ruby-core setup" if testing_ruby_repo
|
488
|
+
|
489
|
+
newer_json = util_spec("json", "999.99.9", nil, ["lib/json.rb"])
|
490
|
+
install_gem newer_json
|
491
|
+
|
492
|
+
path = "#{@tempdir}/test_realworld_upgraded_default_gem.rb"
|
493
|
+
code = <<-RUBY
|
494
|
+
$stderr = $stdout
|
495
|
+
require "json"
|
496
|
+
puts Gem.loaded_specs["json"].version
|
497
|
+
puts $LOADED_FEATURES
|
498
|
+
RUBY
|
499
|
+
File.write(path, code)
|
500
|
+
|
501
|
+
output = Gem::Util.popen({ 'GEM_HOME' => @gemhome }, *ruby_with_rubygems_in_load_path, path).strip
|
502
|
+
assert $?.success?
|
503
|
+
refute_empty output
|
504
|
+
assert_equal "999.99.9", output.lines[0].chomp
|
505
|
+
# Make sure only files from the newer json gem are loaded, and no files from the default json gem
|
506
|
+
assert_equal ["#{@gemhome}/gems/json-999.99.9/lib/json.rb"], output.lines.grep(%r{/gems/json-}).map(&:chomp)
|
507
|
+
end
|
508
|
+
|
380
509
|
def test_default_gem_and_normal_gem
|
381
510
|
default_gem_spec = new_default_spec("default", "2.0.0.0",
|
382
511
|
nil, "default/gem.rb")
|
@@ -385,7 +514,34 @@ class TestGemRequire < Gem::TestCase
|
|
385
514
|
"lib/default/gem.rb")
|
386
515
|
install_specs(normal_gem_spec)
|
387
516
|
assert_require "default/gem"
|
388
|
-
assert_equal %w
|
517
|
+
assert_equal %w[default-3.0], loaded_spec_names
|
518
|
+
end
|
519
|
+
|
520
|
+
def test_normal_gems_with_overridden_load_error_message
|
521
|
+
normal_gem_spec = util_spec("normal", "3.0", nil, "lib/normal/gem.rb")
|
522
|
+
|
523
|
+
install_specs(normal_gem_spec)
|
524
|
+
|
525
|
+
File.write("require_with_overridden_load_error_message.rb", <<-RUBY)
|
526
|
+
LoadError.class_eval do
|
527
|
+
def message
|
528
|
+
"Overridden message"
|
529
|
+
end
|
530
|
+
end
|
531
|
+
|
532
|
+
require 'normal/gem'
|
533
|
+
RUBY
|
534
|
+
|
535
|
+
require "open3"
|
536
|
+
|
537
|
+
output, exit_status = Open3.capture2e(
|
538
|
+
{ "GEM_HOME" => Gem.paths.home },
|
539
|
+
*ruby_with_rubygems_in_load_path,
|
540
|
+
"-r",
|
541
|
+
"./require_with_overridden_load_error_message.rb"
|
542
|
+
)
|
543
|
+
|
544
|
+
assert exit_status.success?, "Require failed due to #{output}"
|
389
545
|
end
|
390
546
|
|
391
547
|
def test_default_gem_prerelease
|
@@ -398,7 +554,7 @@ class TestGemRequire < Gem::TestCase
|
|
398
554
|
install_default_specs(normal_gem_higher_prerelease_spec)
|
399
555
|
|
400
556
|
assert_require "default/gem"
|
401
|
-
assert_equal %w
|
557
|
+
assert_equal %w[default-3.0.0.rc2], loaded_spec_names
|
402
558
|
end
|
403
559
|
|
404
560
|
def loaded_spec_names
|
@@ -444,7 +600,7 @@ class TestGemRequire < Gem::TestCase
|
|
444
600
|
end
|
445
601
|
end
|
446
602
|
assert c.send(:require, "default/gem")
|
447
|
-
assert_equal %w
|
603
|
+
assert_equal %w[default-2.0.0.0], loaded_spec_names
|
448
604
|
end
|
449
605
|
|
450
606
|
def test_require_default_when_gem_defined
|
@@ -456,7 +612,7 @@ class TestGemRequire < Gem::TestCase
|
|
456
612
|
end
|
457
613
|
end
|
458
614
|
assert c.send(:require, "a#{$$}")
|
459
|
-
assert_equal %W
|
615
|
+
assert_equal %W[a#{$$}-1], loaded_spec_names
|
460
616
|
end
|
461
617
|
|
462
618
|
def test_require_bundler
|
@@ -500,31 +656,29 @@ class TestGemRequire < Gem::TestCase
|
|
500
656
|
if RUBY_VERSION >= "2.5"
|
501
657
|
["", "Kernel."].each do |prefix|
|
502
658
|
define_method "test_no_kernel_require_in_#{prefix.tr(".", "_")}warn_with_uplevel" do
|
503
|
-
lib = File.realpath("../../../lib", __FILE__)
|
504
659
|
Dir.mktmpdir("warn_test") do |dir|
|
505
660
|
File.write(dir + "/sub.rb", "#{prefix}warn 'uplevel', 'test', uplevel: 1\n")
|
506
661
|
File.write(dir + "/main.rb", "require 'sub'\n")
|
507
662
|
_, err = capture_subprocess_io do
|
508
|
-
system(
|
663
|
+
system(*ruby_with_rubygems_in_load_path, "-w", "--disable=gems", "-C", dir, "-I", dir, "main.rb")
|
509
664
|
end
|
510
665
|
assert_match(/main\.rb:1: warning: uplevel\ntest\n$/, err)
|
511
666
|
_, err = capture_subprocess_io do
|
512
|
-
system(
|
667
|
+
system(*ruby_with_rubygems_in_load_path, "-w", "--enable=gems", "-C", dir, "-I", dir, "main.rb")
|
513
668
|
end
|
514
669
|
assert_match(/main\.rb:1: warning: uplevel\ntest\n$/, err)
|
515
670
|
end
|
516
671
|
end
|
517
672
|
|
518
673
|
define_method "test_no_other_behavioral_changes_with_#{prefix.tr(".", "_")}warn" do
|
519
|
-
lib = File.realpath("../../../lib", __FILE__)
|
520
674
|
Dir.mktmpdir("warn_test") do |dir|
|
521
675
|
File.write(dir + "/main.rb", "#{prefix}warn({x:1}, {y:2}, [])\n")
|
522
676
|
_, err = capture_subprocess_io do
|
523
|
-
system(
|
677
|
+
system(*ruby_with_rubygems_in_load_path, "-w", "--disable=gems", "-C", dir, "main.rb")
|
524
678
|
end
|
525
679
|
assert_match(/{:x=>1}\n{:y=>2}\n$/, err)
|
526
680
|
_, err = capture_subprocess_io do
|
527
|
-
system(
|
681
|
+
system(*ruby_with_rubygems_in_load_path, "-w", "--enable=gems", "-C", dir, "main.rb")
|
528
682
|
end
|
529
683
|
assert_match(/{:x=>1}\n{:y=>2}\n$/, err)
|
530
684
|
end
|
@@ -532,6 +686,8 @@ class TestGemRequire < Gem::TestCase
|
|
532
686
|
end
|
533
687
|
end
|
534
688
|
|
689
|
+
private
|
690
|
+
|
535
691
|
def silence_warnings
|
536
692
|
old_verbose, $VERBOSE = $VERBOSE, false
|
537
693
|
yield
|
@@ -539,4 +695,50 @@ class TestGemRequire < Gem::TestCase
|
|
539
695
|
$VERBOSE = old_verbose
|
540
696
|
end
|
541
697
|
|
698
|
+
def util_install_extension_file(name)
|
699
|
+
spec = quick_gem name
|
700
|
+
util_build_gem spec
|
701
|
+
|
702
|
+
spec.extensions << "extconf.rb"
|
703
|
+
write_file File.join(@tempdir, "extconf.rb") do |io|
|
704
|
+
io.write <<-RUBY
|
705
|
+
require "mkmf"
|
706
|
+
CONFIG['LDSHARED'] = '$(TOUCH) $@ ||'
|
707
|
+
create_makefile("#{name}")
|
708
|
+
RUBY
|
709
|
+
end
|
710
|
+
|
711
|
+
write_file File.join(@tempdir, "#{name}.c") do |io|
|
712
|
+
io.write <<-C
|
713
|
+
void Init_#{name}() { }
|
714
|
+
C
|
715
|
+
end
|
716
|
+
|
717
|
+
write_file File.join(@tempdir, "depend")
|
718
|
+
|
719
|
+
spec.files += ["extconf.rb", "depend", "#{name}.c"]
|
720
|
+
|
721
|
+
so = File.join(spec.gem_dir, "#{name}.#{RbConfig::CONFIG["DLEXT"]}")
|
722
|
+
refute_path_exists so
|
723
|
+
|
724
|
+
path = Gem::Package.build spec
|
725
|
+
installer = Gem::Installer.at path
|
726
|
+
installer.install
|
727
|
+
assert_path_exists so
|
728
|
+
|
729
|
+
spec.gem_dir
|
730
|
+
end
|
731
|
+
|
732
|
+
def util_install_ruby_file(name)
|
733
|
+
dir_lib = Dir.mktmpdir("test_require_lib", @tempdir)
|
734
|
+
dash_i_lib_arg = File.join dir_lib
|
735
|
+
|
736
|
+
a_rb = File.join dash_i_lib_arg, "#{name}.rb"
|
737
|
+
|
738
|
+
FileUtils.mkdir_p File.dirname a_rb
|
739
|
+
File.open(a_rb, 'w') {|f| f.write "# #{name}.rb" }
|
740
|
+
|
741
|
+
dash_i_lib_arg
|
742
|
+
end
|
743
|
+
|
542
744
|
end
|