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/lib/rubygems/config_file.rb
CHANGED
@@ -261,7 +261,12 @@ if you believe they were disclosed to a third party.
|
|
261
261
|
# Location of RubyGems.org credentials
|
262
262
|
|
263
263
|
def credentials_path
|
264
|
-
File.join Gem.user_home, '.gem', 'credentials'
|
264
|
+
credentials = File.join Gem.user_home, '.gem', 'credentials'
|
265
|
+
if File.exist? credentials
|
266
|
+
credentials
|
267
|
+
else
|
268
|
+
File.join Gem.data_home, "gem", "credentials"
|
269
|
+
end
|
265
270
|
end
|
266
271
|
|
267
272
|
def load_api_keys
|
@@ -429,7 +434,7 @@ if you believe they were disclosed to a third party.
|
|
429
434
|
yaml_hash[:ssl_client_cert] =
|
430
435
|
@hash[:ssl_client_cert] if @hash.key? :ssl_client_cert
|
431
436
|
|
432
|
-
keys = yaml_hash.keys.map {
|
437
|
+
keys = yaml_hash.keys.map {|key| key.to_s }
|
433
438
|
keys << 'debug'
|
434
439
|
re = Regexp.union(*keys)
|
435
440
|
|
@@ -444,6 +449,10 @@ if you believe they were disclosed to a third party.
|
|
444
449
|
|
445
450
|
# Writes out this config file, replacing its source.
|
446
451
|
def write
|
452
|
+
unless File.exist?(File.dirname(config_file_name))
|
453
|
+
FileUtils.mkdir_p File.dirname(config_file_name)
|
454
|
+
end
|
455
|
+
|
447
456
|
File.open config_file_name, 'w' do |io|
|
448
457
|
io.write to_yaml
|
449
458
|
end
|
@@ -39,49 +39,40 @@ module Kernel
|
|
39
39
|
|
40
40
|
path = path.to_path if path.respond_to? :to_path
|
41
41
|
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
safe_lp = lp.dup.tap(&Gem::UNTAINT)
|
48
|
-
begin
|
49
|
-
if File.symlink? safe_lp # for backward compatibility
|
50
|
-
next
|
51
|
-
end
|
52
|
-
rescue SecurityError
|
53
|
-
RUBYGEMS_ACTIVATION_MONITOR.exit
|
54
|
-
raise
|
55
|
-
end
|
56
|
-
|
42
|
+
if spec = Gem.find_unresolved_default_spec(path)
|
43
|
+
# Ensure -I beats a default gem
|
44
|
+
resolved_path = begin
|
45
|
+
rp = nil
|
46
|
+
load_path_check_index = Gem.load_path_insert_index - Gem.activated_gem_paths
|
57
47
|
Gem.suffixes.each do |s|
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
48
|
+
$LOAD_PATH[0...load_path_check_index].each do |lp|
|
49
|
+
safe_lp = lp.dup.tap(&Gem::UNTAINT)
|
50
|
+
begin
|
51
|
+
if File.symlink? safe_lp # for backward compatibility
|
52
|
+
next
|
53
|
+
end
|
54
|
+
rescue SecurityError
|
55
|
+
RUBYGEMS_ACTIVATION_MONITOR.exit
|
56
|
+
raise
|
57
|
+
end
|
58
|
+
|
59
|
+
full_path = File.expand_path(File.join(safe_lp, "#{path}#{s}"))
|
60
|
+
if File.file?(full_path)
|
61
|
+
rp = full_path
|
62
|
+
break
|
63
|
+
end
|
62
64
|
end
|
65
|
+
break if rp
|
63
66
|
end
|
64
|
-
|
65
|
-
end
|
66
|
-
rp
|
67
|
-
end
|
68
|
-
|
69
|
-
if resolved_path
|
70
|
-
begin
|
71
|
-
RUBYGEMS_ACTIVATION_MONITOR.exit
|
72
|
-
return gem_original_require(resolved_path)
|
73
|
-
rescue LoadError
|
74
|
-
RUBYGEMS_ACTIVATION_MONITOR.enter
|
67
|
+
rp
|
75
68
|
end
|
76
|
-
end
|
77
69
|
|
78
|
-
if spec = Gem.find_unresolved_default_spec(path)
|
79
70
|
begin
|
80
71
|
Kernel.send(:gem, spec.name, Gem::Requirement.default_prerelease)
|
81
72
|
rescue Exception
|
82
73
|
RUBYGEMS_ACTIVATION_MONITOR.exit
|
83
74
|
raise
|
84
|
-
end
|
75
|
+
end unless resolved_path
|
85
76
|
end
|
86
77
|
|
87
78
|
# If there are no unresolved deps, then we can use just try
|
@@ -139,7 +130,7 @@ module Kernel
|
|
139
130
|
|
140
131
|
# Ok, now find a gem that has no conflicts, starting
|
141
132
|
# at the highest version.
|
142
|
-
valid = found_specs.find {
|
133
|
+
valid = found_specs.find {|s| !s.has_conflicts? }
|
143
134
|
|
144
135
|
unless valid
|
145
136
|
le = Gem::LoadError.new "unable to find a version of '#{names.first}' to activate"
|
@@ -157,8 +148,7 @@ module Kernel
|
|
157
148
|
RUBYGEMS_ACTIVATION_MONITOR.enter
|
158
149
|
|
159
150
|
begin
|
160
|
-
if load_error.
|
161
|
-
(load_error.message.end_with?(path) and Gem.try_activate(path))
|
151
|
+
if load_error.path == path and Gem.try_activate(path)
|
162
152
|
require_again = true
|
163
153
|
end
|
164
154
|
ensure
|
data/lib/rubygems/defaults.rb
CHANGED
@@ -20,7 +20,13 @@ module Gem
|
|
20
20
|
# specified in the environment
|
21
21
|
|
22
22
|
def self.default_spec_cache_dir
|
23
|
-
File.join Gem.user_home, '.gem', 'specs'
|
23
|
+
default_spec_cache_dir = File.join Gem.user_home, '.gem', 'specs'
|
24
|
+
|
25
|
+
unless File.exist?(default_spec_cache_dir)
|
26
|
+
default_spec_cache_dir = File.join Gem.data_home, 'gem', 'specs'
|
27
|
+
end
|
28
|
+
|
29
|
+
default_spec_cache_dir
|
24
30
|
end
|
25
31
|
|
26
32
|
##
|
@@ -70,15 +76,91 @@ module Gem
|
|
70
76
|
File.join(Gem.default_dir, "specifications", "default")
|
71
77
|
end
|
72
78
|
|
79
|
+
##
|
80
|
+
# Finds the user's home directory.
|
81
|
+
#--
|
82
|
+
# Some comments from the ruby-talk list regarding finding the home
|
83
|
+
# directory:
|
84
|
+
#
|
85
|
+
# I have HOME, USERPROFILE and HOMEDRIVE + HOMEPATH. Ruby seems
|
86
|
+
# to be depending on HOME in those code samples. I propose that
|
87
|
+
# it should fallback to USERPROFILE and HOMEDRIVE + HOMEPATH (at
|
88
|
+
# least on Win32).
|
89
|
+
#++
|
90
|
+
#--
|
91
|
+
#
|
92
|
+
#++
|
93
|
+
|
94
|
+
def self.find_home
|
95
|
+
Dir.home.dup
|
96
|
+
rescue
|
97
|
+
if Gem.win_platform?
|
98
|
+
File.expand_path File.join(ENV['HOMEDRIVE'] || ENV['SystemDrive'], '/')
|
99
|
+
else
|
100
|
+
File.expand_path "/"
|
101
|
+
end
|
102
|
+
end
|
103
|
+
|
104
|
+
private_class_method :find_home
|
105
|
+
|
106
|
+
##
|
107
|
+
# The home directory for the user.
|
108
|
+
|
109
|
+
def self.user_home
|
110
|
+
@user_home ||= find_home.tap(&Gem::UNTAINT)
|
111
|
+
end
|
112
|
+
|
73
113
|
##
|
74
114
|
# Path for gems in the user's home directory
|
75
115
|
|
76
116
|
def self.user_dir
|
77
|
-
|
117
|
+
gem_dir = File.join(Gem.user_home, ".gem")
|
118
|
+
gem_dir = File.join(Gem.data_home, "gem") unless File.exist?(gem_dir)
|
119
|
+
parts = [gem_dir, ruby_engine]
|
78
120
|
parts << RbConfig::CONFIG['ruby_version'] unless RbConfig::CONFIG['ruby_version'].empty?
|
79
121
|
File.join parts
|
80
122
|
end
|
81
123
|
|
124
|
+
##
|
125
|
+
# The path to standard location of the user's configuration directory.
|
126
|
+
|
127
|
+
def self.config_home
|
128
|
+
@config_home ||= (ENV["XDG_CONFIG_HOME"] || File.join(Gem.user_home, '.config'))
|
129
|
+
end
|
130
|
+
|
131
|
+
##
|
132
|
+
# Finds the user's config file
|
133
|
+
|
134
|
+
def self.find_config_file
|
135
|
+
gemrc = File.join Gem.user_home, '.gemrc'
|
136
|
+
if File.exist? gemrc
|
137
|
+
gemrc
|
138
|
+
else
|
139
|
+
File.join Gem.config_home, "gem", "gemrc"
|
140
|
+
end
|
141
|
+
end
|
142
|
+
|
143
|
+
##
|
144
|
+
# The path to standard location of the user's .gemrc file.
|
145
|
+
|
146
|
+
def self.config_file
|
147
|
+
@config_file ||= find_config_file.tap(&Gem::UNTAINT)
|
148
|
+
end
|
149
|
+
|
150
|
+
##
|
151
|
+
# The path to standard location of the user's cache directory.
|
152
|
+
|
153
|
+
def self.cache_home
|
154
|
+
@cache_home ||= (ENV["XDG_CACHE_HOME"] || File.join(Gem.user_home, '.cache'))
|
155
|
+
end
|
156
|
+
|
157
|
+
##
|
158
|
+
# The path to standard location of the user's data directory.
|
159
|
+
|
160
|
+
def self.data_home
|
161
|
+
@data_home ||= (ENV["XDG_DATA_HOME"] || File.join(Gem.user_home, '.local', 'share'))
|
162
|
+
end
|
163
|
+
|
82
164
|
##
|
83
165
|
# How String Gem paths should be split. Overridable for esoteric platforms.
|
84
166
|
|
@@ -115,7 +197,7 @@ module Gem
|
|
115
197
|
# The default directory for binaries
|
116
198
|
|
117
199
|
def self.default_bindir
|
118
|
-
if defined? RUBY_FRAMEWORK_VERSION
|
200
|
+
if defined? RUBY_FRAMEWORK_VERSION # mac framework support
|
119
201
|
'/usr/bin'
|
120
202
|
else # generic install
|
121
203
|
RbConfig::CONFIG['bindir']
|
@@ -130,14 +212,26 @@ module Gem
|
|
130
212
|
# The default signing key path
|
131
213
|
|
132
214
|
def self.default_key_path
|
133
|
-
File.join Gem.user_home, ".gem", "gem-private_key.pem"
|
215
|
+
default_key_path = File.join Gem.user_home, ".gem", "gem-private_key.pem"
|
216
|
+
|
217
|
+
unless File.exist?(default_key_path)
|
218
|
+
default_key_path = File.join Gem.data_home, "gem", "gem-private_key.pem"
|
219
|
+
end
|
220
|
+
|
221
|
+
default_key_path
|
134
222
|
end
|
135
223
|
|
136
224
|
##
|
137
225
|
# The default signing certificate chain path
|
138
226
|
|
139
227
|
def self.default_cert_path
|
140
|
-
File.join Gem.user_home, ".gem", "gem-public_cert.pem"
|
228
|
+
default_cert_path = File.join Gem.user_home, ".gem", "gem-public_cert.pem"
|
229
|
+
|
230
|
+
unless File.exist?(default_cert_path)
|
231
|
+
default_cert_path = File.join Gem.data_home, "gem", "gem-public_cert.pem"
|
232
|
+
end
|
233
|
+
|
234
|
+
default_cert_path
|
141
235
|
end
|
142
236
|
|
143
237
|
##
|
data/lib/rubygems/dependency.rb
CHANGED
@@ -2,9 +2,6 @@
|
|
2
2
|
##
|
3
3
|
# The Dependency class holds a Gem name and a Gem::Requirement.
|
4
4
|
|
5
|
-
require "rubygems/bundler_version_finder"
|
6
|
-
require "rubygems/requirement"
|
7
|
-
|
8
5
|
class Gem::Dependency
|
9
6
|
|
10
7
|
##
|
@@ -322,13 +319,13 @@ class Gem::Dependency
|
|
322
319
|
def to_spec
|
323
320
|
matches = self.to_specs.compact
|
324
321
|
|
325
|
-
active = matches.find {
|
322
|
+
active = matches.find {|spec| spec.activated? }
|
326
323
|
return active if active
|
327
324
|
|
328
325
|
return matches.first if prerelease?
|
329
326
|
|
330
327
|
# Move prereleases to the end of the list for >= 0 requirements
|
331
|
-
pre, matches = matches.partition {
|
328
|
+
pre, matches = matches.partition {|spec| spec.version.prerelease? }
|
332
329
|
matches += pre if requirement == Gem::Requirement.default
|
333
330
|
|
334
331
|
matches.first
|
@@ -5,7 +5,6 @@ require 'rubygems/package'
|
|
5
5
|
require 'rubygems/installer'
|
6
6
|
require 'rubygems/spec_fetcher'
|
7
7
|
require 'rubygems/user_interaction'
|
8
|
-
require 'rubygems/source'
|
9
8
|
require 'rubygems/available_set'
|
10
9
|
require 'rubygems/deprecate'
|
11
10
|
|
@@ -106,27 +105,6 @@ class Gem::DependencyInstaller
|
|
106
105
|
@errors = []
|
107
106
|
end
|
108
107
|
|
109
|
-
##
|
110
|
-
# Creates an AvailableSet to install from based on +dep_or_name+ and
|
111
|
-
# +version+
|
112
|
-
|
113
|
-
def available_set_for(dep_or_name, version) # :nodoc:
|
114
|
-
if String === dep_or_name
|
115
|
-
Gem::Deprecate.skip_during do
|
116
|
-
find_spec_by_name_and_version dep_or_name, version, @prerelease
|
117
|
-
end
|
118
|
-
else
|
119
|
-
dep = dep_or_name.dup
|
120
|
-
dep.prerelease = @prerelease
|
121
|
-
@available = Gem::Deprecate.skip_during do
|
122
|
-
find_gems_with_sources dep
|
123
|
-
end
|
124
|
-
end
|
125
|
-
|
126
|
-
@available.pick_best!
|
127
|
-
end
|
128
|
-
deprecate :available_set_for, :none, 2019, 12
|
129
|
-
|
130
108
|
##
|
131
109
|
# Indicated, based on the requested domain, if local
|
132
110
|
# gems should be considered.
|
@@ -216,57 +194,7 @@ class Gem::DependencyInstaller
|
|
216
194
|
|
217
195
|
set
|
218
196
|
end
|
219
|
-
|
220
|
-
|
221
|
-
##
|
222
|
-
# Finds a spec and the source_uri it came from for gem +gem_name+ and
|
223
|
-
# +version+. Returns an Array of specs and sources required for
|
224
|
-
# installation of the gem.
|
225
|
-
|
226
|
-
def find_spec_by_name_and_version(gem_name,
|
227
|
-
version = Gem::Requirement.default,
|
228
|
-
prerelease = false)
|
229
|
-
set = Gem::AvailableSet.new
|
230
|
-
|
231
|
-
if consider_local?
|
232
|
-
if gem_name =~ /\.gem$/ and File.file? gem_name
|
233
|
-
src = Gem::Source::SpecificFile.new(gem_name)
|
234
|
-
set.add src.spec, src
|
235
|
-
elsif gem_name =~ /\.gem$/
|
236
|
-
Dir[gem_name].each do |name|
|
237
|
-
begin
|
238
|
-
src = Gem::Source::SpecificFile.new name
|
239
|
-
set.add src.spec, src
|
240
|
-
rescue Gem::Package::FormatError
|
241
|
-
end
|
242
|
-
end
|
243
|
-
else
|
244
|
-
local = Gem::Source::Local.new
|
245
|
-
|
246
|
-
if s = local.find_gem(gem_name, version)
|
247
|
-
set.add s, local
|
248
|
-
end
|
249
|
-
end
|
250
|
-
end
|
251
|
-
|
252
|
-
if set.empty?
|
253
|
-
dep = Gem::Dependency.new gem_name, version
|
254
|
-
dep.prerelease = true if prerelease
|
255
|
-
|
256
|
-
set = Gem::Deprecate.skip_during do
|
257
|
-
find_gems_with_sources(dep, true)
|
258
|
-
end
|
259
|
-
|
260
|
-
set.match_platform!
|
261
|
-
end
|
262
|
-
|
263
|
-
if set.empty?
|
264
|
-
raise Gem::SpecificGemNotFoundException.new(gem_name, version, @errors)
|
265
|
-
end
|
266
|
-
|
267
|
-
@available = set
|
268
|
-
end
|
269
|
-
deprecate :find_spec_by_name_and_version, :none, 2019, 12
|
197
|
+
rubygems_deprecate :find_gems_with_sources
|
270
198
|
|
271
199
|
def in_background(what) # :nodoc:
|
272
200
|
fork_happened = false
|
@@ -101,11 +101,11 @@ class Gem::DependencyList
|
|
101
101
|
end
|
102
102
|
|
103
103
|
def find_name(full_name)
|
104
|
-
@specs.find {
|
104
|
+
@specs.find {|spec| spec.full_name == full_name }
|
105
105
|
end
|
106
106
|
|
107
107
|
def inspect # :nodoc:
|
108
|
-
"%s %p>" % [super[0..-2], map {
|
108
|
+
"%s %p>" % [super[0..-2], map {|s| s.full_name }]
|
109
109
|
end
|
110
110
|
|
111
111
|
##
|
@@ -116,7 +116,7 @@ class Gem::DependencyList
|
|
116
116
|
end
|
117
117
|
|
118
118
|
def why_not_ok?(quick = false)
|
119
|
-
unsatisfied = Hash.new {
|
119
|
+
unsatisfied = Hash.new {|h,k| h[k] = [] }
|
120
120
|
each do |spec|
|
121
121
|
spec.runtime_dependencies.each do |dep|
|
122
122
|
inst = Gem::Specification.any? do |installed_spec|
|
@@ -124,7 +124,7 @@ class Gem::DependencyList
|
|
124
124
|
dep.requirement.satisfied_by? installed_spec.version
|
125
125
|
end
|
126
126
|
|
127
|
-
unless inst or @specs.find {
|
127
|
+
unless inst or @specs.find {|s| s.satisfies_requirement? dep }
|
128
128
|
unsatisfied[spec.name] << dep
|
129
129
|
return unsatisfied if quick
|
130
130
|
end
|
@@ -184,7 +184,7 @@ class Gem::DependencyList
|
|
184
184
|
# Removes the gemspec matching +full_name+ from the dependency list
|
185
185
|
|
186
186
|
def remove_by_name(full_name)
|
187
|
-
@specs.delete_if {
|
187
|
+
@specs.delete_if {|spec| spec.full_name == full_name }
|
188
188
|
end
|
189
189
|
|
190
190
|
##
|
@@ -192,7 +192,7 @@ class Gem::DependencyList
|
|
192
192
|
# gemspecs that have a dependency satisfied by the named gemspec.
|
193
193
|
|
194
194
|
def spec_predecessors
|
195
|
-
result = Hash.new {
|
195
|
+
result = Hash.new {|h,k| h[k] = [] }
|
196
196
|
|
197
197
|
specs = @specs.sort.reverse
|
198
198
|
|
@@ -238,7 +238,7 @@ class Gem::DependencyList
|
|
238
238
|
# +ignored+.
|
239
239
|
|
240
240
|
def active_count(specs, ignored)
|
241
|
-
specs.count {
|
241
|
+
specs.count {|spec| ignored[spec.full_name].nil? }
|
242
242
|
end
|
243
243
|
|
244
244
|
end
|
data/lib/rubygems/deprecate.rb
CHANGED
@@ -41,6 +41,10 @@ module Gem::Deprecate
|
|
41
41
|
Gem::Deprecate.skip = original
|
42
42
|
end
|
43
43
|
|
44
|
+
def self.next_rubygems_major_version # :nodoc:
|
45
|
+
Gem::Version.new(Gem.rubygems_version.segments.first).bump
|
46
|
+
end
|
47
|
+
|
44
48
|
##
|
45
49
|
# Simple deprecation method that deprecates +name+ by wrapping it up
|
46
50
|
# in a dummy method. It warns on each call to the dummy method
|
@@ -65,6 +69,47 @@ module Gem::Deprecate
|
|
65
69
|
end
|
66
70
|
end
|
67
71
|
|
68
|
-
|
72
|
+
##
|
73
|
+
# Simple deprecation method that deprecates +name+ by wrapping it up
|
74
|
+
# in a dummy method. It warns on each call to the dummy method
|
75
|
+
# telling the user of +repl+ (unless +repl+ is :none) and the
|
76
|
+
# Rubygems version that it is planned to go away.
|
77
|
+
|
78
|
+
def rubygems_deprecate(name, replacement=:none)
|
79
|
+
class_eval do
|
80
|
+
old = "_deprecated_#{name}"
|
81
|
+
alias_method old, name
|
82
|
+
define_method name do |*args, &block|
|
83
|
+
klass = self.kind_of? Module
|
84
|
+
target = klass ? "#{self}." : "#{self.class}#"
|
85
|
+
msg = [ "NOTE: #{target}#{name} is deprecated",
|
86
|
+
replacement == :none ? " with no replacement" : "; use #{replacement} instead",
|
87
|
+
". It will be removed in Rubygems #{Gem::Deprecate.next_rubygems_major_version}",
|
88
|
+
"\n#{target}#{name} called from #{Gem.location_of_caller.join(":")}",
|
89
|
+
]
|
90
|
+
warn "#{msg.join}." unless Gem::Deprecate.skip
|
91
|
+
send old, *args, &block
|
92
|
+
end
|
93
|
+
end
|
94
|
+
end
|
95
|
+
|
96
|
+
# Deprecation method to deprecate Rubygems commands
|
97
|
+
def rubygems_deprecate_command
|
98
|
+
class_eval do
|
99
|
+
define_method "deprecated?" do
|
100
|
+
true
|
101
|
+
end
|
102
|
+
|
103
|
+
define_method "deprecation_warning" do
|
104
|
+
msg = [ "#{self.command} command is deprecated",
|
105
|
+
". It will be removed in Rubygems #{Gem::Deprecate.next_rubygems_major_version}.\n",
|
106
|
+
]
|
107
|
+
|
108
|
+
alert_warning "#{msg.join}" unless Gem::Deprecate.skip
|
109
|
+
end
|
110
|
+
end
|
111
|
+
end
|
112
|
+
|
113
|
+
module_function :rubygems_deprecate, :rubygems_deprecate_command, :skip_during
|
69
114
|
|
70
115
|
end
|