rubygems-update 3.1.6 → 3.4.10
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +5619 -0
- data/CODE_OF_CONDUCT.md +55 -19
- data/CONTRIBUTING.md +97 -27
- data/Manifest.txt +185 -143
- data/POLICIES.md +70 -27
- data/README.md +29 -14
- data/UPGRADING.md +5 -81
- data/bin/gem +2 -10
- data/bin/update_rubygems +5 -5
- data/bundler/CHANGELOG.md +2605 -1431
- data/bundler/README.md +9 -14
- data/bundler/UPGRADING.md +27 -34
- data/bundler/bundler.gemspec +10 -13
- data/bundler/exe/bundle +7 -8
- data/bundler/exe/bundler +1 -1
- data/bundler/lib/bundler/.document +1 -0
- data/bundler/lib/bundler/build_metadata.rb +4 -12
- data/bundler/lib/bundler/cli/add.rb +2 -2
- data/bundler/lib/bundler/cli/binstubs.rb +11 -3
- data/bundler/lib/bundler/cli/cache.rb +3 -8
- data/bundler/lib/bundler/cli/check.rb +5 -3
- data/bundler/lib/bundler/cli/clean.rb +1 -1
- data/bundler/lib/bundler/cli/common.rb +32 -3
- data/bundler/lib/bundler/cli/config.rb +10 -1
- data/bundler/lib/bundler/cli/console.rb +3 -3
- data/bundler/lib/bundler/cli/doctor.rb +23 -6
- data/bundler/lib/bundler/cli/exec.rb +5 -10
- data/bundler/lib/bundler/cli/fund.rb +36 -0
- data/bundler/lib/bundler/cli/gem.rb +258 -45
- data/bundler/lib/bundler/cli/info.rb +38 -6
- data/bundler/lib/bundler/cli/init.rb +7 -3
- data/bundler/lib/bundler/cli/inject.rb +1 -1
- data/bundler/lib/bundler/cli/install.rb +27 -57
- data/bundler/lib/bundler/cli/issue.rb +5 -4
- data/bundler/lib/bundler/cli/list.rb +19 -11
- data/bundler/lib/bundler/cli/lock.rb +11 -4
- data/bundler/lib/bundler/cli/open.rb +7 -6
- data/bundler/lib/bundler/cli/outdated.rb +106 -79
- data/bundler/lib/bundler/cli/platform.rb +2 -2
- data/bundler/lib/bundler/cli/plugin.rb +10 -0
- data/bundler/lib/bundler/cli/pristine.rb +5 -0
- data/bundler/lib/bundler/cli/remove.rb +1 -2
- data/bundler/lib/bundler/cli/show.rb +2 -2
- data/bundler/lib/bundler/cli/update.rb +20 -9
- data/bundler/lib/bundler/cli/viz.rb +1 -1
- data/bundler/lib/bundler/cli.rb +151 -85
- data/bundler/lib/bundler/compact_index_client/cache.rb +7 -24
- data/bundler/lib/bundler/compact_index_client/gem_parser.rb +28 -0
- data/bundler/lib/bundler/compact_index_client/updater.rb +56 -51
- data/bundler/lib/bundler/compact_index_client.rb +3 -9
- data/bundler/lib/bundler/constants.rb +1 -1
- data/bundler/lib/bundler/current_ruby.rb +19 -6
- data/bundler/lib/bundler/definition.rb +353 -440
- data/bundler/lib/bundler/dependency.rb +23 -77
- data/bundler/lib/bundler/digest.rb +71 -0
- data/bundler/lib/bundler/dsl.rb +77 -85
- data/bundler/lib/bundler/endpoint_specification.rb +16 -14
- data/bundler/lib/bundler/env.rb +3 -3
- data/bundler/lib/bundler/environment_preserver.rb +32 -4
- data/bundler/lib/bundler/errors.rb +31 -14
- data/bundler/lib/bundler/feature_flag.rb +0 -9
- data/bundler/lib/bundler/fetcher/base.rb +7 -9
- data/bundler/lib/bundler/fetcher/compact_index.rb +20 -27
- data/bundler/lib/bundler/fetcher/dependency.rb +2 -6
- data/bundler/lib/bundler/fetcher/downloader.rb +11 -11
- data/bundler/lib/bundler/fetcher/index.rb +2 -30
- data/bundler/lib/bundler/fetcher.rb +26 -31
- data/bundler/lib/bundler/force_platform.rb +18 -0
- data/bundler/lib/bundler/friendly_errors.rb +45 -49
- data/bundler/lib/bundler/gem_helper.rb +53 -31
- data/bundler/lib/bundler/gem_helpers.rb +42 -24
- data/bundler/lib/bundler/gem_version_promoter.rb +54 -99
- data/bundler/lib/bundler/graph.rb +4 -4
- data/bundler/lib/bundler/index.rb +16 -54
- data/bundler/lib/bundler/injector.rb +41 -9
- data/bundler/lib/bundler/inline.rb +11 -22
- data/bundler/lib/bundler/installer/gem_installer.rb +19 -24
- data/bundler/lib/bundler/installer/parallel_installer.rb +34 -43
- data/bundler/lib/bundler/installer/standalone.rb +62 -11
- data/bundler/lib/bundler/installer.rb +43 -87
- data/bundler/lib/bundler/lazy_specification.rb +88 -51
- data/bundler/lib/bundler/lockfile_generator.rb +4 -4
- data/bundler/lib/bundler/lockfile_parser.rb +34 -59
- data/bundler/lib/bundler/man/.document +1 -0
- data/bundler/{man → lib/bundler/man}/bundle-add.1 +21 -5
- data/bundler/{man/bundle-add.ronn → lib/bundler/man/bundle-add.1.ronn} +16 -4
- data/bundler/{man → lib/bundler/man}/bundle-binstubs.1 +5 -3
- data/bundler/{man/bundle-binstubs.ronn → lib/bundler/man/bundle-binstubs.1.ronn} +2 -4
- data/bundler/{man → lib/bundler/man}/bundle-cache.1 +7 -1
- data/bundler/{man/bundle-cache.ronn → lib/bundler/man/bundle-cache.1.ronn} +7 -0
- data/bundler/{man → lib/bundler/man}/bundle-check.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-clean.1 +2 -2
- data/bundler/{man/bundle-clean.ronn → lib/bundler/man/bundle-clean.1.ronn} +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-config.1 +66 -48
- data/bundler/{man/bundle-config.ronn → lib/bundler/man/bundle-config.1.ronn} +75 -66
- data/bundler/lib/bundler/man/bundle-console.1 +53 -0
- data/bundler/lib/bundler/man/bundle-console.1.ronn +44 -0
- data/bundler/{man → lib/bundler/man}/bundle-doctor.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-exec.1 +6 -6
- data/bundler/{man/bundle-exec.ronn → lib/bundler/man/bundle-exec.1.ronn} +6 -6
- data/bundler/lib/bundler/man/bundle-gem.1 +105 -0
- data/bundler/lib/bundler/man/bundle-gem.1.ronn +117 -0
- data/bundler/lib/bundler/man/bundle-help.1 +13 -0
- data/bundler/lib/bundler/man/bundle-help.1.ronn +12 -0
- data/bundler/{man → lib/bundler/man}/bundle-info.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-init.1 +5 -1
- data/bundler/{man/bundle-init.ronn → lib/bundler/man/bundle-init.1.ronn} +2 -0
- data/bundler/{man → lib/bundler/man}/bundle-inject.1 +5 -2
- data/bundler/{man/bundle-inject.ronn → lib/bundler/man/bundle-inject.1.ronn} +3 -1
- data/bundler/{man → lib/bundler/man}/bundle-install.1 +35 -33
- data/bundler/{man/bundle-install.ronn → lib/bundler/man/bundle-install.1.ronn} +33 -34
- data/bundler/{man → lib/bundler/man}/bundle-list.1 +7 -7
- data/bundler/{man/bundle-list.ronn → lib/bundler/man/bundle-list.1.ronn} +6 -6
- data/bundler/{man → lib/bundler/man}/bundle-lock.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-open.1 +22 -2
- data/bundler/{man/bundle-open.ronn → lib/bundler/man/bundle-open.1.ronn} +9 -1
- data/bundler/{man → lib/bundler/man}/bundle-outdated.1 +3 -10
- data/bundler/{man/bundle-outdated.ronn → lib/bundler/man/bundle-outdated.1.ronn} +1 -10
- data/bundler/{man → lib/bundler/man}/bundle-platform.1 +16 -6
- data/bundler/{man/bundle-platform.ronn → 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/{man → lib/bundler/man}/bundle-pristine.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-remove.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-show.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-update.1 +5 -5
- data/bundler/{man/bundle-update.ronn → lib/bundler/man/bundle-update.1.ronn} +5 -4
- data/bundler/lib/bundler/man/bundle-version.1 +35 -0
- data/bundler/lib/bundler/man/bundle-version.1.ronn +24 -0
- data/bundler/{man → lib/bundler/man}/bundle-viz.1 +4 -1
- data/bundler/{man/bundle-viz.ronn → lib/bundler/man/bundle-viz.1.ronn} +2 -0
- data/bundler/{man → lib/bundler/man}/bundle.1 +15 -10
- data/bundler/{man/bundle.ronn → lib/bundler/man/bundle.1.ronn} +12 -7
- data/bundler/{man → lib/bundler/man}/gemfile.5 +120 -83
- data/bundler/{man → lib/bundler/man}/gemfile.5.ronn +109 -88
- data/bundler/{man → 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 +7 -9
- data/bundler/lib/bundler/plugin/api/source.rb +25 -9
- data/bundler/lib/bundler/plugin/dsl.rb +1 -1
- data/bundler/lib/bundler/plugin/index.rb +17 -5
- data/bundler/lib/bundler/plugin/installer/git.rb +0 -4
- data/bundler/lib/bundler/plugin/installer/rubygems.rb +1 -9
- data/bundler/lib/bundler/plugin/installer.rb +16 -13
- data/bundler/lib/bundler/plugin/source_list.rb +5 -1
- data/bundler/lib/bundler/plugin.rb +59 -12
- data/bundler/lib/bundler/process_lock.rb +1 -1
- data/bundler/lib/bundler/remote_specification.rb +12 -7
- data/bundler/lib/bundler/resolver/base.rb +109 -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 +49 -74
- data/bundler/lib/bundler/resolver.rb +336 -344
- data/bundler/lib/bundler/retry.rb +2 -2
- data/bundler/lib/bundler/ruby_dsl.rb +1 -1
- data/bundler/lib/bundler/ruby_version.rb +6 -19
- data/bundler/lib/bundler/rubygems_ext.rb +231 -32
- data/bundler/lib/bundler/rubygems_gem_installer.rb +89 -16
- data/bundler/lib/bundler/rubygems_integration.rb +81 -167
- data/bundler/lib/bundler/runtime.rb +23 -31
- data/bundler/lib/bundler/self_manager.rb +168 -0
- data/bundler/lib/bundler/settings.rb +146 -73
- data/bundler/lib/bundler/setup.rb +5 -2
- data/bundler/lib/bundler/shared_helpers.rb +20 -35
- data/bundler/lib/bundler/similarity_detector.rb +1 -1
- data/bundler/lib/bundler/source/git/git_proxy.rb +263 -114
- data/bundler/lib/bundler/source/git.rb +64 -47
- data/bundler/lib/bundler/source/metadata.rb +3 -8
- data/bundler/lib/bundler/source/path/installer.rb +11 -32
- data/bundler/lib/bundler/source/path.rb +16 -10
- data/bundler/lib/bundler/source/rubygems/remote.rb +1 -1
- data/bundler/lib/bundler/source/rubygems.rb +167 -200
- data/bundler/lib/bundler/source/rubygems_aggregate.rb +68 -0
- data/bundler/lib/bundler/source.rb +25 -5
- data/bundler/lib/bundler/source_list.rb +112 -64
- data/bundler/lib/bundler/source_map.rb +71 -0
- data/bundler/lib/bundler/spec_set.rb +74 -61
- data/bundler/lib/bundler/stub_specification.rb +30 -10
- data/bundler/lib/bundler/templates/Executable +3 -5
- data/bundler/lib/bundler/templates/Executable.bundler +11 -16
- data/bundler/lib/bundler/templates/Executable.standalone +4 -4
- data/bundler/lib/bundler/templates/Gemfile +0 -2
- data/bundler/lib/bundler/templates/newgem/CHANGELOG.md.tt +5 -0
- data/bundler/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt +57 -47
- data/bundler/lib/bundler/templates/newgem/Cargo.toml.tt +7 -0
- data/bundler/lib/bundler/templates/newgem/Gemfile.tt +15 -1
- data/bundler/lib/bundler/templates/newgem/README.md.tt +13 -16
- data/bundler/lib/bundler/templates/newgem/Rakefile.tt +43 -5
- data/bundler/lib/bundler/templates/newgem/bin/console.tt +1 -0
- data/bundler/lib/bundler/templates/newgem/circleci/config.yml.tt +25 -0
- data/bundler/lib/bundler/templates/newgem/ext/newgem/Cargo.toml.tt +15 -0
- data/bundler/lib/bundler/templates/newgem/ext/newgem/{extconf.rb.tt → extconf-c.rb.tt} +2 -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 +37 -0
- data/bundler/lib/bundler/templates/newgem/gitignore.tt +3 -0
- data/bundler/lib/bundler/templates/newgem/gitlab-ci.yml.tt +18 -0
- data/bundler/lib/bundler/templates/newgem/lib/newgem/version.rb.tt +2 -0
- data/bundler/lib/bundler/templates/newgem/lib/newgem.rb.tt +4 -2
- data/bundler/lib/bundler/templates/newgem/newgem.gemspec.tt +34 -18
- data/bundler/lib/bundler/templates/newgem/rubocop.yml.tt +13 -0
- data/bundler/lib/bundler/templates/newgem/sig/newgem.rbs.tt +8 -0
- data/bundler/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt +2 -0
- data/bundler/lib/bundler/templates/newgem/spec/spec_helper.rb.tt +2 -1
- data/bundler/lib/bundler/templates/newgem/standard.yml.tt +3 -0
- data/bundler/lib/bundler/templates/newgem/test/{test_helper.rb.tt → minitest/test_helper.rb.tt} +2 -0
- data/bundler/lib/bundler/templates/newgem/test/{newgem_test.rb.tt → minitest/test_newgem.rb.tt} +3 -1
- data/bundler/lib/bundler/templates/newgem/test/test-unit/newgem_test.rb.tt +15 -0
- data/bundler/lib/bundler/templates/newgem/test/test-unit/test_helper.rb.tt +6 -0
- data/bundler/lib/bundler/ui/shell.rb +37 -14
- data/bundler/lib/bundler/ui/silent.rb +21 -5
- data/bundler/lib/bundler/uri_credentials_filter.rb +3 -1
- data/bundler/lib/bundler/uri_normalizer.rb +23 -0
- data/bundler/lib/bundler/vendor/.document +1 -0
- data/bundler/lib/bundler/vendor/connection_pool/LICENSE +20 -0
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb +19 -21
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/version.rb +1 -1
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/wrapper.rb +56 -0
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool.rb +41 -74
- data/bundler/lib/bundler/vendor/fileutils/LICENSE.txt +22 -0
- data/bundler/lib/bundler/vendor/fileutils/lib/fileutils.rb +1350 -408
- data/bundler/lib/bundler/vendor/net-http-persistent/README.rdoc +82 -0
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +82 -189
- 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 +150 -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/LICENSE.md +20 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/create_link.rb +2 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/file_manipulation.rb +9 -7
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb +1 -2
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions.rb +7 -3
- data/bundler/lib/bundler/vendor/thor/lib/thor/base.rb +9 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/core_ext/hash_with_indifferent_access.rb +6 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/error.rb +10 -5
- data/bundler/lib/bundler/vendor/thor/lib/thor/parser/arguments.rb +5 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/parser/options.rb +28 -9
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell/basic.rb +28 -7
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell/color.rb +5 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/util.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/version.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor.rb +5 -13
- data/bundler/lib/bundler/vendor/tsort/LICENSE.txt +22 -0
- data/bundler/lib/bundler/vendor/tsort/lib/tsort.rb +452 -0
- data/bundler/lib/bundler/vendor/uri/LICENSE.txt +22 -0
- data/bundler/lib/bundler/vendor/uri/lib/uri/common.rb +76 -91
- data/bundler/lib/bundler/vendor/uri/lib/uri/file.rb +7 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/ftp.rb +2 -2
- data/bundler/lib/bundler/vendor/uri/lib/uri/generic.rb +32 -13
- data/bundler/lib/bundler/vendor/uri/lib/uri/http.rb +40 -3
- data/bundler/lib/bundler/vendor/uri/lib/uri/https.rb +2 -2
- data/bundler/lib/bundler/vendor/uri/lib/uri/ldap.rb +2 -2
- data/bundler/lib/bundler/vendor/uri/lib/uri/ldaps.rb +2 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/mailto.rb +2 -3
- data/bundler/lib/bundler/vendor/uri/lib/uri/rfc2396_parser.rb +14 -21
- data/bundler/lib/bundler/vendor/uri/lib/uri/rfc3986_parser.rb +11 -17
- data/bundler/lib/bundler/vendor/uri/lib/uri/version.rb +1 -1
- data/bundler/lib/bundler/vendor/uri/lib/uri/ws.rb +83 -0
- data/bundler/lib/bundler/vendor/uri/lib/uri/wss.rb +23 -0
- data/bundler/lib/bundler/vendor/uri/lib/uri.rb +3 -3
- data/bundler/lib/bundler/vendored_persistent.rb +1 -40
- data/bundler/lib/bundler/{vendored_molinillo.rb → vendored_pub_grub.rb} +1 -1
- data/bundler/lib/bundler/vendored_tsort.rb +4 -0
- data/bundler/lib/bundler/version.rb +5 -1
- data/bundler/lib/bundler/worker.rb +25 -12
- data/bundler/lib/bundler/yaml_serializer.rb +1 -1
- data/bundler/lib/bundler.rb +98 -110
- data/hide_lib_for_update/note.txt +0 -4
- data/lib/rubygems/available_set.rb +7 -9
- data/lib/rubygems/basic_specification.rb +23 -21
- data/lib/rubygems/bundler_version_finder.rb +27 -54
- data/lib/rubygems/command.rb +63 -52
- data/lib/rubygems/command_manager.rb +36 -16
- data/lib/rubygems/commands/build_command.rb +50 -27
- data/lib/rubygems/commands/cert_command.rb +78 -75
- data/lib/rubygems/commands/check_command.rb +20 -22
- data/lib/rubygems/commands/cleanup_command.rb +30 -26
- data/lib/rubygems/commands/contents_command.rb +16 -18
- data/lib/rubygems/commands/dependency_command.rb +39 -51
- data/lib/rubygems/commands/environment_command.rb +11 -10
- data/lib/rubygems/commands/exec_command.rb +248 -0
- data/lib/rubygems/commands/fetch_command.rb +33 -16
- data/lib/rubygems/commands/generate_index_command.rb +17 -19
- data/lib/rubygems/commands/help_command.rb +9 -9
- data/lib/rubygems/commands/info_command.rb +10 -7
- data/lib/rubygems/commands/install_command.rb +36 -30
- data/lib/rubygems/commands/list_command.rb +9 -8
- data/lib/rubygems/commands/lock_command.rb +5 -7
- data/lib/rubygems/commands/mirror_command.rb +3 -5
- data/lib/rubygems/commands/open_command.rb +10 -14
- data/lib/rubygems/commands/outdated_command.rb +5 -7
- data/lib/rubygems/commands/owner_command.rb +26 -16
- data/lib/rubygems/commands/pristine_command.rb +70 -49
- data/lib/rubygems/commands/push_command.rb +22 -59
- data/lib/rubygems/commands/query_command.rb +21 -351
- data/lib/rubygems/commands/rdoc_command.rb +26 -27
- data/lib/rubygems/commands/search_command.rb +8 -8
- data/lib/rubygems/commands/server_command.rb +16 -77
- data/lib/rubygems/commands/setup_command.rb +255 -229
- data/lib/rubygems/commands/signin_command.rb +9 -11
- data/lib/rubygems/commands/signout_command.rb +7 -9
- data/lib/rubygems/commands/sources_command.rb +27 -25
- data/lib/rubygems/commands/specification_command.rb +25 -21
- data/lib/rubygems/commands/stale_command.rb +3 -5
- data/lib/rubygems/commands/uninstall_command.rb +44 -43
- data/lib/rubygems/commands/unpack_command.rb +14 -16
- data/lib/rubygems/commands/update_command.rb +126 -74
- data/lib/rubygems/commands/which_command.rb +7 -9
- data/lib/rubygems/commands/yank_command.rb +16 -19
- data/lib/rubygems/compatibility.rb +4 -2
- data/lib/rubygems/config_file.rb +75 -26
- data/lib/rubygems/core_ext/kernel_gem.rb +1 -6
- data/lib/rubygems/core_ext/kernel_require.rb +108 -112
- data/lib/rubygems/core_ext/kernel_warn.rb +31 -36
- data/lib/rubygems/core_ext/tcpsocket_init.rb +52 -0
- data/lib/rubygems/defaults.rb +124 -34
- data/lib/rubygems/dependency.rb +24 -22
- data/lib/rubygems/dependency_installer.rb +43 -115
- data/lib/rubygems/dependency_list.rb +13 -15
- data/lib/rubygems/deprecate.rb +102 -8
- data/lib/rubygems/doctor.rb +22 -22
- data/lib/rubygems/errors.rb +6 -21
- data/lib/rubygems/exceptions.rb +34 -37
- data/lib/rubygems/ext/build_error.rb +2 -0
- data/lib/rubygems/ext/builder.rb +64 -54
- 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 +6 -9
- data/lib/rubygems/ext/configure_builder.rb +5 -8
- data/lib/rubygems/ext/ext_conf_builder.rb +43 -66
- data/lib/rubygems/ext/rake_builder.rb +7 -10
- data/lib/rubygems/ext.rb +7 -6
- data/lib/rubygems/gem_runner.rb +15 -26
- data/lib/rubygems/gemcutter_utilities.rb +161 -33
- data/lib/rubygems/indexer.rb +31 -50
- data/lib/rubygems/install_default_message.rb +2 -2
- data/lib/rubygems/install_message.rb +2 -2
- data/lib/rubygems/install_update_options.rb +73 -64
- data/lib/rubygems/installer.rb +199 -156
- data/lib/rubygems/installer_uninstaller_utils.rb +29 -0
- data/lib/rubygems/local_remote_options.rb +22 -24
- data/lib/rubygems/mock_gem_ui.rb +2 -8
- data/lib/rubygems/name_tuple.rb +9 -14
- data/lib/rubygems/openssl.rb +7 -0
- data/lib/rubygems/optparse/.document +1 -0
- data/lib/rubygems/optparse/COPYING +56 -0
- data/lib/rubygems/optparse/lib/optionparser.rb +2 -0
- data/lib/rubygems/optparse/lib/optparse/ac.rb +54 -0
- data/lib/rubygems/optparse/lib/optparse/date.rb +18 -0
- data/lib/rubygems/optparse/lib/optparse/kwargs.rb +22 -0
- data/lib/rubygems/optparse/lib/optparse/shellwords.rb +7 -0
- data/lib/rubygems/optparse/lib/optparse/time.rb +11 -0
- data/lib/rubygems/optparse/lib/optparse/uri.rb +7 -0
- data/lib/rubygems/optparse/lib/optparse/version.rb +71 -0
- data/lib/rubygems/optparse/lib/optparse.rb +2308 -0
- data/lib/rubygems/optparse.rb +3 -0
- data/lib/rubygems/package/digest_io.rb +0 -2
- data/lib/rubygems/package/file_source.rb +2 -4
- data/lib/rubygems/package/io_source.rb +4 -2
- data/lib/rubygems/package/old.rb +9 -11
- data/lib/rubygems/package/tar_header.rb +65 -67
- data/lib/rubygems/package/tar_reader/entry.rb +89 -11
- data/lib/rubygems/package/tar_reader.rb +1 -32
- data/lib/rubygems/package/tar_writer.rb +8 -18
- data/lib/rubygems/package.rb +109 -120
- data/lib/rubygems/package_task.rb +5 -11
- data/lib/rubygems/path_support.rb +2 -9
- data/lib/rubygems/platform.rb +113 -74
- data/lib/rubygems/psych_tree.rb +1 -3
- data/lib/rubygems/query_utils.rb +351 -0
- data/lib/rubygems/rdoc.rb +2 -14
- data/lib/rubygems/remote_fetcher.rb +48 -74
- data/lib/rubygems/request/connection_pools.rb +6 -10
- data/lib/rubygems/request/http_pool.rb +2 -4
- data/lib/rubygems/request/https_pool.rb +0 -2
- data/lib/rubygems/request.rb +26 -31
- data/lib/rubygems/request_set/gem_dependency_api.rb +127 -130
- data/lib/rubygems/request_set/lockfile/parser.rb +26 -28
- data/lib/rubygems/request_set/lockfile/tokenizer.rb +5 -7
- data/lib/rubygems/request_set/lockfile.rb +17 -21
- data/lib/rubygems/request_set.rb +27 -40
- data/lib/rubygems/requirement.rb +29 -49
- data/lib/rubygems/resolver/activation_request.rb +12 -6
- data/lib/rubygems/resolver/api_set/gem_parser.rb +20 -0
- data/lib/rubygems/resolver/api_set.rb +32 -25
- data/lib/rubygems/resolver/api_specification.rb +29 -15
- data/lib/rubygems/resolver/best_set.rb +7 -9
- data/lib/rubygems/resolver/composed_set.rb +3 -5
- data/lib/rubygems/resolver/conflict.rb +12 -14
- data/lib/rubygems/resolver/current_set.rb +0 -2
- data/lib/rubygems/resolver/dependency_request.rb +3 -5
- data/lib/rubygems/resolver/git_set.rb +2 -4
- data/lib/rubygems/resolver/git_specification.rb +6 -8
- data/lib/rubygems/resolver/index_set.rb +4 -6
- data/lib/rubygems/resolver/index_specification.rb +38 -7
- data/lib/rubygems/resolver/installed_specification.rb +4 -6
- data/lib/rubygems/resolver/installer_set.rb +66 -24
- data/lib/rubygems/resolver/local_specification.rb +2 -4
- data/lib/rubygems/resolver/lock_set.rb +6 -8
- data/lib/rubygems/resolver/lock_specification.rb +4 -6
- data/lib/rubygems/resolver/molinillo/LICENSE +9 -0
- data/lib/rubygems/resolver/molinillo/lib/molinillo/delegates/resolution_state.rb +7 -0
- data/lib/rubygems/resolver/molinillo/lib/molinillo/delegates/specification_provider.rb +8 -0
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/action.rb +1 -0
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb +2 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_vertex.rb +2 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/delete_edge.rb +2 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb +2 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/log.rb +7 -6
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/set_payload.rb +2 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/tag.rb +4 -3
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/vertex.rb +51 -12
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph.rb +42 -9
- data/lib/rubygems/resolver/molinillo/lib/molinillo/errors.rb +82 -8
- data/lib/rubygems/resolver/molinillo/lib/molinillo/gem_metadata.rb +2 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/modules/specification_provider.rb +13 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/modules/ui.rb +3 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/resolution.rb +510 -165
- data/lib/rubygems/resolver/molinillo/lib/molinillo/resolver.rb +3 -2
- data/lib/rubygems/resolver/molinillo/lib/molinillo/state.rb +8 -4
- data/lib/rubygems/resolver/molinillo/lib/molinillo.rb +6 -5
- data/lib/rubygems/resolver/molinillo.rb +1 -1
- data/lib/rubygems/resolver/requirement_list.rb +0 -2
- data/lib/rubygems/resolver/set.rb +0 -3
- data/lib/rubygems/resolver/source_set.rb +0 -2
- data/lib/rubygems/resolver/spec_specification.rb +14 -2
- data/lib/rubygems/resolver/specification.rb +14 -4
- data/lib/rubygems/resolver/stats.rb +1 -3
- data/lib/rubygems/resolver/vendor_set.rb +1 -3
- data/lib/rubygems/resolver/vendor_specification.rb +3 -5
- data/lib/rubygems/resolver.rb +53 -51
- data/lib/rubygems/s3_uri_signer.rb +7 -15
- data/lib/rubygems/safe_yaml.rb +14 -16
- data/lib/rubygems/security/policies.rb +47 -47
- data/lib/rubygems/security/policy.rb +25 -29
- data/lib/rubygems/security/signer.rb +13 -16
- data/lib/rubygems/security/trust_dir.rb +5 -6
- data/lib/rubygems/security.rb +90 -69
- data/lib/rubygems/security_option.rb +7 -7
- data/lib/rubygems/source/git.rb +31 -31
- data/lib/rubygems/source/installed.rb +1 -3
- data/lib/rubygems/source/local.rb +4 -6
- data/lib/rubygems/source/lock.rb +0 -2
- data/lib/rubygems/source/specific_file.rb +1 -3
- data/lib/rubygems/source/vendor.rb +0 -2
- data/lib/rubygems/source.rb +44 -38
- data/lib/rubygems/source_list.rb +9 -16
- data/lib/rubygems/spec_fetcher.rb +49 -48
- data/lib/rubygems/specification.rb +382 -343
- data/lib/rubygems/specification_policy.rb +131 -61
- data/lib/rubygems/stub_specification.rb +24 -31
- data/lib/rubygems/text.rb +22 -21
- data/lib/rubygems/tsort/.document +1 -0
- data/lib/rubygems/tsort/LICENSE.txt +22 -0
- data/lib/rubygems/tsort/lib/tsort.rb +452 -0
- data/lib/rubygems/tsort.rb +3 -0
- data/lib/rubygems/uninstaller.rb +98 -45
- data/lib/rubygems/unknown_command_spell_checker.rb +21 -0
- data/lib/rubygems/update_suggestion.rb +69 -0
- data/lib/rubygems/uri.rb +126 -0
- data/lib/rubygems/uri_formatter.rb +2 -3
- data/lib/rubygems/user_interaction.rb +43 -54
- data/lib/rubygems/util/licenses.rb +115 -10
- data/lib/rubygems/util/list.rb +0 -2
- data/lib/rubygems/util.rb +19 -17
- data/lib/rubygems/validator.rb +7 -9
- data/lib/rubygems/version.rb +31 -22
- data/lib/rubygems/version_option.rb +11 -5
- data/lib/rubygems.rb +213 -290
- data/rubygems-update.gemspec +5 -5
- data/setup.rb +11 -22
- 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/null-required-ruby-version.gemspec.rz +0 -0
- data/test/rubygems/data/null-required-rubygems-version.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/{lib/rubygems/test_case.rb → test/rubygems/helper.rb} +402 -327
- data/{lib → test}/rubygems/installer_test_case.rb +38 -24
- 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/{lib → test}/rubygems/package/tar_test_case.rb +51 -18
- data/test/rubygems/packages/Bluebie-legs-0.6.2.gem +0 -0
- data/test/rubygems/packages/ascii_binder-0.1.10.1.gem +0 -0
- data/test/rubygems/packages/ill-formatted-platform-1.0.0.10.gem +0 -0
- data/test/rubygems/plugin/exception/rubygems_plugin.rb +1 -1
- data/test/rubygems/plugin/load/rubygems_plugin.rb +0 -2
- data/test/rubygems/plugin/standarderror/rubygems_plugin.rb +1 -1
- data/test/rubygems/private_ec_key.pem +9 -0
- 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/commands/crash_command.rb +0 -2
- data/test/rubygems/rubygems_plugin.rb +2 -4
- data/test/rubygems/simple_gem.rb +1 -1
- data/test/rubygems/specifications/bar-0.0.2.gemspec +0 -2
- data/test/rubygems/specifications/rubyforge-0.0.1.gemspec +4 -6
- data/test/rubygems/test_bundled_ca.rb +43 -50
- data/test/rubygems/test_config.rb +5 -7
- data/test/rubygems/test_deprecate.rb +87 -10
- data/test/rubygems/test_exit.rb +17 -0
- data/test/rubygems/test_gem.rb +560 -826
- data/test/rubygems/test_gem_available_set.rb +24 -26
- data/test/rubygems/test_gem_bundler_version_finder.rb +40 -46
- data/test/rubygems/test_gem_command.rb +78 -49
- data/test/rubygems/test_gem_command_manager.rb +163 -35
- data/test/rubygems/test_gem_commands_build_command.rb +285 -57
- data/test/rubygems/test_gem_commands_cert_command.rb +180 -125
- data/test/rubygems/test_gem_commands_check_command.rb +9 -11
- data/test/rubygems/test_gem_commands_cleanup_command.rb +78 -69
- data/test/rubygems/test_gem_commands_contents_command.rb +73 -42
- data/test/rubygems/test_gem_commands_dependency_command.rb +38 -40
- data/test/rubygems/test_gem_commands_environment_command.rb +60 -38
- data/test/rubygems/test_gem_commands_exec_command.rb +851 -0
- data/test/rubygems/test_gem_commands_fetch_command.rb +163 -32
- data/test/rubygems/test_gem_commands_generate_index_command.rb +8 -14
- data/test/rubygems/test_gem_commands_help_command.rb +34 -16
- data/test/rubygems/test_gem_commands_info_command.rb +33 -9
- data/test/rubygems/test_gem_commands_install_command.rb +420 -198
- data/test/rubygems/test_gem_commands_list_command.rb +5 -7
- data/test/rubygems/test_gem_commands_lock_command.rb +11 -13
- data/test/rubygems/test_gem_commands_mirror.rb +3 -5
- data/test/rubygems/test_gem_commands_open_command.rb +16 -19
- data/test/rubygems/test_gem_commands_outdated_command.rb +23 -7
- data/test/rubygems/test_gem_commands_owner_command.rb +181 -46
- data/test/rubygems/test_gem_commands_pristine_command.rb +179 -99
- data/test/rubygems/test_gem_commands_push_command.rb +156 -67
- data/test/rubygems/test_gem_commands_query_command.rb +91 -91
- data/test/rubygems/test_gem_commands_search_command.rb +2 -4
- data/test/rubygems/test_gem_commands_server_command.rb +6 -50
- data/test/rubygems/test_gem_commands_setup_command.rb +285 -183
- data/test/rubygems/test_gem_commands_signin_command.rb +187 -28
- data/test/rubygems/test_gem_commands_signout_command.rb +3 -10
- data/test/rubygems/test_gem_commands_sources_command.rb +139 -32
- data/test/rubygems/test_gem_commands_specification_command.rb +81 -55
- data/test/rubygems/test_gem_commands_stale_command.rb +4 -6
- data/test/rubygems/test_gem_commands_uninstall_command.rb +102 -87
- data/test/rubygems/test_gem_commands_unpack_command.rb +32 -34
- data/test/rubygems/test_gem_commands_update_command.rb +341 -94
- data/test/rubygems/test_gem_commands_which_command.rb +12 -14
- data/test/rubygems/test_gem_commands_yank_command.rb +80 -44
- data/test/rubygems/test_gem_config_file.rb +114 -97
- data/test/rubygems/test_gem_dependency.rb +88 -86
- data/test/rubygems/test_gem_dependency_installer.rb +277 -391
- data/test/rubygems/test_gem_dependency_list.rb +57 -59
- data/test/rubygems/test_gem_dependency_resolution_error.rb +5 -7
- data/test/rubygems/test_gem_doctor.rb +73 -47
- data/test/rubygems/test_gem_ext_builder.rb +115 -111
- 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 +31 -38
- data/test/rubygems/test_gem_ext_configure_builder.rb +23 -39
- data/test/rubygems/test_gem_ext_ext_conf_builder.rb +66 -82
- data/test/rubygems/test_gem_ext_rake_builder.rb +49 -32
- data/test/rubygems/test_gem_gem_runner.rb +57 -9
- data/test/rubygems/test_gem_gemcutter_utilities.rb +91 -76
- data/test/rubygems/test_gem_impossible_dependencies_error.rb +4 -6
- data/test/rubygems/test_gem_indexer.rb +100 -83
- data/test/rubygems/test_gem_install_update_options.rb +31 -21
- data/test/rubygems/test_gem_installer.rb +857 -484
- data/test/rubygems/test_gem_local_remote_options.rb +11 -13
- data/test/rubygems/test_gem_name_tuple.rb +4 -6
- data/test/rubygems/test_gem_package.rb +330 -305
- data/test/rubygems/test_gem_package_old.rb +18 -20
- data/test/rubygems/test_gem_package_tar_header.rb +69 -52
- data/test/rubygems/test_gem_package_tar_reader.rb +54 -9
- data/test/rubygems/test_gem_package_tar_reader_entry.rb +168 -25
- data/test/rubygems/test_gem_package_tar_writer.rb +96 -100
- data/test/rubygems/test_gem_package_task.rb +58 -25
- data/test/rubygems/test_gem_path_support.rb +15 -21
- data/test/rubygems/test_gem_platform.rb +388 -201
- data/test/rubygems/test_gem_rdoc.rb +19 -21
- data/test/rubygems/test_gem_remote_fetcher.rb +377 -338
- data/test/rubygems/test_gem_request.rb +114 -86
- data/test/rubygems/test_gem_request_connection_pools.rb +30 -34
- data/test/rubygems/test_gem_request_set.rb +124 -125
- data/test/rubygems/test_gem_request_set_gem_dependency_api.rb +227 -231
- data/test/rubygems/test_gem_request_set_lockfile.rb +93 -95
- data/test/rubygems/test_gem_request_set_lockfile_parser.rb +69 -71
- data/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb +136 -138
- data/test/rubygems/test_gem_requirement.rb +133 -54
- data/test/rubygems/test_gem_resolver.rb +182 -117
- data/test/rubygems/test_gem_resolver_activation_request.rb +6 -8
- data/test/rubygems/test_gem_resolver_api_set.rb +79 -78
- data/test/rubygems/test_gem_resolver_api_specification.rb +47 -49
- data/test/rubygems/test_gem_resolver_best_set.rb +43 -22
- data/test/rubygems/test_gem_resolver_composed_set.rb +1 -3
- data/test/rubygems/test_gem_resolver_conflict.rb +12 -14
- data/test/rubygems/test_gem_resolver_dependency_request.rb +15 -17
- data/test/rubygems/test_gem_resolver_git_set.rb +22 -24
- data/test/rubygems/test_gem_resolver_git_specification.rb +22 -23
- data/test/rubygems/test_gem_resolver_index_set.rb +14 -16
- data/test/rubygems/test_gem_resolver_index_specification.rb +16 -18
- data/test/rubygems/test_gem_resolver_installed_specification.rb +5 -7
- data/test/rubygems/test_gem_resolver_installer_set.rb +104 -44
- data/test/rubygems/test_gem_resolver_local_specification.rb +7 -9
- data/test/rubygems/test_gem_resolver_lock_set.rb +15 -17
- data/test/rubygems/test_gem_resolver_lock_specification.rb +17 -19
- data/test/rubygems/test_gem_resolver_requirement_list.rb +1 -3
- data/test/rubygems/test_gem_resolver_specification.rb +8 -12
- data/test/rubygems/test_gem_resolver_vendor_set.rb +9 -11
- data/test/rubygems/test_gem_resolver_vendor_specification.rb +10 -12
- data/test/rubygems/test_gem_security.rb +105 -79
- data/test/rubygems/test_gem_security_policy.rb +102 -107
- data/test/rubygems/test_gem_security_signer.rb +51 -53
- data/test/rubygems/test_gem_security_trust_dir.rb +14 -16
- data/test/rubygems/test_gem_silent_ui.rb +46 -42
- data/test/rubygems/test_gem_source.rb +53 -52
- data/test/rubygems/test_gem_source_fetch_problem.rb +16 -8
- data/test/rubygems/test_gem_source_git.rb +78 -72
- data/test/rubygems/test_gem_source_installed.rb +16 -18
- data/test/rubygems/test_gem_source_list.rb +5 -6
- data/test/rubygems/test_gem_source_local.rb +15 -17
- data/test/rubygems/test_gem_source_lock.rb +31 -33
- data/test/rubygems/test_gem_source_specific_file.rb +18 -20
- data/test/rubygems/test_gem_source_subpath_problem.rb +49 -0
- data/test/rubygems/test_gem_source_vendor.rb +13 -15
- data/test/rubygems/test_gem_spec_fetcher.rb +74 -67
- data/test/rubygems/test_gem_specification.rb +967 -1056
- data/test/rubygems/test_gem_stream_ui.rb +23 -23
- data/test/rubygems/test_gem_stub_specification.rb +39 -57
- data/test/rubygems/test_gem_text.rb +8 -4
- data/test/rubygems/test_gem_uninstaller.rb +234 -105
- data/test/rubygems/test_gem_unsatisfiable_dependency_error.rb +3 -5
- data/test/rubygems/test_gem_update_suggestion.rb +208 -0
- data/test/rubygems/test_gem_uri.rb +39 -0
- data/test/rubygems/test_gem_uri_formatter.rb +14 -16
- data/test/rubygems/test_gem_util.rb +37 -35
- data/test/rubygems/test_gem_validator.rb +10 -12
- data/test/rubygems/test_gem_version.rb +32 -32
- data/test/rubygems/test_gem_version_option.rb +16 -18
- data/test/rubygems/test_kernel.rb +47 -67
- data/test/rubygems/test_project_sanity.rb +8 -3
- data/test/rubygems/test_remote_fetch_error.rb +7 -9
- data/test/rubygems/test_require.rb +269 -182
- data/test/rubygems/test_rubygems.rb +74 -0
- data/{lib/rubygems/test_utilities.rb → test/rubygems/utilities.rb} +63 -50
- 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 +17 -0
- metadata +190 -173
- data/.bundle/config +0 -2
- data/.rubocop.yml +0 -91
- data/Gemfile +0 -8
- data/Gemfile.lock +0 -43
- data/History.txt +0 -4473
- data/Rakefile +0 -428
- data/bundler/CODE_OF_CONDUCT.md +0 -136
- data/bundler/lib/bundler/dep_proxy.rb +0 -48
- data/bundler/lib/bundler/gemdeps.rb +0 -29
- data/bundler/lib/bundler/psyched_yaml.rb +0 -37
- data/bundler/lib/bundler/templates/gems.rb +0 -8
- data/bundler/lib/bundler/templates/newgem/travis.yml.tt +0 -6
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/monotonic_time.rb +0 -66
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/compatibility.rb +0 -26
- 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 -81
- 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 -158
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb +0 -223
- 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 -101
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/modules/ui.rb +0 -67
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +0 -837
- 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 -12
- data/bundler/lib/bundler/version_ranges.rb +0 -122
- data/bundler/man/bundle-add.1.txt +0 -58
- data/bundler/man/bundle-binstubs.1.txt +0 -48
- data/bundler/man/bundle-cache.1.txt +0 -78
- data/bundler/man/bundle-check.1.txt +0 -33
- data/bundler/man/bundle-clean.1.txt +0 -26
- data/bundler/man/bundle-config.1.txt +0 -528
- data/bundler/man/bundle-doctor.1.txt +0 -44
- data/bundler/man/bundle-exec.1.txt +0 -178
- data/bundler/man/bundle-gem.1 +0 -80
- data/bundler/man/bundle-gem.1.txt +0 -91
- data/bundler/man/bundle-gem.ronn +0 -78
- data/bundler/man/bundle-info.1.txt +0 -21
- data/bundler/man/bundle-init.1.txt +0 -34
- data/bundler/man/bundle-inject.1.txt +0 -32
- data/bundler/man/bundle-install.1.txt +0 -401
- data/bundler/man/bundle-list.1.txt +0 -43
- data/bundler/man/bundle-lock.1.txt +0 -93
- data/bundler/man/bundle-open.1.txt +0 -29
- data/bundler/man/bundle-outdated.1.txt +0 -131
- data/bundler/man/bundle-platform.1.txt +0 -57
- data/bundler/man/bundle-pristine.1.txt +0 -44
- data/bundler/man/bundle-remove.1.txt +0 -34
- data/bundler/man/bundle-show.1.txt +0 -27
- data/bundler/man/bundle-update.1.txt +0 -390
- data/bundler/man/bundle-viz.1.txt +0 -39
- data/bundler/man/bundle.1.txt +0 -116
- data/bundler/man/gemfile.5.txt +0 -649
- data/lib/rubygems/psych_additions.rb +0 -10
- data/lib/rubygems/server.rb +0 -879
- data/lib/rubygems/source_local.rb +0 -7
- data/lib/rubygems/source_specific_file.rb +0 -6
- data/lib/rubygems/syck_hack.rb +0 -79
- data/lib/rubygems/uri_parser.rb +0 -36
- data/lib/rubygems/uri_parsing.rb +0 -23
- data/lib/ubygems.rb +0 -14
- data/test/rubygems/bogussources.rb +0 -9
- data/test/rubygems/data/null-type.gemspec.rz +0 -0
- data/test/rubygems/test_gem_server.rb +0 -612
- data/tmp/.keep +0 -0
- data/util/CL2notes +0 -55
- data/util/bisect +0 -10
- data/util/ci.sh +0 -62
- data/util/cops/deprecations.rb +0 -52
- data/util/create_certs.rb +0 -171
- data/util/create_certs.sh +0 -27
- data/util/create_encrypted_key.rb +0 -16
- data/util/generate_spdx_license_list.rb +0 -63
- data/util/patch_with_prs.rb +0 -77
- data/util/rubocop +0 -8
- data/util/update_bundled_ca_certificates.rb +0 -137
- data/util/update_changelog.rb +0 -64
- /data/bundler/{man/bundle-check.ronn → lib/bundler/man/bundle-check.1.ronn} +0 -0
- /data/bundler/{man/bundle-doctor.ronn → lib/bundler/man/bundle-doctor.1.ronn} +0 -0
- /data/bundler/{man/bundle-info.ronn → lib/bundler/man/bundle-info.1.ronn} +0 -0
- /data/bundler/{man/bundle-lock.ronn → lib/bundler/man/bundle-lock.1.ronn} +0 -0
- /data/bundler/{man/bundle-pristine.ronn → lib/bundler/man/bundle-pristine.1.ronn} +0 -0
- /data/bundler/{man/bundle-remove.ronn → lib/bundler/man/bundle-remove.1.ronn} +0 -0
- /data/bundler/{man/bundle-show.ronn → lib/bundler/man/bundle-show.1.ronn} +0 -0
@@ -4,7 +4,6 @@
|
|
4
4
|
# files
|
5
5
|
|
6
6
|
class Gem::Resolver::InstallerSet < Gem::Resolver::Set
|
7
|
-
|
8
7
|
##
|
9
8
|
# List of Gem::Specification objects that must always be installed.
|
10
9
|
|
@@ -26,6 +25,12 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
|
|
26
25
|
|
27
26
|
attr_reader :remote_set # :nodoc:
|
28
27
|
|
28
|
+
##
|
29
|
+
# Ignore ruby & rubygems specification constraints.
|
30
|
+
#
|
31
|
+
|
32
|
+
attr_accessor :force # :nodoc:
|
33
|
+
|
29
34
|
##
|
30
35
|
# Creates a new InstallerSet that will look for gems in +domain+.
|
31
36
|
|
@@ -33,7 +38,6 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
|
|
33
38
|
super()
|
34
39
|
|
35
40
|
@domain = domain
|
36
|
-
@remote = consider_remote?
|
37
41
|
|
38
42
|
@f = Gem::SpecFetcher.fetcher
|
39
43
|
|
@@ -43,6 +47,7 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
|
|
43
47
|
@local = {}
|
44
48
|
@local_source = Gem::Source::Local.new
|
45
49
|
@remote_set = Gem::Resolver::BestSet.new
|
50
|
+
@force = false
|
46
51
|
@specs = {}
|
47
52
|
end
|
48
53
|
|
@@ -56,24 +61,38 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
|
|
56
61
|
found = find_all request
|
57
62
|
|
58
63
|
found.delete_if do |s|
|
59
|
-
s.version.prerelease?
|
64
|
+
s.version.prerelease? && !s.local?
|
60
65
|
end unless dependency.prerelease?
|
61
66
|
|
62
67
|
found = found.select do |s|
|
63
|
-
Gem::Source::SpecificFile === s.source
|
64
|
-
Gem::Platform
|
65
|
-
|
68
|
+
Gem::Source::SpecificFile === s.source ||
|
69
|
+
Gem::Platform.match_spec?(s)
|
70
|
+
end
|
71
|
+
|
72
|
+
found = found.sort_by do |s|
|
73
|
+
[s.version, Gem::Platform.sort_priority(s.platform)]
|
66
74
|
end
|
67
75
|
|
68
|
-
|
76
|
+
newest = found.last
|
77
|
+
|
78
|
+
unless newest
|
69
79
|
exc = Gem::UnsatisfiableDependencyError.new request
|
70
80
|
exc.errors = errors
|
71
81
|
|
72
82
|
raise exc
|
73
83
|
end
|
74
84
|
|
75
|
-
|
76
|
-
|
85
|
+
unless @force
|
86
|
+
found_matching_metadata = found.reverse.find do |spec|
|
87
|
+
metadata_satisfied?(spec)
|
88
|
+
end
|
89
|
+
|
90
|
+
if found_matching_metadata.nil?
|
91
|
+
ensure_required_ruby_version_met(newest.spec)
|
92
|
+
ensure_required_rubygems_version_met(newest.spec)
|
93
|
+
else
|
94
|
+
newest = found_matching_metadata
|
95
|
+
end
|
77
96
|
end
|
78
97
|
|
79
98
|
@always_install << newest.spec
|
@@ -91,14 +110,14 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
|
|
91
110
|
# Should local gems should be considered?
|
92
111
|
|
93
112
|
def consider_local? # :nodoc:
|
94
|
-
@domain == :both
|
113
|
+
@domain == :both || @domain == :local
|
95
114
|
end
|
96
115
|
|
97
116
|
##
|
98
117
|
# Should remote gems should be considered?
|
99
118
|
|
100
119
|
def consider_remote? # :nodoc:
|
101
|
-
@domain == :both
|
120
|
+
@domain == :both || @domain == :remote
|
102
121
|
end
|
103
122
|
|
104
123
|
##
|
@@ -117,13 +136,13 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
|
|
117
136
|
|
118
137
|
dep = req.dependency
|
119
138
|
|
120
|
-
return res if @ignore_dependencies
|
121
|
-
|
139
|
+
return res if @ignore_dependencies &&
|
140
|
+
@always_install.none? {|spec| dep.match? spec }
|
122
141
|
|
123
142
|
name = dep.name
|
124
143
|
|
125
144
|
dep.matching_specs.each do |gemspec|
|
126
|
-
next if @always_install.any? {
|
145
|
+
next if @always_install.any? {|spec| spec.name == gemspec.name }
|
127
146
|
|
128
147
|
res << Gem::Resolver::InstalledSpecification.new(self, gemspec)
|
129
148
|
end unless @ignore_installed
|
@@ -148,10 +167,6 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
|
|
148
167
|
end
|
149
168
|
end
|
150
169
|
|
151
|
-
res.delete_if do |spec|
|
152
|
-
spec.version.prerelease? and not dep.prerelease?
|
153
|
-
end
|
154
|
-
|
155
170
|
res.concat @remote_set.find_all req if consider_remote?
|
156
171
|
|
157
172
|
res
|
@@ -168,10 +183,10 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
|
|
168
183
|
end
|
169
184
|
|
170
185
|
def inspect # :nodoc:
|
171
|
-
always_install = @always_install.map {
|
186
|
+
always_install = @always_install.map {|s| s.full_name }
|
172
187
|
|
173
|
-
|
174
|
-
self.class, @domain, @specs.keys, always_install
|
188
|
+
"#<%s domain: %s specs: %p always install: %p>" % [
|
189
|
+
self.class, @domain, @specs.keys, always_install
|
175
190
|
]
|
176
191
|
end
|
177
192
|
|
@@ -199,16 +214,16 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
|
|
199
214
|
end
|
200
215
|
|
201
216
|
def pretty_print(q) # :nodoc:
|
202
|
-
q.group 2,
|
217
|
+
q.group 2, "[InstallerSet", "]" do
|
203
218
|
q.breakable
|
204
219
|
q.text "domain: #{@domain}"
|
205
220
|
|
206
221
|
q.breakable
|
207
|
-
q.text
|
222
|
+
q.text "specs: "
|
208
223
|
q.pp @specs.keys
|
209
224
|
|
210
225
|
q.breakable
|
211
|
-
q.text
|
226
|
+
q.text "always install: "
|
212
227
|
q.pp @always_install
|
213
228
|
end
|
214
229
|
end
|
@@ -224,4 +239,31 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
|
|
224
239
|
end
|
225
240
|
end
|
226
241
|
|
242
|
+
private
|
243
|
+
|
244
|
+
def metadata_satisfied?(spec)
|
245
|
+
spec.required_ruby_version.satisfied_by?(Gem.ruby_version) &&
|
246
|
+
spec.required_rubygems_version.satisfied_by?(Gem.rubygems_version)
|
247
|
+
end
|
248
|
+
|
249
|
+
def ensure_required_ruby_version_met(spec) # :nodoc:
|
250
|
+
if rrv = spec.required_ruby_version
|
251
|
+
ruby_version = Gem.ruby_version
|
252
|
+
unless rrv.satisfied_by? ruby_version
|
253
|
+
raise Gem::RuntimeRequirementNotMetError,
|
254
|
+
"#{spec.full_name} requires Ruby version #{rrv}. The current ruby version is #{ruby_version}."
|
255
|
+
end
|
256
|
+
end
|
257
|
+
end
|
258
|
+
|
259
|
+
def ensure_required_rubygems_version_met(spec) # :nodoc:
|
260
|
+
if rrgv = spec.required_rubygems_version
|
261
|
+
unless rrgv.satisfied_by? Gem.rubygems_version
|
262
|
+
rg_version = Gem::VERSION
|
263
|
+
raise Gem::RuntimeRequirementNotMetError,
|
264
|
+
"#{spec.full_name} requires RubyGems version #{rrgv}. The current RubyGems version is #{rg_version}. " +
|
265
|
+
"Try 'gem update --system' to update RubyGems itself."
|
266
|
+
end
|
267
|
+
end
|
268
|
+
end
|
227
269
|
end
|
@@ -3,7 +3,6 @@
|
|
3
3
|
# A LocalSpecification comes from a .gem file on the local filesystem.
|
4
4
|
|
5
5
|
class Gem::Resolver::LocalSpecification < Gem::Resolver::SpecSpecification
|
6
|
-
|
7
6
|
##
|
8
7
|
# Returns +true+ if this gem is installable for the current platform.
|
9
8
|
|
@@ -18,7 +17,7 @@ class Gem::Resolver::LocalSpecification < Gem::Resolver::SpecSpecification
|
|
18
17
|
end
|
19
18
|
|
20
19
|
def pretty_print(q) # :nodoc:
|
21
|
-
q.group 2,
|
20
|
+
q.group 2, "[LocalSpecification", "]" do
|
22
21
|
q.breakable
|
23
22
|
q.text "name: #{name}"
|
24
23
|
|
@@ -29,7 +28,7 @@ class Gem::Resolver::LocalSpecification < Gem::Resolver::SpecSpecification
|
|
29
28
|
q.text "platform: #{platform}"
|
30
29
|
|
31
30
|
q.breakable
|
32
|
-
q.text
|
31
|
+
q.text "dependencies:"
|
33
32
|
q.breakable
|
34
33
|
q.pp dependencies
|
35
34
|
|
@@ -37,5 +36,4 @@ class Gem::Resolver::LocalSpecification < Gem::Resolver::SpecSpecification
|
|
37
36
|
q.text "source: #{@source.path}"
|
38
37
|
end
|
39
38
|
end
|
40
|
-
|
41
39
|
end
|
@@ -3,7 +3,6 @@
|
|
3
3
|
# A set of gems from a gem dependencies lockfile.
|
4
4
|
|
5
5
|
class Gem::Resolver::LockSet < Gem::Resolver::Set
|
6
|
-
|
7
6
|
attr_reader :specs # :nodoc:
|
8
7
|
|
9
8
|
##
|
@@ -29,7 +28,7 @@ class Gem::Resolver::LockSet < Gem::Resolver::Set
|
|
29
28
|
def add(name, version, platform) # :nodoc:
|
30
29
|
version = Gem::Version.new version
|
31
30
|
specs = [
|
32
|
-
Gem::Resolver::LockSpecification.new(self, name, version, @sources, platform)
|
31
|
+
Gem::Resolver::LockSpecification.new(self, name, version, @sources, platform),
|
33
32
|
]
|
34
33
|
|
35
34
|
@specs.concat specs
|
@@ -55,7 +54,7 @@ class Gem::Resolver::LockSet < Gem::Resolver::Set
|
|
55
54
|
dep = Gem::Dependency.new name, version
|
56
55
|
|
57
56
|
found = @specs.find do |spec|
|
58
|
-
dep.matches_spec?
|
57
|
+
dep.matches_spec?(spec) && spec.platform == platform
|
59
58
|
end
|
60
59
|
|
61
60
|
tuple = Gem::NameTuple.new found.name, found.version, found.platform
|
@@ -64,19 +63,18 @@ class Gem::Resolver::LockSet < Gem::Resolver::Set
|
|
64
63
|
end
|
65
64
|
|
66
65
|
def pretty_print(q) # :nodoc:
|
67
|
-
q.group 2,
|
66
|
+
q.group 2, "[LockSet", "]" do
|
68
67
|
q.breakable
|
69
|
-
q.text
|
68
|
+
q.text "source:"
|
70
69
|
|
71
70
|
q.breakable
|
72
71
|
q.pp @source
|
73
72
|
|
74
73
|
q.breakable
|
75
|
-
q.text
|
74
|
+
q.text "specs:"
|
76
75
|
|
77
76
|
q.breakable
|
78
|
-
q.pp @specs.map {
|
77
|
+
q.pp @specs.map {|spec| spec.full_name }
|
79
78
|
end
|
80
79
|
end
|
81
|
-
|
82
80
|
end
|
@@ -6,7 +6,6 @@
|
|
6
6
|
# lockfile.
|
7
7
|
|
8
8
|
class Gem::Resolver::LockSpecification < Gem::Resolver::Specification
|
9
|
-
|
10
9
|
attr_reader :sources
|
11
10
|
|
12
11
|
def initialize(set, name, version, sources, platform)
|
@@ -30,7 +29,7 @@ class Gem::Resolver::LockSpecification < Gem::Resolver::Specification
|
|
30
29
|
def install(options = {})
|
31
30
|
destination = options[:install_dir] || Gem.dir
|
32
31
|
|
33
|
-
if File.exist? File.join(destination,
|
32
|
+
if File.exist? File.join(destination, "specifications", spec.spec_name)
|
34
33
|
yield nil
|
35
34
|
return
|
36
35
|
end
|
@@ -46,7 +45,7 @@ class Gem::Resolver::LockSpecification < Gem::Resolver::Specification
|
|
46
45
|
end
|
47
46
|
|
48
47
|
def pretty_print(q) # :nodoc:
|
49
|
-
q.group 2,
|
48
|
+
q.group 2, "[LockSpecification", "]" do
|
50
49
|
q.breakable
|
51
50
|
q.text "name: #{@name}"
|
52
51
|
|
@@ -60,7 +59,7 @@ class Gem::Resolver::LockSpecification < Gem::Resolver::Specification
|
|
60
59
|
|
61
60
|
unless @dependencies.empty?
|
62
61
|
q.breakable
|
63
|
-
q.text
|
62
|
+
q.text "dependencies:"
|
64
63
|
q.breakable
|
65
64
|
q.pp @dependencies
|
66
65
|
end
|
@@ -72,7 +71,7 @@ class Gem::Resolver::LockSpecification < Gem::Resolver::Specification
|
|
72
71
|
|
73
72
|
def spec
|
74
73
|
@spec ||= Gem::Specification.find do |spec|
|
75
|
-
spec.name == @name
|
74
|
+
spec.name == @name && spec.version == @version
|
76
75
|
end
|
77
76
|
|
78
77
|
@spec ||= Gem::Specification.new do |s|
|
@@ -83,5 +82,4 @@ class Gem::Resolver::LockSpecification < Gem::Resolver::Specification
|
|
83
82
|
s.dependencies.concat @dependencies
|
84
83
|
end
|
85
84
|
end
|
86
|
-
|
87
85
|
end
|
@@ -0,0 +1,9 @@
|
|
1
|
+
This project is licensed under the MIT license.
|
2
|
+
|
3
|
+
Copyright (c) 2014 Samuel E. Giddins segiddins@segiddins.me
|
4
|
+
|
5
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
6
|
+
|
7
|
+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
|
8
|
+
|
9
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
@@ -1,4 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
2
3
|
module Gem::Resolver::Molinillo
|
3
4
|
# @!visibility private
|
4
5
|
module Delegates
|
@@ -45,6 +46,12 @@ module Gem::Resolver::Molinillo
|
|
45
46
|
current_state = state || Gem::Resolver::Molinillo::ResolutionState.empty
|
46
47
|
current_state.conflicts
|
47
48
|
end
|
49
|
+
|
50
|
+
# (see Gem::Resolver::Molinillo::ResolutionState#unused_unwind_options)
|
51
|
+
def unused_unwind_options
|
52
|
+
current_state = state || Gem::Resolver::Molinillo::ResolutionState.empty
|
53
|
+
current_state.unused_unwind_options
|
54
|
+
end
|
48
55
|
end
|
49
56
|
end
|
50
57
|
end
|
@@ -1,4 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
2
3
|
module Gem::Resolver::Molinillo
|
3
4
|
module Delegates
|
4
5
|
# Delegates all {Gem::Resolver::Molinillo::SpecificationProvider} methods to a
|
@@ -25,6 +26,13 @@ module Gem::Resolver::Molinillo
|
|
25
26
|
end
|
26
27
|
end
|
27
28
|
|
29
|
+
# (see Gem::Resolver::Molinillo::SpecificationProvider#dependencies_equal?)
|
30
|
+
def dependencies_equal?(dependencies, other_dependencies)
|
31
|
+
with_no_such_dependency_error_handling do
|
32
|
+
specification_provider.dependencies_equal?(dependencies, other_dependencies)
|
33
|
+
end
|
34
|
+
end
|
35
|
+
|
28
36
|
# (see Gem::Resolver::Molinillo::SpecificationProvider#name_for)
|
29
37
|
def name_for(dependency)
|
30
38
|
with_no_such_dependency_error_handling do
|
@@ -1,10 +1,11 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
2
|
+
|
3
|
+
require_relative 'add_edge_no_circular'
|
4
|
+
require_relative 'add_vertex'
|
5
|
+
require_relative 'delete_edge'
|
6
|
+
require_relative 'detach_vertex_named'
|
7
|
+
require_relative 'set_payload'
|
8
|
+
require_relative 'tag'
|
8
9
|
|
9
10
|
module Gem::Resolver::Molinillo
|
10
11
|
class DependencyGraph
|
@@ -1,5 +1,6 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
-
|
2
|
+
|
3
|
+
require_relative 'action'
|
3
4
|
module Gem::Resolver::Molinillo
|
4
5
|
class DependencyGraph
|
5
6
|
# @!visibility private
|
@@ -13,11 +14,11 @@ module Gem::Resolver::Molinillo
|
|
13
14
|
end
|
14
15
|
|
15
16
|
# (see Action#up)
|
16
|
-
def up(
|
17
|
+
def up(graph)
|
17
18
|
end
|
18
19
|
|
19
20
|
# (see Action#down)
|
20
|
-
def down(
|
21
|
+
def down(graph)
|
21
22
|
end
|
22
23
|
|
23
24
|
# @!group Tag
|
@@ -1,4 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
2
3
|
module Gem::Resolver::Molinillo
|
3
4
|
class DependencyGraph
|
4
5
|
# A vertex in a {DependencyGraph} that encapsulates a {#name} and a
|
@@ -32,7 +33,7 @@ module Gem::Resolver::Molinillo
|
|
32
33
|
# @return [Array<Object>] all of the requirements that required
|
33
34
|
# this vertex
|
34
35
|
def requirements
|
35
|
-
incoming_edges.map(&:requirement) + explicit_requirements
|
36
|
+
(incoming_edges.map(&:requirement) + explicit_requirements).uniq
|
36
37
|
end
|
37
38
|
|
38
39
|
# @return [Array<Edge>] the edges of {#graph} that have `self` as their
|
@@ -49,14 +50,25 @@ module Gem::Resolver::Molinillo
|
|
49
50
|
incoming_edges.map(&:origin)
|
50
51
|
end
|
51
52
|
|
52
|
-
# @return [
|
53
|
+
# @return [Set<Vertex>] the vertices of {#graph} where `self` is a
|
53
54
|
# {#descendent?}
|
54
55
|
def recursive_predecessors
|
55
|
-
|
56
|
-
|
57
|
-
|
56
|
+
_recursive_predecessors
|
57
|
+
end
|
58
|
+
|
59
|
+
# @param [Set<Vertex>] vertices the set to add the predecessors to
|
60
|
+
# @return [Set<Vertex>] the vertices of {#graph} where `self` is a
|
61
|
+
# {#descendent?}
|
62
|
+
def _recursive_predecessors(vertices = new_vertex_set)
|
63
|
+
incoming_edges.each do |edge|
|
64
|
+
vertex = edge.origin
|
65
|
+
next unless vertices.add?(vertex)
|
66
|
+
vertex._recursive_predecessors(vertices)
|
67
|
+
end
|
68
|
+
|
58
69
|
vertices
|
59
70
|
end
|
71
|
+
protected :_recursive_predecessors
|
60
72
|
|
61
73
|
# @return [Array<Vertex>] the vertices of {#graph} that have an edge with
|
62
74
|
# `self` as their {Edge#origin}
|
@@ -64,14 +76,25 @@ module Gem::Resolver::Molinillo
|
|
64
76
|
outgoing_edges.map(&:destination)
|
65
77
|
end
|
66
78
|
|
67
|
-
# @return [
|
79
|
+
# @return [Set<Vertex>] the vertices of {#graph} where `self` is an
|
68
80
|
# {#ancestor?}
|
69
81
|
def recursive_successors
|
70
|
-
|
71
|
-
|
72
|
-
|
82
|
+
_recursive_successors
|
83
|
+
end
|
84
|
+
|
85
|
+
# @param [Set<Vertex>] vertices the set to add the successors to
|
86
|
+
# @return [Set<Vertex>] the vertices of {#graph} where `self` is an
|
87
|
+
# {#ancestor?}
|
88
|
+
def _recursive_successors(vertices = new_vertex_set)
|
89
|
+
outgoing_edges.each do |edge|
|
90
|
+
vertex = edge.destination
|
91
|
+
next unless vertices.add?(vertex)
|
92
|
+
vertex._recursive_successors(vertices)
|
93
|
+
end
|
94
|
+
|
73
95
|
vertices
|
74
96
|
end
|
97
|
+
protected :_recursive_successors
|
75
98
|
|
76
99
|
# @return [String] a string suitable for debugging
|
77
100
|
def inspect
|
@@ -105,21 +128,37 @@ module Gem::Resolver::Molinillo
|
|
105
128
|
|
106
129
|
# Is there a path from `self` to `other` following edges in the
|
107
130
|
# dependency graph?
|
108
|
-
# @return
|
131
|
+
# @return whether there is a path following edges within this {#graph}
|
109
132
|
def path_to?(other)
|
110
|
-
|
133
|
+
_path_to?(other)
|
111
134
|
end
|
112
135
|
|
113
136
|
alias descendent? path_to?
|
114
137
|
|
138
|
+
# @param [Vertex] other the vertex to check if there's a path to
|
139
|
+
# @param [Set<Vertex>] visited the vertices of {#graph} that have been visited
|
140
|
+
# @return [Boolean] whether there is a path to `other` from `self`
|
141
|
+
def _path_to?(other, visited = new_vertex_set)
|
142
|
+
return false unless visited.add?(self)
|
143
|
+
return true if equal?(other)
|
144
|
+
successors.any? { |v| v._path_to?(other, visited) }
|
145
|
+
end
|
146
|
+
protected :_path_to?
|
147
|
+
|
115
148
|
# Is there a path from `other` to `self` following edges in the
|
116
149
|
# dependency graph?
|
117
|
-
# @return
|
150
|
+
# @return whether there is a path following edges within this {#graph}
|
118
151
|
def ancestor?(other)
|
119
152
|
other.path_to?(self)
|
120
153
|
end
|
121
154
|
|
122
155
|
alias is_reachable_from? ancestor?
|
156
|
+
|
157
|
+
def new_vertex_set
|
158
|
+
require 'set'
|
159
|
+
Set.new
|
160
|
+
end
|
161
|
+
private :new_vertex_set
|
123
162
|
end
|
124
163
|
end
|
125
164
|
end
|
@@ -1,9 +1,9 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
-
require 'set'
|
3
|
-
require 'tsort'
|
4
2
|
|
5
|
-
|
6
|
-
|
3
|
+
require_relative '../../../../tsort'
|
4
|
+
|
5
|
+
require_relative 'dependency_graph/log'
|
6
|
+
require_relative 'dependency_graph/vertex'
|
7
7
|
|
8
8
|
module Gem::Resolver::Molinillo
|
9
9
|
# A directed acyclic graph that is tuned to hold named dependencies
|
@@ -17,7 +17,7 @@ module Gem::Resolver::Molinillo
|
|
17
17
|
vertices.values.each { |v| yield v }
|
18
18
|
end
|
19
19
|
|
20
|
-
include TSort
|
20
|
+
include Gem::TSort
|
21
21
|
|
22
22
|
# @!visibility private
|
23
23
|
alias tsort_each_node each
|
@@ -32,7 +32,7 @@ module Gem::Resolver::Molinillo
|
|
32
32
|
# all belong to the same graph.
|
33
33
|
# @return [Array<Vertex>] The sorted vertices.
|
34
34
|
def self.tsort(vertices)
|
35
|
-
TSort.tsort(
|
35
|
+
Gem::TSort.tsort(
|
36
36
|
lambda { |b| vertices.each(&b) },
|
37
37
|
lambda { |v, &b| (v.successors & vertices).each(&b) }
|
38
38
|
)
|
@@ -123,6 +123,7 @@ module Gem::Resolver::Molinillo
|
|
123
123
|
dot.join("\n")
|
124
124
|
end
|
125
125
|
|
126
|
+
# @param [DependencyGraph] other
|
126
127
|
# @return [Boolean] whether the two dependency graphs are equal, determined
|
127
128
|
# by a recursive traversal of each {#root_vertices} and its
|
128
129
|
# {Vertex#successors}
|
@@ -147,8 +148,8 @@ module Gem::Resolver::Molinillo
|
|
147
148
|
vertex = add_vertex(name, payload, root)
|
148
149
|
vertex.explicit_requirements << requirement if root
|
149
150
|
parent_names.each do |parent_name|
|
150
|
-
|
151
|
-
add_edge(
|
151
|
+
parent_vertex = vertex_named(parent_name)
|
152
|
+
add_edge(parent_vertex, vertex, requirement)
|
152
153
|
end
|
153
154
|
vertex
|
154
155
|
end
|
@@ -189,7 +190,7 @@ module Gem::Resolver::Molinillo
|
|
189
190
|
# @return [Edge] the added edge
|
190
191
|
def add_edge(origin, destination, requirement)
|
191
192
|
if destination.path_to?(origin)
|
192
|
-
raise CircularDependencyError.new(
|
193
|
+
raise CircularDependencyError.new(path(destination, origin))
|
193
194
|
end
|
194
195
|
add_edge_no_circular(origin, destination, requirement)
|
195
196
|
end
|
@@ -218,5 +219,37 @@ module Gem::Resolver::Molinillo
|
|
218
219
|
def add_edge_no_circular(origin, destination, requirement)
|
219
220
|
log.add_edge_no_circular(self, origin.name, destination.name, requirement)
|
220
221
|
end
|
222
|
+
|
223
|
+
# Returns the path between two vertices
|
224
|
+
# @raise [ArgumentError] if there is no path between the vertices
|
225
|
+
# @param [Vertex] from
|
226
|
+
# @param [Vertex] to
|
227
|
+
# @return [Array<Vertex>] the shortest path from `from` to `to`
|
228
|
+
def path(from, to)
|
229
|
+
distances = Hash.new(vertices.size + 1)
|
230
|
+
distances[from.name] = 0
|
231
|
+
predecessors = {}
|
232
|
+
each do |vertex|
|
233
|
+
vertex.successors.each do |successor|
|
234
|
+
if distances[successor.name] > distances[vertex.name] + 1
|
235
|
+
distances[successor.name] = distances[vertex.name] + 1
|
236
|
+
predecessors[successor] = vertex
|
237
|
+
end
|
238
|
+
end
|
239
|
+
end
|
240
|
+
|
241
|
+
path = [to]
|
242
|
+
while before = predecessors[to]
|
243
|
+
path << before
|
244
|
+
to = before
|
245
|
+
break if to == from
|
246
|
+
end
|
247
|
+
|
248
|
+
unless path.last.equal?(from)
|
249
|
+
raise ArgumentError, "There is no path from #{from.name} to #{to.name}"
|
250
|
+
end
|
251
|
+
|
252
|
+
path.reverse
|
253
|
+
end
|
221
254
|
end
|
222
255
|
end
|