rubygems-update 3.2.0.rc.1 → 3.2.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CONTRIBUTING.md +23 -8
- data/History.txt +307 -239
- data/Manifest.txt +36 -54
- data/POLICIES.md +4 -3
- data/Rakefile +29 -51
- data/bundler/CHANGELOG.md +786 -690
- data/bundler/UPGRADING.md +3 -3
- data/bundler/lib/bundler.rb +17 -3
- data/bundler/lib/bundler/build_metadata.rb +4 -12
- data/bundler/lib/bundler/cli.rb +31 -15
- data/bundler/lib/bundler/cli/add.rb +1 -1
- data/bundler/lib/bundler/cli/binstubs.rb +6 -2
- data/bundler/lib/bundler/cli/cache.rb +1 -7
- data/bundler/lib/bundler/cli/clean.rb +1 -1
- data/bundler/lib/bundler/cli/common.rb +14 -0
- data/bundler/lib/bundler/cli/doctor.rb +1 -1
- data/bundler/lib/bundler/cli/exec.rb +4 -4
- data/bundler/lib/bundler/cli/fund.rb +36 -0
- data/bundler/lib/bundler/cli/gem.rb +1 -1
- data/bundler/lib/bundler/cli/info.rb +2 -1
- data/bundler/lib/bundler/cli/init.rb +1 -1
- data/bundler/lib/bundler/cli/inject.rb +1 -1
- data/bundler/lib/bundler/cli/install.rb +18 -7
- data/bundler/lib/bundler/cli/list.rb +1 -1
- data/bundler/lib/bundler/cli/outdated.rb +1 -3
- data/bundler/lib/bundler/cli/pristine.rb +1 -1
- data/bundler/lib/bundler/cli/show.rb +1 -1
- data/bundler/lib/bundler/cli/update.rb +3 -1
- data/bundler/lib/bundler/compact_index_client.rb +1 -1
- data/bundler/lib/bundler/compact_index_client/cache.rb +6 -14
- data/bundler/lib/bundler/compact_index_client/gem_parser.rb +28 -0
- data/bundler/lib/bundler/compact_index_client/updater.rb +5 -5
- data/bundler/lib/bundler/definition.rb +49 -60
- data/bundler/lib/bundler/dep_proxy.rb +1 -1
- data/bundler/lib/bundler/dependency.rb +3 -1
- data/bundler/lib/bundler/dsl.rb +4 -4
- data/bundler/lib/bundler/endpoint_specification.rb +1 -1
- data/bundler/lib/bundler/env.rb +1 -1
- data/bundler/lib/bundler/feature_flag.rb +0 -1
- data/bundler/lib/bundler/fetcher.rb +3 -3
- data/bundler/lib/bundler/fetcher/base.rb +1 -1
- data/bundler/lib/bundler/fetcher/compact_index.rb +1 -1
- data/bundler/lib/bundler/fetcher/downloader.rb +1 -1
- data/bundler/lib/bundler/fetcher/index.rb +3 -4
- data/bundler/lib/bundler/friendly_errors.rb +18 -3
- data/bundler/lib/bundler/gem_helper.rb +17 -9
- data/bundler/lib/bundler/gem_helpers.rb +36 -25
- data/bundler/lib/bundler/gem_version_promoter.rb +1 -1
- data/bundler/lib/bundler/graph.rb +1 -1
- data/bundler/lib/bundler/index.rb +6 -2
- data/bundler/lib/bundler/injector.rb +10 -3
- data/bundler/lib/bundler/installer.rb +8 -6
- data/bundler/lib/bundler/installer/gem_installer.rb +1 -1
- data/bundler/lib/bundler/installer/parallel_installer.rb +1 -1
- data/bundler/lib/bundler/installer/standalone.rb +2 -2
- data/bundler/lib/bundler/lazy_specification.rb +22 -11
- data/bundler/lib/bundler/lockfile_generator.rb +1 -1
- data/bundler/lib/bundler/lockfile_parser.rb +1 -1
- data/bundler/lib/bundler/man/.document +1 -0
- data/bundler/{man/bundle-add.ronn → lib/bundler/man/bundle-add.1.ronn} +0 -0
- data/bundler/{man/bundle-binstubs.ronn → lib/bundler/man/bundle-binstubs.1.ronn} +2 -4
- data/bundler/{man/bundle-cache.ronn → lib/bundler/man/bundle-cache.1.ronn} +0 -0
- data/bundler/{man/bundle-check.ronn → lib/bundler/man/bundle-check.1.ronn} +0 -0
- data/bundler/{man/bundle-clean.ronn → lib/bundler/man/bundle-clean.1.ronn} +0 -0
- data/bundler/{man/bundle-config.ronn → lib/bundler/man/bundle-config.1.ronn} +14 -21
- data/bundler/{man/bundle-doctor.ronn → lib/bundler/man/bundle-doctor.1.ronn} +0 -0
- data/bundler/{man/bundle-exec.ronn → lib/bundler/man/bundle-exec.1.ronn} +0 -0
- data/bundler/{man/bundle-gem.ronn → lib/bundler/man/bundle-gem.1.ronn} +0 -0
- data/bundler/{man/bundle-info.ronn → lib/bundler/man/bundle-info.1.ronn} +0 -0
- data/bundler/{man/bundle-init.ronn → lib/bundler/man/bundle-init.1.ronn} +0 -0
- data/bundler/{man/bundle-inject.ronn → lib/bundler/man/bundle-inject.1.ronn} +0 -0
- data/bundler/{man/bundle-install.ronn → lib/bundler/man/bundle-install.1.ronn} +25 -3
- data/bundler/{man/bundle-list.ronn → lib/bundler/man/bundle-list.1.ronn} +0 -0
- data/bundler/{man/bundle-lock.ronn → lib/bundler/man/bundle-lock.1.ronn} +0 -0
- data/bundler/{man/bundle-open.ronn → lib/bundler/man/bundle-open.1.ronn} +0 -0
- data/bundler/{man/bundle-outdated.ronn → lib/bundler/man/bundle-outdated.1.ronn} +0 -0
- data/bundler/{man/bundle-platform.ronn → lib/bundler/man/bundle-platform.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
- data/bundler/{man/bundle-update.ronn → lib/bundler/man/bundle-update.1.ronn} +0 -0
- data/bundler/{man/bundle-viz.ronn → lib/bundler/man/bundle-viz.1.ronn} +0 -0
- data/bundler/{man/bundle.ronn → lib/bundler/man/bundle.1.ronn} +0 -0
- data/bundler/{man → lib/bundler/man}/gemfile.5.ronn +4 -4
- data/bundler/lib/bundler/mirror.rb +2 -2
- data/bundler/lib/bundler/plugin.rb +5 -6
- data/bundler/lib/bundler/plugin/api/source.rb +1 -1
- data/bundler/lib/bundler/plugin/dsl.rb +1 -1
- data/bundler/lib/bundler/plugin/index.rb +1 -1
- data/bundler/lib/bundler/plugin/installer.rb +1 -1
- data/bundler/lib/bundler/plugin/installer/rubygems.rb +1 -1
- data/bundler/lib/bundler/plugin/source_list.rb +1 -1
- data/bundler/lib/bundler/remote_specification.rb +1 -1
- data/bundler/lib/bundler/resolver.rb +26 -30
- data/bundler/lib/bundler/resolver/spec_group.rb +21 -27
- data/bundler/lib/bundler/retry.rb +1 -1
- data/bundler/lib/bundler/ruby_version.rb +1 -1
- data/bundler/lib/bundler/rubygems_ext.rb +46 -1
- data/bundler/lib/bundler/rubygems_gem_installer.rb +2 -2
- data/bundler/lib/bundler/rubygems_integration.rb +22 -12
- data/bundler/lib/bundler/runtime.rb +2 -2
- data/bundler/lib/bundler/settings.rb +49 -43
- data/bundler/lib/bundler/shared_helpers.rb +1 -1
- data/bundler/lib/bundler/similarity_detector.rb +1 -1
- data/bundler/lib/bundler/source.rb +1 -1
- data/bundler/lib/bundler/source/git.rb +1 -1
- data/bundler/lib/bundler/source/git/git_proxy.rb +5 -3
- data/bundler/lib/bundler/source/path.rb +2 -2
- data/bundler/lib/bundler/source/path/installer.rb +1 -1
- data/bundler/lib/bundler/source/rubygems.rb +2 -2
- data/bundler/lib/bundler/source/rubygems/remote.rb +1 -1
- data/bundler/lib/bundler/source_list.rb +2 -2
- data/bundler/lib/bundler/spec_set.rb +7 -9
- data/bundler/lib/bundler/stub_specification.rb +1 -3
- data/bundler/lib/bundler/templates/newgem/README.md.tt +1 -2
- data/bundler/lib/bundler/templates/newgem/bin/console.tt +1 -2
- data/bundler/lib/bundler/templates/newgem/lib/newgem.rb.tt +2 -2
- data/bundler/lib/bundler/templates/newgem/newgem.gemspec.tt +8 -2
- data/bundler/lib/bundler/templates/newgem/spec/spec_helper.rb.tt +0 -1
- data/bundler/lib/bundler/ui/shell.rb +5 -5
- data/bundler/lib/bundler/uri_credentials_filter.rb +3 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo.rb +0 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb +34 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb +2 -2
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +38 -40
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +8 -1
- data/bundler/lib/bundler/vendor/tmpdir/lib/tmpdir.rb +154 -0
- data/bundler/lib/bundler/vendored_persistent.rb +0 -7
- data/bundler/lib/bundler/vendored_tmpdir.rb +4 -0
- data/bundler/lib/bundler/version.rb +1 -1
- data/bundler/lib/bundler/worker.rb +1 -1
- data/bundler/lib/bundler/yaml_serializer.rb +1 -1
- data/bundler/man/bundle-add.1 +1 -1
- data/bundler/man/bundle-binstubs.1 +5 -3
- data/bundler/man/bundle-cache.1 +1 -1
- data/bundler/man/bundle-check.1 +1 -1
- data/bundler/man/bundle-clean.1 +1 -1
- data/bundler/man/bundle-config.1 +14 -17
- data/bundler/man/bundle-doctor.1 +1 -1
- data/bundler/man/bundle-exec.1 +1 -1
- data/bundler/man/bundle-gem.1 +1 -1
- data/bundler/man/bundle-info.1 +1 -1
- data/bundler/man/bundle-init.1 +1 -1
- data/bundler/man/bundle-inject.1 +1 -1
- data/bundler/man/bundle-install.1 +30 -3
- data/bundler/man/bundle-list.1 +1 -1
- data/bundler/man/bundle-lock.1 +1 -1
- data/bundler/man/bundle-open.1 +1 -1
- data/bundler/man/bundle-outdated.1 +1 -1
- data/bundler/man/bundle-platform.1 +1 -1
- data/bundler/man/bundle-pristine.1 +1 -1
- data/bundler/man/bundle-remove.1 +1 -1
- data/bundler/man/bundle-show.1 +1 -1
- data/bundler/man/bundle-update.1 +1 -1
- data/bundler/man/bundle-viz.1 +1 -1
- data/bundler/man/bundle.1 +1 -1
- data/bundler/man/gemfile.5 +4 -4
- data/lib/rubygems.rb +8 -7
- data/lib/rubygems/available_set.rb +1 -3
- data/lib/rubygems/basic_specification.rb +0 -4
- data/lib/rubygems/command.rb +0 -2
- data/lib/rubygems/command_manager.rb +2 -4
- data/lib/rubygems/commands/build_command.rb +40 -20
- data/lib/rubygems/commands/cert_command.rb +1 -9
- data/lib/rubygems/commands/check_command.rb +0 -2
- data/lib/rubygems/commands/cleanup_command.rb +8 -4
- data/lib/rubygems/commands/contents_command.rb +0 -2
- data/lib/rubygems/commands/dependency_command.rb +0 -2
- data/lib/rubygems/commands/environment_command.rb +1 -3
- data/lib/rubygems/commands/fetch_command.rb +0 -2
- data/lib/rubygems/commands/generate_index_command.rb +0 -2
- data/lib/rubygems/commands/help_command.rb +2 -2
- data/lib/rubygems/commands/info_command.rb +0 -2
- data/lib/rubygems/commands/install_command.rb +0 -2
- data/lib/rubygems/commands/list_command.rb +0 -2
- data/lib/rubygems/commands/lock_command.rb +0 -2
- data/lib/rubygems/commands/mirror_command.rb +0 -2
- data/lib/rubygems/commands/open_command.rb +0 -2
- data/lib/rubygems/commands/outdated_command.rb +0 -2
- data/lib/rubygems/commands/owner_command.rb +9 -4
- data/lib/rubygems/commands/pristine_command.rb +1 -3
- data/lib/rubygems/commands/push_command.rb +6 -5
- data/lib/rubygems/commands/query_command.rb +16 -1
- data/lib/rubygems/commands/rdoc_command.rb +0 -2
- data/lib/rubygems/commands/search_command.rb +0 -2
- data/lib/rubygems/commands/server_command.rb +3 -1
- data/lib/rubygems/commands/setup_command.rb +21 -44
- data/lib/rubygems/commands/signin_command.rb +0 -2
- data/lib/rubygems/commands/signout_command.rb +0 -2
- data/lib/rubygems/commands/sources_command.rb +6 -4
- data/lib/rubygems/commands/specification_command.rb +6 -2
- data/lib/rubygems/commands/stale_command.rb +0 -2
- data/lib/rubygems/commands/uninstall_command.rb +0 -2
- data/lib/rubygems/commands/unpack_command.rb +0 -2
- data/lib/rubygems/commands/update_command.rb +20 -5
- data/lib/rubygems/commands/which_command.rb +0 -2
- data/lib/rubygems/commands/yank_command.rb +4 -7
- data/lib/rubygems/config_file.rb +0 -2
- data/lib/rubygems/core_ext/kernel_require.rb +3 -0
- data/lib/rubygems/core_ext/kernel_warn.rb +12 -13
- data/lib/rubygems/defaults.rb +2 -2
- data/lib/rubygems/dependency.rb +1 -3
- data/lib/rubygems/dependency_installer.rb +5 -5
- data/lib/rubygems/dependency_list.rb +0 -2
- data/lib/rubygems/doctor.rb +0 -2
- data/lib/rubygems/errors.rb +0 -12
- data/lib/rubygems/exceptions.rb +0 -20
- data/lib/rubygems/ext/builder.rb +13 -34
- data/lib/rubygems/ext/cmake_builder.rb +4 -6
- data/lib/rubygems/ext/configure_builder.rb +4 -6
- data/lib/rubygems/ext/ext_conf_builder.rb +19 -16
- data/lib/rubygems/ext/rake_builder.rb +4 -6
- data/lib/rubygems/gem_runner.rb +0 -2
- data/lib/rubygems/gemcutter_utilities.rb +101 -20
- data/lib/rubygems/indexer.rb +0 -3
- data/lib/rubygems/install_update_options.rb +2 -2
- data/lib/rubygems/installer.rb +16 -40
- data/lib/rubygems/installer_test_case.rb +7 -10
- data/lib/rubygems/mock_gem_ui.rb +0 -6
- data/lib/rubygems/name_tuple.rb +1 -3
- data/lib/rubygems/openssl.rb +7 -0
- data/lib/rubygems/package.rb +6 -12
- data/lib/rubygems/package/digest_io.rb +0 -2
- data/lib/rubygems/package/file_source.rb +0 -2
- data/lib/rubygems/package/io_source.rb +0 -2
- data/lib/rubygems/package/old.rb +0 -2
- data/lib/rubygems/package/tar_header.rb +1 -3
- data/lib/rubygems/package/tar_reader.rb +0 -2
- data/lib/rubygems/package/tar_reader/entry.rb +0 -2
- data/lib/rubygems/package/tar_test_case.rb +1 -3
- data/lib/rubygems/package/tar_writer.rb +0 -6
- data/lib/rubygems/package_task.rb +0 -2
- data/lib/rubygems/path_support.rb +0 -2
- data/lib/rubygems/platform.rb +18 -9
- data/lib/rubygems/psych_tree.rb +0 -2
- data/lib/rubygems/query_utils.rb +0 -9
- data/lib/rubygems/remote_fetcher.rb +6 -9
- data/lib/rubygems/request.rb +4 -11
- data/lib/rubygems/request/connection_pools.rb +0 -4
- data/lib/rubygems/request/http_pool.rb +0 -2
- data/lib/rubygems/request/https_pool.rb +0 -2
- data/lib/rubygems/request_set.rb +2 -15
- data/lib/rubygems/request_set/gem_dependency_api.rb +4 -6
- data/lib/rubygems/request_set/lockfile.rb +0 -4
- data/lib/rubygems/request_set/lockfile/parser.rb +0 -2
- data/lib/rubygems/request_set/lockfile/tokenizer.rb +0 -2
- data/lib/rubygems/requirement.rb +8 -8
- data/lib/rubygems/resolver.rb +7 -4
- data/lib/rubygems/resolver/activation_request.rb +9 -3
- data/lib/rubygems/resolver/api_set.rb +27 -20
- data/lib/rubygems/resolver/api_set/gem_parser.rb +20 -0
- data/lib/rubygems/resolver/api_specification.rb +23 -9
- data/lib/rubygems/resolver/best_set.rb +1 -3
- data/lib/rubygems/resolver/composed_set.rb +0 -2
- data/lib/rubygems/resolver/conflict.rb +1 -3
- data/lib/rubygems/resolver/current_set.rb +0 -2
- data/lib/rubygems/resolver/dependency_request.rb +1 -3
- data/lib/rubygems/resolver/git_set.rb +0 -2
- data/lib/rubygems/resolver/git_specification.rb +0 -2
- data/lib/rubygems/resolver/index_set.rb +0 -2
- data/lib/rubygems/resolver/index_specification.rb +26 -2
- data/lib/rubygems/resolver/installed_specification.rb +0 -2
- data/lib/rubygems/resolver/installer_set.rb +57 -10
- data/lib/rubygems/resolver/local_specification.rb +0 -2
- data/lib/rubygems/resolver/lock_set.rb +1 -3
- data/lib/rubygems/resolver/lock_specification.rb +0 -2
- data/lib/rubygems/resolver/molinillo/lib/molinillo.rb +6 -5
- data/lib/rubygems/resolver/molinillo/lib/molinillo/delegates/resolution_state.rb +7 -0
- data/lib/rubygems/resolver/molinillo/lib/molinillo/delegates/specification_provider.rb +1 -0
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph.rb +39 -5
- 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 +43 -10
- data/lib/rubygems/resolver/molinillo/lib/molinillo/errors.rb +75 -7
- data/lib/rubygems/resolver/molinillo/lib/molinillo/gem_metadata.rb +2 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/modules/specification_provider.rb +1 -0
- data/lib/rubygems/resolver/molinillo/lib/molinillo/modules/ui.rb +3 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/resolution.rb +506 -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/requirement_list.rb +0 -2
- data/lib/rubygems/resolver/set.rb +0 -2
- data/lib/rubygems/resolver/source_set.rb +0 -2
- data/lib/rubygems/resolver/spec_specification.rb +14 -2
- data/lib/rubygems/resolver/specification.rb +13 -3
- data/lib/rubygems/resolver/stats.rb +0 -2
- data/lib/rubygems/resolver/vendor_set.rb +0 -2
- data/lib/rubygems/resolver/vendor_specification.rb +0 -2
- data/lib/rubygems/s3_uri_signer.rb +2 -8
- data/lib/rubygems/security.rb +2 -9
- data/lib/rubygems/security/policy.rb +1 -5
- data/lib/rubygems/security/signer.rb +1 -3
- data/lib/rubygems/security/trust_dir.rb +0 -2
- data/lib/rubygems/server.rb +7 -4
- data/lib/rubygems/source.rb +23 -12
- data/lib/rubygems/source/git.rb +0 -2
- data/lib/rubygems/source/installed.rb +0 -2
- data/lib/rubygems/source/local.rb +0 -2
- data/lib/rubygems/source/lock.rb +0 -2
- data/lib/rubygems/source/specific_file.rb +0 -2
- data/lib/rubygems/source/vendor.rb +0 -2
- data/lib/rubygems/source_list.rb +0 -2
- data/lib/rubygems/spec_fetcher.rb +1 -3
- data/lib/rubygems/specification.rb +27 -19
- data/lib/rubygems/specification_policy.rb +0 -2
- data/lib/rubygems/ssl_certs/{index.rubygems.org → rubygems.org}/GlobalSignRootCA.pem +0 -0
- data/lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA_R3.pem +21 -0
- data/lib/rubygems/stub_specification.rb +1 -5
- data/lib/rubygems/syck_hack.rb +0 -2
- data/lib/rubygems/test_case.rb +18 -42
- data/lib/rubygems/test_utilities.rb +6 -13
- data/lib/rubygems/uninstaller.rb +0 -2
- data/lib/rubygems/uri_formatter.rb +2 -3
- data/lib/rubygems/uri_parser.rb +0 -2
- data/lib/rubygems/user_interaction.rb +0 -16
- data/lib/rubygems/util.rb +0 -2
- data/lib/rubygems/util/licenses.rb +0 -2
- data/lib/rubygems/util/list.rb +0 -2
- data/lib/rubygems/validator.rb +0 -2
- data/lib/rubygems/version.rb +0 -2
- data/lib/rubygems/version_option.rb +6 -0
- data/rubygems-update.gemspec +1 -1
- data/test/rubygems/plugin/load/rubygems_plugin.rb +0 -2
- data/test/rubygems/rubygems/commands/crash_command.rb +0 -2
- data/test/rubygems/rubygems_plugin.rb +0 -2
- data/test/rubygems/test_bundled_ca.rb +42 -41
- data/test/rubygems/test_config.rb +0 -2
- data/test/rubygems/test_deprecate.rb +0 -6
- data/test/rubygems/test_gem.rb +3 -5
- data/test/rubygems/test_gem_available_set.rb +0 -2
- data/test/rubygems/test_gem_bundler_version_finder.rb +0 -2
- data/test/rubygems/test_gem_command.rb +0 -4
- data/test/rubygems/test_gem_command_manager.rb +0 -2
- data/test/rubygems/test_gem_commands_build_command.rb +226 -13
- data/test/rubygems/test_gem_commands_cert_command.rb +2 -4
- data/test/rubygems/test_gem_commands_check_command.rb +0 -2
- data/test/rubygems/test_gem_commands_cleanup_command.rb +13 -4
- data/test/rubygems/test_gem_commands_contents_command.rb +2 -4
- data/test/rubygems/test_gem_commands_dependency_command.rb +0 -2
- data/test/rubygems/test_gem_commands_environment_command.rb +0 -2
- data/test/rubygems/test_gem_commands_fetch_command.rb +0 -2
- data/test/rubygems/test_gem_commands_generate_index_command.rb +0 -2
- data/test/rubygems/test_gem_commands_help_command.rb +15 -4
- data/test/rubygems/test_gem_commands_info_command.rb +0 -2
- data/test/rubygems/test_gem_commands_install_command.rb +132 -3
- data/test/rubygems/test_gem_commands_list_command.rb +0 -2
- data/test/rubygems/test_gem_commands_lock_command.rb +0 -2
- data/test/rubygems/test_gem_commands_mirror.rb +0 -2
- data/test/rubygems/test_gem_commands_open_command.rb +0 -2
- data/test/rubygems/test_gem_commands_outdated_command.rb +0 -2
- data/test/rubygems/test_gem_commands_owner_command.rb +48 -2
- data/test/rubygems/test_gem_commands_pristine_command.rb +2 -4
- data/test/rubygems/test_gem_commands_push_command.rb +70 -7
- data/test/rubygems/test_gem_commands_query_command.rb +3 -7
- data/test/rubygems/test_gem_commands_search_command.rb +0 -2
- data/test/rubygems/test_gem_commands_server_command.rb +0 -2
- data/test/rubygems/test_gem_commands_setup_command.rb +19 -30
- data/test/rubygems/test_gem_commands_signin_command.rb +27 -5
- data/test/rubygems/test_gem_commands_signout_command.rb +0 -2
- data/test/rubygems/test_gem_commands_sources_command.rb +60 -2
- data/test/rubygems/test_gem_commands_specification_command.rb +28 -2
- data/test/rubygems/test_gem_commands_stale_command.rb +0 -2
- data/test/rubygems/test_gem_commands_uninstall_command.rb +0 -2
- data/test/rubygems/test_gem_commands_unpack_command.rb +0 -2
- data/test/rubygems/test_gem_commands_update_command.rb +50 -4
- data/test/rubygems/test_gem_commands_which_command.rb +0 -2
- data/test/rubygems/test_gem_commands_yank_command.rb +30 -2
- data/test/rubygems/test_gem_config_file.rb +0 -2
- data/test/rubygems/test_gem_dependency.rb +0 -2
- data/test/rubygems/test_gem_dependency_installer.rb +38 -4
- data/test/rubygems/test_gem_dependency_list.rb +2 -4
- data/test/rubygems/test_gem_dependency_resolution_error.rb +0 -2
- data/test/rubygems/test_gem_doctor.rb +0 -2
- data/test/rubygems/test_gem_ext_builder.rb +12 -22
- data/test/rubygems/test_gem_ext_cmake_builder.rb +3 -11
- data/test/rubygems/test_gem_ext_configure_builder.rb +3 -11
- data/test/rubygems/test_gem_ext_ext_conf_builder.rb +9 -28
- data/test/rubygems/test_gem_ext_rake_builder.rb +30 -15
- data/test/rubygems/test_gem_gem_runner.rb +7 -6
- data/test/rubygems/test_gem_gemcutter_utilities.rb +3 -5
- data/test/rubygems/test_gem_impossible_dependencies_error.rb +0 -2
- data/test/rubygems/test_gem_indexer.rb +0 -2
- data/test/rubygems/test_gem_install_update_options.rb +14 -4
- data/test/rubygems/test_gem_installer.rb +113 -74
- data/test/rubygems/test_gem_local_remote_options.rb +0 -2
- data/test/rubygems/test_gem_name_tuple.rb +0 -2
- data/test/rubygems/test_gem_package.rb +25 -19
- data/test/rubygems/test_gem_package_old.rb +4 -6
- data/test/rubygems/test_gem_package_tar_header.rb +0 -2
- data/test/rubygems/test_gem_package_tar_reader.rb +0 -2
- data/test/rubygems/test_gem_package_tar_reader_entry.rb +0 -2
- data/test/rubygems/test_gem_package_tar_writer.rb +1 -3
- data/test/rubygems/test_gem_package_task.rb +0 -2
- data/test/rubygems/test_gem_path_support.rb +0 -2
- data/test/rubygems/test_gem_platform.rb +63 -6
- data/test/rubygems/test_gem_rdoc.rb +0 -2
- data/test/rubygems/test_gem_remote_fetcher.rb +18 -23
- data/test/rubygems/test_gem_request.rb +2 -6
- data/test/rubygems/test_gem_request_connection_pools.rb +0 -4
- data/test/rubygems/test_gem_request_set.rb +0 -2
- data/test/rubygems/test_gem_request_set_gem_dependency_api.rb +0 -2
- data/test/rubygems/test_gem_request_set_lockfile.rb +4 -6
- data/test/rubygems/test_gem_request_set_lockfile_parser.rb +0 -2
- data/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb +0 -2
- data/test/rubygems/test_gem_requirement.rb +8 -2
- data/test/rubygems/test_gem_resolver.rb +0 -2
- data/test/rubygems/test_gem_resolver_activation_request.rb +0 -2
- data/test/rubygems/test_gem_resolver_api_set.rb +58 -57
- data/test/rubygems/test_gem_resolver_api_specification.rb +3 -5
- data/test/rubygems/test_gem_resolver_best_set.rb +3 -5
- data/test/rubygems/test_gem_resolver_composed_set.rb +0 -2
- data/test/rubygems/test_gem_resolver_conflict.rb +1 -3
- data/test/rubygems/test_gem_resolver_dependency_request.rb +0 -2
- data/test/rubygems/test_gem_resolver_git_set.rb +0 -2
- data/test/rubygems/test_gem_resolver_git_specification.rb +0 -2
- data/test/rubygems/test_gem_resolver_index_set.rb +0 -2
- data/test/rubygems/test_gem_resolver_index_specification.rb +0 -2
- data/test/rubygems/test_gem_resolver_installed_specification.rb +0 -2
- data/test/rubygems/test_gem_resolver_installer_set.rb +0 -2
- data/test/rubygems/test_gem_resolver_local_specification.rb +0 -2
- data/test/rubygems/test_gem_resolver_lock_set.rb +0 -2
- data/test/rubygems/test_gem_resolver_lock_specification.rb +0 -2
- data/test/rubygems/test_gem_resolver_requirement_list.rb +0 -2
- data/test/rubygems/test_gem_resolver_specification.rb +0 -4
- data/test/rubygems/test_gem_resolver_vendor_set.rb +1 -3
- data/test/rubygems/test_gem_resolver_vendor_specification.rb +0 -2
- data/test/rubygems/test_gem_security.rb +2 -4
- data/test/rubygems/test_gem_security_policy.rb +2 -4
- data/test/rubygems/test_gem_security_signer.rb +2 -4
- data/test/rubygems/test_gem_security_trust_dir.rb +2 -4
- data/test/rubygems/test_gem_server.rb +0 -4
- data/test/rubygems/test_gem_silent_ui.rb +0 -2
- data/test/rubygems/test_gem_source.rb +7 -4
- data/test/rubygems/test_gem_source_fetch_problem.rb +0 -2
- data/test/rubygems/test_gem_source_git.rb +0 -2
- data/test/rubygems/test_gem_source_installed.rb +0 -2
- data/test/rubygems/test_gem_source_list.rb +1 -2
- data/test/rubygems/test_gem_source_local.rb +0 -2
- data/test/rubygems/test_gem_source_lock.rb +0 -2
- data/test/rubygems/test_gem_source_specific_file.rb +0 -2
- data/test/rubygems/test_gem_source_subpath_problem.rb +49 -0
- data/test/rubygems/test_gem_source_vendor.rb +0 -2
- data/test/rubygems/test_gem_spec_fetcher.rb +0 -2
- data/test/rubygems/test_gem_specification.rb +15 -14
- data/test/rubygems/test_gem_stream_ui.rb +0 -2
- data/test/rubygems/test_gem_stub_specification.rb +4 -6
- data/test/rubygems/test_gem_text.rb +0 -2
- data/test/rubygems/test_gem_uninstaller.rb +7 -9
- data/test/rubygems/test_gem_unsatisfiable_dependency_error.rb +0 -2
- data/test/rubygems/test_gem_uri_formatter.rb +0 -2
- data/test/rubygems/test_gem_util.rb +0 -2
- data/test/rubygems/test_gem_validator.rb +1 -3
- data/test/rubygems/test_gem_version.rb +0 -2
- data/test/rubygems/test_gem_version_option.rb +1 -3
- data/test/rubygems/test_kernel.rb +0 -2
- data/test/rubygems/test_project_sanity.rb +0 -2
- data/test/rubygems/test_remote_fetch_error.rb +0 -2
- data/test/rubygems/test_require.rb +50 -17
- data/test/test_changelog_generator.rb +17 -0
- metadata +59 -77
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/compatibility.rb +0 -26
- 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 -527
- data/bundler/man/bundle-doctor.1.txt +0 -44
- data/bundler/man/bundle-exec.1.txt +0 -181
- data/bundler/man/bundle-gem.1.txt +0 -117
- 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 -44
- 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 -391
- data/bundler/man/bundle-viz.1.txt +0 -39
- data/bundler/man/bundle.1.txt +0 -116
- data/bundler/man/gemfile.5.txt +0 -651
- data/lib/rubygems/ssl_certs/rubygems.global.ssl.fastly.net/DigiCertHighAssuranceEVRootCA.pem +0 -23
- data/lib/rubygems/ssl_certs/rubygems.org/AddTrustExternalCARoot.pem +0 -25
@@ -0,0 +1,20 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
class Gem::Resolver::APISet::GemParser
|
4
|
+
def parse(line)
|
5
|
+
version_and_platform, rest = line.split(" ", 2)
|
6
|
+
version, platform = version_and_platform.split("-", 2)
|
7
|
+
dependencies, requirements = rest.split("|", 2).map {|s| s.split(",") } if rest
|
8
|
+
dependencies = dependencies ? dependencies.map {|d| parse_dependency(d) } : []
|
9
|
+
requirements = requirements ? requirements.map {|d| parse_dependency(d) } : []
|
10
|
+
[version, platform, dependencies, requirements]
|
11
|
+
end
|
12
|
+
|
13
|
+
private
|
14
|
+
|
15
|
+
def parse_dependency(string)
|
16
|
+
dependency = string.split(":")
|
17
|
+
dependency[-1] = dependency[-1].split("&") if dependency.size > 1
|
18
|
+
dependency
|
19
|
+
end
|
20
|
+
end
|
@@ -6,6 +6,16 @@
|
|
6
6
|
# is the name, version, and dependencies.
|
7
7
|
|
8
8
|
class Gem::Resolver::APISpecification < Gem::Resolver::Specification
|
9
|
+
##
|
10
|
+
# We assume that all instances of this class are immutable;
|
11
|
+
# so avoid duplicated generation for performance.
|
12
|
+
@@cache = {}
|
13
|
+
def self.new(set, api_data)
|
14
|
+
cache_key = [set, api_data]
|
15
|
+
cache = @@cache[cache_key]
|
16
|
+
return cache if cache
|
17
|
+
@@cache[cache_key] = super
|
18
|
+
end
|
9
19
|
|
10
20
|
##
|
11
21
|
# Creates an APISpecification for the given +set+ from the rubygems.org
|
@@ -19,12 +29,14 @@ class Gem::Resolver::APISpecification < Gem::Resolver::Specification
|
|
19
29
|
|
20
30
|
@set = set
|
21
31
|
@name = api_data[:name]
|
22
|
-
@version = Gem::Version.new
|
23
|
-
@platform = Gem::Platform.new
|
24
|
-
@original_platform = api_data[:platform]
|
32
|
+
@version = Gem::Version.new(api_data[:number]).freeze
|
33
|
+
@platform = Gem::Platform.new(api_data[:platform]).freeze
|
34
|
+
@original_platform = api_data[:platform].freeze
|
25
35
|
@dependencies = api_data[:dependencies].map do |name, ver|
|
26
|
-
Gem::Dependency.new
|
27
|
-
end
|
36
|
+
Gem::Dependency.new(name, ver.split(/\s*,\s*/)).freeze
|
37
|
+
end.freeze
|
38
|
+
@required_ruby_version = Gem::Requirement.new(api_data.dig(:requirements, :ruby)).freeze
|
39
|
+
@required_rubygems_version = Gem::Requirement.new(api_data.dig(:requirements, :rubygems)).freeze
|
28
40
|
end
|
29
41
|
|
30
42
|
def ==(other) # :nodoc:
|
@@ -32,8 +44,11 @@ class Gem::Resolver::APISpecification < Gem::Resolver::Specification
|
|
32
44
|
@set == other.set and
|
33
45
|
@name == other.name and
|
34
46
|
@version == other.version and
|
35
|
-
@platform == other.platform
|
36
|
-
|
47
|
+
@platform == other.platform
|
48
|
+
end
|
49
|
+
|
50
|
+
def hash
|
51
|
+
@set.hash ^ @name.hash ^ @version.hash ^ @platform.hash
|
37
52
|
end
|
38
53
|
|
39
54
|
def fetch_development_dependencies # :nodoc:
|
@@ -43,7 +58,7 @@ class Gem::Resolver::APISpecification < Gem::Resolver::Specification
|
|
43
58
|
end
|
44
59
|
|
45
60
|
def installable_platform? # :nodoc:
|
46
|
-
Gem::Platform.
|
61
|
+
Gem::Platform.match_gem? @platform, @name
|
47
62
|
end
|
48
63
|
|
49
64
|
def pretty_print(q) # :nodoc:
|
@@ -86,5 +101,4 @@ class Gem::Resolver::APISpecification < Gem::Resolver::Specification
|
|
86
101
|
def source # :nodoc:
|
87
102
|
@set.source
|
88
103
|
end
|
89
|
-
|
90
104
|
end
|
@@ -5,7 +5,6 @@
|
|
5
5
|
# It combines IndexSet and APISet
|
6
6
|
|
7
7
|
class Gem::Resolver::BestSet < Gem::Resolver::ComposedSet
|
8
|
-
|
9
8
|
##
|
10
9
|
# Creates a BestSet for the given +sources+ or Gem::sources if none are
|
11
10
|
# specified. +sources+ must be a Gem::SourceList.
|
@@ -61,7 +60,7 @@ class Gem::Resolver::BestSet < Gem::Resolver::ComposedSet
|
|
61
60
|
def replace_failed_api_set(error) # :nodoc:
|
62
61
|
uri = error.uri
|
63
62
|
uri = URI uri unless URI === uri
|
64
|
-
uri
|
63
|
+
uri = uri + "."
|
65
64
|
|
66
65
|
raise error unless api_set = @sets.find do |set|
|
67
66
|
Gem::Resolver::APISet === set and set.dep_uri == uri
|
@@ -74,5 +73,4 @@ class Gem::Resolver::BestSet < Gem::Resolver::ComposedSet
|
|
74
73
|
index_set
|
75
74
|
end
|
76
75
|
end
|
77
|
-
|
78
76
|
end
|
@@ -9,7 +9,6 @@
|
|
9
9
|
# This method will eliminate nesting of composed sets.
|
10
10
|
|
11
11
|
class Gem::Resolver::ComposedSet < Gem::Resolver::Set
|
12
|
-
|
13
12
|
attr_reader :sets # :nodoc:
|
14
13
|
|
15
14
|
##
|
@@ -62,5 +61,4 @@ class Gem::Resolver::ComposedSet < Gem::Resolver::Set
|
|
62
61
|
def prefetch(reqs)
|
63
62
|
@sets.each {|s| s.prefetch(reqs) }
|
64
63
|
end
|
65
|
-
|
66
64
|
end
|
@@ -4,7 +4,6 @@
|
|
4
4
|
# with a spec that would be activated.
|
5
5
|
|
6
6
|
class Gem::Resolver::Conflict
|
7
|
-
|
8
7
|
##
|
9
8
|
# The specification that was activated prior to the conflict
|
10
9
|
|
@@ -86,7 +85,7 @@ class Gem::Resolver::Conflict
|
|
86
85
|
activated, requirement,
|
87
86
|
request_path(@activated).reverse.join(", depends on\n "),
|
88
87
|
request_path(@failed_dep).reverse.join(", depends on\n "),
|
89
|
-
matching
|
88
|
+
matching
|
90
89
|
]
|
91
90
|
end
|
92
91
|
|
@@ -151,5 +150,4 @@ class Gem::Resolver::Conflict
|
|
151
150
|
def requester
|
152
151
|
@failed_dep.requester
|
153
152
|
end
|
154
|
-
|
155
153
|
end
|
@@ -4,7 +4,6 @@
|
|
4
4
|
# contained the Dependency.
|
5
5
|
|
6
6
|
class Gem::Resolver::DependencyRequest
|
7
|
-
|
8
7
|
##
|
9
8
|
# The wrapped Gem::Dependency
|
10
9
|
|
@@ -29,7 +28,7 @@ class Gem::Resolver::DependencyRequest
|
|
29
28
|
when Gem::Dependency
|
30
29
|
@dependency == other
|
31
30
|
when Gem::Resolver::DependencyRequest
|
32
|
-
@dependency == other.dependency
|
31
|
+
@dependency == other.dependency
|
33
32
|
else
|
34
33
|
false
|
35
34
|
end
|
@@ -116,5 +115,4 @@ class Gem::Resolver::DependencyRequest
|
|
116
115
|
def to_s # :nodoc:
|
117
116
|
@dependency.to_s
|
118
117
|
end
|
119
|
-
|
120
118
|
end
|
@@ -10,7 +10,6 @@
|
|
10
10
|
# set.add_git_gem 'rake', 'git://example/rake.git', tag: 'rake-10.1.0'
|
11
11
|
|
12
12
|
class Gem::Resolver::GitSet < Gem::Resolver::Set
|
13
|
-
|
14
13
|
##
|
15
14
|
# The root directory for git gems in this set. This is usually Gem.dir, the
|
16
15
|
# installation directory for regular gems.
|
@@ -118,5 +117,4 @@ class Gem::Resolver::GitSet < Gem::Resolver::Set
|
|
118
117
|
end
|
119
118
|
end
|
120
119
|
end
|
121
|
-
|
122
120
|
end
|
@@ -5,7 +5,6 @@
|
|
5
5
|
# option.
|
6
6
|
|
7
7
|
class Gem::Resolver::GitSpecification < Gem::Resolver::SpecSpecification
|
8
|
-
|
9
8
|
def ==(other) # :nodoc:
|
10
9
|
self.class === other and
|
11
10
|
@set == other.set and
|
@@ -54,5 +53,4 @@ class Gem::Resolver::GitSpecification < Gem::Resolver::SpecSpecification
|
|
54
53
|
q.pp @source
|
55
54
|
end
|
56
55
|
end
|
57
|
-
|
58
56
|
end
|
@@ -5,7 +5,6 @@
|
|
5
5
|
# and +version+ are needed.
|
6
6
|
|
7
7
|
class Gem::Resolver::IndexSpecification < Gem::Resolver::Specification
|
8
|
-
|
9
8
|
##
|
10
9
|
# An IndexSpecification is created from the index format described in `gem
|
11
10
|
# help generate_index`.
|
@@ -34,6 +33,32 @@ class Gem::Resolver::IndexSpecification < Gem::Resolver::Specification
|
|
34
33
|
spec.dependencies
|
35
34
|
end
|
36
35
|
|
36
|
+
##
|
37
|
+
# The required_ruby_version constraint for this specification
|
38
|
+
|
39
|
+
def required_ruby_version
|
40
|
+
spec.required_ruby_version
|
41
|
+
end
|
42
|
+
|
43
|
+
##
|
44
|
+
# The required_rubygems_version constraint for this specification
|
45
|
+
#
|
46
|
+
|
47
|
+
def required_rubygems_version
|
48
|
+
spec.required_rubygems_version
|
49
|
+
end
|
50
|
+
|
51
|
+
def ==(other)
|
52
|
+
self.class === other &&
|
53
|
+
@name == other.name &&
|
54
|
+
@version == other.version &&
|
55
|
+
@platform == other.platform
|
56
|
+
end
|
57
|
+
|
58
|
+
def hash
|
59
|
+
@name.hash ^ @version.hash ^ @platform.hash
|
60
|
+
end
|
61
|
+
|
37
62
|
def inspect # :nodoc:
|
38
63
|
'#<%s %s source %s>' % [self.class, full_name, @source]
|
39
64
|
end
|
@@ -65,5 +90,4 @@ class Gem::Resolver::IndexSpecification < Gem::Resolver::Specification
|
|
65
90
|
@source.fetch_spec tuple
|
66
91
|
end
|
67
92
|
end
|
68
|
-
|
69
93
|
end
|
@@ -4,7 +4,6 @@
|
|
4
4
|
# locally.
|
5
5
|
|
6
6
|
class Gem::Resolver::InstalledSpecification < Gem::Resolver::SpecSpecification
|
7
|
-
|
8
7
|
def ==(other) # :nodoc:
|
9
8
|
self.class === other and
|
10
9
|
@set == other.set and
|
@@ -54,5 +53,4 @@ class Gem::Resolver::InstalledSpecification < Gem::Resolver::SpecSpecification
|
|
54
53
|
def source
|
55
54
|
@source ||= Gem::Source::Installed.new
|
56
55
|
end
|
57
|
-
|
58
56
|
end
|
@@ -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
|
|
@@ -65,15 +70,30 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
|
|
65
70
|
Gem::Platform.local === s.platform
|
66
71
|
end
|
67
72
|
|
68
|
-
|
69
|
-
|
70
|
-
exc.errors = errors
|
71
|
-
|
72
|
-
raise exc
|
73
|
+
found = found.sort_by do |s|
|
74
|
+
[s.version, s.platform == Gem::Platform::RUBY ? -1 : 1]
|
73
75
|
end
|
74
76
|
|
75
|
-
newest = found.
|
76
|
-
|
77
|
+
newest = found.last
|
78
|
+
|
79
|
+
unless @force
|
80
|
+
found_matching_metadata = found.select do |spec|
|
81
|
+
metadata_satisfied?(spec)
|
82
|
+
end
|
83
|
+
|
84
|
+
if found_matching_metadata.empty?
|
85
|
+
if newest
|
86
|
+
ensure_required_ruby_version_met(newest.spec)
|
87
|
+
ensure_required_rubygems_version_met(newest.spec)
|
88
|
+
else
|
89
|
+
exc = Gem::UnsatisfiableDependencyError.new request
|
90
|
+
exc.errors = errors
|
91
|
+
|
92
|
+
raise exc
|
93
|
+
end
|
94
|
+
else
|
95
|
+
newest = found_matching_metadata.last
|
96
|
+
end
|
77
97
|
end
|
78
98
|
|
79
99
|
@always_install << newest.spec
|
@@ -171,7 +191,7 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
|
|
171
191
|
always_install = @always_install.map {|s| s.full_name }
|
172
192
|
|
173
193
|
'#<%s domain: %s specs: %p always install: %p>' % [
|
174
|
-
self.class, @domain, @specs.keys, always_install
|
194
|
+
self.class, @domain, @specs.keys, always_install
|
175
195
|
]
|
176
196
|
end
|
177
197
|
|
@@ -224,4 +244,31 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
|
|
224
244
|
end
|
225
245
|
end
|
226
246
|
|
247
|
+
private
|
248
|
+
|
249
|
+
def metadata_satisfied?(spec)
|
250
|
+
spec.required_ruby_version.satisfied_by?(Gem.ruby_version) &&
|
251
|
+
spec.required_rubygems_version.satisfied_by?(Gem.rubygems_version)
|
252
|
+
end
|
253
|
+
|
254
|
+
def ensure_required_ruby_version_met(spec) # :nodoc:
|
255
|
+
if rrv = spec.required_ruby_version
|
256
|
+
ruby_version = Gem.ruby_version
|
257
|
+
unless rrv.satisfied_by? ruby_version
|
258
|
+
raise Gem::RuntimeRequirementNotMetError,
|
259
|
+
"#{spec.full_name} requires Ruby version #{rrv}. The current ruby version is #{ruby_version}."
|
260
|
+
end
|
261
|
+
end
|
262
|
+
end
|
263
|
+
|
264
|
+
def ensure_required_rubygems_version_met(spec) # :nodoc:
|
265
|
+
if rrgv = spec.required_rubygems_version
|
266
|
+
unless rrgv.satisfied_by? Gem.rubygems_version
|
267
|
+
rg_version = Gem::VERSION
|
268
|
+
raise Gem::RuntimeRequirementNotMetError,
|
269
|
+
"#{spec.full_name} requires RubyGems version #{rrgv}. The current RubyGems version is #{rg_version}. " +
|
270
|
+
"Try 'gem update --system' to update RubyGems itself."
|
271
|
+
end
|
272
|
+
end
|
273
|
+
end
|
227
274
|
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
|
|
@@ -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
|
@@ -78,5 +77,4 @@ class Gem::Resolver::LockSet < Gem::Resolver::Set
|
|
78
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)
|
@@ -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
|