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
data/lib/rubygems/security.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 "exceptions"
|
9
|
+
require_relative "openssl"
|
10
10
|
|
11
11
|
##
|
12
12
|
# = Signing gems
|
@@ -334,7 +334,7 @@ module Gem::Security
|
|
334
334
|
##
|
335
335
|
# Used internally to select the signing digest from all computed digests
|
336
336
|
|
337
|
-
DIGEST_NAME =
|
337
|
+
DIGEST_NAME = "SHA256" # :nodoc:
|
338
338
|
|
339
339
|
##
|
340
340
|
# Length of keys created by RSA and DSA keys
|
@@ -344,18 +344,18 @@ module Gem::Security
|
|
344
344
|
##
|
345
345
|
# Default algorithm to use when building a key pair
|
346
346
|
|
347
|
-
DEFAULT_KEY_ALGORITHM =
|
347
|
+
DEFAULT_KEY_ALGORITHM = "RSA"
|
348
348
|
|
349
349
|
##
|
350
350
|
# Named curve used for Elliptic Curve
|
351
351
|
|
352
|
-
EC_NAME =
|
352
|
+
EC_NAME = "secp384r1"
|
353
353
|
|
354
354
|
##
|
355
355
|
# Cipher used to encrypt the key pair used to sign gems.
|
356
356
|
# Must be in the list returned by OpenSSL::Cipher.ciphers
|
357
357
|
|
358
|
-
KEY_CIPHER = OpenSSL::Cipher.new(
|
358
|
+
KEY_CIPHER = OpenSSL::Cipher.new("AES-256-CBC") if defined?(OpenSSL::Cipher)
|
359
359
|
|
360
360
|
##
|
361
361
|
# One day in seconds
|
@@ -376,10 +376,10 @@ module Gem::Security
|
|
376
376
|
# * The certificate contains a subject key identifier
|
377
377
|
|
378
378
|
EXTENSIONS = {
|
379
|
-
|
380
|
-
|
381
|
-
|
382
|
-
|
379
|
+
"basicConstraints" => "CA:FALSE",
|
380
|
+
"keyUsage" =>
|
381
|
+
"keyEncipherment,dataEncipherment,digitalSignature",
|
382
|
+
"subjectKeyIdentifier" => "hash",
|
383
383
|
}.freeze
|
384
384
|
|
385
385
|
def self.alt_name_or_x509_entry(certificate, x509_entry)
|
@@ -473,7 +473,7 @@ module Gem::Security
|
|
473
473
|
OpenSSL::Digest.new(algorithm)
|
474
474
|
end
|
475
475
|
else
|
476
|
-
require
|
476
|
+
require "digest"
|
477
477
|
|
478
478
|
def self.create_digest(algorithm = DIGEST_NAME)
|
479
479
|
Digest.const_get(algorithm).new
|
@@ -487,11 +487,11 @@ module Gem::Security
|
|
487
487
|
def self.create_key(algorithm)
|
488
488
|
if defined?(OpenSSL::PKey)
|
489
489
|
case algorithm.downcase
|
490
|
-
when
|
490
|
+
when "dsa"
|
491
491
|
OpenSSL::PKey::DSA.new(RSA_DSA_KEY_LENGTH)
|
492
|
-
when
|
492
|
+
when "rsa"
|
493
493
|
OpenSSL::PKey::RSA.new(RSA_DSA_KEY_LENGTH)
|
494
|
-
when
|
494
|
+
when "ec"
|
495
495
|
if RUBY_VERSION >= "2.4.0"
|
496
496
|
OpenSSL::PKey::EC.generate(EC_NAME)
|
497
497
|
else
|
@@ -510,11 +510,11 @@ module Gem::Security
|
|
510
510
|
# Turns +email_address+ into an OpenSSL::X509::Name
|
511
511
|
|
512
512
|
def self.email_to_name(email_address)
|
513
|
-
email_address = email_address.gsub(/[^\w@.-]+/i,
|
513
|
+
email_address = email_address.gsub(/[^\w@.-]+/i, "_")
|
514
514
|
|
515
|
-
cn, dcs = email_address.split
|
515
|
+
cn, dcs = email_address.split "@"
|
516
516
|
|
517
|
-
dcs = dcs.split
|
517
|
+
dcs = dcs.split "."
|
518
518
|
|
519
519
|
OpenSSL::X509::Name.new([
|
520
520
|
["CN", cn],
|
@@ -571,17 +571,17 @@ module Gem::Security
|
|
571
571
|
signee_key = certificate.public_key
|
572
572
|
|
573
573
|
alt_name = certificate.extensions.find do |extension|
|
574
|
-
extension.oid ==
|
574
|
+
extension.oid == "subjectAltName"
|
575
575
|
end
|
576
576
|
|
577
|
-
extensions = extensions.merge
|
577
|
+
extensions = extensions.merge "subjectAltName" => alt_name.value if
|
578
578
|
alt_name
|
579
579
|
|
580
580
|
issuer_alt_name = signing_cert.extensions.find do |extension|
|
581
|
-
extension.oid ==
|
581
|
+
extension.oid == "subjectAltName"
|
582
582
|
end
|
583
583
|
|
584
|
-
extensions = extensions.merge
|
584
|
+
extensions = extensions.merge "issuerAltName" => issuer_alt_name.value if
|
585
585
|
issuer_alt_name
|
586
586
|
|
587
587
|
signed = create_cert signee_subject, signee_key, age, extensions, serial
|
@@ -597,7 +597,7 @@ module Gem::Security
|
|
597
597
|
def self.trust_dir
|
598
598
|
return @trust_dir if @trust_dir
|
599
599
|
|
600
|
-
dir = File.join Gem.user_home,
|
600
|
+
dir = File.join Gem.user_home, ".gem", "trust"
|
601
601
|
|
602
602
|
@trust_dir ||= Gem::Security::TrustDir.new dir
|
603
603
|
end
|
@@ -617,7 +617,7 @@ module Gem::Security
|
|
617
617
|
def self.write(pemmable, path, permissions = 0600, passphrase = nil, cipher = KEY_CIPHER)
|
618
618
|
path = File.expand_path path
|
619
619
|
|
620
|
-
File.open path,
|
620
|
+
File.open path, "wb", permissions do |io|
|
621
621
|
if passphrase and cipher
|
622
622
|
io.write pemmable.to_pem cipher, passphrase
|
623
623
|
else
|
@@ -633,9 +633,9 @@ module Gem::Security
|
|
633
633
|
end
|
634
634
|
|
635
635
|
if Gem::HAVE_OPENSSL
|
636
|
-
require_relative
|
637
|
-
require_relative
|
638
|
-
require_relative
|
636
|
+
require_relative "security/policy"
|
637
|
+
require_relative "security/policies"
|
638
|
+
require_relative "security/trust_dir"
|
639
639
|
end
|
640
640
|
|
641
|
-
require_relative
|
641
|
+
require_relative "security/signer"
|
@@ -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
|
# forward-declare
|
11
11
|
|
@@ -20,9 +20,9 @@ end
|
|
20
20
|
module Gem::SecurityOption
|
21
21
|
def add_security_option
|
22
22
|
Gem::OptionParser.accept Gem::Security::Policy do |value|
|
23
|
-
require_relative
|
23
|
+
require_relative "security"
|
24
24
|
|
25
|
-
raise Gem::OptionParser::InvalidArgument,
|
25
|
+
raise Gem::OptionParser::InvalidArgument, "OpenSSL not installed" unless
|
26
26
|
defined?(Gem::Security::HighSecurity)
|
27
27
|
|
28
28
|
policy = Gem::Security::Policies[value]
|
@@ -33,9 +33,9 @@ module Gem::SecurityOption
|
|
33
33
|
policy
|
34
34
|
end
|
35
35
|
|
36
|
-
add_option(:"Install/Update",
|
36
|
+
add_option(:"Install/Update", "-P", "--trust-policy POLICY",
|
37
37
|
Gem::Security::Policy,
|
38
|
-
|
38
|
+
"Specify gem trust policy") do |value, options|
|
39
39
|
options[:security_policy] = value
|
40
40
|
end
|
41
41
|
end
|
data/lib/rubygems/source/git.rb
CHANGED
@@ -58,7 +58,7 @@ class Gem::Source::Git < Gem::Source
|
|
58
58
|
|
59
59
|
@remote = true
|
60
60
|
@root_dir = Gem.dir
|
61
|
-
@git = ENV[
|
61
|
+
@git = ENV["git"] || "git"
|
62
62
|
end
|
63
63
|
|
64
64
|
def <=>(other)
|
@@ -92,18 +92,18 @@ class Gem::Source::Git < Gem::Source
|
|
92
92
|
return false unless File.exist? repo_cache_dir
|
93
93
|
|
94
94
|
unless File.exist? install_dir
|
95
|
-
system @git,
|
95
|
+
system @git, "clone", "--quiet", "--no-checkout",
|
96
96
|
repo_cache_dir, install_dir
|
97
97
|
end
|
98
98
|
|
99
99
|
Dir.chdir install_dir do
|
100
|
-
system @git,
|
100
|
+
system @git, "fetch", "--quiet", "--force", "--tags", install_dir
|
101
101
|
|
102
|
-
success = system @git,
|
102
|
+
success = system @git, "reset", "--quiet", "--hard", rev_parse
|
103
103
|
|
104
104
|
if @need_submodules
|
105
105
|
require "open3"
|
106
|
-
_, status = Open3.capture2e(@git,
|
106
|
+
_, status = Open3.capture2e(@git, "submodule", "update", "--quiet", "--init", "--recursive")
|
107
107
|
|
108
108
|
success &&= status.success?
|
109
109
|
end
|
@@ -120,11 +120,11 @@ class Gem::Source::Git < Gem::Source
|
|
120
120
|
|
121
121
|
if File.exist? repo_cache_dir
|
122
122
|
Dir.chdir repo_cache_dir do
|
123
|
-
system @git,
|
124
|
-
@repository,
|
123
|
+
system @git, "fetch", "--quiet", "--force", "--tags",
|
124
|
+
@repository, "refs/heads/*:refs/heads/*"
|
125
125
|
end
|
126
126
|
else
|
127
|
-
system @git,
|
127
|
+
system @git, "clone", "--quiet", "--bare", "--no-hardlinks",
|
128
128
|
@repository, repo_cache_dir
|
129
129
|
end
|
130
130
|
end
|
@@ -133,7 +133,7 @@ class Gem::Source::Git < Gem::Source
|
|
133
133
|
# Directory where git gems get unpacked and so-forth.
|
134
134
|
|
135
135
|
def base_dir # :nodoc:
|
136
|
-
File.join @root_dir,
|
136
|
+
File.join @root_dir, "bundler"
|
137
137
|
end
|
138
138
|
|
139
139
|
##
|
@@ -155,11 +155,11 @@ class Gem::Source::Git < Gem::Source
|
|
155
155
|
def install_dir # :nodoc:
|
156
156
|
return unless File.exist? repo_cache_dir
|
157
157
|
|
158
|
-
File.join base_dir,
|
158
|
+
File.join base_dir, "gems", "#{@name}-#{dir_shortref}"
|
159
159
|
end
|
160
160
|
|
161
161
|
def pretty_print(q) # :nodoc:
|
162
|
-
q.group 2,
|
162
|
+
q.group 2, "[Git: ", "]" do
|
163
163
|
q.breakable
|
164
164
|
q.text @repository
|
165
165
|
|
@@ -172,7 +172,7 @@ class Gem::Source::Git < Gem::Source
|
|
172
172
|
# The directory where the git gem's repository will be cached.
|
173
173
|
|
174
174
|
def repo_cache_dir # :nodoc:
|
175
|
-
File.join @root_dir,
|
175
|
+
File.join @root_dir, "cache", "bundler", "git", "#{@name}-#{uri_hash}"
|
176
176
|
end
|
177
177
|
|
178
178
|
##
|
@@ -182,7 +182,7 @@ class Gem::Source::Git < Gem::Source
|
|
182
182
|
hash = nil
|
183
183
|
|
184
184
|
Dir.chdir repo_cache_dir do
|
185
|
-
hash = Gem::Util.popen(@git,
|
185
|
+
hash = Gem::Util.popen(@git, "rev-parse", @reference).strip
|
186
186
|
end
|
187
187
|
|
188
188
|
raise Gem::Exception,
|
@@ -201,7 +201,7 @@ class Gem::Source::Git < Gem::Source
|
|
201
201
|
return [] unless install_dir
|
202
202
|
|
203
203
|
Dir.chdir install_dir do
|
204
|
-
Dir[
|
204
|
+
Dir["{,*,*/*}.gemspec"].map do |spec_file|
|
205
205
|
directory = File.dirname spec_file
|
206
206
|
file = File.basename spec_file
|
207
207
|
|
@@ -211,7 +211,7 @@ class Gem::Source::Git < Gem::Source
|
|
211
211
|
spec.base_dir = base_dir
|
212
212
|
|
213
213
|
spec.extension_dir =
|
214
|
-
File.join base_dir,
|
214
|
+
File.join base_dir, "extensions", Gem::Platform.local.to_s,
|
215
215
|
Gem.extension_api_version, "#{name}-#{dir_shortref}"
|
216
216
|
|
217
217
|
spec.full_gem_path = File.dirname spec.loaded_from if spec
|
@@ -226,11 +226,11 @@ class Gem::Source::Git < Gem::Source
|
|
226
226
|
# A hash for the git gem based on the git repository URI.
|
227
227
|
|
228
228
|
def uri_hash # :nodoc:
|
229
|
-
require_relative
|
229
|
+
require_relative "../openssl"
|
230
230
|
|
231
231
|
normalized =
|
232
232
|
if @repository =~ %r{^\w+://(\w+@)?}
|
233
|
-
uri = URI(@repository).normalize.to_s.sub %r{/$},
|
233
|
+
uri = URI(@repository).normalize.to_s.sub %r{/$},""
|
234
234
|
uri.sub(/\A(\w+)/) { $1.downcase }
|
235
235
|
else
|
236
236
|
@repository
|
@@ -29,7 +29,7 @@ class Gem::Source::Local < Gem::Source
|
|
29
29
|
end
|
30
30
|
|
31
31
|
def inspect # :nodoc:
|
32
|
-
keys = @specs ? @specs.keys.sort :
|
32
|
+
keys = @specs ? @specs.keys.sort : "NOT LOADED"
|
33
33
|
"#<%s specs: %p>" % [self.class, keys]
|
34
34
|
end
|
35
35
|
|
@@ -121,7 +121,7 @@ class Gem::Source::Local < Gem::Source
|
|
121
121
|
end
|
122
122
|
|
123
123
|
def pretty_print(q) # :nodoc:
|
124
|
-
q.group 2,
|
124
|
+
q.group 2, "[Local gems:", "]" do
|
125
125
|
q.breakable
|
126
126
|
q.seplist @specs.keys do |v|
|
127
127
|
q.text v.full_name
|
data/lib/rubygems/source.rb
CHANGED
@@ -12,9 +12,9 @@ class Gem::Source
|
|
12
12
|
include Gem::Text
|
13
13
|
|
14
14
|
FILES = { # :nodoc:
|
15
|
-
:released =>
|
16
|
-
:latest =>
|
17
|
-
:prerelease =>
|
15
|
+
:released => "specs",
|
16
|
+
:latest => "latest_specs",
|
17
|
+
:prerelease => "prerelease_specs",
|
18
18
|
}.freeze
|
19
19
|
|
20
20
|
##
|
@@ -71,7 +71,7 @@ class Gem::Source
|
|
71
71
|
# Returns a Set that can fetch specifications from this source.
|
72
72
|
|
73
73
|
def dependency_resolver_set # :nodoc:
|
74
|
-
return Gem::Resolver::IndexSet.new self if
|
74
|
+
return Gem::Resolver::IndexSet.new self if "file" == uri.scheme
|
75
75
|
|
76
76
|
fetch_uri = if uri.host == "rubygems.org"
|
77
77
|
index_uri = uri.dup
|
@@ -141,7 +141,7 @@ class Gem::Source
|
|
141
141
|
return spec if spec
|
142
142
|
end
|
143
143
|
|
144
|
-
source_uri.path <<
|
144
|
+
source_uri.path << ".rz"
|
145
145
|
|
146
146
|
spec = fetcher.fetch_path source_uri
|
147
147
|
spec = Gem::Util.inflate spec
|
@@ -150,7 +150,7 @@ class Gem::Source
|
|
150
150
|
require "fileutils"
|
151
151
|
FileUtils.mkdir_p cache_dir
|
152
152
|
|
153
|
-
File.open local_spec,
|
153
|
+
File.open local_spec, "wb" do |io|
|
154
154
|
io.write spec
|
155
155
|
end
|
156
156
|
end
|
@@ -209,13 +209,13 @@ class Gem::Source
|
|
209
209
|
end
|
210
210
|
|
211
211
|
def pretty_print(q) # :nodoc:
|
212
|
-
q.group 2,
|
212
|
+
q.group 2, "[Remote:", "]" do
|
213
213
|
q.breakable
|
214
214
|
q.text @uri.to_s
|
215
215
|
|
216
216
|
if api = uri
|
217
217
|
q.breakable
|
218
|
-
q.text
|
218
|
+
q.text "API URI: "
|
219
219
|
q.text api.to_s
|
220
220
|
end
|
221
221
|
end
|
@@ -229,13 +229,13 @@ class Gem::Source
|
|
229
229
|
private
|
230
230
|
|
231
231
|
def enforce_trailing_slash(uri)
|
232
|
-
uri.merge(uri.path.gsub(/\/+$/,
|
232
|
+
uri.merge(uri.path.gsub(/\/+$/, "") + "/")
|
233
233
|
end
|
234
234
|
end
|
235
235
|
|
236
|
-
require_relative
|
237
|
-
require_relative
|
238
|
-
require_relative
|
239
|
-
require_relative
|
240
|
-
require_relative
|
241
|
-
require_relative
|
236
|
+
require_relative "source/git"
|
237
|
+
require_relative "source/installed"
|
238
|
+
require_relative "source/specific_file"
|
239
|
+
require_relative "source/local"
|
240
|
+
require_relative "source/lock"
|
241
|
+
require_relative "source/vendor"
|
@@ -1,9 +1,9 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
-
require_relative
|
3
|
-
require_relative
|
4
|
-
require_relative
|
5
|
-
require_relative
|
6
|
-
require_relative
|
2
|
+
require_relative "remote_fetcher"
|
3
|
+
require_relative "user_interaction"
|
4
|
+
require_relative "errors"
|
5
|
+
require_relative "text"
|
6
|
+
require_relative "name_tuple"
|
7
7
|
|
8
8
|
##
|
9
9
|
# SpecFetcher handles metadata updates from remote gem repositories.
|
@@ -171,19 +171,19 @@ class Gem::SpecFetcher
|
|
171
171
|
# alternative gem names.
|
172
172
|
|
173
173
|
def suggest_gems_from_name(gem_name, type = :latest, num_results = 5)
|
174
|
-
gem_name = gem_name.downcase.tr(
|
174
|
+
gem_name = gem_name.downcase.tr("_-", "")
|
175
175
|
max = gem_name.size / 2
|
176
176
|
names = available_specs(type).first.values.flatten(1)
|
177
177
|
|
178
178
|
matches = names.map do |n|
|
179
179
|
next unless n.match_platform?
|
180
|
-
[n.name, 0] if n.name.downcase.tr(
|
180
|
+
[n.name, 0] if n.name.downcase.tr("_-", "").include?(gem_name)
|
181
181
|
end.compact
|
182
182
|
|
183
183
|
if matches.length < num_results
|
184
184
|
matches += names.map do |n|
|
185
185
|
next unless n.match_platform?
|
186
|
-
distance = levenshtein_distance gem_name, n.name.downcase.tr(
|
186
|
+
distance = levenshtein_distance gem_name, n.name.downcase.tr("_-", "")
|
187
187
|
next if distance >= max
|
188
188
|
return [n.name] if distance == 0
|
189
189
|
[n.name, distance]
|
@@ -6,12 +6,11 @@
|
|
6
6
|
# See LICENSE.txt for permissions.
|
7
7
|
#++
|
8
8
|
|
9
|
-
require_relative
|
10
|
-
require_relative
|
11
|
-
require_relative
|
12
|
-
require_relative
|
13
|
-
require_relative
|
14
|
-
require_relative 'util/list'
|
9
|
+
require_relative "deprecate"
|
10
|
+
require_relative "basic_specification"
|
11
|
+
require_relative "stub_specification"
|
12
|
+
require_relative "platform"
|
13
|
+
require_relative "util/list"
|
15
14
|
|
16
15
|
##
|
17
16
|
# The Specification class contains the information for a gem. Typically
|
@@ -75,20 +74,20 @@ class Gem::Specification < Gem::BasicSpecification
|
|
75
74
|
# key should be equal to the CURRENT_SPECIFICATION_VERSION.
|
76
75
|
|
77
76
|
SPECIFICATION_VERSION_HISTORY = { # :nodoc:
|
78
|
-
-1 => [
|
77
|
+
-1 => ["(RubyGems versions up to and including 0.7 did not have versioned specifications)"],
|
79
78
|
1 => [
|
80
79
|
'Deprecated "test_suite_file" in favor of the new, but equivalent, "test_files"',
|
81
80
|
'"test_file=x" is a shortcut for "test_files=[x]"',
|
82
81
|
],
|
83
82
|
2 => [
|
84
83
|
'Added "required_rubygems_version"',
|
85
|
-
|
84
|
+
"Now forward-compatible with future versions",
|
86
85
|
],
|
87
86
|
3 => [
|
88
|
-
|
87
|
+
"Added Fixnum validation to the specification_version",
|
89
88
|
],
|
90
89
|
4 => [
|
91
|
-
|
90
|
+
"Added sandboxed freeform metadata to the specification version.",
|
92
91
|
],
|
93
92
|
}.freeze
|
94
93
|
|
@@ -127,7 +126,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
127
126
|
@@default_value = {
|
128
127
|
:authors => [],
|
129
128
|
:autorequire => nil,
|
130
|
-
:bindir =>
|
129
|
+
:bindir => "bin",
|
131
130
|
:cert_chain => [],
|
132
131
|
:date => nil,
|
133
132
|
:dependencies => [],
|
@@ -144,7 +143,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
144
143
|
:platform => Gem::Platform::RUBY,
|
145
144
|
:post_install_message => nil,
|
146
145
|
:rdoc_options => [],
|
147
|
-
:require_paths => [
|
146
|
+
:require_paths => ["lib"],
|
148
147
|
:required_ruby_version => Gem::Requirement.default,
|
149
148
|
:required_rubygems_version => Gem::Requirement.default,
|
150
149
|
:requirements => [],
|
@@ -490,12 +489,12 @@ class Gem::Specification < Gem::BasicSpecification
|
|
490
489
|
# legacy constants
|
491
490
|
when nil, Gem::Platform::RUBY then
|
492
491
|
@new_platform = Gem::Platform::RUBY
|
493
|
-
when
|
494
|
-
@new_platform = Gem::Platform.new
|
495
|
-
when
|
496
|
-
@new_platform = Gem::Platform.new
|
497
|
-
when
|
498
|
-
@new_platform = Gem::Platform.new
|
492
|
+
when "mswin32" then # was Gem::Platform::WIN32
|
493
|
+
@new_platform = Gem::Platform.new "x86-mswin32"
|
494
|
+
when "i586-linux" then # was Gem::Platform::LINUX_586
|
495
|
+
@new_platform = Gem::Platform.new "x86-linux"
|
496
|
+
when "powerpc-darwin" then # was Gem::Platform::DARWIN
|
497
|
+
@new_platform = Gem::Platform.new "ppc-darwin"
|
499
498
|
else
|
500
499
|
@new_platform = Gem::Platform.new platform
|
501
500
|
end
|
@@ -1150,7 +1149,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1150
1149
|
file = file.dup.tap(&Gem::UNTAINT)
|
1151
1150
|
return unless File.file?(file)
|
1152
1151
|
|
1153
|
-
code = Gem.open_file(file,
|
1152
|
+
code = Gem.open_file(file, "r:UTF-8:-", &:read)
|
1154
1153
|
|
1155
1154
|
code.tap(&Gem::UNTAINT)
|
1156
1155
|
|
@@ -1392,7 +1391,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1392
1391
|
@required_rubygems_version,
|
1393
1392
|
@original_platform,
|
1394
1393
|
@dependencies,
|
1395
|
-
|
1394
|
+
"", # rubyforge_project
|
1396
1395
|
@email,
|
1397
1396
|
@authors,
|
1398
1397
|
@description,
|
@@ -1610,7 +1609,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1610
1609
|
return if default_gem?
|
1611
1610
|
return if File.exist? gem_build_complete_path
|
1612
1611
|
return if !File.writable?(base_dir)
|
1613
|
-
return if !File.exist?(File.join(base_dir,
|
1612
|
+
return if !File.exist?(File.join(base_dir, "extensions"))
|
1614
1613
|
|
1615
1614
|
begin
|
1616
1615
|
# We need to require things in $LOAD_PATH without looking for the
|
@@ -1618,9 +1617,9 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1618
1617
|
unresolved_deps = Gem::Specification.unresolved_deps.dup
|
1619
1618
|
Gem::Specification.unresolved_deps.clear
|
1620
1619
|
|
1621
|
-
require_relative
|
1622
|
-
require_relative
|
1623
|
-
require_relative
|
1620
|
+
require_relative "config_file"
|
1621
|
+
require_relative "ext"
|
1622
|
+
require_relative "user_interaction"
|
1624
1623
|
|
1625
1624
|
ui = Gem::SilentUI.new
|
1626
1625
|
Gem::DefaultUserInteraction.use_ui ui do
|
@@ -1839,7 +1838,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1839
1838
|
# spec.doc_dir 'ri' # => "/path/to/gem_repo/doc/a-1/ri"
|
1840
1839
|
|
1841
1840
|
def doc_dir(type = nil)
|
1842
|
-
@doc_dir ||= File.join base_dir,
|
1841
|
+
@doc_dir ||= File.join base_dir, "doc", full_name
|
1843
1842
|
|
1844
1843
|
if type
|
1845
1844
|
File.join @doc_dir, type
|
@@ -1851,17 +1850,17 @@ class Gem::Specification < Gem::BasicSpecification
|
|
1851
1850
|
def encode_with(coder) # :nodoc:
|
1852
1851
|
mark_version
|
1853
1852
|
|
1854
|
-
coder.add
|
1855
|
-
coder.add
|
1853
|
+
coder.add "name", @name
|
1854
|
+
coder.add "version", @version
|
1856
1855
|
platform = case @original_platform
|
1857
|
-
when nil,
|
1858
|
-
|
1856
|
+
when nil, "" then
|
1857
|
+
"ruby"
|
1859
1858
|
when String then
|
1860
1859
|
@original_platform
|
1861
1860
|
else
|
1862
1861
|
@original_platform.to_s
|
1863
1862
|
end
|
1864
|
-
coder.add
|
1863
|
+
coder.add "platform", platform
|
1865
1864
|
|
1866
1865
|
attributes = @@attributes.map(&:to_s) - %w[name version platform]
|
1867
1866
|
attributes.each do |name|
|
@@ -2231,7 +2230,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
2231
2230
|
end
|
2232
2231
|
|
2233
2232
|
def pretty_print(q) # :nodoc:
|
2234
|
-
q.group 2,
|
2233
|
+
q.group 2, "Gem::Specification.new do |s|", "end" do
|
2235
2234
|
q.breakable
|
2236
2235
|
|
2237
2236
|
attributes = @@attributes - [:name, :version]
|
@@ -2326,7 +2325,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
2326
2325
|
# Returns the full path to this spec's ri directory.
|
2327
2326
|
|
2328
2327
|
def ri_dir
|
2329
|
-
@ri_dir ||= File.join base_dir,
|
2328
|
+
@ri_dir ||= File.join base_dir, "ri", full_name
|
2330
2329
|
end
|
2331
2330
|
|
2332
2331
|
##
|
@@ -2336,13 +2335,13 @@ class Gem::Specification < Gem::BasicSpecification
|
|
2336
2335
|
def ruby_code(obj)
|
2337
2336
|
case obj
|
2338
2337
|
when String then obj.dump + ".freeze"
|
2339
|
-
when Array then
|
2338
|
+
when Array then "[" + obj.map {|x| ruby_code x }.join(", ") + "]"
|
2340
2339
|
when Hash then
|
2341
2340
|
seg = obj.keys.sort.map {|k| "#{k.to_s.dump} => #{obj[k].to_s.dump}" }
|
2342
2341
|
"{ #{seg.join(', ')} }"
|
2343
2342
|
when Gem::Version then obj.to_s.dump
|
2344
|
-
when DateLike then obj.strftime(
|
2345
|
-
when Time then obj.strftime(
|
2343
|
+
when DateLike then obj.strftime("%Y-%m-%d").dump
|
2344
|
+
when Time then obj.strftime("%Y-%m-%d").dump
|
2346
2345
|
when Numeric then obj.inspect
|
2347
2346
|
when true, false, nil then obj.inspect
|
2348
2347
|
when Gem::Platform then "Gem::Platform.new(#{obj.to_a.inspect})"
|
@@ -2575,14 +2574,14 @@ class Gem::Specification < Gem::BasicSpecification
|
|
2575
2574
|
# back, we have to check again here to make sure that our
|
2576
2575
|
# psych code was properly loaded, and load it if not.
|
2577
2576
|
unless Gem.const_defined?(:NoAliasYAMLTree)
|
2578
|
-
require_relative
|
2577
|
+
require_relative "psych_tree"
|
2579
2578
|
end
|
2580
2579
|
|
2581
2580
|
builder = Gem::NoAliasYAMLTree.create
|
2582
2581
|
builder << self
|
2583
2582
|
ast = builder.tree
|
2584
2583
|
|
2585
|
-
require
|
2584
|
+
require "stringio"
|
2586
2585
|
io = StringIO.new
|
2587
2586
|
io.set_encoding Encoding::UTF_8
|
2588
2587
|
|
@@ -2669,7 +2668,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
2669
2668
|
# skip to set required_ruby_version when pre-released rubygems.
|
2670
2669
|
# It caused to raise CircularDependencyError
|
2671
2670
|
if @version.prerelease? && (@name.nil? || @name.strip != "rubygems")
|
2672
|
-
self.required_rubygems_version =
|
2671
|
+
self.required_rubygems_version = "> 1.3.1"
|
2673
2672
|
end
|
2674
2673
|
invalidate_memoized_attributes
|
2675
2674
|
|