rubygems-update 3.3.7 → 3.4.8
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +1419 -1036
- data/CONTRIBUTING.md +30 -7
- data/Manifest.txt +63 -31
- data/POLICIES.md +53 -18
- data/README.md +3 -6
- data/bin/gem +2 -5
- data/bin/update_rubygems +5 -5
- data/bundler/CHANGELOG.md +457 -1
- data/bundler/README.md +3 -6
- data/bundler/UPGRADING.md +11 -4
- data/bundler/bundler.gemspec +8 -10
- data/bundler/exe/bundle +2 -5
- data/bundler/exe/bundler +1 -1
- data/bundler/lib/bundler/build_metadata.rb +3 -3
- data/bundler/lib/bundler/cli/add.rb +1 -1
- data/bundler/lib/bundler/cli/binstubs.rb +5 -1
- data/bundler/lib/bundler/cli/check.rb +1 -1
- data/bundler/lib/bundler/cli/common.rb +4 -2
- data/bundler/lib/bundler/cli/console.rb +2 -2
- data/bundler/lib/bundler/cli/doctor.rb +4 -6
- data/bundler/lib/bundler/cli/gem.rb +62 -40
- data/bundler/lib/bundler/cli/info.rb +1 -1
- data/bundler/lib/bundler/cli/init.rb +6 -2
- data/bundler/lib/bundler/cli/install.rb +7 -5
- data/bundler/lib/bundler/cli/lock.rb +8 -5
- data/bundler/lib/bundler/cli/open.rb +6 -4
- data/bundler/lib/bundler/cli/outdated.rb +13 -6
- data/bundler/lib/bundler/cli/platform.rb +1 -1
- data/bundler/lib/bundler/cli/show.rb +1 -1
- data/bundler/lib/bundler/cli/viz.rb +1 -1
- data/bundler/lib/bundler/cli.rb +55 -10
- data/bundler/lib/bundler/compact_index_client/cache.rb +1 -1
- data/bundler/lib/bundler/compact_index_client/updater.rb +53 -39
- data/bundler/lib/bundler/constants.rb +1 -1
- data/bundler/lib/bundler/current_ruby.rb +18 -6
- data/bundler/lib/bundler/definition.rb +206 -129
- data/bundler/lib/bundler/dependency.rb +21 -66
- data/bundler/lib/bundler/digest.rb +1 -1
- data/bundler/lib/bundler/dsl.rb +13 -18
- data/bundler/lib/bundler/endpoint_specification.rb +6 -10
- data/bundler/lib/bundler/env.rb +1 -1
- data/bundler/lib/bundler/environment_preserver.rb +3 -2
- data/bundler/lib/bundler/errors.rb +15 -15
- data/bundler/lib/bundler/feature_flag.rb +0 -1
- data/bundler/lib/bundler/fetcher/base.rb +6 -8
- data/bundler/lib/bundler/fetcher/compact_index.rb +9 -11
- data/bundler/lib/bundler/fetcher/dependency.rb +1 -1
- data/bundler/lib/bundler/fetcher/downloader.rb +2 -5
- data/bundler/lib/bundler/fetcher.rb +15 -14
- data/bundler/lib/bundler/force_platform.rb +18 -0
- data/bundler/lib/bundler/friendly_errors.rb +21 -7
- data/bundler/lib/bundler/gem_helpers.rb +9 -2
- data/bundler/lib/bundler/gem_version_promoter.rb +53 -98
- data/bundler/lib/bundler/graph.rb +3 -3
- data/bundler/lib/bundler/index.rb +13 -51
- data/bundler/lib/bundler/injector.rb +9 -4
- data/bundler/lib/bundler/inline.rb +9 -21
- data/bundler/lib/bundler/installer/gem_installer.rb +14 -1
- data/bundler/lib/bundler/installer/parallel_installer.rb +3 -33
- data/bundler/lib/bundler/installer/standalone.rb +42 -11
- data/bundler/lib/bundler/installer.rb +20 -41
- data/bundler/lib/bundler/lazy_specification.rb +53 -48
- data/bundler/lib/bundler/lockfile_generator.rb +2 -2
- data/bundler/lib/bundler/lockfile_parser.rb +18 -14
- data/bundler/lib/bundler/man/bundle-add.1 +13 -5
- data/bundler/lib/bundler/man/bundle-add.1.ronn +10 -4
- data/bundler/lib/bundler/man/bundle-binstubs.1 +1 -1
- data/bundler/lib/bundler/man/bundle-cache.1 +7 -1
- data/bundler/lib/bundler/man/bundle-cache.1.ronn +7 -0
- data/bundler/lib/bundler/man/bundle-check.1 +1 -1
- data/bundler/lib/bundler/man/bundle-clean.1 +2 -2
- data/bundler/lib/bundler/man/bundle-clean.1.ronn +1 -1
- data/bundler/lib/bundler/man/bundle-config.1 +30 -11
- data/bundler/lib/bundler/man/bundle-config.1.ronn +26 -14
- data/bundler/lib/bundler/man/bundle-console.1 +53 -0
- data/bundler/lib/bundler/man/bundle-console.1.ronn +44 -0
- data/bundler/lib/bundler/man/bundle-doctor.1 +1 -1
- data/bundler/lib/bundler/man/bundle-exec.1 +6 -6
- data/bundler/lib/bundler/man/bundle-exec.1.ronn +6 -6
- data/bundler/lib/bundler/man/bundle-gem.1 +27 -37
- data/bundler/lib/bundler/man/bundle-gem.1.ronn +5 -5
- data/bundler/lib/bundler/man/bundle-help.1 +13 -0
- data/bundler/lib/bundler/man/bundle-help.1.ronn +12 -0
- data/bundler/lib/bundler/man/bundle-info.1 +1 -1
- data/bundler/lib/bundler/man/bundle-init.1 +5 -1
- data/bundler/lib/bundler/man/bundle-init.1.ronn +2 -0
- 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 +5 -30
- data/bundler/lib/bundler/man/bundle-install.1.ronn +6 -29
- 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 +22 -2
- data/bundler/lib/bundler/man/bundle-open.1.ronn +9 -1
- data/bundler/lib/bundler/man/bundle-outdated.1 +3 -10
- data/bundler/lib/bundler/man/bundle-outdated.1.ronn +1 -10
- data/bundler/lib/bundler/man/bundle-platform.1 +16 -6
- data/bundler/lib/bundler/man/bundle-platform.1.ronn +14 -7
- data/bundler/lib/bundler/man/bundle-plugin.1 +81 -0
- data/bundler/lib/bundler/man/bundle-plugin.1.ronn +59 -0
- 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-version.1 +35 -0
- data/bundler/lib/bundler/man/bundle-version.1.ronn +24 -0
- 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 +15 -10
- data/bundler/lib/bundler/man/bundle.1.ronn +12 -7
- data/bundler/lib/bundler/man/gemfile.5 +92 -81
- data/bundler/lib/bundler/man/gemfile.5.ronn +98 -85
- data/bundler/lib/bundler/man/index.txt +4 -0
- data/bundler/lib/bundler/match_metadata.rb +13 -0
- data/bundler/lib/bundler/match_platform.rb +0 -1
- data/bundler/lib/bundler/match_remote_metadata.rb +29 -0
- data/bundler/lib/bundler/mirror.rb +5 -7
- data/bundler/lib/bundler/plugin/api/source.rb +3 -9
- data/bundler/lib/bundler/plugin/index.rb +4 -4
- data/bundler/lib/bundler/plugin/installer/git.rb +0 -4
- data/bundler/lib/bundler/plugin/installer/rubygems.rb +0 -8
- data/bundler/lib/bundler/plugin.rb +3 -1
- data/bundler/lib/bundler/process_lock.rb +1 -1
- data/bundler/lib/bundler/remote_specification.rb +8 -9
- data/bundler/lib/bundler/resolver/base.rb +77 -0
- data/bundler/lib/bundler/resolver/candidate.rb +94 -0
- data/bundler/lib/bundler/resolver/incompatibility.rb +15 -0
- data/bundler/lib/bundler/resolver/package.rb +72 -0
- data/bundler/lib/bundler/resolver/root.rb +25 -0
- data/bundler/lib/bundler/resolver/spec_group.rb +42 -70
- data/bundler/lib/bundler/resolver.rb +328 -299
- data/bundler/lib/bundler/ruby_dsl.rb +1 -1
- data/bundler/lib/bundler/ruby_version.rb +5 -18
- data/bundler/lib/bundler/rubygems_ext.rb +131 -17
- data/bundler/lib/bundler/rubygems_gem_installer.rb +32 -20
- data/bundler/lib/bundler/rubygems_integration.rb +13 -35
- data/bundler/lib/bundler/runtime.rb +1 -6
- data/bundler/lib/bundler/settings.rb +2 -8
- data/bundler/lib/bundler/setup.rb +4 -1
- data/bundler/lib/bundler/shared_helpers.rb +12 -12
- data/bundler/lib/bundler/source/git/git_proxy.rb +209 -69
- data/bundler/lib/bundler/source/git.rb +22 -25
- data/bundler/lib/bundler/source/metadata.rb +2 -3
- data/bundler/lib/bundler/source/path/installer.rb +1 -22
- data/bundler/lib/bundler/source/path.rb +7 -7
- data/bundler/lib/bundler/source/rubygems.rb +75 -117
- data/bundler/lib/bundler/source.rb +3 -4
- data/bundler/lib/bundler/source_list.rb +12 -2
- data/bundler/lib/bundler/source_map.rb +15 -2
- data/bundler/lib/bundler/spec_set.rb +58 -34
- data/bundler/lib/bundler/stub_specification.rb +5 -3
- data/bundler/lib/bundler/templates/Executable +3 -5
- data/bundler/lib/bundler/templates/Executable.bundler +6 -11
- data/bundler/lib/bundler/templates/Executable.standalone +4 -4
- data/bundler/lib/bundler/templates/newgem/Cargo.toml.tt +7 -0
- data/bundler/lib/bundler/templates/newgem/Gemfile.tt +3 -0
- data/bundler/lib/bundler/templates/newgem/README.md.tt +7 -11
- data/bundler/lib/bundler/templates/newgem/Rakefile.tt +2 -1
- data/bundler/lib/bundler/templates/newgem/circleci/config.yml.tt +12 -0
- data/bundler/lib/bundler/templates/newgem/ext/newgem/Cargo.toml.tt +15 -0
- data/bundler/lib/bundler/templates/newgem/ext/newgem/extconf-rust.rb.tt +6 -0
- data/bundler/lib/bundler/templates/newgem/ext/newgem/src/lib.rs.tt +12 -0
- data/bundler/lib/bundler/templates/newgem/github/workflows/main.yml.tt +11 -1
- data/bundler/lib/bundler/templates/newgem/gitignore.tt +3 -0
- data/bundler/lib/bundler/templates/newgem/gitlab-ci.yml.tt +13 -4
- data/bundler/lib/bundler/templates/newgem/newgem.gemspec.tt +9 -3
- data/bundler/lib/bundler/ui/shell.rb +35 -12
- data/bundler/lib/bundler/ui/silent.rb +21 -5
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb +3 -3
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/wrapper.rb +0 -1
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool.rb +3 -1
- data/bundler/lib/bundler/vendor/fileutils/lib/fileutils.rb +1350 -408
- data/bundler/lib/bundler/vendor/net-http-persistent/README.rdoc +1 -1
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +1 -1
- data/bundler/lib/bundler/vendor/pub_grub/LICENSE.txt +21 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/assignment.rb +20 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/basic_package_source.rb +189 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/failure_writer.rb +182 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/incompatibility.rb +155 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/package.rb +43 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/partial_solution.rb +121 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/rubygems.rb +45 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/solve_failure.rb +19 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/static_package_source.rb +60 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/term.rb +105 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version.rb +3 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_constraint.rb +129 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_range.rb +411 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_solver.rb +243 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_union.rb +178 -0
- data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub.rb +31 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell/basic.rb +1 -1
- data/bundler/lib/bundler/vendor/tsort/lib/tsort.rb +318 -319
- data/bundler/lib/bundler/vendor/uri/lib/uri/common.rb +64 -16
- data/bundler/lib/bundler/vendor/uri/lib/uri/file.rb +7 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/ftp.rb +2 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/generic.rb +27 -7
- data/bundler/lib/bundler/vendor/uri/lib/uri/http.rb +40 -2
- data/bundler/lib/bundler/vendor/uri/lib/uri/https.rb +2 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/ldap.rb +1 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/ldaps.rb +2 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/mailto.rb +2 -2
- data/bundler/lib/bundler/vendor/uri/lib/uri/rfc2396_parser.rb +13 -7
- data/bundler/lib/bundler/vendor/uri/lib/uri/rfc3986_parser.rb +10 -5
- data/bundler/lib/bundler/vendor/uri/lib/uri/version.rb +1 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/ws.rb +1 -2
- data/bundler/lib/bundler/vendor/uri/lib/uri/wss.rb +2 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri.rb +3 -2
- data/bundler/lib/bundler/vendored_persistent.rb +1 -33
- data/bundler/lib/bundler/{vendored_tmpdir.rb → vendored_pub_grub.rb} +1 -1
- data/bundler/lib/bundler/version.rb +5 -1
- data/bundler/lib/bundler/worker.rb +5 -7
- data/bundler/lib/bundler.rb +39 -73
- data/lib/rubygems/available_set.rb +3 -3
- data/lib/rubygems/basic_specification.rb +4 -4
- data/lib/rubygems/bundler_version_finder.rb +1 -1
- data/lib/rubygems/command.rb +40 -32
- data/lib/rubygems/command_manager.rb +33 -14
- data/lib/rubygems/commands/build_command.rb +11 -8
- data/lib/rubygems/commands/cert_command.rb +33 -33
- data/lib/rubygems/commands/check_command.rb +20 -20
- data/lib/rubygems/commands/cleanup_command.rb +17 -17
- data/lib/rubygems/commands/contents_command.rb +13 -13
- data/lib/rubygems/commands/dependency_command.rb +16 -16
- data/lib/rubygems/commands/environment_command.rb +10 -7
- data/lib/rubygems/commands/exec_command.rb +248 -0
- data/lib/rubygems/commands/fetch_command.rb +9 -9
- data/lib/rubygems/commands/generate_index_command.rb +17 -17
- data/lib/rubygems/commands/help_command.rb +6 -6
- data/lib/rubygems/commands/info_command.rb +3 -3
- data/lib/rubygems/commands/install_command.rb +28 -24
- 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 +17 -12
- data/lib/rubygems/commands/pristine_command.rb +37 -37
- 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 +20 -19
- 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 +99 -108
- 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 +22 -22
- data/lib/rubygems/commands/specification_command.rb +14 -14
- data/lib/rubygems/commands/stale_command.rb +2 -2
- data/lib/rubygems/commands/uninstall_command.rb +40 -40
- data/lib/rubygems/commands/unpack_command.rb +13 -13
- data/lib/rubygems/commands/update_command.rb +49 -68
- data/lib/rubygems/commands/which_command.rb +7 -7
- data/lib/rubygems/commands/yank_command.rb +11 -11
- data/lib/rubygems/compatibility.rb +4 -2
- data/lib/rubygems/config_file.rb +54 -21
- data/lib/rubygems/core_ext/kernel_gem.rb +1 -6
- data/lib/rubygems/core_ext/kernel_require.rb +117 -114
- data/lib/rubygems/core_ext/kernel_warn.rb +33 -37
- data/lib/rubygems/core_ext/tcpsocket_init.rb +1 -1
- data/lib/rubygems/defaults.rb +32 -18
- data/lib/rubygems/dependency.rb +14 -11
- data/lib/rubygems/dependency_installer.rb +37 -37
- data/lib/rubygems/dependency_list.rb +6 -6
- data/lib/rubygems/deprecate.rb +2 -2
- data/lib/rubygems/doctor.rb +18 -18
- data/lib/rubygems/errors.rb +3 -3
- data/lib/rubygems/exceptions.rb +6 -8
- data/lib/rubygems/ext/build_error.rb +1 -1
- data/lib/rubygems/ext/builder.rb +27 -18
- data/lib/rubygems/ext/cargo_builder/link_flag_converter.rb +27 -0
- data/lib/rubygems/ext/cargo_builder.rb +360 -0
- 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 +36 -59
- data/lib/rubygems/ext/rake_builder.rb +3 -3
- data/lib/rubygems/ext.rb +7 -6
- data/lib/rubygems/gem_runner.rb +8 -12
- data/lib/rubygems/gemcutter_utilities.rb +60 -21
- data/lib/rubygems/indexer.rb +30 -28
- 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 +40 -50
- data/lib/rubygems/installer_uninstaller_utils.rb +2 -2
- data/lib/rubygems/local_remote_options.rb +19 -21
- data/lib/rubygems/mock_gem_ui.rb +2 -2
- data/lib/rubygems/name_tuple.rb +4 -4
- data/lib/rubygems/optparse/lib/optparse/ac.rb +1 -1
- data/lib/rubygems/optparse/lib/optparse/date.rb +1 -1
- data/lib/rubygems/optparse/lib/optparse/kwargs.rb +1 -1
- data/lib/rubygems/optparse/lib/optparse/shellwords.rb +1 -1
- data/lib/rubygems/optparse/lib/optparse/time.rb +1 -1
- data/lib/rubygems/optparse/lib/optparse/uri.rb +1 -1
- data/lib/rubygems/optparse/lib/optparse.rb +95 -17
- 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 +61 -61
- data/lib/rubygems/package/tar_reader/entry.rb +90 -9
- data/lib/rubygems/package/tar_reader.rb +1 -29
- data/lib/rubygems/package/tar_writer.rb +7 -7
- data/lib/rubygems/package.rb +66 -49
- data/lib/rubygems/package_task.rb +4 -4
- data/lib/rubygems/platform.rb +80 -51
- data/lib/rubygems/psych_tree.rb +1 -1
- data/lib/rubygems/query_utils.rb +36 -36
- data/lib/rubygems/rdoc.rb +2 -2
- data/lib/rubygems/remote_fetcher.rb +22 -22
- data/lib/rubygems/request/connection_pools.rb +4 -4
- data/lib/rubygems/request/http_pool.rb +1 -1
- data/lib/rubygems/request.rb +24 -24
- data/lib/rubygems/request_set/gem_dependency_api.rb +122 -123
- data/lib/rubygems/request_set/lockfile/parser.rb +26 -26
- data/lib/rubygems/request_set/lockfile/tokenizer.rb +4 -4
- data/lib/rubygems/request_set/lockfile.rb +5 -5
- data/lib/rubygems/request_set.rb +17 -17
- data/lib/rubygems/requirement.rb +14 -14
- 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 +6 -6
- data/lib/rubygems/resolver/best_set.rb +5 -5
- data/lib/rubygems/resolver/conflict.rb +10 -10
- 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 +6 -6
- data/lib/rubygems/resolver/index_set.rb +3 -3
- data/lib/rubygems/resolver/index_specification.rb +6 -5
- data/lib/rubygems/resolver/installed_specification.rb +4 -4
- data/lib/rubygems/resolver/installer_set.rb +11 -16
- data/lib/rubygems/resolver/local_specification.rb +2 -2
- data/lib/rubygems/resolver/lock_set.rb +4 -4
- data/lib/rubygems/resolver/lock_specification.rb +4 -4
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph.rb +1 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/errors.rb +32 -26
- data/lib/rubygems/resolver/molinillo/lib/molinillo/gem_metadata.rb +1 -1
- data/lib/rubygems/resolver/molinillo.rb +1 -1
- data/lib/rubygems/resolver/specification.rb +1 -1
- data/lib/rubygems/resolver/stats.rb +1 -1
- data/lib/rubygems/resolver/vendor_set.rb +1 -1
- data/lib/rubygems/resolver/vendor_specification.rb +3 -3
- data/lib/rubygems/resolver.rb +40 -40
- data/lib/rubygems/s3_uri_signer.rb +6 -6
- data/lib/rubygems/safe_yaml.rb +2 -2
- data/lib/rubygems/security/policies.rb +47 -47
- data/lib/rubygems/security/policy.rb +18 -18
- data/lib/rubygems/security/signer.rb +5 -5
- data/lib/rubygems/security/trust_dir.rb +4 -4
- data/lib/rubygems/security.rb +29 -42
- data/lib/rubygems/security_option.rb +5 -5
- data/lib/rubygems/source/git.rb +25 -24
- 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 +18 -25
- data/lib/rubygems/source_list.rb +1 -5
- data/lib/rubygems/spec_fetcher.rb +11 -11
- data/lib/rubygems/specification.rb +175 -118
- data/lib/rubygems/specification_policy.rb +35 -16
- data/lib/rubygems/stub_specification.rb +8 -8
- data/lib/rubygems/text.rb +2 -2
- data/lib/rubygems/tsort/lib/tsort.rb +308 -310
- data/lib/rubygems/tsort.rb +1 -1
- data/lib/rubygems/uninstaller.rb +18 -18
- data/lib/rubygems/update_suggestion.rb +69 -0
- data/lib/rubygems/uri.rb +45 -30
- data/lib/rubygems/uri_formatter.rb +1 -1
- data/lib/rubygems/user_interaction.rb +33 -19
- data/lib/rubygems/util/licenses.rb +3 -3
- data/lib/rubygems/util.rb +12 -16
- data/lib/rubygems/validator.rb +6 -6
- data/lib/rubygems/version.rb +17 -11
- data/lib/rubygems/version_option.rb +3 -3
- data/lib/rubygems.rb +96 -77
- data/rubygems-update.gemspec +3 -3
- data/setup.rb +10 -10
- data/test/rubygems/alternate_cert.pem +14 -14
- data/test/rubygems/alternate_cert_32.pem +15 -15
- data/test/rubygems/alternate_key.pem +25 -25
- data/test/rubygems/bundler_test_gem.rb +419 -0
- data/test/rubygems/child_cert.pem +15 -16
- data/test/rubygems/child_cert_32.pem +15 -16
- data/test/rubygems/child_key.pem +25 -25
- data/test/rubygems/data/excon-0.7.7.gemspec.rz +0 -0
- data/test/rubygems/data/pry-0.4.7.gemspec.rz +0 -0
- data/test/rubygems/encrypted_private_key.pem +26 -26
- data/test/rubygems/expired_cert.pem +15 -15
- data/test/rubygems/future_cert.pem +15 -15
- data/test/rubygems/future_cert_32.pem +15 -15
- data/test/rubygems/grandchild_cert.pem +15 -16
- data/test/rubygems/grandchild_cert_32.pem +15 -16
- data/test/rubygems/grandchild_key.pem +25 -25
- data/test/rubygems/helper.rb +183 -163
- data/test/rubygems/installer_test_case.rb +13 -13
- data/test/rubygems/invalid_issuer_cert.pem +16 -16
- data/test/rubygems/invalid_issuer_cert_32.pem +16 -16
- data/test/rubygems/invalid_key.pem +25 -25
- data/test/rubygems/invalid_signer_cert.pem +15 -15
- data/test/rubygems/invalid_signer_cert_32.pem +15 -15
- data/test/rubygems/invalidchild_cert.pem +15 -16
- data/test/rubygems/invalidchild_cert_32.pem +15 -16
- data/test/rubygems/invalidchild_key.pem +25 -25
- data/test/rubygems/package/tar_test_case.rb +52 -17
- data/test/rubygems/packages/Bluebie-legs-0.6.2.gem +0 -0
- data/test/rubygems/plugin/exception/rubygems_plugin.rb +1 -1
- data/test/rubygems/plugin/standarderror/rubygems_plugin.rb +1 -1
- data/test/rubygems/private_key.pem +25 -25
- data/test/rubygems/public_cert.pem +16 -16
- data/test/rubygems/public_cert_32.pem +15 -15
- data/test/rubygems/public_key.pem +7 -7
- data/test/rubygems/rubygems_plugin.rb +2 -2
- data/test/rubygems/simple_gem.rb +1 -1
- data/test/rubygems/specifications/rubyforge-0.0.1.gemspec +4 -4
- data/test/rubygems/test_bundled_ca.rb +11 -11
- data/test/rubygems/test_config.rb +3 -3
- data/test/rubygems/test_deprecate.rb +3 -3
- data/test/rubygems/test_exit.rb +8 -2
- data/test/rubygems/test_gem.rb +327 -694
- data/test/rubygems/test_gem_available_set.rb +21 -21
- data/test/rubygems/test_gem_bundler_version_finder.rb +5 -4
- data/test/rubygems/test_gem_command.rb +44 -44
- data/test/rubygems/test_gem_command_manager.rb +102 -31
- data/test/rubygems/test_gem_commands_build_command.rb +73 -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 +28 -28
- data/test/rubygems/test_gem_commands_dependency_command.rb +36 -36
- data/test/rubygems/test_gem_commands_environment_command.rb +38 -14
- data/test/rubygems/test_gem_commands_exec_command.rb +851 -0
- 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 +28 -2
- data/test/rubygems/test_gem_commands_install_command.rb +153 -134
- 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 +126 -45
- data/test/rubygems/test_gem_commands_pristine_command.rb +93 -92
- data/test/rubygems/test_gem_commands_push_command.rb +85 -59
- 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 +123 -94
- data/test/rubygems/test_gem_commands_signin_command.rb +153 -25
- data/test/rubygems/test_gem_commands_signout_command.rb +3 -3
- data/test/rubygems/test_gem_commands_sources_command.rb +74 -25
- 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 +145 -93
- data/test/rubygems/test_gem_commands_which_command.rb +6 -6
- data/test/rubygems/test_gem_commands_yank_command.rb +42 -42
- data/test/rubygems/test_gem_config_file.rb +93 -81
- data/test/rubygems/test_gem_dependency.rb +75 -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 +60 -62
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/.gitignore +1 -0
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/custom_name.gemspec +8 -0
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/Cargo.lock +233 -0
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/Cargo.toml +10 -0
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/src/lib.rs +27 -0
- data/test/rubygems/test_gem_ext_cargo_builder/custom_name/lib/custom_name.rb +1 -0
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/.gitignore +1 -0
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.lock +247 -0
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.toml +10 -0
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/rust_ruby_example.gemspec +8 -0
- data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/src/lib.rs +51 -0
- data/test/rubygems/test_gem_ext_cargo_builder.rb +166 -0
- data/test/rubygems/test_gem_ext_cargo_builder_link_flag_converter.rb +33 -0
- data/test/rubygems/test_gem_ext_cargo_builder_unit.rb +60 -0
- data/test/rubygems/test_gem_ext_cmake_builder.rb +17 -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 +9 -9
- data/test/rubygems/test_gem_gemcutter_utilities.rb +71 -65
- data/test/rubygems/test_gem_impossible_dependencies_error.rb +4 -4
- data/test/rubygems/test_gem_indexer.rb +90 -67
- data/test/rubygems/test_gem_install_update_options.rb +16 -16
- data/test/rubygems/test_gem_installer.rb +371 -304
- 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 +244 -234
- data/test/rubygems/test_gem_package_old.rb +13 -13
- data/test/rubygems/test_gem_package_tar_header.rb +47 -47
- data/test/rubygems/test_gem_package_tar_reader.rb +55 -8
- data/test/rubygems/test_gem_package_tar_reader_entry.rb +161 -16
- 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 +335 -214
- data/test/rubygems/test_gem_rdoc.rb +14 -14
- data/test/rubygems/test_gem_remote_fetcher.rb +157 -157
- 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 +100 -100
- data/test/rubygems/test_gem_request_set_gem_dependency_api.rb +209 -211
- data/test/rubygems/test_gem_request_set_lockfile.rb +86 -86
- data/test/rubygems/test_gem_request_set_lockfile_parser.rb +58 -58
- data/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb +62 -62
- data/test/rubygems/test_gem_requirement.rb +47 -41
- data/test/rubygems/test_gem_resolver.rb +166 -99
- 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 +16 -16
- data/test/rubygems/test_gem_resolver_installed_specification.rb +5 -5
- data/test/rubygems/test_gem_resolver_installer_set.rb +79 -35
- 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 +68 -68
- data/test/rubygems/test_gem_security_policy.rb +72 -72
- data/test/rubygems/test_gem_security_signer.rb +34 -34
- data/test/rubygems/test_gem_security_trust_dir.rb +6 -6
- 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 +69 -62
- 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 +539 -474
- 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 +113 -113
- data/test/rubygems/test_gem_unsatisfiable_dependency_error.rb +3 -3
- data/test/rubygems/test_gem_update_suggestion.rb +208 -0
- 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 +23 -16
- data/test/rubygems/test_gem_version_option.rb +15 -15
- data/test/rubygems/test_kernel.rb +41 -47
- 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 +129 -119
- data/test/rubygems/test_rubygems.rb +19 -16
- data/test/rubygems/utilities.rb +55 -33
- data/test/rubygems/wrong_key_cert.pem +15 -15
- data/test/rubygems/wrong_key_cert_32.pem +15 -15
- data/test/test_changelog_generator.rb +1 -0
- metadata +67 -35
- data/bundler/lib/bundler/dep_proxy.rb +0 -55
- data/bundler/lib/bundler/templates/gems.rb +0 -5
- data/bundler/lib/bundler/templates/newgem/travis.yml.tt +0 -6
- data/bundler/lib/bundler/vendor/molinillo/LICENSE +0 -9
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb +0 -57
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb +0 -88
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/action.rb +0 -36
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb +0 -66
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb +0 -62
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb +0 -63
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb +0 -61
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/log.rb +0 -126
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb +0 -46
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb +0 -36
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb +0 -164
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb +0 -255
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb +0 -143
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb +0 -6
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/modules/specification_provider.rb +0 -112
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/modules/ui.rb +0 -67
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +0 -839
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb +0 -46
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/state.rb +0 -58
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo.rb +0 -11
- data/bundler/lib/bundler/vendor/tmpdir/lib/tmpdir.rb +0 -154
- data/bundler/lib/bundler/vendored_molinillo.rb +0 -4
- data/bundler/lib/bundler/version_ranges.rb +0 -122
- data/lib/rubygems/psych_additions.rb +0 -10
- data/test/rubygems/data/null-type.gemspec.rz +0 -0
- /data/bundler/lib/bundler/templates/newgem/ext/newgem/{extconf.rb.tt → extconf-c.rb.tt} +0 -0
@@ -1,2 +1,2 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
-
require_relative
|
2
|
+
require_relative "molinillo/lib/molinillo"
|
@@ -6,9 +6,9 @@
|
|
6
6
|
|
7
7
|
class Gem::Resolver::VendorSpecification < Gem::Resolver::SpecSpecification
|
8
8
|
def ==(other) # :nodoc:
|
9
|
-
self.class === other
|
10
|
-
@set == other.set
|
11
|
-
@spec == other.spec
|
9
|
+
self.class === other &&
|
10
|
+
@set == other.set &&
|
11
|
+
@spec == other.spec &&
|
12
12
|
@source == other.source
|
13
13
|
end
|
14
14
|
|
data/lib/rubygems/resolver.rb
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
-
require_relative
|
3
|
-
require_relative
|
4
|
-
require_relative
|
2
|
+
require_relative "dependency"
|
3
|
+
require_relative "exceptions"
|
4
|
+
require_relative "util/list"
|
5
5
|
|
6
6
|
##
|
7
7
|
# Given a set of Gem::Dependency objects as +needed+ and a way to query the
|
@@ -10,14 +10,14 @@ require_relative 'util/list'
|
|
10
10
|
# all the requirements.
|
11
11
|
|
12
12
|
class Gem::Resolver
|
13
|
-
require_relative
|
13
|
+
require_relative "resolver/molinillo"
|
14
14
|
|
15
15
|
##
|
16
16
|
# If the DEBUG_RESOLVER environment variable is set then debugging mode is
|
17
17
|
# enabled for the resolver. This will display information about the state
|
18
18
|
# of the resolver while a set of dependencies is being resolved.
|
19
19
|
|
20
|
-
DEBUG_RESOLVER = !ENV[
|
20
|
+
DEBUG_RESOLVER = !ENV["DEBUG_RESOLVER"].nil?
|
21
21
|
|
22
22
|
##
|
23
23
|
# Set to true if all development dependencies should be considered.
|
@@ -74,7 +74,7 @@ class Gem::Resolver
|
|
74
74
|
|
75
75
|
case sets.length
|
76
76
|
when 0 then
|
77
|
-
raise ArgumentError,
|
77
|
+
raise ArgumentError, "one set in the composition must be non-nil"
|
78
78
|
when 1 then
|
79
79
|
sets.first
|
80
80
|
else
|
@@ -124,7 +124,7 @@ class Gem::Resolver
|
|
124
124
|
data = yield
|
125
125
|
$stderr.printf "%10s (%d entries)\n", stage.to_s.upcase, data.size
|
126
126
|
unless data.empty?
|
127
|
-
require
|
127
|
+
require "pp"
|
128
128
|
PP.pp data, $stderr
|
129
129
|
end
|
130
130
|
end
|
@@ -153,10 +153,10 @@ class Gem::Resolver
|
|
153
153
|
s.fetch_development_dependencies if @development
|
154
154
|
|
155
155
|
s.dependencies.reverse_each do |d|
|
156
|
-
next if d.type == :development
|
157
|
-
next if d.type == :development
|
156
|
+
next if d.type == :development && !@development
|
157
|
+
next if d.type == :development && @development_shallow &&
|
158
158
|
act.development?
|
159
|
-
next if d.type == :development
|
159
|
+
next if d.type == :development && @development_shallow &&
|
160
160
|
act.parent
|
161
161
|
|
162
162
|
reqs << Gem::Resolver::DependencyRequest.new(d, act)
|
@@ -173,7 +173,7 @@ class Gem::Resolver
|
|
173
173
|
include Molinillo::UI
|
174
174
|
|
175
175
|
def output
|
176
|
-
@output ||= debug? ? $stdout : File.open(IO::NULL,
|
176
|
+
@output ||= debug? ? $stdout : File.open(IO::NULL, "w")
|
177
177
|
end
|
178
178
|
|
179
179
|
def debug?
|
@@ -192,7 +192,7 @@ class Gem::Resolver
|
|
192
192
|
conflict = e.conflicts.values.first
|
193
193
|
raise Gem::DependencyResolutionError, Conflict.new(conflict.requirement_trees.first.first, conflict.existing, conflict.requirement)
|
194
194
|
ensure
|
195
|
-
@output.close if defined?(@output)
|
195
|
+
@output.close if defined?(@output) && !debug?
|
196
196
|
end
|
197
197
|
|
198
198
|
##
|
@@ -246,7 +246,7 @@ class Gem::Resolver
|
|
246
246
|
|
247
247
|
sources.each do |source|
|
248
248
|
groups[source].
|
249
|
-
sort_by {|spec| [spec.version, Gem::Platform.local
|
249
|
+
sort_by {|spec| [spec.version, spec.platform =~ Gem::Platform.local ? 1 : 0] }.
|
250
250
|
map {|spec| ActivationRequest.new spec, dependency }.
|
251
251
|
each {|activation_request| activation_requests << activation_request }
|
252
252
|
end
|
@@ -318,30 +318,30 @@ class Gem::Resolver
|
|
318
318
|
private :amount_constrained
|
319
319
|
end
|
320
320
|
|
321
|
-
require_relative
|
322
|
-
require_relative
|
323
|
-
require_relative
|
324
|
-
require_relative
|
325
|
-
require_relative
|
326
|
-
|
327
|
-
require_relative
|
328
|
-
require_relative
|
329
|
-
require_relative
|
330
|
-
require_relative
|
331
|
-
require_relative
|
332
|
-
require_relative
|
333
|
-
require_relative
|
334
|
-
require_relative
|
335
|
-
require_relative
|
336
|
-
require_relative
|
337
|
-
require_relative
|
338
|
-
|
339
|
-
require_relative
|
340
|
-
require_relative
|
341
|
-
require_relative
|
342
|
-
require_relative
|
343
|
-
require_relative
|
344
|
-
require_relative
|
345
|
-
require_relative
|
346
|
-
require_relative
|
347
|
-
require_relative
|
321
|
+
require_relative "resolver/activation_request"
|
322
|
+
require_relative "resolver/conflict"
|
323
|
+
require_relative "resolver/dependency_request"
|
324
|
+
require_relative "resolver/requirement_list"
|
325
|
+
require_relative "resolver/stats"
|
326
|
+
|
327
|
+
require_relative "resolver/set"
|
328
|
+
require_relative "resolver/api_set"
|
329
|
+
require_relative "resolver/composed_set"
|
330
|
+
require_relative "resolver/best_set"
|
331
|
+
require_relative "resolver/current_set"
|
332
|
+
require_relative "resolver/git_set"
|
333
|
+
require_relative "resolver/index_set"
|
334
|
+
require_relative "resolver/installer_set"
|
335
|
+
require_relative "resolver/lock_set"
|
336
|
+
require_relative "resolver/vendor_set"
|
337
|
+
require_relative "resolver/source_set"
|
338
|
+
|
339
|
+
require_relative "resolver/specification"
|
340
|
+
require_relative "resolver/spec_specification"
|
341
|
+
require_relative "resolver/api_specification"
|
342
|
+
require_relative "resolver/git_specification"
|
343
|
+
require_relative "resolver/index_specification"
|
344
|
+
require_relative "resolver/installed_specification"
|
345
|
+
require_relative "resolver/local_specification"
|
346
|
+
require_relative "resolver/lock_specification"
|
347
|
+
require_relative "resolver/vendor_specification"
|
@@ -1,4 +1,4 @@
|
|
1
|
-
require_relative
|
1
|
+
require_relative "openssl"
|
2
2
|
|
3
3
|
##
|
4
4
|
# S3URISigner implements AWS SigV4 for S3 Source to avoid a dependency on the aws-sdk-* gems
|
@@ -138,14 +138,14 @@ class Gem::S3URISigner
|
|
138
138
|
end
|
139
139
|
|
140
140
|
def ec2_metadata_credentials_json
|
141
|
-
require
|
142
|
-
require_relative
|
143
|
-
require_relative
|
144
|
-
require
|
141
|
+
require "net/http"
|
142
|
+
require_relative "request"
|
143
|
+
require_relative "request/connection_pools"
|
144
|
+
require "json"
|
145
145
|
|
146
146
|
iam_info = ec2_metadata_request(EC2_IAM_INFO)
|
147
147
|
# Expected format: arn:aws:iam::<id>:instance-profile/<role_name>
|
148
|
-
role_name = iam_info[
|
148
|
+
role_name = iam_info["InstanceProfileArn"].split("/").last
|
149
149
|
ec2_metadata_request(EC2_IAM_SECURITY_CREDENTIALS + role_name)
|
150
150
|
end
|
151
151
|
|
data/lib/rubygems/safe_yaml.rb
CHANGED
@@ -26,7 +26,7 @@ module Gem
|
|
26
26
|
|
27
27
|
if ::Psych.respond_to? :safe_load
|
28
28
|
def self.safe_load(input)
|
29
|
-
if Gem::Version.new(Psych::VERSION) >= Gem::Version.new(
|
29
|
+
if Gem::Version.new(Psych::VERSION) >= Gem::Version.new("3.1.0.pre1")
|
30
30
|
::Psych.safe_load(input, permitted_classes: PERMITTED_CLASSES, permitted_symbols: PERMITTED_SYMBOLS, aliases: true)
|
31
31
|
else
|
32
32
|
::Psych.safe_load(input, PERMITTED_CLASSES, PERMITTED_SYMBOLS, true)
|
@@ -34,7 +34,7 @@ module Gem
|
|
34
34
|
end
|
35
35
|
|
36
36
|
def self.load(input)
|
37
|
-
if Gem::Version.new(Psych::VERSION) >= Gem::Version.new(
|
37
|
+
if Gem::Version.new(Psych::VERSION) >= Gem::Version.new("3.1.0.pre1")
|
38
38
|
::Psych.safe_load(input, permitted_classes: [::Symbol])
|
39
39
|
else
|
40
40
|
::Psych.safe_load(input, [::Symbol])
|
@@ -5,13 +5,13 @@ module Gem::Security
|
|
5
5
|
# No security policy: all package signature checks are disabled.
|
6
6
|
|
7
7
|
NoSecurity = Policy.new(
|
8
|
-
|
9
|
-
:verify_data
|
10
|
-
:verify_signer
|
11
|
-
:verify_chain
|
12
|
-
:verify_root
|
13
|
-
:only_trusted
|
14
|
-
:only_signed
|
8
|
+
"No Security",
|
9
|
+
:verify_data => false,
|
10
|
+
:verify_signer => false,
|
11
|
+
:verify_chain => false,
|
12
|
+
:verify_root => false,
|
13
|
+
:only_trusted => false,
|
14
|
+
:only_signed => false
|
15
15
|
)
|
16
16
|
|
17
17
|
##
|
@@ -23,13 +23,13 @@ module Gem::Security
|
|
23
23
|
# easily spoofed, and is not recommended.
|
24
24
|
|
25
25
|
AlmostNoSecurity = Policy.new(
|
26
|
-
|
27
|
-
:verify_data
|
28
|
-
:verify_signer
|
29
|
-
:verify_chain
|
30
|
-
:verify_root
|
31
|
-
:only_trusted
|
32
|
-
:only_signed
|
26
|
+
"Almost No Security",
|
27
|
+
:verify_data => true,
|
28
|
+
:verify_signer => false,
|
29
|
+
:verify_chain => false,
|
30
|
+
:verify_root => false,
|
31
|
+
:only_trusted => false,
|
32
|
+
:only_signed => false
|
33
33
|
)
|
34
34
|
|
35
35
|
##
|
@@ -40,13 +40,13 @@ module Gem::Security
|
|
40
40
|
# is not recommended.
|
41
41
|
|
42
42
|
LowSecurity = Policy.new(
|
43
|
-
|
44
|
-
:verify_data
|
45
|
-
:verify_signer
|
46
|
-
:verify_chain
|
47
|
-
:verify_root
|
48
|
-
:only_trusted
|
49
|
-
:only_signed
|
43
|
+
"Low Security",
|
44
|
+
:verify_data => true,
|
45
|
+
:verify_signer => true,
|
46
|
+
:verify_chain => false,
|
47
|
+
:verify_root => false,
|
48
|
+
:only_trusted => false,
|
49
|
+
:only_signed => false
|
50
50
|
)
|
51
51
|
|
52
52
|
##
|
@@ -59,13 +59,13 @@ module Gem::Security
|
|
59
59
|
# gem off as unsigned.
|
60
60
|
|
61
61
|
MediumSecurity = Policy.new(
|
62
|
-
|
63
|
-
:verify_data
|
64
|
-
:verify_signer
|
65
|
-
:verify_chain
|
66
|
-
:verify_root
|
67
|
-
:only_trusted
|
68
|
-
:only_signed
|
62
|
+
"Medium Security",
|
63
|
+
:verify_data => true,
|
64
|
+
:verify_signer => true,
|
65
|
+
:verify_chain => true,
|
66
|
+
:verify_root => true,
|
67
|
+
:only_trusted => true,
|
68
|
+
:only_signed => false
|
69
69
|
)
|
70
70
|
|
71
71
|
##
|
@@ -78,37 +78,37 @@ module Gem::Security
|
|
78
78
|
# a reasonable guarantee that the contents of the gem have not been altered.
|
79
79
|
|
80
80
|
HighSecurity = Policy.new(
|
81
|
-
|
82
|
-
:verify_data
|
83
|
-
:verify_signer
|
84
|
-
:verify_chain
|
85
|
-
:verify_root
|
86
|
-
:only_trusted
|
87
|
-
:only_signed
|
81
|
+
"High Security",
|
82
|
+
:verify_data => true,
|
83
|
+
:verify_signer => true,
|
84
|
+
:verify_chain => true,
|
85
|
+
:verify_root => true,
|
86
|
+
:only_trusted => true,
|
87
|
+
:only_signed => true
|
88
88
|
)
|
89
89
|
|
90
90
|
##
|
91
91
|
# Policy used to verify a certificate and key when signing a gem
|
92
92
|
|
93
93
|
SigningPolicy = Policy.new(
|
94
|
-
|
95
|
-
:verify_data
|
96
|
-
:verify_signer
|
97
|
-
:verify_chain
|
98
|
-
:verify_root
|
99
|
-
:only_trusted
|
100
|
-
:only_signed
|
94
|
+
"Signing Policy",
|
95
|
+
:verify_data => false,
|
96
|
+
:verify_signer => true,
|
97
|
+
:verify_chain => true,
|
98
|
+
:verify_root => true,
|
99
|
+
:only_trusted => false,
|
100
|
+
:only_signed => false
|
101
101
|
)
|
102
102
|
|
103
103
|
##
|
104
104
|
# Hash of configured security policies
|
105
105
|
|
106
106
|
Policies = {
|
107
|
-
|
108
|
-
|
109
|
-
|
110
|
-
|
111
|
-
|
107
|
+
"NoSecurity" => NoSecurity,
|
108
|
+
"AlmostNoSecurity" => AlmostNoSecurity,
|
109
|
+
"LowSecurity" => LowSecurity,
|
110
|
+
"MediumSecurity" => MediumSecurity,
|
111
|
+
"HighSecurity" => HighSecurity,
|
112
112
|
# SigningPolicy is not intended for use by `gem -P` so do not list it
|
113
113
|
}.freeze
|
114
114
|
|
@@ -1,5 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
-
require_relative
|
2
|
+
require_relative "../user_interaction"
|
3
3
|
|
4
4
|
##
|
5
5
|
# A Gem::Security::Policy object encapsulates the settings for verifying
|
@@ -53,8 +53,8 @@ class Gem::Security::Policy
|
|
53
53
|
# and is valid for the given +time+.
|
54
54
|
|
55
55
|
def check_chain(chain, time)
|
56
|
-
raise Gem::Security::Exception,
|
57
|
-
raise Gem::Security::Exception,
|
56
|
+
raise Gem::Security::Exception, "missing signing chain" unless chain
|
57
|
+
raise Gem::Security::Exception, "empty signing chain" if chain.empty?
|
58
58
|
|
59
59
|
begin
|
60
60
|
chain.each_cons 2 do |issuer, cert|
|
@@ -83,21 +83,21 @@ class Gem::Security::Policy
|
|
83
83
|
# If the +issuer+ is +nil+ no verification is performed.
|
84
84
|
|
85
85
|
def check_cert(signer, issuer, time)
|
86
|
-
raise Gem::Security::Exception,
|
86
|
+
raise Gem::Security::Exception, "missing signing certificate" unless
|
87
87
|
signer
|
88
88
|
|
89
89
|
message = "certificate #{signer.subject}"
|
90
90
|
|
91
|
-
if not_before = signer.not_before
|
91
|
+
if (not_before = signer.not_before) && not_before > time
|
92
92
|
raise Gem::Security::Exception,
|
93
93
|
"#{message} not valid before #{not_before}"
|
94
94
|
end
|
95
95
|
|
96
|
-
if not_after = signer.not_after
|
96
|
+
if (not_after = signer.not_after) && not_after < time
|
97
97
|
raise Gem::Security::Exception, "#{message} not valid after #{not_after}"
|
98
98
|
end
|
99
99
|
|
100
|
-
if issuer
|
100
|
+
if issuer && !signer.verify(issuer.public_key)
|
101
101
|
raise Gem::Security::Exception,
|
102
102
|
"#{message} was not issued by #{issuer.subject}"
|
103
103
|
end
|
@@ -109,10 +109,10 @@ class Gem::Security::Policy
|
|
109
109
|
# Ensures the public key of +key+ matches the public key in +signer+
|
110
110
|
|
111
111
|
def check_key(signer, key)
|
112
|
-
unless signer
|
112
|
+
unless signer && key
|
113
113
|
return true unless @only_signed
|
114
114
|
|
115
|
-
raise Gem::Security::Exception,
|
115
|
+
raise Gem::Security::Exception, "missing key or signature"
|
116
116
|
end
|
117
117
|
|
118
118
|
raise Gem::Security::Exception,
|
@@ -127,11 +127,11 @@ class Gem::Security::Policy
|
|
127
127
|
# +time+.
|
128
128
|
|
129
129
|
def check_root(chain, time)
|
130
|
-
raise Gem::Security::Exception,
|
130
|
+
raise Gem::Security::Exception, "missing signing chain" unless chain
|
131
131
|
|
132
132
|
root = chain.first
|
133
133
|
|
134
|
-
raise Gem::Security::Exception,
|
134
|
+
raise Gem::Security::Exception, "missing root certificate" unless root
|
135
135
|
|
136
136
|
raise Gem::Security::Exception,
|
137
137
|
"root certificate #{root.subject} is not self-signed " +
|
@@ -146,11 +146,11 @@ class Gem::Security::Policy
|
|
146
146
|
# the digests of the two certificates match according to +digester+
|
147
147
|
|
148
148
|
def check_trust(chain, digester, trust_dir)
|
149
|
-
raise Gem::Security::Exception,
|
149
|
+
raise Gem::Security::Exception, "missing signing chain" unless chain
|
150
150
|
|
151
151
|
root = chain.first
|
152
152
|
|
153
|
-
raise Gem::Security::Exception,
|
153
|
+
raise Gem::Security::Exception, "missing root certificate" unless root
|
154
154
|
|
155
155
|
path = Gem::Security.trust_dir.cert_path root
|
156
156
|
|
@@ -182,7 +182,7 @@ class Gem::Security::Policy
|
|
182
182
|
|
183
183
|
def subject(certificate) # :nodoc:
|
184
184
|
certificate.extensions.each do |extension|
|
185
|
-
next unless extension.oid ==
|
185
|
+
next unless extension.oid == "subjectAltName"
|
186
186
|
|
187
187
|
return extension.value
|
188
188
|
end
|
@@ -206,7 +206,7 @@ class Gem::Security::Policy
|
|
206
206
|
# If +key+ is given it is used to validate the signing certificate.
|
207
207
|
|
208
208
|
def verify(chain, key = nil, digests = {}, signatures = {},
|
209
|
-
full_name =
|
209
|
+
full_name = "(unknown)")
|
210
210
|
if signatures.empty?
|
211
211
|
if @only_signed
|
212
212
|
raise Gem::Security::Exception,
|
@@ -230,8 +230,8 @@ class Gem::Security::Policy
|
|
230
230
|
end
|
231
231
|
|
232
232
|
if @verify_data
|
233
|
-
raise Gem::Security::Exception,
|
234
|
-
signer_digests.nil?
|
233
|
+
raise Gem::Security::Exception, "no digests provided (probable bug)" if
|
234
|
+
signer_digests.nil? || signer_digests.empty?
|
235
235
|
else
|
236
236
|
signer_digests = {}
|
237
237
|
end
|
@@ -248,7 +248,7 @@ class Gem::Security::Policy
|
|
248
248
|
|
249
249
|
if @only_trusted
|
250
250
|
check_trust chain, digester, trust_dir
|
251
|
-
elsif signatures.empty?
|
251
|
+
elsif signatures.empty? && digests.empty?
|
252
252
|
# trust is irrelevant if there's no signatures to verify
|
253
253
|
else
|
254
254
|
alert_warning "#{subject signer} is not trusted for #{full_name}"
|
@@ -42,7 +42,7 @@ class Gem::Security::Signer
|
|
42
42
|
def self.re_sign_cert(expired_cert, expired_cert_path, private_key)
|
43
43
|
return unless expired_cert.not_after < Time.now
|
44
44
|
|
45
|
-
expiry = expired_cert.not_after.strftime(
|
45
|
+
expiry = expired_cert.not_after.strftime("%Y%m%d%H%M%S")
|
46
46
|
expired_cert_file = "#{File.basename(expired_cert_path)}.expired.#{expiry}"
|
47
47
|
new_expired_cert_path = File.join(Gem.user_home, ".gem", expired_cert_file)
|
48
48
|
|
@@ -105,7 +105,7 @@ class Gem::Security::Signer
|
|
105
105
|
# this value is preferred, otherwise the subject is used.
|
106
106
|
|
107
107
|
def extract_name(cert) # :nodoc:
|
108
|
-
subject_alt_name = cert.extensions.find {|e|
|
108
|
+
subject_alt_name = cert.extensions.find {|e| "subjectAltName" == e.oid }
|
109
109
|
|
110
110
|
if subject_alt_name
|
111
111
|
/\Aemail:/ =~ subject_alt_name.value # rubocop:disable Performance/StartWith
|
@@ -139,9 +139,9 @@ class Gem::Security::Signer
|
|
139
139
|
def sign(data)
|
140
140
|
return unless @key
|
141
141
|
|
142
|
-
raise Gem::Security::Exception,
|
142
|
+
raise Gem::Security::Exception, "no certs provided" if @cert_chain.empty?
|
143
143
|
|
144
|
-
if @cert_chain.length == 1
|
144
|
+
if @cert_chain.length == 1 && @cert_chain.last.not_after < Time.now
|
145
145
|
alert("Your certificate has expired, trying to re-sign it...")
|
146
146
|
|
147
147
|
re_sign_key(
|
@@ -182,7 +182,7 @@ class Gem::Security::Signer
|
|
182
182
|
return unless disk_key
|
183
183
|
|
184
184
|
if disk_key.to_pem == @key.to_pem && disk_cert == old_cert.to_pem
|
185
|
-
expiry = old_cert.not_after.strftime(
|
185
|
+
expiry = old_cert.not_after.strftime("%Y%m%d%H%M%S")
|
186
186
|
old_cert_file = "gem-public_cert.pem.expired.#{expiry}"
|
187
187
|
old_cert_path = File.join(Gem.user_home, ".gem", old_cert_file)
|
188
188
|
|
@@ -8,7 +8,7 @@ class Gem::Security::TrustDir
|
|
8
8
|
# Default permissions for the trust directory and its contents
|
9
9
|
|
10
10
|
DEFAULT_PERMISSIONS = {
|
11
|
-
:trust_dir
|
11
|
+
:trust_dir => 0700,
|
12
12
|
:trusted_cert => 0600,
|
13
13
|
}.freeze
|
14
14
|
|
@@ -41,7 +41,7 @@ class Gem::Security::TrustDir
|
|
41
41
|
def each_certificate
|
42
42
|
return enum_for __method__ unless block_given?
|
43
43
|
|
44
|
-
glob = File.join @dir,
|
44
|
+
glob = File.join @dir, "*.pem"
|
45
45
|
|
46
46
|
Dir[glob].each do |certificate_file|
|
47
47
|
begin
|
@@ -92,7 +92,7 @@ class Gem::Security::TrustDir
|
|
92
92
|
|
93
93
|
destination = cert_path certificate
|
94
94
|
|
95
|
-
File.open destination,
|
95
|
+
File.open destination, "wb", 0600 do |io|
|
96
96
|
io.write certificate.to_pem
|
97
97
|
io.chmod(@permissions[:trusted_cert])
|
98
98
|
end
|
@@ -104,7 +104,7 @@ class Gem::Security::TrustDir
|
|
104
104
|
# permissions.
|
105
105
|
|
106
106
|
def verify
|
107
|
-
require
|
107
|
+
require "fileutils"
|
108
108
|
if File.exist? @dir
|
109
109
|
raise Gem::Security::Exception,
|
110
110
|
"trust directory #{@dir} is not a directory" unless
|