rubygems-update 3.3.18 → 3.3.19
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +24 -0
- data/Manifest.txt +1 -0
- data/bin/gem +2 -2
- data/bin/update_rubygems +4 -4
- data/bundler/CHANGELOG.md +29 -0
- data/bundler/lib/bundler/build_metadata.rb +2 -2
- data/bundler/lib/bundler/cli/common.rb +1 -0
- data/bundler/lib/bundler/definition.rb +31 -12
- data/bundler/lib/bundler/dsl.rb +2 -2
- data/bundler/lib/bundler/incomplete_specification.rb +12 -0
- data/bundler/lib/bundler/index.rb +10 -12
- data/bundler/lib/bundler/lazy_specification.rb +15 -6
- data/bundler/lib/bundler/man/bundle-add.1 +1 -1
- data/bundler/lib/bundler/man/bundle-binstubs.1 +1 -1
- data/bundler/lib/bundler/man/bundle-cache.1 +1 -1
- data/bundler/lib/bundler/man/bundle-check.1 +1 -1
- data/bundler/lib/bundler/man/bundle-clean.1 +1 -1
- data/bundler/lib/bundler/man/bundle-config.1 +13 -3
- data/bundler/lib/bundler/man/bundle-config.1.ronn +9 -2
- data/bundler/lib/bundler/man/bundle-doctor.1 +1 -1
- data/bundler/lib/bundler/man/bundle-exec.1 +2 -2
- data/bundler/lib/bundler/man/bundle-exec.1.ronn +1 -1
- data/bundler/lib/bundler/man/bundle-gem.1 +1 -1
- data/bundler/lib/bundler/man/bundle-info.1 +1 -1
- data/bundler/lib/bundler/man/bundle-init.1 +1 -1
- data/bundler/lib/bundler/man/bundle-inject.1 +5 -2
- data/bundler/lib/bundler/man/bundle-inject.1.ronn +3 -1
- data/bundler/lib/bundler/man/bundle-install.1 +1 -1
- data/bundler/lib/bundler/man/bundle-list.1 +1 -1
- data/bundler/lib/bundler/man/bundle-lock.1 +1 -1
- data/bundler/lib/bundler/man/bundle-open.1 +1 -1
- data/bundler/lib/bundler/man/bundle-outdated.1 +1 -1
- data/bundler/lib/bundler/man/bundle-platform.1 +1 -1
- data/bundler/lib/bundler/man/bundle-pristine.1 +1 -1
- data/bundler/lib/bundler/man/bundle-remove.1 +1 -1
- data/bundler/lib/bundler/man/bundle-show.1 +1 -1
- data/bundler/lib/bundler/man/bundle-update.1 +1 -1
- data/bundler/lib/bundler/man/bundle-viz.1 +4 -1
- data/bundler/lib/bundler/man/bundle-viz.1.ronn +2 -0
- data/bundler/lib/bundler/man/bundle.1 +3 -3
- data/bundler/lib/bundler/man/bundle.1.ronn +2 -2
- data/bundler/lib/bundler/man/gemfile.5 +16 -10
- data/bundler/lib/bundler/man/gemfile.5.ronn +23 -16
- data/bundler/lib/bundler/remote_specification.rb +5 -4
- data/bundler/lib/bundler/resolver.rb +5 -6
- data/bundler/lib/bundler/rubygems_gem_installer.rb +19 -12
- data/bundler/lib/bundler/settings.rb +1 -0
- data/bundler/lib/bundler/spec_set.rb +29 -21
- data/bundler/lib/bundler/version.rb +1 -1
- data/bundler/lib/bundler.rb +1 -0
- data/lib/rubygems/basic_specification.rb +2 -2
- data/lib/rubygems/command.rb +19 -19
- data/lib/rubygems/command_manager.rb +9 -9
- data/lib/rubygems/commands/build_command.rb +8 -8
- data/lib/rubygems/commands/cert_command.rb +32 -32
- data/lib/rubygems/commands/check_command.rb +20 -20
- data/lib/rubygems/commands/cleanup_command.rb +16 -16
- data/lib/rubygems/commands/contents_command.rb +12 -12
- data/lib/rubygems/commands/dependency_command.rb +12 -12
- data/lib/rubygems/commands/environment_command.rb +5 -5
- data/lib/rubygems/commands/fetch_command.rb +6 -6
- data/lib/rubygems/commands/generate_index_command.rb +15 -15
- data/lib/rubygems/commands/help_command.rb +3 -3
- data/lib/rubygems/commands/info_command.rb +3 -3
- data/lib/rubygems/commands/install_command.rb +13 -13
- data/lib/rubygems/commands/list_command.rb +3 -3
- data/lib/rubygems/commands/lock_command.rb +4 -4
- data/lib/rubygems/commands/mirror_command.rb +3 -3
- data/lib/rubygems/commands/open_command.rb +9 -9
- data/lib/rubygems/commands/outdated_command.rb +5 -5
- data/lib/rubygems/commands/owner_command.rb +11 -11
- data/lib/rubygems/commands/pristine_command.rb +31 -31
- data/lib/rubygems/commands/push_command.rb +8 -8
- data/lib/rubygems/commands/query_command.rb +8 -8
- data/lib/rubygems/commands/rdoc_command.rb +17 -17
- data/lib/rubygems/commands/search_command.rb +3 -3
- data/lib/rubygems/commands/server_command.rb +3 -3
- data/lib/rubygems/commands/setup_command.rb +92 -102
- data/lib/rubygems/commands/signin_command.rb +9 -9
- data/lib/rubygems/commands/signout_command.rb +7 -7
- data/lib/rubygems/commands/sources_command.rb +19 -19
- data/lib/rubygems/commands/specification_command.rb +11 -11
- data/lib/rubygems/commands/stale_command.rb +2 -2
- data/lib/rubygems/commands/uninstall_command.rb +36 -36
- data/lib/rubygems/commands/unpack_command.rb +12 -12
- data/lib/rubygems/commands/update_command.rb +35 -51
- data/lib/rubygems/commands/which_command.rb +6 -6
- data/lib/rubygems/commands/yank_command.rb +11 -11
- data/lib/rubygems/config_file.rb +14 -14
- data/lib/rubygems/core_ext/kernel_gem.rb +1 -1
- data/lib/rubygems/core_ext/kernel_require.rb +1 -1
- data/lib/rubygems/core_ext/kernel_warn.rb +1 -1
- data/lib/rubygems/core_ext/tcpsocket_init.rb +1 -1
- data/lib/rubygems/defaults.rb +15 -15
- data/lib/rubygems/dependency.rb +4 -4
- data/lib/rubygems/dependency_installer.rb +8 -8
- data/lib/rubygems/dependency_list.rb +2 -2
- data/lib/rubygems/doctor.rb +16 -16
- data/lib/rubygems/errors.rb +2 -2
- data/lib/rubygems/exceptions.rb +4 -4
- data/lib/rubygems/ext/build_error.rb +1 -1
- data/lib/rubygems/ext/builder.rb +16 -16
- data/lib/rubygems/ext/cargo_builder.rb +7 -7
- data/lib/rubygems/ext/cmake_builder.rb +2 -2
- data/lib/rubygems/ext/configure_builder.rb +1 -1
- data/lib/rubygems/ext/ext_conf_builder.rb +6 -6
- data/lib/rubygems/ext/rake_builder.rb +3 -3
- data/lib/rubygems/ext.rb +7 -7
- data/lib/rubygems/gem_runner.rb +5 -5
- data/lib/rubygems/gemcutter_utilities.rb +30 -27
- data/lib/rubygems/indexer.rb +24 -24
- data/lib/rubygems/install_default_message.rb +2 -2
- data/lib/rubygems/install_message.rb +2 -2
- data/lib/rubygems/install_update_options.rb +55 -55
- data/lib/rubygems/installer.rb +27 -27
- data/lib/rubygems/installer_uninstaller_utils.rb +2 -2
- data/lib/rubygems/local_remote_options.rb +18 -20
- data/lib/rubygems/mock_gem_ui.rb +2 -2
- data/lib/rubygems/name_tuple.rb +1 -1
- data/lib/rubygems/optparse.rb +1 -1
- data/lib/rubygems/package/file_source.rb +2 -2
- data/lib/rubygems/package/old.rb +8 -8
- data/lib/rubygems/package/tar_header.rb +33 -33
- data/lib/rubygems/package/tar_reader/entry.rb +2 -2
- data/lib/rubygems/package/tar_reader.rb +1 -1
- data/lib/rubygems/package/tar_writer.rb +6 -6
- data/lib/rubygems/package.rb +35 -35
- data/lib/rubygems/package_task.rb +4 -4
- data/lib/rubygems/platform.rb +42 -42
- data/lib/rubygems/psych_tree.rb +1 -1
- data/lib/rubygems/query_utils.rb +27 -27
- data/lib/rubygems/rdoc.rb +2 -2
- data/lib/rubygems/remote_fetcher.rb +19 -19
- data/lib/rubygems/request/connection_pools.rb +2 -2
- data/lib/rubygems/request.rb +21 -21
- data/lib/rubygems/request_set/gem_dependency_api.rb +15 -15
- data/lib/rubygems/request_set/lockfile/parser.rb +14 -14
- data/lib/rubygems/request_set/lockfile/tokenizer.rb +2 -2
- data/lib/rubygems/request_set/lockfile.rb +5 -5
- data/lib/rubygems/request_set.rb +14 -14
- data/lib/rubygems/requirement.rb +5 -5
- data/lib/rubygems/resolver/activation_request.rb +3 -3
- data/lib/rubygems/resolver/api_set.rb +4 -4
- data/lib/rubygems/resolver/api_specification.rb +2 -2
- data/lib/rubygems/resolver/best_set.rb +2 -2
- data/lib/rubygems/resolver/conflict.rb +7 -7
- data/lib/rubygems/resolver/dependency_request.rb +2 -2
- data/lib/rubygems/resolver/git_set.rb +2 -2
- data/lib/rubygems/resolver/git_specification.rb +3 -3
- data/lib/rubygems/resolver/index_set.rb +3 -3
- data/lib/rubygems/resolver/index_specification.rb +3 -3
- data/lib/rubygems/resolver/installed_specification.rb +2 -2
- data/lib/rubygems/resolver/installer_set.rb +4 -4
- data/lib/rubygems/resolver/local_specification.rb +2 -2
- data/lib/rubygems/resolver/lock_set.rb +3 -3
- data/lib/rubygems/resolver/lock_specification.rb +3 -3
- data/lib/rubygems/resolver/molinillo.rb +1 -1
- data/lib/rubygems/resolver/specification.rb +1 -1
- data/lib/rubygems/resolver/vendor_set.rb +1 -1
- data/lib/rubygems/resolver.rb +35 -35
- data/lib/rubygems/s3_uri_signer.rb +6 -6
- data/lib/rubygems/safe_yaml.rb +2 -2
- data/lib/rubygems/security/policies.rb +11 -11
- data/lib/rubygems/security/policy.rb +12 -12
- data/lib/rubygems/security/signer.rb +4 -4
- data/lib/rubygems/security/trust_dir.rb +3 -3
- data/lib/rubygems/security.rb +27 -27
- data/lib/rubygems/security_option.rb +5 -5
- data/lib/rubygems/source/git.rb +17 -17
- data/lib/rubygems/source/installed.rb +1 -1
- data/lib/rubygems/source/local.rb +2 -2
- data/lib/rubygems/source/specific_file.rb +1 -1
- data/lib/rubygems/source.rb +15 -15
- data/lib/rubygems/spec_fetcher.rb +8 -8
- data/lib/rubygems/specification.rb +37 -38
- data/lib/rubygems/specification_policy.rb +13 -13
- data/lib/rubygems/stub_specification.rb +5 -5
- data/lib/rubygems/tsort.rb +1 -1
- data/lib/rubygems/uninstaller.rb +14 -14
- data/lib/rubygems/uri.rb +4 -4
- data/lib/rubygems/uri_formatter.rb +1 -1
- data/lib/rubygems/user_interaction.rb +31 -17
- data/lib/rubygems/util/licenses.rb +3 -3
- data/lib/rubygems/util.rb +10 -10
- data/lib/rubygems/validator.rb +5 -5
- data/lib/rubygems/version.rb +3 -5
- data/lib/rubygems/version_option.rb +3 -3
- data/lib/rubygems.rb +59 -58
- data/rubygems-update.gemspec +2 -2
- data/setup.rb +9 -9
- data/test/rubygems/helper.rb +127 -127
- data/test/rubygems/installer_test_case.rb +13 -13
- data/test/rubygems/package/tar_test_case.rb +2 -2
- data/test/rubygems/plugin/exception/rubygems_plugin.rb +1 -1
- data/test/rubygems/plugin/standarderror/rubygems_plugin.rb +1 -1
- data/test/rubygems/rubygems_plugin.rb +2 -2
- data/test/rubygems/specifications/rubyforge-0.0.1.gemspec +4 -4
- data/test/rubygems/test_bundled_ca.rb +10 -10
- data/test/rubygems/test_config.rb +3 -3
- data/test/rubygems/test_deprecate.rb +3 -3
- data/test/rubygems/test_exit.rb +2 -2
- data/test/rubygems/test_gem.rb +342 -342
- data/test/rubygems/test_gem_available_set.rb +21 -21
- data/test/rubygems/test_gem_bundler_version_finder.rb +1 -1
- data/test/rubygems/test_gem_command.rb +44 -44
- data/test/rubygems/test_gem_command_manager.rb +29 -29
- data/test/rubygems/test_gem_commands_build_command.rb +63 -63
- data/test/rubygems/test_gem_commands_cert_command.rb +97 -99
- data/test/rubygems/test_gem_commands_check_command.rb +4 -4
- data/test/rubygems/test_gem_commands_cleanup_command.rb +40 -40
- data/test/rubygems/test_gem_commands_contents_command.rb +27 -27
- data/test/rubygems/test_gem_commands_dependency_command.rb +36 -36
- data/test/rubygems/test_gem_commands_environment_command.rb +16 -16
- data/test/rubygems/test_gem_commands_fetch_command.rb +37 -37
- data/test/rubygems/test_gem_commands_generate_index_command.rb +7 -7
- data/test/rubygems/test_gem_commands_help_command.rb +13 -13
- data/test/rubygems/test_gem_commands_info_command.rb +2 -2
- data/test/rubygems/test_gem_commands_install_command.rb +131 -131
- data/test/rubygems/test_gem_commands_list_command.rb +4 -4
- data/test/rubygems/test_gem_commands_lock_command.rb +10 -10
- data/test/rubygems/test_gem_commands_mirror.rb +2 -2
- data/test/rubygems/test_gem_commands_open_command.rb +4 -4
- data/test/rubygems/test_gem_commands_outdated_command.rb +9 -9
- data/test/rubygems/test_gem_commands_owner_command.rb +41 -41
- data/test/rubygems/test_gem_commands_pristine_command.rb +92 -92
- data/test/rubygems/test_gem_commands_push_command.rb +54 -54
- data/test/rubygems/test_gem_commands_query_command.rb +73 -73
- data/test/rubygems/test_gem_commands_search_command.rb +2 -2
- data/test/rubygems/test_gem_commands_server_command.rb +2 -2
- data/test/rubygems/test_gem_commands_setup_command.rb +119 -85
- data/test/rubygems/test_gem_commands_signin_command.rb +45 -31
- data/test/rubygems/test_gem_commands_signout_command.rb +3 -3
- data/test/rubygems/test_gem_commands_sources_command.rb +28 -29
- data/test/rubygems/test_gem_commands_specification_command.rb +32 -32
- data/test/rubygems/test_gem_commands_stale_command.rb +4 -4
- data/test/rubygems/test_gem_commands_uninstall_command.rb +75 -75
- data/test/rubygems/test_gem_commands_unpack_command.rb +31 -31
- data/test/rubygems/test_gem_commands_update_command.rb +89 -89
- data/test/rubygems/test_gem_commands_which_command.rb +6 -6
- data/test/rubygems/test_gem_commands_yank_command.rb +40 -40
- data/test/rubygems/test_gem_config_file.rb +77 -77
- data/test/rubygems/test_gem_dependency.rb +73 -73
- data/test/rubygems/test_gem_dependency_installer.rb +165 -165
- data/test/rubygems/test_gem_dependency_list.rb +47 -47
- data/test/rubygems/test_gem_dependency_resolution_error.rb +4 -4
- data/test/rubygems/test_gem_doctor.rb +26 -26
- data/test/rubygems/test_gem_ext_builder.rb +59 -59
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.lock +6 -6
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.toml +1 -1
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/build.rb +8 -8
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/custom_name.gemspec +1 -1
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.lock +6 -6
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.toml +1 -1
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/build.rb +8 -8
- data/test/rubygems/test_gem_ext_cargo_builder.rb +26 -26
- data/test/rubygems/test_gem_ext_cargo_builder_link_flag_converter.rb +3 -3
- data/test/rubygems/test_gem_ext_cargo_builder_unit.rb +23 -23
- data/test/rubygems/test_gem_ext_cmake_builder.rb +15 -15
- data/test/rubygems/test_gem_ext_configure_builder.rb +13 -13
- data/test/rubygems/test_gem_ext_ext_conf_builder.rb +51 -52
- data/test/rubygems/test_gem_ext_rake_builder.rb +15 -15
- data/test/rubygems/test_gem_gem_runner.rb +7 -7
- data/test/rubygems/test_gem_gemcutter_utilities.rb +66 -66
- data/test/rubygems/test_gem_impossible_dependencies_error.rb +4 -4
- data/test/rubygems/test_gem_indexer.rb +48 -48
- data/test/rubygems/test_gem_install_update_options.rb +16 -16
- data/test/rubygems/test_gem_installer.rb +297 -297
- data/test/rubygems/test_gem_local_remote_options.rb +10 -10
- data/test/rubygems/test_gem_name_tuple.rb +4 -4
- data/test/rubygems/test_gem_package.rb +206 -206
- data/test/rubygems/test_gem_package_old.rb +13 -13
- data/test/rubygems/test_gem_package_tar_header.rb +42 -42
- data/test/rubygems/test_gem_package_tar_reader.rb +7 -7
- data/test/rubygems/test_gem_package_tar_reader_entry.rb +10 -10
- data/test/rubygems/test_gem_package_tar_writer.rb +76 -76
- data/test/rubygems/test_gem_package_task.rb +18 -18
- data/test/rubygems/test_gem_path_support.rb +14 -14
- data/test/rubygems/test_gem_platform.rb +227 -227
- data/test/rubygems/test_gem_rdoc.rb +14 -14
- data/test/rubygems/test_gem_remote_fetcher.rb +149 -149
- data/test/rubygems/test_gem_request.rb +55 -55
- data/test/rubygems/test_gem_request_connection_pools.rb +29 -29
- data/test/rubygems/test_gem_request_set.rb +99 -99
- data/test/rubygems/test_gem_request_set_gem_dependency_api.rb +204 -206
- data/test/rubygems/test_gem_request_set_lockfile.rb +86 -86
- data/test/rubygems/test_gem_request_set_lockfile_parser.rb +56 -56
- data/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb +62 -62
- data/test/rubygems/test_gem_requirement.rb +38 -38
- data/test/rubygems/test_gem_resolver.rb +98 -98
- data/test/rubygems/test_gem_resolver_activation_request.rb +6 -6
- data/test/rubygems/test_gem_resolver_api_set.rb +33 -33
- data/test/rubygems/test_gem_resolver_api_specification.rb +47 -47
- data/test/rubygems/test_gem_resolver_best_set.rb +22 -22
- data/test/rubygems/test_gem_resolver_composed_set.rb +1 -1
- data/test/rubygems/test_gem_resolver_conflict.rb +12 -12
- data/test/rubygems/test_gem_resolver_dependency_request.rb +15 -15
- data/test/rubygems/test_gem_resolver_git_set.rb +21 -21
- data/test/rubygems/test_gem_resolver_git_specification.rb +21 -21
- data/test/rubygems/test_gem_resolver_index_set.rb +12 -12
- data/test/rubygems/test_gem_resolver_index_specification.rb +15 -15
- data/test/rubygems/test_gem_resolver_installed_specification.rb +5 -5
- data/test/rubygems/test_gem_resolver_installer_set.rb +34 -34
- data/test/rubygems/test_gem_resolver_local_specification.rb +7 -7
- data/test/rubygems/test_gem_resolver_lock_set.rb +12 -12
- data/test/rubygems/test_gem_resolver_lock_specification.rb +17 -17
- data/test/rubygems/test_gem_resolver_requirement_list.rb +1 -1
- data/test/rubygems/test_gem_resolver_specification.rb +8 -8
- data/test/rubygems/test_gem_resolver_vendor_set.rb +6 -6
- data/test/rubygems/test_gem_resolver_vendor_specification.rb +10 -10
- data/test/rubygems/test_gem_security.rb +67 -67
- data/test/rubygems/test_gem_security_policy.rb +62 -62
- data/test/rubygems/test_gem_security_signer.rb +28 -28
- data/test/rubygems/test_gem_security_trust_dir.rb +4 -4
- data/test/rubygems/test_gem_silent_ui.rb +38 -32
- data/test/rubygems/test_gem_source.rb +44 -44
- data/test/rubygems/test_gem_source_fetch_problem.rb +9 -9
- data/test/rubygems/test_gem_source_git.rb +59 -59
- data/test/rubygems/test_gem_source_installed.rb +16 -16
- data/test/rubygems/test_gem_source_list.rb +5 -5
- data/test/rubygems/test_gem_source_local.rb +14 -14
- data/test/rubygems/test_gem_source_lock.rb +31 -31
- data/test/rubygems/test_gem_source_specific_file.rb +17 -17
- data/test/rubygems/test_gem_source_subpath_problem.rb +7 -7
- data/test/rubygems/test_gem_source_vendor.rb +13 -13
- data/test/rubygems/test_gem_spec_fetcher.rb +72 -72
- data/test/rubygems/test_gem_specification.rb +434 -435
- data/test/rubygems/test_gem_stream_ui.rb +19 -19
- data/test/rubygems/test_gem_stub_specification.rb +32 -32
- data/test/rubygems/test_gem_text.rb +1 -1
- data/test/rubygems/test_gem_uninstaller.rb +112 -112
- data/test/rubygems/test_gem_unsatisfiable_dependency_error.rb +3 -3
- data/test/rubygems/test_gem_uri.rb +4 -4
- data/test/rubygems/test_gem_uri_formatter.rb +14 -14
- data/test/rubygems/test_gem_util.rb +23 -23
- data/test/rubygems/test_gem_validator.rb +8 -8
- data/test/rubygems/test_gem_version.rb +13 -13
- data/test/rubygems/test_gem_version_option.rb +15 -15
- data/test/rubygems/test_kernel.rb +31 -31
- data/test/rubygems/test_project_sanity.rb +1 -1
- data/test/rubygems/test_remote_fetch_error.rb +6 -6
- data/test/rubygems/test_require.rb +42 -42
- data/test/rubygems/test_rubygems.rb +8 -8
- data/test/rubygems/utilities.rb +17 -17
- metadata +4 -3
@@ -1,4 +1,4 @@
|
|
1
|
-
require_relative
|
1
|
+
require_relative "user_interaction"
|
2
2
|
|
3
3
|
class Gem::SpecificationPolicy
|
4
4
|
include Gem::UserInteraction
|
@@ -120,7 +120,7 @@ class Gem::SpecificationPolicy
|
|
120
120
|
metadata = @specification.metadata
|
121
121
|
|
122
122
|
unless Hash === metadata
|
123
|
-
error
|
123
|
+
error "metadata must be a hash"
|
124
124
|
end
|
125
125
|
|
126
126
|
metadata.each do |key, value|
|
@@ -188,7 +188,7 @@ duplicate dependency on #{dep}, (#{prev.requirement}) use:
|
|
188
188
|
prerelease_dep && !@specification.version.prerelease?
|
189
189
|
|
190
190
|
open_ended = dep.requirement.requirements.all? do |op, version|
|
191
|
-
not version.prerelease? and (op ==
|
191
|
+
not version.prerelease? and (op == ">" or op == ">=")
|
192
192
|
end
|
193
193
|
|
194
194
|
if open_ended
|
@@ -198,12 +198,12 @@ duplicate dependency on #{dep}, (#{prev.requirement}) use:
|
|
198
198
|
|
199
199
|
base = segments.first 2
|
200
200
|
|
201
|
-
recommendation = if (op ==
|
201
|
+
recommendation = if (op == ">" || op == ">=") && segments == [0]
|
202
202
|
" use a bounded requirement, such as '~> x.y'"
|
203
203
|
else
|
204
|
-
bugfix = if op ==
|
204
|
+
bugfix = if op == ">"
|
205
205
|
", '> #{dep_version}'"
|
206
|
-
elsif op ==
|
206
|
+
elsif op == ">=" and base != segments
|
207
207
|
", '>= #{dep_version}'"
|
208
208
|
end
|
209
209
|
|
@@ -286,7 +286,7 @@ duplicate dependency on #{dep}, (#{prev.requirement}) use:
|
|
286
286
|
def validate_require_paths
|
287
287
|
return unless @specification.raw_require_paths.empty?
|
288
288
|
|
289
|
-
error
|
289
|
+
error "specification must have at least one require_path"
|
290
290
|
end
|
291
291
|
|
292
292
|
def validate_non_files
|
@@ -310,7 +310,7 @@ duplicate dependency on #{dep}, (#{prev.requirement}) use:
|
|
310
310
|
def validate_specification_version
|
311
311
|
return if @specification.specification_version.is_a?(Integer)
|
312
312
|
|
313
|
-
error
|
313
|
+
error "specification_version must be an Integer (did you mean version?)"
|
314
314
|
end
|
315
315
|
|
316
316
|
def validate_platform
|
@@ -380,7 +380,7 @@ http://spdx.org/licenses or '#{Gem::Licenses::NONSTANDARD}' for a nonstandard li
|
|
380
380
|
WARNING
|
381
381
|
end
|
382
382
|
|
383
|
-
LAZY = '"FIxxxXME" or "TOxxxDO"'.gsub(/xxx/,
|
383
|
+
LAZY = '"FIxxxXME" or "TOxxxDO"'.gsub(/xxx/, "")
|
384
384
|
LAZY_PATTERN = /\AFI XME|\ATO DO/x.freeze
|
385
385
|
HOMEPAGE_URI_PATTERN = /\A[a-z][a-z\d+.-]*:/i.freeze
|
386
386
|
|
@@ -405,7 +405,7 @@ http://spdx.org/licenses or '#{Gem::Licenses::NONSTANDARD}' for a nonstandard li
|
|
405
405
|
|
406
406
|
# Make sure a homepage is valid HTTP/HTTPS URI
|
407
407
|
if homepage and not homepage.empty?
|
408
|
-
require
|
408
|
+
require "uri"
|
409
409
|
begin
|
410
410
|
homepage_uri = URI.parse(homepage)
|
411
411
|
unless [URI::HTTP, URI::HTTPS].member? homepage_uri.class
|
@@ -445,7 +445,7 @@ http://spdx.org/licenses or '#{Gem::Licenses::NONSTANDARD}' for a nonstandard li
|
|
445
445
|
|
446
446
|
def validate_shebang_line_in(executable)
|
447
447
|
executable_path = File.join(@specification.bindir, executable)
|
448
|
-
return if File.read(executable_path, 2) ==
|
448
|
+
return if File.read(executable_path, 2) == "#!"
|
449
449
|
|
450
450
|
warning "#{executable_path} is missing #! line"
|
451
451
|
end
|
@@ -457,11 +457,11 @@ http://spdx.org/licenses or '#{Gem::Licenses::NONSTANDARD}' for a nonstandard li
|
|
457
457
|
end
|
458
458
|
|
459
459
|
def validate_extensions # :nodoc:
|
460
|
-
require_relative
|
460
|
+
require_relative "ext"
|
461
461
|
builder = Gem::Ext::Builder.new(@specification)
|
462
462
|
|
463
463
|
rake_extension = @specification.extensions.any? {|s| builder.builder_for(s) == Gem::Ext::RakeBuilder }
|
464
|
-
rake_dependency = @specification.dependencies.any? {|d| d.name ==
|
464
|
+
rake_dependency = @specification.dependencies.any? {|d| d.name == "rake" }
|
465
465
|
|
466
466
|
warning <<-WARNING if rake_extension && !rake_dependency
|
467
467
|
You have specified rake based extension, but rake is not added as dependency. It is recommended to add rake as a dependency in gemspec since there's no guarantee rake will be already installed.
|
@@ -9,7 +9,7 @@ class Gem::StubSpecification < Gem::BasicSpecification
|
|
9
9
|
PREFIX = "# stub: ".freeze
|
10
10
|
|
11
11
|
# :nodoc:
|
12
|
-
OPEN_MODE =
|
12
|
+
OPEN_MODE = "r:UTF-8:-".freeze
|
13
13
|
|
14
14
|
class StubLine # :nodoc: all
|
15
15
|
attr_reader :name, :version, :platform, :require_paths, :extensions,
|
@@ -19,9 +19,9 @@ class Gem::StubSpecification < Gem::BasicSpecification
|
|
19
19
|
|
20
20
|
# These are common require paths.
|
21
21
|
REQUIRE_PATHS = { # :nodoc:
|
22
|
-
|
23
|
-
|
24
|
-
|
22
|
+
"lib" => "lib".freeze,
|
23
|
+
"test" => "test".freeze,
|
24
|
+
"ext" => "ext".freeze,
|
25
25
|
}.freeze
|
26
26
|
|
27
27
|
# These are common require path lists. This hash is used to optimize
|
@@ -29,7 +29,7 @@ class Gem::StubSpecification < Gem::BasicSpecification
|
|
29
29
|
# in their require paths, so lets take advantage of that by pre-allocating
|
30
30
|
# a require path list for that case.
|
31
31
|
REQUIRE_PATH_LIST = { # :nodoc:
|
32
|
-
|
32
|
+
"lib" => ["lib"].freeze,
|
33
33
|
}.freeze
|
34
34
|
|
35
35
|
def initialize(data, extensions)
|
data/lib/rubygems/tsort.rb
CHANGED
data/lib/rubygems/uninstaller.rb
CHANGED
@@ -5,12 +5,12 @@
|
|
5
5
|
# See LICENSE.txt for permissions.
|
6
6
|
#++
|
7
7
|
|
8
|
-
require
|
9
|
-
require_relative
|
10
|
-
require_relative
|
11
|
-
require_relative
|
12
|
-
require_relative
|
13
|
-
require_relative
|
8
|
+
require "fileutils"
|
9
|
+
require_relative "../rubygems"
|
10
|
+
require_relative "installer_uninstaller_utils"
|
11
|
+
require_relative "dependency_list"
|
12
|
+
require_relative "rdoc"
|
13
|
+
require_relative "user_interaction"
|
14
14
|
|
15
15
|
##
|
16
16
|
# An Uninstaller.
|
@@ -302,8 +302,8 @@ class Gem::Uninstaller
|
|
302
302
|
# Is +spec+ in +gem_dir+?
|
303
303
|
|
304
304
|
def path_ok?(gem_dir, spec)
|
305
|
-
full_path = File.join gem_dir,
|
306
|
-
original_path = File.join gem_dir,
|
305
|
+
full_path = File.join gem_dir, "gems", spec.full_name
|
306
|
+
original_path = File.join gem_dir, "gems", spec.original_name
|
307
307
|
|
308
308
|
full_path == spec.full_gem_path || original_path == spec.full_gem_path
|
309
309
|
end
|
@@ -332,10 +332,10 @@ class Gem::Uninstaller
|
|
332
332
|
# Asks if it is OK to remove +spec+. Returns true if it is OK.
|
333
333
|
|
334
334
|
def ask_if_ok(spec) # :nodoc:
|
335
|
-
msg = [
|
336
|
-
msg <<
|
335
|
+
msg = [""]
|
336
|
+
msg << "You have requested to uninstall the gem:"
|
337
337
|
msg << "\t#{spec.full_name}"
|
338
|
-
msg <<
|
338
|
+
msg << ""
|
339
339
|
|
340
340
|
siblings = Gem::Specification.select do |s|
|
341
341
|
s.name == spec.name && s.full_name != spec.full_name
|
@@ -347,8 +347,8 @@ class Gem::Uninstaller
|
|
347
347
|
end
|
348
348
|
end
|
349
349
|
|
350
|
-
msg <<
|
351
|
-
msg <<
|
350
|
+
msg << "If you remove this gem, these dependencies will not be met."
|
351
|
+
msg << "Continue with Uninstall?"
|
352
352
|
return ask_yes_no(msg.join("\n"), false)
|
353
353
|
end
|
354
354
|
|
@@ -360,7 +360,7 @@ class Gem::Uninstaller
|
|
360
360
|
# of what it did for us to find rather than trying to recreate
|
361
361
|
# it again.
|
362
362
|
if @format_executable
|
363
|
-
require_relative
|
363
|
+
require_relative "installer"
|
364
364
|
Gem::Installer.exec_format % File.basename(filename)
|
365
365
|
else
|
366
366
|
filename
|
data/lib/rubygems/uri.rb
CHANGED
@@ -66,7 +66,7 @@ class Gem::Uri
|
|
66
66
|
def redact_credentials_from(text)
|
67
67
|
return text unless valid_uri? && password? && text.include?(to_s)
|
68
68
|
|
69
|
-
text.sub(password,
|
69
|
+
text.sub(password, "REDACTED")
|
70
70
|
end
|
71
71
|
|
72
72
|
def method_missing(method_name, *args, &blk)
|
@@ -97,11 +97,11 @@ class Gem::Uri
|
|
97
97
|
end
|
98
98
|
|
99
99
|
def with_redacted_user
|
100
|
-
clone.tap {|uri| uri.user =
|
100
|
+
clone.tap {|uri| uri.user = "REDACTED" }
|
101
101
|
end
|
102
102
|
|
103
103
|
def with_redacted_password
|
104
|
-
clone.tap {|uri| uri.password =
|
104
|
+
clone.tap {|uri| uri.password = "REDACTED" }
|
105
105
|
end
|
106
106
|
|
107
107
|
def valid_uri?
|
@@ -113,7 +113,7 @@ class Gem::Uri
|
|
113
113
|
end
|
114
114
|
|
115
115
|
def oauth_basic?
|
116
|
-
password ==
|
116
|
+
password == "x-oauth-basic"
|
117
117
|
end
|
118
118
|
|
119
119
|
def token?
|
@@ -5,8 +5,8 @@
|
|
5
5
|
# See LICENSE.txt for permissions.
|
6
6
|
#++
|
7
7
|
|
8
|
-
require_relative
|
9
|
-
require_relative
|
8
|
+
require_relative "deprecate"
|
9
|
+
require_relative "text"
|
10
10
|
|
11
11
|
##
|
12
12
|
# Module that defines the default UserInteraction. Any class including this
|
@@ -148,7 +148,7 @@ module Gem::UserInteraction
|
|
148
148
|
##
|
149
149
|
# Displays the given +statement+ on the standard output (or equivalent).
|
150
150
|
|
151
|
-
def say(statement =
|
151
|
+
def say(statement = "")
|
152
152
|
ui.say statement
|
153
153
|
end
|
154
154
|
|
@@ -259,11 +259,11 @@ class Gem::StreamUI
|
|
259
259
|
|
260
260
|
default_answer = case default
|
261
261
|
when nil
|
262
|
-
|
262
|
+
"yn"
|
263
263
|
when true
|
264
|
-
|
264
|
+
"Yn"
|
265
265
|
else
|
266
|
-
|
266
|
+
"yN"
|
267
267
|
end
|
268
268
|
|
269
269
|
result = nil
|
@@ -312,7 +312,7 @@ class Gem::StreamUI
|
|
312
312
|
def require_io_console
|
313
313
|
@require_io_console ||= begin
|
314
314
|
begin
|
315
|
-
require
|
315
|
+
require "io/console"
|
316
316
|
rescue LoadError
|
317
317
|
end
|
318
318
|
true
|
@@ -472,7 +472,7 @@ class Gem::StreamUI
|
|
472
472
|
# and the +terminal_message+ when it is complete.
|
473
473
|
|
474
474
|
def initialize(out_stream, size, initial_message,
|
475
|
-
terminal_message =
|
475
|
+
terminal_message = "complete")
|
476
476
|
@out = out_stream
|
477
477
|
@total = size
|
478
478
|
@count = 0
|
@@ -616,18 +616,11 @@ class Gem::SilentUI < Gem::StreamUI
|
|
616
616
|
# The SilentUI has no arguments as it does not use any stream.
|
617
617
|
|
618
618
|
def initialize
|
619
|
-
|
620
|
-
|
621
|
-
reader = File.open(IO::NULL, 'r')
|
622
|
-
writer = File.open(IO::NULL, 'w')
|
623
|
-
|
624
|
-
super reader, writer, writer, false
|
619
|
+
io = NullIO.new
|
620
|
+
super io, io, io, false
|
625
621
|
end
|
626
622
|
|
627
623
|
def close
|
628
|
-
super
|
629
|
-
@ins.close
|
630
|
-
@outs.close
|
631
624
|
end
|
632
625
|
|
633
626
|
def download_reporter(*args) # :nodoc:
|
@@ -637,4 +630,25 @@ class Gem::SilentUI < Gem::StreamUI
|
|
637
630
|
def progress_reporter(*args) # :nodoc:
|
638
631
|
SilentProgressReporter.new(@outs, *args)
|
639
632
|
end
|
633
|
+
|
634
|
+
##
|
635
|
+
# An absolutely silent IO.
|
636
|
+
|
637
|
+
class NullIO
|
638
|
+
def puts(*args)
|
639
|
+
end
|
640
|
+
|
641
|
+
def print(*args)
|
642
|
+
end
|
643
|
+
|
644
|
+
def flush
|
645
|
+
end
|
646
|
+
|
647
|
+
def gets(*args)
|
648
|
+
end
|
649
|
+
|
650
|
+
def tty?
|
651
|
+
false
|
652
|
+
end
|
653
|
+
end
|
640
654
|
end
|
@@ -1,11 +1,11 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
-
require_relative
|
2
|
+
require_relative "../text"
|
3
3
|
|
4
4
|
class Gem::Licenses
|
5
5
|
extend Gem::Text
|
6
6
|
|
7
|
-
NONSTANDARD =
|
8
|
-
LICENSE_REF =
|
7
|
+
NONSTANDARD = "Nonstandard".freeze
|
8
|
+
LICENSE_REF = "LicenseRef-.+".freeze
|
9
9
|
|
10
10
|
# Software Package Data Exchange (SPDX) standard open-source software
|
11
11
|
# license identifiers
|
data/lib/rubygems/util.rb
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
-
require_relative
|
2
|
+
require_relative "deprecate"
|
3
3
|
|
4
4
|
##
|
5
5
|
# This module contains various utility methods as module methods.
|
@@ -10,9 +10,9 @@ module Gem::Util
|
|
10
10
|
# Zlib::GzipReader wrapper that unzips +data+.
|
11
11
|
|
12
12
|
def self.gunzip(data)
|
13
|
-
require
|
14
|
-
require
|
15
|
-
data = StringIO.new(data,
|
13
|
+
require "zlib"
|
14
|
+
require "stringio"
|
15
|
+
data = StringIO.new(data, "r")
|
16
16
|
|
17
17
|
gzip_reader = begin
|
18
18
|
Zlib::GzipReader.new(data)
|
@@ -29,9 +29,9 @@ module Gem::Util
|
|
29
29
|
# Zlib::GzipWriter wrapper that zips +data+.
|
30
30
|
|
31
31
|
def self.gzip(data)
|
32
|
-
require
|
33
|
-
require
|
34
|
-
zipped = StringIO.new(String.new,
|
32
|
+
require "zlib"
|
33
|
+
require "stringio"
|
34
|
+
zipped = StringIO.new(String.new, "w")
|
35
35
|
zipped.set_encoding Encoding::BINARY
|
36
36
|
|
37
37
|
Zlib::GzipWriter.wrap zipped do |io|
|
@@ -45,7 +45,7 @@ module Gem::Util
|
|
45
45
|
# A Zlib::Inflate#inflate wrapper
|
46
46
|
|
47
47
|
def self.inflate(data)
|
48
|
-
require
|
48
|
+
require "zlib"
|
49
49
|
Zlib::Inflate.inflate data
|
50
50
|
end
|
51
51
|
|
@@ -86,7 +86,7 @@ module Gem::Util
|
|
86
86
|
loop do
|
87
87
|
Dir.chdir here, &block rescue Errno::EACCES
|
88
88
|
|
89
|
-
new_here = File.expand_path(
|
89
|
+
new_here = File.expand_path("..", here)
|
90
90
|
return if new_here == here # toplevel
|
91
91
|
here = new_here
|
92
92
|
end
|
@@ -109,7 +109,7 @@ module Gem::Util
|
|
109
109
|
# comes with a leading slash.
|
110
110
|
|
111
111
|
def self.correct_for_windows_path(path)
|
112
|
-
if path[0].chr ==
|
112
|
+
if path[0].chr == "/" && path[1].chr =~ /[a-z]/i && path[2].chr == ":"
|
113
113
|
path[1..-1]
|
114
114
|
else
|
115
115
|
path
|
data/lib/rubygems/validator.rb
CHANGED
@@ -5,8 +5,8 @@
|
|
5
5
|
# See LICENSE.txt for permissions.
|
6
6
|
#++
|
7
7
|
|
8
|
-
require_relative
|
9
|
-
require_relative
|
8
|
+
require_relative "package"
|
9
|
+
require_relative "installer"
|
10
10
|
|
11
11
|
##
|
12
12
|
# Validator performs various gem file and gem database validation
|
@@ -15,7 +15,7 @@ class Gem::Validator
|
|
15
15
|
include Gem::UserInteraction
|
16
16
|
|
17
17
|
def initialize # :nodoc:
|
18
|
-
require
|
18
|
+
require "find"
|
19
19
|
end
|
20
20
|
|
21
21
|
private
|
@@ -110,11 +110,11 @@ class Gem::Validator
|
|
110
110
|
begin
|
111
111
|
next unless data # HACK `gem check -a mkrf`
|
112
112
|
|
113
|
-
source = File.join gem_directory, entry[
|
113
|
+
source = File.join gem_directory, entry["path"]
|
114
114
|
|
115
115
|
File.open source, Gem.binary_mode do |f|
|
116
116
|
unless f.read == data
|
117
|
-
errors[gem_name][entry[
|
117
|
+
errors[gem_name][entry["path"]] = "Modified from original"
|
118
118
|
end
|
119
119
|
end
|
120
120
|
end
|
data/lib/rubygems/version.rb
CHANGED
@@ -153,8 +153,6 @@ require_relative "deprecate"
|
|
153
153
|
# a zero to give a sensible result.
|
154
154
|
|
155
155
|
class Gem::Version
|
156
|
-
autoload :Requirement, File.expand_path('requirement', __dir__)
|
157
|
-
|
158
156
|
include Comparable
|
159
157
|
|
160
158
|
VERSION_PATTERN = '[0-9]+(?>\.[0-9a-zA-Z]+)*(-[0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*)?'.freeze # :nodoc:
|
@@ -278,7 +276,7 @@ class Gem::Version
|
|
278
276
|
end
|
279
277
|
|
280
278
|
def yaml_initialize(tag, map) # :nodoc:
|
281
|
-
@version = map[
|
279
|
+
@version = map["version"]
|
282
280
|
@segments = nil
|
283
281
|
@hash = nil
|
284
282
|
end
|
@@ -288,7 +286,7 @@ class Gem::Version
|
|
288
286
|
end
|
289
287
|
|
290
288
|
def encode_with(coder) # :nodoc:
|
291
|
-
coder.add
|
289
|
+
coder.add "version", @version
|
292
290
|
end
|
293
291
|
|
294
292
|
##
|
@@ -313,7 +311,7 @@ class Gem::Version
|
|
313
311
|
@@release[self] ||= if prerelease?
|
314
312
|
segments = self.segments
|
315
313
|
segments.pop while segments.any? {|s| String === s }
|
316
|
-
self.class.new segments.join(
|
314
|
+
self.class.new segments.join(".")
|
317
315
|
else
|
318
316
|
self
|
319
317
|
end
|
@@ -5,7 +5,7 @@
|
|
5
5
|
# See LICENSE.txt for permissions.
|
6
6
|
#++
|
7
7
|
|
8
|
-
require_relative
|
8
|
+
require_relative "../rubygems"
|
9
9
|
|
10
10
|
##
|
11
11
|
# Mixin methods for --version and --platform Gem::Command options.
|
@@ -24,7 +24,7 @@ module Gem::VersionOption
|
|
24
24
|
end
|
25
25
|
end
|
26
26
|
|
27
|
-
add_option(
|
27
|
+
add_option("--platform PLATFORM", Gem::Platform,
|
28
28
|
"Specify the platform of gem to #{task}", *wrap) do
|
29
29
|
|value, options|
|
30
30
|
unless options[:added_platform]
|
@@ -55,7 +55,7 @@ module Gem::VersionOption
|
|
55
55
|
Gem::Requirement.new(*value.split(/\s*,\s*/))
|
56
56
|
end
|
57
57
|
|
58
|
-
add_option(
|
58
|
+
add_option("-v", "--version VERSION", Gem::Requirement,
|
59
59
|
"Specify version of gem to #{task}", *wrap) do
|
60
60
|
|value, options|
|
61
61
|
# Allow handling for multiple --version operators
|