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
data/test/rubygems/test_gem.rb
CHANGED
@@ -7,16 +7,6 @@ require 'pathname'
|
|
7
7
|
require 'tmpdir'
|
8
8
|
require 'rbconfig'
|
9
9
|
|
10
|
-
if File.exist?(File.join(Dir.tmpdir, "Gemfile"))
|
11
|
-
raise "rubygems/bundler tests do not work correctly if there is #{ File.join(Dir.tmpdir, "Gemfile") }"
|
12
|
-
end
|
13
|
-
|
14
|
-
# TODO: push this up to test_case.rb once battle tested
|
15
|
-
|
16
|
-
$LOAD_PATH.map! do |path|
|
17
|
-
path.dup.tap(&Gem::UNTAINT)
|
18
|
-
end
|
19
|
-
|
20
10
|
class TestGem < Gem::TestCase
|
21
11
|
|
22
12
|
PLUGINS_LOADED = [] # rubocop:disable Style/MutableConstant
|
@@ -31,7 +21,7 @@ class TestGem < Gem::TestCase
|
|
31
21
|
common_installer_setup
|
32
22
|
|
33
23
|
ENV.delete 'RUBYGEMS_GEMDEPS'
|
34
|
-
@additional = %w[a b].map {
|
24
|
+
@additional = %w[a b].map {|d| File.join @tempdir, d }
|
35
25
|
|
36
26
|
util_remove_interrupt_command
|
37
27
|
end
|
@@ -48,12 +38,12 @@ class TestGem < Gem::TestCase
|
|
48
38
|
|
49
39
|
a1.activate
|
50
40
|
|
51
|
-
assert_equal %w
|
41
|
+
assert_equal %w[a-1], loaded_spec_names
|
52
42
|
assert_equal ["b (> 0)"], unresolved_names
|
53
43
|
|
54
44
|
Gem.finish_resolve
|
55
45
|
|
56
|
-
assert_equal %w
|
46
|
+
assert_equal %w[a-1 b-2 c-2], loaded_spec_names
|
57
47
|
assert_equal [], unresolved_names
|
58
48
|
end
|
59
49
|
end
|
@@ -72,12 +62,12 @@ class TestGem < Gem::TestCase
|
|
72
62
|
|
73
63
|
a1.activate
|
74
64
|
|
75
|
-
assert_equal %w
|
65
|
+
assert_equal %w[a-1], loaded_spec_names
|
76
66
|
assert_equal ["b (> 0)", "d (> 0)"], unresolved_names
|
77
67
|
|
78
68
|
Gem.finish_resolve
|
79
69
|
|
80
|
-
assert_equal %w
|
70
|
+
assert_equal %w[a-1 b-1 c-1 d-2], loaded_spec_names
|
81
71
|
assert_equal [], unresolved_names
|
82
72
|
end
|
83
73
|
end
|
@@ -95,12 +85,12 @@ class TestGem < Gem::TestCase
|
|
95
85
|
a1.activate
|
96
86
|
c1.activate
|
97
87
|
|
98
|
-
assert_equal %w
|
88
|
+
assert_equal %w[a-1 c-1], loaded_spec_names
|
99
89
|
assert_equal ["b (> 0)"], unresolved_names
|
100
90
|
|
101
91
|
Gem.finish_resolve
|
102
92
|
|
103
|
-
assert_equal %w
|
93
|
+
assert_equal %w[a-1 b-1 c-1], loaded_spec_names
|
104
94
|
assert_equal [], unresolved_names
|
105
95
|
end
|
106
96
|
end
|
@@ -115,7 +105,7 @@ class TestGem < Gem::TestCase
|
|
115
105
|
|
116
106
|
installed = Gem.install 'a', '= 1', :install_dir => gemhome2
|
117
107
|
|
118
|
-
assert_equal %w[a-1], installed.map {
|
108
|
+
assert_equal %w[a-1], installed.map {|spec| spec.full_name }
|
119
109
|
|
120
110
|
assert_path_exists File.join(gemhome2, 'gems', 'a-1')
|
121
111
|
end
|
@@ -134,7 +124,7 @@ class TestGem < Gem::TestCase
|
|
134
124
|
rescue StandardError
|
135
125
|
Gem.install 'a', '= 1', :install_dir => gemhome2
|
136
126
|
end
|
137
|
-
assert_equal %w[a-1], installed.map {
|
127
|
+
assert_equal %w[a-1], installed.map {|spec| spec.full_name }
|
138
128
|
end
|
139
129
|
|
140
130
|
def test_self_install_permissions
|
@@ -161,10 +151,8 @@ class TestGem < Gem::TestCase
|
|
161
151
|
|
162
152
|
def test_self_install_permissions_with_format_executable_and_non_standard_ruby_install_name
|
163
153
|
Gem::Installer.exec_format = nil
|
164
|
-
|
165
|
-
|
166
|
-
assert_self_install_permissions(format_executable: true)
|
167
|
-
end
|
154
|
+
ruby_install_name 'ruby27' do
|
155
|
+
assert_self_install_permissions(format_executable: true)
|
168
156
|
end
|
169
157
|
ensure
|
170
158
|
Gem::Installer.exec_format = nil
|
@@ -220,7 +208,7 @@ class TestGem < Gem::TestCase
|
|
220
208
|
end
|
221
209
|
assert_equal(expected, result)
|
222
210
|
ensure
|
223
|
-
File.chmod(0755, *Dir.glob(@gemhome + '/gems/**/').map {|path| path.tap(&Gem::UNTAINT)})
|
211
|
+
File.chmod(0755, *Dir.glob(@gemhome + '/gems/**/').map {|path| path.tap(&Gem::UNTAINT) })
|
224
212
|
end
|
225
213
|
|
226
214
|
def test_require_missing
|
@@ -307,7 +295,23 @@ class TestGem < Gem::TestCase
|
|
307
295
|
gem 'c'
|
308
296
|
Gem.finish_resolve
|
309
297
|
|
310
|
-
assert_equal %w
|
298
|
+
assert_equal %w[a-1 b-2 c-1], loaded_spec_names
|
299
|
+
end
|
300
|
+
|
301
|
+
def test_activate_bin_path_in_debug_mode
|
302
|
+
a1 = util_spec 'a', '1' do |s|
|
303
|
+
s.executables = ['exec']
|
304
|
+
end
|
305
|
+
|
306
|
+
install_specs a1
|
307
|
+
|
308
|
+
require "open3"
|
309
|
+
output, status = Open3.capture2e(
|
310
|
+
{ "GEM_HOME" => Gem.paths.home, "DEBUG_RESOLVER" => "1" },
|
311
|
+
*ruby_with_rubygems_in_load_path, "-e", "\"Gem.activate_bin_path('a', 'exec', '>= 0')\""
|
312
|
+
)
|
313
|
+
|
314
|
+
assert status.success?, output
|
311
315
|
end
|
312
316
|
|
313
317
|
def test_activate_bin_path_gives_proper_error_for_bundler
|
@@ -333,7 +337,7 @@ class TestGem < Gem::TestCase
|
|
333
337
|
L
|
334
338
|
end
|
335
339
|
|
336
|
-
File.open("Gemfile", "w") {
|
340
|
+
File.open("Gemfile", "w") {|f| f.puts('source "https://rubygems.org"') }
|
337
341
|
|
338
342
|
e = assert_raises Gem::GemNotFoundException do
|
339
343
|
load Gem.activate_bin_path("bundler", "bundle", ">= 0.a")
|
@@ -372,11 +376,11 @@ class TestGem < Gem::TestCase
|
|
372
376
|
L
|
373
377
|
end
|
374
378
|
|
375
|
-
File.open("Gemfile", "w") {
|
379
|
+
File.open("Gemfile", "w") {|f| f.puts('source "https://rubygems.org"') }
|
376
380
|
|
377
381
|
load Gem.activate_bin_path("bundler", "bundle", ">= 0.a")
|
378
382
|
|
379
|
-
assert_equal %w
|
383
|
+
assert_equal %w[bundler-2.0.0], loaded_spec_names
|
380
384
|
end
|
381
385
|
|
382
386
|
def test_activate_bin_path_respects_underscore_selection_if_given
|
@@ -406,11 +410,11 @@ class TestGem < Gem::TestCase
|
|
406
410
|
L
|
407
411
|
end
|
408
412
|
|
409
|
-
File.open("Gemfile", "w") {
|
413
|
+
File.open("Gemfile", "w") {|f| f.puts('source "https://rubygems.org"') }
|
410
414
|
|
411
415
|
load Gem.activate_bin_path("bundler", "bundle", "= 1.17.3")
|
412
416
|
|
413
|
-
assert_equal %w
|
417
|
+
assert_equal %w[bundler-1.17.3], loaded_spec_names
|
414
418
|
end
|
415
419
|
|
416
420
|
def test_self_bin_path_no_exec_name
|
@@ -657,7 +661,7 @@ class TestGem < Gem::TestCase
|
|
657
661
|
assert_directory_exists util_cache_dir
|
658
662
|
end
|
659
663
|
|
660
|
-
unless win_platform? || Process.uid.zero?
|
664
|
+
unless win_platform? || Process.uid.zero? # only for FS that support write protection
|
661
665
|
def test_self_ensure_gem_directories_write_protected
|
662
666
|
gemdir = File.join @tempdir, "egd"
|
663
667
|
FileUtils.rm_r gemdir rescue nil
|
@@ -709,7 +713,7 @@ class TestGem < Gem::TestCase
|
|
709
713
|
|
710
714
|
discover_path = File.join 'lib', 'sff', 'discover.rb'
|
711
715
|
|
712
|
-
foo1, foo2 = %w
|
716
|
+
foo1, foo2 = %w[1 2].map do |version|
|
713
717
|
spec = quick_gem 'sff', version do |s|
|
714
718
|
s.files << discover_path
|
715
719
|
end
|
@@ -741,7 +745,7 @@ class TestGem < Gem::TestCase
|
|
741
745
|
|
742
746
|
discover_path = File.join 'lib', 'sff', 'discover.rb'
|
743
747
|
|
744
|
-
foo1, _ = %w
|
748
|
+
foo1, _ = %w[1 2].map do |version|
|
745
749
|
spec = quick_gem 'sff', version do |s|
|
746
750
|
s.files << discover_path
|
747
751
|
end
|
@@ -777,7 +781,7 @@ class TestGem < Gem::TestCase
|
|
777
781
|
|
778
782
|
discover_path = File.join 'lib', 'sff', 'discover.rb'
|
779
783
|
|
780
|
-
_, foo2 = %w
|
784
|
+
_, foo2 = %w[1 2].map do |version|
|
781
785
|
spec = quick_gem 'sff', version do |s|
|
782
786
|
s.files << discover_path
|
783
787
|
end
|
@@ -1017,7 +1021,7 @@ class TestGem < Gem::TestCase
|
|
1017
1021
|
|
1018
1022
|
Gem.refresh
|
1019
1023
|
|
1020
|
-
Gem::Specification.each{|spec| assert spec.activated? if spec == s}
|
1024
|
+
Gem::Specification.each{|spec| assert spec.activated? if spec == s }
|
1021
1025
|
|
1022
1026
|
Gem.loaded_specs.delete(s)
|
1023
1027
|
Gem.refresh
|
@@ -1025,20 +1029,16 @@ class TestGem < Gem::TestCase
|
|
1025
1029
|
|
1026
1030
|
def test_self_ruby_escaping_spaces_in_path
|
1027
1031
|
with_clean_path_to_ruby do
|
1028
|
-
|
1029
|
-
|
1030
|
-
assert_equal "\"C:/Ruby 1.8/bin/ruby.exe\"", Gem.ruby
|
1031
|
-
end
|
1032
|
+
with_rb_config_ruby("C:/Ruby 1.8/bin/ruby.exe") do
|
1033
|
+
assert_equal "\"C:/Ruby 1.8/bin/ruby.exe\"", Gem.ruby
|
1032
1034
|
end
|
1033
1035
|
end
|
1034
1036
|
end
|
1035
1037
|
|
1036
1038
|
def test_self_ruby_path_without_spaces
|
1037
1039
|
with_clean_path_to_ruby do
|
1038
|
-
|
1039
|
-
|
1040
|
-
assert_equal "C:/Ruby18/bin/ruby.exe", Gem.ruby
|
1041
|
-
end
|
1040
|
+
with_rb_config_ruby("C:/Ruby18/bin/ruby.exe") do
|
1041
|
+
assert_equal "C:/Ruby18/bin/ruby.exe", Gem.ruby
|
1042
1042
|
end
|
1043
1043
|
end
|
1044
1044
|
end
|
@@ -1090,7 +1090,7 @@ class TestGem < Gem::TestCase
|
|
1090
1090
|
util_restore_RUBY_VERSION
|
1091
1091
|
end
|
1092
1092
|
|
1093
|
-
def
|
1093
|
+
def test_self_ruby_version_with_svn_prerelease
|
1094
1094
|
util_set_RUBY_VERSION '2.6.0', -1, 63539, 'ruby 2.6.0preview2 (2018-05-31 trunk 63539) [x86_64-linux]'
|
1095
1095
|
|
1096
1096
|
assert_equal Gem::Version.new('2.6.0.preview2'), Gem.ruby_version
|
@@ -1098,6 +1098,14 @@ class TestGem < Gem::TestCase
|
|
1098
1098
|
util_restore_RUBY_VERSION
|
1099
1099
|
end
|
1100
1100
|
|
1101
|
+
def test_self_ruby_version_with_git_prerelease
|
1102
|
+
util_set_RUBY_VERSION '2.7.0', -1, 'b563439274a402e33541f5695b1bfd4ac1085638', 'ruby 2.7.0preview3 (2019-11-23 master b563439274) [x86_64-linux]'
|
1103
|
+
|
1104
|
+
assert_equal Gem::Version.new('2.7.0.preview3'), Gem.ruby_version
|
1105
|
+
ensure
|
1106
|
+
util_restore_RUBY_VERSION
|
1107
|
+
end
|
1108
|
+
|
1101
1109
|
def test_self_ruby_version_with_non_mri_implementations_with_mri_prerelase_compatibility
|
1102
1110
|
util_set_RUBY_VERSION '2.6.0', -1, 63539, 'weirdjruby 9.2.0.0 (2.6.0preview2) 2018-05-24 81156a8 OpenJDK 64-Bit Server VM 25.171-b11 on 1.8.0_171-8u171-b11-0ubuntu0.16.04.1-b11 [linux-x86_64]', 'weirdjruby', '9.2.0.0'
|
1103
1111
|
|
@@ -1106,7 +1114,7 @@ class TestGem < Gem::TestCase
|
|
1106
1114
|
util_restore_RUBY_VERSION
|
1107
1115
|
end
|
1108
1116
|
|
1109
|
-
def
|
1117
|
+
def test_self_ruby_version_with_svn_trunk
|
1110
1118
|
util_set_RUBY_VERSION '1.9.2', -1, 23493, 'ruby 1.9.2dev (2009-05-20 trunk 23493) [x86_64-linux]'
|
1111
1119
|
|
1112
1120
|
assert_equal Gem::Version.new('1.9.2.dev'), Gem.ruby_version
|
@@ -1114,6 +1122,14 @@ class TestGem < Gem::TestCase
|
|
1114
1122
|
util_restore_RUBY_VERSION
|
1115
1123
|
end
|
1116
1124
|
|
1125
|
+
def test_self_ruby_version_with_git_master
|
1126
|
+
util_set_RUBY_VERSION '2.7.0', -1, '5de284ec78220e75643f89b454ce999da0c1c195', 'ruby 2.7.0dev (2019-12-23T01:37:30Z master 5de284ec78) [x86_64-linux]'
|
1127
|
+
|
1128
|
+
assert_equal Gem::Version.new('2.7.0.dev'), Gem.ruby_version
|
1129
|
+
ensure
|
1130
|
+
util_restore_RUBY_VERSION
|
1131
|
+
end
|
1132
|
+
|
1117
1133
|
def test_self_rubygems_version
|
1118
1134
|
assert_equal Gem::Version.new(Gem::VERSION), Gem.rubygems_version
|
1119
1135
|
end
|
@@ -1147,7 +1163,7 @@ class TestGem < Gem::TestCase
|
|
1147
1163
|
def test_self_post_build
|
1148
1164
|
assert_equal 1, Gem.post_build_hooks.length
|
1149
1165
|
|
1150
|
-
Gem.post_build {
|
1166
|
+
Gem.post_build {|installer| }
|
1151
1167
|
|
1152
1168
|
assert_equal 2, Gem.post_build_hooks.length
|
1153
1169
|
end
|
@@ -1155,7 +1171,7 @@ class TestGem < Gem::TestCase
|
|
1155
1171
|
def test_self_post_install
|
1156
1172
|
assert_equal 1, Gem.post_install_hooks.length
|
1157
1173
|
|
1158
|
-
Gem.post_install {
|
1174
|
+
Gem.post_install {|installer| }
|
1159
1175
|
|
1160
1176
|
assert_equal 2, Gem.post_install_hooks.length
|
1161
1177
|
end
|
@@ -1163,7 +1179,7 @@ class TestGem < Gem::TestCase
|
|
1163
1179
|
def test_self_done_installing
|
1164
1180
|
assert_empty Gem.done_installing_hooks
|
1165
1181
|
|
1166
|
-
Gem.done_installing {
|
1182
|
+
Gem.done_installing {|gems| }
|
1167
1183
|
|
1168
1184
|
assert_equal 1, Gem.done_installing_hooks.length
|
1169
1185
|
end
|
@@ -1171,7 +1187,7 @@ class TestGem < Gem::TestCase
|
|
1171
1187
|
def test_self_post_reset
|
1172
1188
|
assert_empty Gem.post_reset_hooks
|
1173
1189
|
|
1174
|
-
Gem.post_reset {
|
1190
|
+
Gem.post_reset {}
|
1175
1191
|
|
1176
1192
|
assert_equal 1, Gem.post_reset_hooks.length
|
1177
1193
|
end
|
@@ -1179,7 +1195,7 @@ class TestGem < Gem::TestCase
|
|
1179
1195
|
def test_self_post_uninstall
|
1180
1196
|
assert_equal 1, Gem.post_uninstall_hooks.length
|
1181
1197
|
|
1182
|
-
Gem.post_uninstall {
|
1198
|
+
Gem.post_uninstall {|installer| }
|
1183
1199
|
|
1184
1200
|
assert_equal 2, Gem.post_uninstall_hooks.length
|
1185
1201
|
end
|
@@ -1187,7 +1203,7 @@ class TestGem < Gem::TestCase
|
|
1187
1203
|
def test_self_pre_install
|
1188
1204
|
assert_equal 1, Gem.pre_install_hooks.length
|
1189
1205
|
|
1190
|
-
Gem.pre_install {
|
1206
|
+
Gem.pre_install {|installer| }
|
1191
1207
|
|
1192
1208
|
assert_equal 2, Gem.pre_install_hooks.length
|
1193
1209
|
end
|
@@ -1195,7 +1211,7 @@ class TestGem < Gem::TestCase
|
|
1195
1211
|
def test_self_pre_reset
|
1196
1212
|
assert_empty Gem.pre_reset_hooks
|
1197
1213
|
|
1198
|
-
Gem.pre_reset {
|
1214
|
+
Gem.pre_reset {}
|
1199
1215
|
|
1200
1216
|
assert_equal 1, Gem.pre_reset_hooks.length
|
1201
1217
|
end
|
@@ -1203,7 +1219,7 @@ class TestGem < Gem::TestCase
|
|
1203
1219
|
def test_self_pre_uninstall
|
1204
1220
|
assert_equal 1, Gem.pre_uninstall_hooks.length
|
1205
1221
|
|
1206
|
-
Gem.pre_uninstall {
|
1222
|
+
Gem.pre_uninstall {|installer| }
|
1207
1223
|
|
1208
1224
|
assert_equal 2, Gem.pre_uninstall_hooks.length
|
1209
1225
|
end
|
@@ -1232,7 +1248,7 @@ class TestGem < Gem::TestCase
|
|
1232
1248
|
|
1233
1249
|
install_specs b1, b2, b3
|
1234
1250
|
|
1235
|
-
specs1 = Gem::Specification.stubs.find_all {
|
1251
|
+
specs1 = Gem::Specification.stubs.find_all {|s| s.name == 'b' }
|
1236
1252
|
Gem::Specification.reset
|
1237
1253
|
specs2 = Gem::Specification.stubs_for('b')
|
1238
1254
|
assert_equal specs1.map(&:version), specs2.map(&:version)
|
@@ -1255,7 +1271,8 @@ class TestGem < Gem::TestCase
|
|
1255
1271
|
Gem.try_activate 'a_file'
|
1256
1272
|
end
|
1257
1273
|
|
1258
|
-
assert_match %r
|
1274
|
+
assert_match %r{Could not find 'b' }, e.message
|
1275
|
+
assert_match %r{at: #{a.spec_file}}, e.message
|
1259
1276
|
end
|
1260
1277
|
|
1261
1278
|
def test_self_try_activate_missing_prerelease
|
@@ -1275,7 +1292,7 @@ class TestGem < Gem::TestCase
|
|
1275
1292
|
Gem.try_activate 'a_file'
|
1276
1293
|
end
|
1277
1294
|
|
1278
|
-
assert_match %r
|
1295
|
+
assert_match %r{Could not find 'b' \(= 1.0rc1\)}, e.message
|
1279
1296
|
end
|
1280
1297
|
|
1281
1298
|
def test_self_try_activate_missing_extensions
|
@@ -1355,6 +1372,8 @@ class TestGem < Gem::TestCase
|
|
1355
1372
|
parts = [@userhome, '.gem', Gem.ruby_engine]
|
1356
1373
|
parts << RbConfig::CONFIG['ruby_version'] unless RbConfig::CONFIG['ruby_version'].empty?
|
1357
1374
|
|
1375
|
+
FileUtils.mkdir_p File.join(parts)
|
1376
|
+
|
1358
1377
|
assert_equal File.join(parts), Gem.user_dir
|
1359
1378
|
end
|
1360
1379
|
|
@@ -1378,9 +1397,9 @@ class TestGem < Gem::TestCase
|
|
1378
1397
|
r.gem "b", "= 1"
|
1379
1398
|
end
|
1380
1399
|
|
1381
|
-
activated = Gem::Specification.map {
|
1400
|
+
activated = Gem::Specification.map {|x| x.full_name }
|
1382
1401
|
|
1383
|
-
assert_equal %w
|
1402
|
+
assert_equal %w[a-1 b-1 c-2], activated.sort
|
1384
1403
|
end
|
1385
1404
|
|
1386
1405
|
def test_self_needs_picks_up_unresolved_deps
|
@@ -1400,7 +1419,7 @@ class TestGem < Gem::TestCase
|
|
1400
1419
|
require "d#{$$}"
|
1401
1420
|
end
|
1402
1421
|
|
1403
|
-
assert_equal %w
|
1422
|
+
assert_equal %w[a-1 b-1 c-2 d-1 e-1], loaded_spec_names
|
1404
1423
|
end
|
1405
1424
|
end
|
1406
1425
|
|
@@ -1470,7 +1489,6 @@ class TestGem < Gem::TestCase
|
|
1470
1489
|
install_gem foo2
|
1471
1490
|
end
|
1472
1491
|
|
1473
|
-
Gem.searcher = nil
|
1474
1492
|
Gem::Specification.reset
|
1475
1493
|
|
1476
1494
|
gem 'foo'
|
@@ -1500,8 +1518,8 @@ class TestGem < Gem::TestCase
|
|
1500
1518
|
def test_gem_path_ordering
|
1501
1519
|
refute_equal Gem.dir, Gem.user_dir
|
1502
1520
|
|
1503
|
-
write_file File.join(@tempdir, 'lib', "g.rb") {
|
1504
|
-
write_file File.join(@tempdir, 'lib', 'm.rb') {
|
1521
|
+
write_file File.join(@tempdir, 'lib', "g.rb") {|fp| fp.puts "" }
|
1522
|
+
write_file File.join(@tempdir, 'lib', 'm.rb') {|fp| fp.puts "" }
|
1505
1523
|
|
1506
1524
|
g = util_spec 'g', '1', nil, "lib/g.rb"
|
1507
1525
|
m = util_spec 'm', '1', nil, "lib/m.rb"
|
@@ -1556,8 +1574,8 @@ class TestGem < Gem::TestCase
|
|
1556
1574
|
end
|
1557
1575
|
|
1558
1576
|
def test_gem_path_ordering_short
|
1559
|
-
write_file File.join(@tempdir, 'lib', "g.rb") {
|
1560
|
-
write_file File.join(@tempdir, 'lib', 'm.rb') {
|
1577
|
+
write_file File.join(@tempdir, 'lib', "g.rb") {|fp| fp.puts "" }
|
1578
|
+
write_file File.join(@tempdir, 'lib', 'm.rb') {|fp| fp.puts "" }
|
1561
1579
|
|
1562
1580
|
g = util_spec 'g', '1', nil, "lib/g.rb"
|
1563
1581
|
m = util_spec 'm', '1', nil, "lib/m.rb"
|
@@ -1593,7 +1611,7 @@ class TestGem < Gem::TestCase
|
|
1593
1611
|
|
1594
1612
|
Gem.use_gemdeps
|
1595
1613
|
|
1596
|
-
assert_equal add_bundler_full_name(%W
|
1614
|
+
assert_equal add_bundler_full_name(%W[a-1 b-1 c-1]), loaded_spec_names
|
1597
1615
|
end
|
1598
1616
|
|
1599
1617
|
def test_auto_activation_of_used_gemdeps_file
|
@@ -1614,11 +1632,10 @@ class TestGem < Gem::TestCase
|
|
1614
1632
|
ENV['RUBYGEMS_GEMDEPS'] = "-"
|
1615
1633
|
|
1616
1634
|
expected_specs = [a, b, util_spec("bundler", Bundler::VERSION), c].compact
|
1617
|
-
assert_equal expected_specs, Gem.use_gemdeps.sort_by {
|
1635
|
+
assert_equal expected_specs, Gem.use_gemdeps.sort_by {|s| s.name }
|
1618
1636
|
end
|
1619
1637
|
|
1620
|
-
|
1621
|
-
BUNDLER_LIB_PATH = File.expand_path $LOAD_PATH.find {|lp| File.file?(File.join(lp, "bundler.rb")) }.dup.tap(&Gem::UNTAINT)
|
1638
|
+
BUNDLER_LIB_PATH = File.expand_path $LOAD_PATH.find {|lp| File.file?(File.join(lp, "bundler.rb")) }
|
1622
1639
|
BUNDLER_FULL_NAME = "bundler-#{Bundler::VERSION}".freeze
|
1623
1640
|
|
1624
1641
|
def add_bundler_full_name(names)
|
@@ -1645,8 +1662,8 @@ class TestGem < Gem::TestCase
|
|
1645
1662
|
ENV['RUBYGEMS_GEMDEPS'] = "-"
|
1646
1663
|
|
1647
1664
|
path = File.join @tempdir, "gem.deps.rb"
|
1648
|
-
cmd = [
|
1649
|
-
"-I#{BUNDLER_LIB_PATH
|
1665
|
+
cmd = [*ruby_with_rubygems_in_load_path,
|
1666
|
+
"-I#{BUNDLER_LIB_PATH}"]
|
1650
1667
|
cmd << "-eputs Gem.loaded_specs.values.map(&:full_name).sort"
|
1651
1668
|
|
1652
1669
|
File.open path, "w" do |f|
|
@@ -1683,8 +1700,8 @@ class TestGem < Gem::TestCase
|
|
1683
1700
|
Dir.mkdir "sub1"
|
1684
1701
|
|
1685
1702
|
path = File.join @tempdir, "gem.deps.rb"
|
1686
|
-
cmd = [
|
1687
|
-
"-I#{BUNDLER_LIB_PATH
|
1703
|
+
cmd = [*ruby_with_rubygems_in_load_path, "-Csub1",
|
1704
|
+
"-I#{BUNDLER_LIB_PATH}"]
|
1688
1705
|
cmd << "-eputs Gem.loaded_specs.values.map(&:full_name).sort"
|
1689
1706
|
|
1690
1707
|
File.open path, "w" do |f|
|
@@ -1731,12 +1748,24 @@ class TestGem < Gem::TestCase
|
|
1731
1748
|
assert_nil Gem.find_unresolved_default_spec("README")
|
1732
1749
|
end
|
1733
1750
|
|
1751
|
+
def test_register_default_spec_old_style_with_folder_starting_with_lib
|
1752
|
+
Gem.clear_default_specs
|
1753
|
+
|
1754
|
+
old_style = Gem::Specification.new do |spec|
|
1755
|
+
spec.files = ["libexec/bundle", "foo.rb", "bar.rb"]
|
1756
|
+
end
|
1757
|
+
|
1758
|
+
Gem.register_default_spec old_style
|
1759
|
+
|
1760
|
+
assert_equal old_style, Gem.find_unresolved_default_spec("foo.rb")
|
1761
|
+
end
|
1762
|
+
|
1734
1763
|
def test_use_gemdeps
|
1735
1764
|
gem_deps_file = 'gem.deps.rb'.tap(&Gem::UNTAINT)
|
1736
1765
|
spec = util_spec 'a', 1
|
1737
1766
|
install_specs spec
|
1738
1767
|
|
1739
|
-
spec = Gem::Specification.find {
|
1768
|
+
spec = Gem::Specification.find {|s| s == spec }
|
1740
1769
|
refute spec.activated?
|
1741
1770
|
|
1742
1771
|
File.open gem_deps_file, 'w' do |io|
|
@@ -1747,7 +1776,7 @@ class TestGem < Gem::TestCase
|
|
1747
1776
|
|
1748
1777
|
Gem.use_gemdeps gem_deps_file
|
1749
1778
|
|
1750
|
-
assert_equal add_bundler_full_name(%W
|
1779
|
+
assert_equal add_bundler_full_name(%W[a-1]), loaded_spec_names
|
1751
1780
|
refute_nil Gem.gemdeps
|
1752
1781
|
end
|
1753
1782
|
|
@@ -1797,7 +1826,7 @@ class TestGem < Gem::TestCase
|
|
1797
1826
|
|
1798
1827
|
spec = util_spec 'a', 1
|
1799
1828
|
install_specs spec
|
1800
|
-
spec = Gem::Specification.find {
|
1829
|
+
spec = Gem::Specification.find {|s| s == spec }
|
1801
1830
|
|
1802
1831
|
refute spec.activated?
|
1803
1832
|
|
@@ -1807,7 +1836,7 @@ class TestGem < Gem::TestCase
|
|
1807
1836
|
|
1808
1837
|
Gem.use_gemdeps
|
1809
1838
|
|
1810
|
-
assert_equal add_bundler_full_name(%W
|
1839
|
+
assert_equal add_bundler_full_name(%W[a-1]), loaded_spec_names
|
1811
1840
|
ensure
|
1812
1841
|
ENV['RUBYGEMS_GEMDEPS'] = rubygems_gemdeps
|
1813
1842
|
end
|
@@ -1875,7 +1904,7 @@ You may need to `gem install -g` to install missing gems
|
|
1875
1904
|
spec = util_spec 'a', 1
|
1876
1905
|
install_specs spec
|
1877
1906
|
|
1878
|
-
spec = Gem::Specification.find {
|
1907
|
+
spec = Gem::Specification.find {|s| s == spec }
|
1879
1908
|
refute spec.activated?
|
1880
1909
|
|
1881
1910
|
File.open 'x', 'w' do |io|
|
@@ -1884,7 +1913,7 @@ You may need to `gem install -g` to install missing gems
|
|
1884
1913
|
|
1885
1914
|
Gem.use_gemdeps
|
1886
1915
|
|
1887
|
-
assert_equal add_bundler_full_name(%W
|
1916
|
+
assert_equal add_bundler_full_name(%W[a-1]), loaded_spec_names
|
1888
1917
|
ensure
|
1889
1918
|
ENV['RUBYGEMS_GEMDEPS'] = rubygems_gemdeps
|
1890
1919
|
end
|
@@ -1903,40 +1932,60 @@ You may need to `gem install -g` to install missing gems
|
|
1903
1932
|
assert platform_defaults.is_a? Hash
|
1904
1933
|
end
|
1905
1934
|
|
1906
|
-
|
1907
|
-
|
1908
|
-
|
1935
|
+
# Ensure that `Gem.source_date_epoch` is consistent even if
|
1936
|
+
# $SOURCE_DATE_EPOCH has not been set.
|
1937
|
+
def test_default_source_date_epoch_doesnt_change
|
1938
|
+
old_epoch = ENV['SOURCE_DATE_EPOCH']
|
1939
|
+
ENV['SOURCE_DATE_EPOCH'] = nil
|
1909
1940
|
|
1910
|
-
|
1941
|
+
# Unfortunately, there is no real way to test this aside from waiting
|
1942
|
+
# enough for `Time.now.to_i` to change -- which is a whole second.
|
1943
|
+
#
|
1944
|
+
# Fortunately, we only need to do this once.
|
1945
|
+
a = Gem.source_date_epoch
|
1946
|
+
sleep 1
|
1947
|
+
b = Gem.source_date_epoch
|
1948
|
+
assert_equal a, b
|
1911
1949
|
ensure
|
1912
|
-
|
1913
|
-
RbConfig::CONFIG['ruby_install_name'] = orig_RUBY_INSTALL_NAME
|
1914
|
-
else
|
1915
|
-
RbConfig::CONFIG.delete 'ruby_install_name'
|
1916
|
-
end
|
1950
|
+
ENV['SOURCE_DATE_EPOCH'] = old_epoch
|
1917
1951
|
end
|
1918
1952
|
|
1919
|
-
def
|
1920
|
-
|
1921
|
-
|
1922
|
-
|
1923
|
-
RbConfig::CONFIG['bindir'] = bindir
|
1924
|
-
RbConfig::CONFIG['EXEEXT'] = exeext
|
1953
|
+
def ruby_install_name(name)
|
1954
|
+
with_clean_path_to_ruby do
|
1955
|
+
orig_RUBY_INSTALL_NAME = RbConfig::CONFIG['ruby_install_name']
|
1956
|
+
RbConfig::CONFIG['ruby_install_name'] = name
|
1925
1957
|
|
1926
|
-
|
1927
|
-
|
1928
|
-
|
1929
|
-
|
1958
|
+
begin
|
1959
|
+
yield
|
1960
|
+
ensure
|
1961
|
+
if orig_RUBY_INSTALL_NAME
|
1962
|
+
RbConfig::CONFIG['ruby_install_name'] = orig_RUBY_INSTALL_NAME
|
1963
|
+
else
|
1964
|
+
RbConfig::CONFIG.delete 'ruby_install_name'
|
1965
|
+
end
|
1966
|
+
end
|
1967
|
+
end
|
1930
1968
|
end
|
1931
1969
|
|
1932
|
-
def
|
1933
|
-
|
1970
|
+
def with_rb_config_ruby(path)
|
1971
|
+
rb_config_singleton_class = class << RbConfig; self; end
|
1972
|
+
orig_path = RbConfig.ruby
|
1934
1973
|
|
1935
|
-
|
1974
|
+
redefine_method(rb_config_singleton_class, :ruby, path)
|
1936
1975
|
|
1937
1976
|
yield
|
1938
1977
|
ensure
|
1939
|
-
|
1978
|
+
redefine_method(rb_config_singleton_class, :ruby, orig_path)
|
1979
|
+
end
|
1980
|
+
|
1981
|
+
def redefine_method(base, method, new_result)
|
1982
|
+
if RUBY_VERSION >= "2.5"
|
1983
|
+
base.alias_method(method, method)
|
1984
|
+
base.define_method(method) { new_result }
|
1985
|
+
else
|
1986
|
+
base.send(:alias_method, method, method)
|
1987
|
+
base.send(:define_method, method) { new_result }
|
1988
|
+
end
|
1940
1989
|
end
|
1941
1990
|
|
1942
1991
|
def with_plugin(path)
|