rubygems-update 2.6.11 → 2.7.11
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.travis.yml +8 -22
- data/CONTRIBUTING.rdoc +53 -54
- data/History.txt +405 -0
- data/Manifest.txt +46 -15
- data/POLICIES.rdoc +3 -3
- data/README.md +72 -0
- data/Rakefile +55 -12
- data/appveyor.yml +29 -1
- data/bin/gem +1 -1
- data/bin/update_rubygems +2 -2
- data/bundler/CHANGELOG.md +412 -9
- data/bundler/CODE_OF_CONDUCT.md +1 -1
- data/bundler/CONTRIBUTING.md +10 -29
- data/bundler/README.md +27 -11
- data/bundler/bundler.gemspec +58 -0
- data/bundler/exe/bundle +5 -7
- data/bundler/exe/bundle_ruby +4 -3
- data/bundler/lib/bundler.rb +103 -79
- data/bundler/lib/bundler/build_metadata.rb +53 -0
- data/bundler/lib/bundler/capistrano.rb +5 -0
- data/bundler/lib/bundler/cli.rb +231 -66
- data/bundler/lib/bundler/cli/add.rb +25 -0
- data/bundler/lib/bundler/cli/binstubs.rb +9 -7
- data/bundler/lib/bundler/cli/cache.rb +5 -4
- data/bundler/lib/bundler/cli/check.rb +3 -5
- data/bundler/lib/bundler/cli/clean.rb +5 -6
- data/bundler/lib/bundler/cli/common.rb +18 -2
- data/bundler/lib/bundler/cli/config.rb +26 -7
- data/bundler/lib/bundler/cli/console.rb +2 -1
- data/bundler/lib/bundler/cli/doctor.rb +1 -0
- data/bundler/lib/bundler/cli/exec.rb +6 -5
- data/bundler/lib/bundler/cli/gem.rb +42 -18
- data/bundler/lib/bundler/cli/info.rb +50 -0
- data/bundler/lib/bundler/cli/init.rb +21 -7
- data/bundler/lib/bundler/cli/inject.rb +13 -4
- data/bundler/lib/bundler/cli/install.rb +61 -77
- data/bundler/lib/bundler/cli/issue.rb +40 -0
- data/bundler/lib/bundler/cli/list.rb +22 -0
- data/bundler/lib/bundler/cli/lock.rb +4 -2
- data/bundler/lib/bundler/cli/open.rb +2 -2
- data/bundler/lib/bundler/cli/outdated.rb +30 -28
- data/bundler/lib/bundler/cli/package.rb +9 -6
- data/bundler/lib/bundler/cli/platform.rb +1 -0
- data/bundler/lib/bundler/cli/plugin.rb +1 -0
- data/bundler/lib/bundler/cli/pristine.rb +43 -0
- data/bundler/lib/bundler/cli/show.rb +1 -1
- data/bundler/lib/bundler/cli/update.rb +36 -13
- data/bundler/lib/bundler/cli/viz.rb +5 -1
- data/bundler/lib/bundler/compact_index_client.rb +1 -0
- data/bundler/lib/bundler/compact_index_client/cache.rb +1 -2
- data/bundler/lib/bundler/compact_index_client/updater.rb +36 -8
- data/bundler/lib/bundler/compatibility_guard.rb +14 -0
- data/bundler/lib/bundler/constants.rb +1 -0
- data/bundler/lib/bundler/current_ruby.rb +16 -8
- data/bundler/lib/bundler/definition.rb +252 -170
- data/bundler/lib/bundler/dep_proxy.rb +3 -1
- data/bundler/lib/bundler/dependency.rb +7 -7
- data/bundler/lib/bundler/deployment.rb +1 -1
- data/bundler/lib/bundler/deprecate.rb +15 -3
- data/bundler/lib/bundler/dsl.rb +103 -62
- data/bundler/lib/bundler/endpoint_specification.rb +13 -3
- data/bundler/lib/bundler/env.rb +101 -38
- data/bundler/lib/bundler/environment_preserver.rb +27 -6
- data/bundler/lib/bundler/errors.rb +3 -1
- data/bundler/lib/bundler/feature_flag.rb +39 -4
- data/bundler/lib/bundler/fetcher.rb +18 -11
- data/bundler/lib/bundler/fetcher/base.rb +1 -0
- data/bundler/lib/bundler/fetcher/compact_index.rb +2 -12
- data/bundler/lib/bundler/fetcher/dependency.rb +2 -1
- data/bundler/lib/bundler/fetcher/downloader.rb +14 -7
- data/bundler/lib/bundler/fetcher/index.rb +3 -2
- data/bundler/lib/bundler/friendly_errors.rb +7 -2
- data/bundler/lib/bundler/gem_helper.rb +24 -10
- data/bundler/lib/bundler/gem_helpers.rb +1 -0
- data/bundler/lib/bundler/gem_remote_fetcher.rb +1 -0
- data/bundler/lib/bundler/gem_tasks.rb +1 -0
- data/bundler/lib/bundler/gem_version_promoter.rb +13 -0
- data/bundler/lib/bundler/gemdeps.rb +1 -0
- data/bundler/lib/bundler/graph.rb +1 -0
- data/bundler/lib/bundler/index.rb +19 -11
- data/bundler/lib/bundler/injector.rb +54 -30
- data/bundler/lib/bundler/inline.rb +10 -10
- data/bundler/lib/bundler/installer.rb +114 -52
- data/bundler/lib/bundler/installer/gem_installer.rb +14 -4
- data/bundler/lib/bundler/installer/parallel_installer.rb +91 -42
- data/bundler/lib/bundler/installer/standalone.rb +1 -0
- data/bundler/lib/bundler/lazy_specification.rb +17 -4
- data/bundler/lib/bundler/lockfile_generator.rb +95 -0
- data/bundler/lib/bundler/lockfile_parser.rb +49 -35
- data/bundler/lib/bundler/match_platform.rb +1 -0
- data/bundler/lib/bundler/mirror.rb +10 -5
- data/bundler/lib/bundler/plugin.rb +8 -3
- data/bundler/lib/bundler/plugin/api/source.rb +16 -3
- data/bundler/lib/bundler/plugin/index.rb +9 -2
- data/bundler/lib/bundler/plugin/installer.rb +7 -6
- data/bundler/lib/bundler/plugin/source_list.rb +7 -8
- data/bundler/lib/bundler/process_lock.rb +24 -0
- data/bundler/lib/bundler/psyched_yaml.rb +10 -0
- data/bundler/lib/bundler/remote_specification.rb +25 -1
- data/bundler/lib/bundler/resolver.rb +176 -193
- data/bundler/lib/bundler/resolver/spec_group.rb +106 -0
- data/bundler/lib/bundler/retry.rb +1 -0
- data/bundler/lib/bundler/ruby_dsl.rb +1 -0
- data/bundler/lib/bundler/ruby_version.rb +7 -2
- data/bundler/lib/bundler/rubygems_ext.rb +18 -8
- data/bundler/lib/bundler/rubygems_gem_installer.rb +25 -2
- data/bundler/lib/bundler/rubygems_integration.rb +166 -69
- data/bundler/lib/bundler/runtime.rb +29 -19
- data/bundler/lib/bundler/settings.rb +202 -87
- data/bundler/lib/bundler/settings/validator.rb +79 -0
- data/bundler/lib/bundler/setup.rb +4 -7
- data/bundler/lib/bundler/shared_helpers.rb +143 -27
- data/bundler/lib/bundler/similarity_detector.rb +1 -0
- data/bundler/lib/bundler/source.rb +53 -1
- data/bundler/lib/bundler/source/gemspec.rb +1 -0
- data/bundler/lib/bundler/source/git.rb +51 -22
- data/bundler/lib/bundler/source/git/git_proxy.rb +23 -13
- data/bundler/lib/bundler/source/metadata.rb +63 -0
- data/bundler/lib/bundler/source/path.rb +38 -17
- data/bundler/lib/bundler/source/path/installer.rb +4 -2
- data/bundler/lib/bundler/source/rubygems.rb +161 -82
- data/bundler/lib/bundler/source/rubygems/remote.rb +12 -2
- data/bundler/lib/bundler/source_list.rb +75 -15
- data/bundler/lib/bundler/spec_set.rb +37 -21
- data/bundler/lib/bundler/ssl_certs/certificate_manager.rb +2 -1
- data/bundler/lib/bundler/stub_specification.rb +86 -2
- data/bundler/lib/bundler/templates/.document +1 -0
- data/bundler/lib/bundler/templates/Executable +13 -1
- data/bundler/lib/bundler/templates/Executable.bundler +105 -0
- data/bundler/lib/bundler/templates/Executable.standalone +5 -5
- data/bundler/lib/bundler/templates/Gemfile +3 -0
- data/bundler/lib/bundler/templates/gems.rb +8 -0
- data/bundler/lib/bundler/templates/newgem/Gemfile.tt +4 -2
- data/bundler/lib/bundler/templates/newgem/LICENSE.txt.tt +1 -1
- data/bundler/lib/bundler/templates/newgem/README.md.tt +14 -8
- data/bundler/lib/bundler/templates/newgem/Rakefile.tt +5 -5
- data/bundler/lib/bundler/templates/newgem/ext/newgem/newgem.c.tt +4 -4
- data/bundler/lib/bundler/templates/newgem/ext/newgem/newgem.h.tt +3 -3
- data/bundler/lib/bundler/templates/newgem/gitignore.tt +0 -1
- data/bundler/lib/bundler/templates/newgem/lib/newgem.rb.tt +6 -6
- data/bundler/lib/bundler/templates/newgem/lib/newgem/version.rb.tt +4 -4
- data/bundler/lib/bundler/templates/newgem/newgem.gemspec.tt +21 -12
- data/bundler/lib/bundler/templates/newgem/rspec.tt +1 -0
- data/bundler/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt +0 -2
- data/bundler/lib/bundler/templates/newgem/spec/spec_helper.rb.tt +3 -0
- data/bundler/lib/bundler/templates/newgem/test/newgem_test.rb.tt +1 -1
- data/bundler/lib/bundler/templates/newgem/test/test_helper.rb.tt +3 -3
- data/bundler/lib/bundler/templates/newgem/{.travis.yml.tt → travis.yml.tt} +2 -0
- data/bundler/lib/bundler/ui.rb +1 -0
- data/bundler/lib/bundler/ui/rg_proxy.rb +1 -0
- data/bundler/lib/bundler/ui/shell.rb +26 -10
- data/bundler/lib/bundler/ui/silent.rb +12 -1
- data/bundler/lib/bundler/uri_credentials_filter.rb +1 -0
- data/bundler/lib/bundler/vendor/fileutils/lib/fileutils.rb +1638 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo.rb +2 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/compatibility.rb +26 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb +7 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb +1 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb +16 -5
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/action.rb +1 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb +10 -2
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb +1 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb +1 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb +1 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/log.rb +1 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb +1 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb +1 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb +16 -5
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb +75 -7
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb +2 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/modules/specification_provider.rb +1 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/modules/ui.rb +3 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +501 -138
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb +1 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/state.rb +8 -4
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +3 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor.rb +46 -21
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions.rb +24 -22
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/create_file.rb +2 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/create_link.rb +2 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/directory.rb +2 -2
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/empty_directory.rb +16 -8
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/file_manipulation.rb +66 -18
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb +17 -15
- data/bundler/lib/bundler/vendor/thor/lib/thor/base.rb +55 -32
- data/bundler/lib/bundler/vendor/thor/lib/thor/command.rb +13 -11
- data/bundler/lib/bundler/vendor/thor/lib/thor/core_ext/hash_with_indifferent_access.rb +21 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/core_ext/io_binary_read.rb +7 -5
- data/bundler/lib/bundler/vendor/thor/lib/thor/core_ext/ordered_hash.rb +94 -63
- data/bundler/lib/bundler/vendor/thor/lib/thor/error.rb +3 -3
- data/bundler/lib/bundler/vendor/thor/lib/thor/group.rb +13 -13
- data/bundler/lib/bundler/vendor/thor/lib/thor/invocation.rb +4 -5
- data/bundler/lib/bundler/vendor/thor/lib/thor/line_editor/basic.rb +2 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/parser/argument.rb +4 -7
- data/bundler/lib/bundler/vendor/thor/lib/thor/parser/arguments.rb +16 -16
- data/bundler/lib/bundler/vendor/thor/lib/thor/parser/option.rb +42 -21
- data/bundler/lib/bundler/vendor/thor/lib/thor/parser/options.rb +13 -10
- data/bundler/lib/bundler/vendor/thor/lib/thor/runner.rb +31 -29
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell/basic.rb +49 -33
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell/color.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell/html.rb +4 -4
- data/bundler/lib/bundler/vendor/thor/lib/thor/util.rb +8 -7
- data/bundler/lib/bundler/vendor/thor/lib/thor/version.rb +1 -1
- data/bundler/lib/bundler/vendored_fileutils.rb +9 -0
- data/bundler/lib/bundler/vendored_molinillo.rb +1 -0
- data/bundler/lib/bundler/vendored_persistent.rb +35 -0
- data/bundler/lib/bundler/vendored_thor.rb +6 -2
- data/bundler/lib/bundler/version.rb +19 -2
- data/bundler/lib/bundler/version_ranges.rb +76 -0
- data/bundler/lib/bundler/vlad.rb +5 -0
- data/bundler/lib/bundler/worker.rb +3 -1
- data/bundler/lib/bundler/yaml_serializer.rb +3 -3
- data/bundler/man/bundle-add.ronn +29 -0
- data/bundler/man/bundle-binstubs.ronn +15 -1
- data/bundler/man/bundle-check.ronn +26 -0
- data/bundler/man/bundle-clean.ronn +18 -0
- data/bundler/man/bundle-config.ronn +193 -69
- data/bundler/man/bundle-doctor.ronn +33 -0
- data/bundler/man/bundle-exec.ronn +10 -3
- data/bundler/man/bundle-gem.ronn +3 -2
- data/bundler/man/bundle-info.ronn +17 -0
- data/bundler/man/bundle-init.ronn +29 -0
- data/bundler/man/bundle-inject.ronn +22 -0
- data/bundler/man/bundle-install.ronn +44 -35
- data/bundler/man/bundle-list.ronn +15 -0
- data/bundler/man/bundle-lock.ronn +1 -1
- data/bundler/man/bundle-open.ronn +19 -0
- data/bundler/man/bundle-outdated.ronn +2 -2
- data/bundler/man/bundle-package.ronn +7 -2
- data/bundler/man/bundle-pristine.ronn +34 -0
- data/bundler/man/bundle-show.ronn +21 -0
- data/bundler/man/bundle-update.ronn +24 -17
- data/bundler/man/bundle-viz.ronn +30 -0
- data/bundler/man/bundle.ronn +36 -45
- data/bundler/man/gemfile.5.ronn +77 -71
- data/lib/rubygems.rb +102 -46
- data/lib/rubygems/basic_specification.rb +8 -4
- data/lib/rubygems/bundler_version_finder.rb +99 -0
- data/lib/rubygems/command.rb +10 -2
- data/lib/rubygems/command_manager.rb +8 -4
- data/lib/rubygems/commands/cert_command.rb +31 -6
- data/lib/rubygems/commands/cleanup_command.rb +10 -3
- data/lib/rubygems/commands/generate_index_command.rb +1 -1
- data/lib/rubygems/commands/help_command.rb +1 -1
- data/lib/rubygems/commands/install_command.rb +7 -0
- data/lib/rubygems/commands/open_command.rb +1 -1
- data/lib/rubygems/commands/owner_command.rb +7 -2
- data/lib/rubygems/commands/pristine_command.rb +11 -8
- data/lib/rubygems/commands/push_command.rb +39 -5
- data/lib/rubygems/commands/query_command.rb +17 -17
- data/lib/rubygems/commands/setup_command.rb +174 -69
- data/lib/rubygems/commands/signin_command.rb +33 -0
- data/lib/rubygems/commands/signout_command.rb +33 -0
- data/lib/rubygems/commands/sources_command.rb +1 -1
- data/lib/rubygems/commands/uninstall_command.rb +5 -4
- data/lib/rubygems/commands/unpack_command.rb +19 -7
- data/lib/rubygems/commands/update_command.rb +1 -1
- data/lib/rubygems/commands/which_command.rb +1 -1
- data/lib/rubygems/commands/yank_command.rb +4 -11
- data/lib/rubygems/config_file.rb +15 -26
- data/lib/rubygems/core_ext/kernel_require.rb +12 -16
- data/lib/rubygems/dependency.rb +3 -0
- data/lib/rubygems/dependency_installer.rb +8 -2
- data/lib/rubygems/dependency_list.rb +1 -1
- data/lib/rubygems/errors.rb +3 -0
- data/lib/rubygems/exceptions.rb +11 -1
- data/lib/rubygems/ext/builder.rb +2 -2
- data/lib/rubygems/ext/ext_conf_builder.rb +2 -4
- data/lib/rubygems/ext/rake_builder.rb +1 -1
- data/lib/rubygems/gem_runner.rb +5 -1
- data/lib/rubygems/gemcutter_utilities.rb +5 -2
- data/lib/rubygems/indexer.rb +6 -5
- data/lib/rubygems/install_update_options.rb +6 -29
- data/lib/rubygems/installer.rb +60 -13
- data/lib/rubygems/installer_test_case.rb +6 -3
- data/lib/rubygems/package.rb +55 -8
- data/lib/rubygems/package/file_source.rb +2 -2
- data/lib/rubygems/package/old.rb +3 -3
- data/lib/rubygems/package/tar_header.rb +17 -10
- data/lib/rubygems/package/tar_writer.rb +4 -3
- data/lib/rubygems/platform.rb +1 -1
- data/lib/rubygems/remote_fetcher.rb +2 -2
- data/lib/rubygems/request.rb +1 -1
- data/lib/rubygems/request_set.rb +47 -19
- data/lib/rubygems/request_set/gem_dependency_api.rb +3 -3
- data/lib/rubygems/request_set/lockfile.rb +1 -1
- data/lib/rubygems/requirement.rb +19 -4
- data/lib/rubygems/resolver.rb +24 -3
- data/lib/rubygems/resolver/api_specification.rb +5 -0
- data/lib/rubygems/resolver/installer_set.rb +4 -6
- data/lib/rubygems/safe_yaml.rb +51 -0
- data/lib/rubygems/security.rb +18 -6
- data/lib/rubygems/security/trust_dir.rb +1 -1
- data/lib/rubygems/security_option.rb +43 -0
- data/lib/rubygems/server.rb +21 -17
- data/lib/rubygems/source.rb +9 -6
- data/lib/rubygems/source/git.rb +2 -1
- data/lib/rubygems/source/local.rb +38 -35
- data/lib/rubygems/source/lock.rb +4 -1
- data/lib/rubygems/source_local.rb +3 -1
- data/lib/rubygems/source_specific_file.rb +3 -2
- data/lib/rubygems/spec_fetcher.rb +7 -3
- data/lib/rubygems/specification.rb +315 -249
- 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 +4 -3
- data/lib/rubygems/test_case.rb +51 -11
- data/lib/rubygems/test_utilities.rb +2 -2
- data/lib/rubygems/text.rb +14 -1
- data/lib/rubygems/user_interaction.rb +24 -15
- data/lib/rubygems/util.rb +6 -16
- data/lib/rubygems/util/licenses.rb +72 -4
- data/lib/rubygems/validator.rb +3 -3
- data/lib/rubygems/version.rb +24 -4
- data/lib/rubygems/version_option.rb +6 -1
- data/lib/ubygems.rb +3 -0
- data/setup.rb +1 -1
- data/test/rubygems/private3072_key.pem +40 -0
- data/test/rubygems/public3072_cert.pem +25 -0
- data/test/rubygems/test_bundled_ca.rb +7 -4
- data/test/rubygems/test_config.rb +1 -1
- data/test/rubygems/test_gem.rb +158 -39
- data/test/rubygems/test_gem_bundler_version_finder.rb +126 -0
- data/test/rubygems/test_gem_command.rb +7 -1
- data/test/rubygems/test_gem_command_manager.rb +2 -2
- data/test/rubygems/test_gem_commands_build_command.rb +29 -1
- data/test/rubygems/test_gem_commands_cert_command.rb +64 -0
- data/test/rubygems/test_gem_commands_cleanup_command.rb +44 -1
- data/test/rubygems/test_gem_commands_install_command.rb +73 -2
- data/test/rubygems/test_gem_commands_open_command.rb +2 -1
- data/test/rubygems/test_gem_commands_owner_command.rb +25 -0
- data/test/rubygems/test_gem_commands_pristine_command.rb +1 -1
- data/test/rubygems/test_gem_commands_push_command.rb +25 -5
- data/test/rubygems/test_gem_commands_query_command.rb +154 -1
- data/test/rubygems/test_gem_commands_setup_command.rb +140 -10
- data/test/rubygems/test_gem_commands_signin_command.rb +98 -0
- data/test/rubygems/test_gem_commands_signout_command.rb +37 -0
- data/test/rubygems/test_gem_commands_sources_command.rb +52 -0
- data/test/rubygems/test_gem_commands_uninstall_command.rb +15 -3
- data/test/rubygems/test_gem_commands_update_command.rb +1 -7
- data/test/rubygems/test_gem_commands_which_command.rb +3 -3
- data/test/rubygems/test_gem_dependency.rb +28 -0
- data/test/rubygems/test_gem_dependency_installer.rb +1 -1
- data/test/rubygems/test_gem_doctor.rb +2 -2
- data/test/rubygems/test_gem_ext_builder.rb +8 -8
- data/test/rubygems/test_gem_ext_configure_builder.rb +1 -1
- data/test/rubygems/test_gem_ext_rake_builder.rb +2 -6
- data/test/rubygems/test_gem_gemcutter_utilities.rb +4 -4
- data/test/rubygems/test_gem_indexer.rb +1 -2
- data/test/rubygems/test_gem_install_update_options.rb +6 -1
- data/test/rubygems/test_gem_installer.rb +168 -31
- data/test/rubygems/test_gem_package.rb +183 -26
- data/test/rubygems/test_gem_package_old.rb +1 -1
- data/test/rubygems/test_gem_package_tar_header.rb +21 -0
- data/test/rubygems/test_gem_rdoc.rb +2 -0
- data/test/rubygems/test_gem_remote_fetcher.rb +24 -5
- data/test/rubygems/test_gem_request.rb +5 -2
- data/test/rubygems/test_gem_request_connection_pools.rb +6 -7
- data/test/rubygems/test_gem_request_set.rb +7 -7
- data/test/rubygems/test_gem_request_set_gem_dependency_api.rb +3 -3
- data/test/rubygems/test_gem_request_set_lockfile.rb +4 -4
- data/test/rubygems/test_gem_request_set_lockfile_parser.rb +1 -1
- data/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb +1 -1
- data/test/rubygems/test_gem_requirement.rb +12 -0
- data/test/rubygems/test_gem_resolver.rb +26 -0
- data/test/rubygems/test_gem_resolver_api_specification.rb +24 -0
- data/test/rubygems/test_gem_resolver_conflict.rb +1 -1
- data/test/rubygems/test_gem_resolver_git_specification.rb +1 -1
- data/test/rubygems/test_gem_resolver_installer_set.rb +1 -1
- data/test/rubygems/test_gem_security.rb +5 -0
- data/test/rubygems/test_gem_security_policy.rb +27 -27
- data/test/rubygems/test_gem_security_signer.rb +6 -6
- data/test/rubygems/test_gem_security_trust_dir.rb +2 -2
- data/test/rubygems/test_gem_server.rb +194 -12
- data/test/rubygems/test_gem_source.rb +12 -3
- data/test/rubygems/test_gem_source_git.rb +1 -1
- data/test/rubygems/test_gem_spec_fetcher.rb +20 -0
- data/test/rubygems/test_gem_specification.rb +180 -42
- data/test/rubygems/test_gem_stream_ui.rb +8 -8
- data/test/rubygems/test_gem_stub_specification.rb +26 -8
- data/test/rubygems/test_gem_text.rb +16 -0
- data/test/rubygems/test_gem_util.rb +26 -0
- data/test/rubygems/test_gem_version.rb +68 -9
- data/test/rubygems/test_gem_version_option.rb +15 -0
- data/test/rubygems/test_kernel.rb +30 -0
- data/test/rubygems/test_require.rb +70 -21
- data/util/ci +1 -0
- data/util/generate_spdx_license_list.rb +16 -6
- data/util/update_bundled_ca_certificates.rb +1 -3
- metadata +61 -57
- data/README.rdoc +0 -54
- data/bundler/DEVELOPMENT.md +0 -150
- data/bundler/ISSUES.md +0 -117
- data/bundler/lib/bundler/postit_trampoline.rb +0 -73
- data/bundler/lib/bundler/vendor/postit/lib/postit.rb +0 -15
- data/bundler/lib/bundler/vendor/postit/lib/postit/environment.rb +0 -44
- data/bundler/lib/bundler/vendor/postit/lib/postit/installer.rb +0 -28
- data/bundler/lib/bundler/vendor/postit/lib/postit/parser.rb +0 -21
- data/bundler/lib/bundler/vendor/postit/lib/postit/setup.rb +0 -12
- data/bundler/lib/bundler/vendor/postit/lib/postit/version.rb +0 -3
- data/bundler/man/index.txt +0 -8
- 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
@@ -13,12 +13,13 @@ module Bundler
|
|
13
13
|
|
14
14
|
def install(names, options)
|
15
15
|
version = options[:version] || [">= 0"]
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
16
|
+
Bundler.settings.temporary(:lockfile_uses_separate_rubygems_sources => false, :disable_multisource => false) do
|
17
|
+
if options[:git]
|
18
|
+
install_git(names, version, options)
|
19
|
+
else
|
20
|
+
sources = options[:source] || Bundler.rubygems.sources
|
21
|
+
install_rubygems(names, version, sources)
|
22
|
+
end
|
22
23
|
end
|
23
24
|
end
|
24
25
|
|
@@ -5,13 +5,6 @@ module Bundler
|
|
5
5
|
# approptiate options to be used with Source classes for plugin installation
|
6
6
|
module Plugin
|
7
7
|
class SourceList < Bundler::SourceList
|
8
|
-
def initialize
|
9
|
-
@path_sources = []
|
10
|
-
@git_sources = []
|
11
|
-
@rubygems_aggregate = Plugin::Installer::Rubygems.new
|
12
|
-
@rubygems_sources = []
|
13
|
-
end
|
14
|
-
|
15
8
|
def add_git_source(options = {})
|
16
9
|
add_source_to_list Plugin::Installer::Git.new(options), git_sources
|
17
10
|
end
|
@@ -21,7 +14,13 @@ module Bundler
|
|
21
14
|
end
|
22
15
|
|
23
16
|
def all_sources
|
24
|
-
path_sources + git_sources + rubygems_sources
|
17
|
+
path_sources + git_sources + rubygems_sources + [metadata_source]
|
18
|
+
end
|
19
|
+
|
20
|
+
private
|
21
|
+
|
22
|
+
def rubygems_aggregate_class
|
23
|
+
Plugin::Installer::Rubygems
|
25
24
|
end
|
26
25
|
end
|
27
26
|
end
|
@@ -0,0 +1,24 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Bundler
|
4
|
+
class ProcessLock
|
5
|
+
def self.lock(bundle_path = Bundler.bundle_path)
|
6
|
+
lock_file_path = File.join(bundle_path, "bundler.lock")
|
7
|
+
has_lock = false
|
8
|
+
|
9
|
+
File.open(lock_file_path, "w") do |f|
|
10
|
+
f.flock(File::LOCK_EX)
|
11
|
+
has_lock = true
|
12
|
+
yield
|
13
|
+
f.flock(File::LOCK_UN)
|
14
|
+
end
|
15
|
+
rescue Errno::EACCES, Errno::ENOLCK, *[SharedHelpers.const_get_safely(:ENOTSUP, Errno)].compact
|
16
|
+
# In the case the user does not have access to
|
17
|
+
# create the lock file or is using NFS where
|
18
|
+
# locks are not available we skip locking.
|
19
|
+
yield
|
20
|
+
ensure
|
21
|
+
FileUtils.rm_f(lock_file_path) if has_lock
|
22
|
+
end
|
23
|
+
end
|
24
|
+
end
|
@@ -1,4 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
2
3
|
# Psych could be a gem, so try to ask for it
|
3
4
|
begin
|
4
5
|
gem "psych"
|
@@ -25,3 +26,12 @@ module Bundler
|
|
25
26
|
YamlLibrarySyntaxError = ::ArgumentError
|
26
27
|
end
|
27
28
|
end
|
29
|
+
|
30
|
+
require "bundler/deprecate"
|
31
|
+
begin
|
32
|
+
Bundler::Deprecate.skip_during do
|
33
|
+
require "rubygems/safe_yaml"
|
34
|
+
end
|
35
|
+
rescue LoadError
|
36
|
+
# it's OK if the file isn't there
|
37
|
+
end
|
@@ -1,6 +1,6 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
2
3
|
require "uri"
|
3
|
-
require "rubygems/spec_fetcher"
|
4
4
|
|
5
5
|
module Bundler
|
6
6
|
# Represents a lazily loaded gem specification, where the full specification
|
@@ -12,6 +12,7 @@ module Bundler
|
|
12
12
|
include Comparable
|
13
13
|
|
14
14
|
attr_reader :name, :version, :platform
|
15
|
+
attr_writer :dependencies
|
15
16
|
attr_accessor :source, :remote
|
16
17
|
|
17
18
|
def initialize(name, version, platform, spec_fetcher)
|
@@ -19,6 +20,7 @@ module Bundler
|
|
19
20
|
@version = Gem::Version.create version
|
20
21
|
@platform = platform
|
21
22
|
@spec_fetcher = spec_fetcher
|
23
|
+
@dependencies = nil
|
22
24
|
end
|
23
25
|
|
24
26
|
# Needed before installs, since the arch matters then and quick
|
@@ -50,6 +52,7 @@ module Bundler
|
|
50
52
|
# once the remote gem is downloaded, the backend specification will
|
51
53
|
# be swapped out.
|
52
54
|
def __swap__(spec)
|
55
|
+
SharedHelpers.ensure_same_dependencies(self, dependencies, spec.dependencies)
|
53
56
|
@_remote_specification = spec
|
54
57
|
end
|
55
58
|
|
@@ -70,8 +73,29 @@ module Bundler
|
|
70
73
|
"#<#{self.class} name=#{name} version=#{version} platform=#{platform}>"
|
71
74
|
end
|
72
75
|
|
76
|
+
def dependencies
|
77
|
+
@dependencies ||= begin
|
78
|
+
deps = method_missing(:dependencies)
|
79
|
+
|
80
|
+
# allow us to handle when the specs dependencies are an array of array of string
|
81
|
+
# see https://github.com/bundler/bundler/issues/5797
|
82
|
+
deps = deps.map {|d| d.is_a?(Gem::Dependency) ? d : Gem::Dependency.new(*d) }
|
83
|
+
|
84
|
+
deps
|
85
|
+
end
|
86
|
+
end
|
87
|
+
|
88
|
+
def git_version
|
89
|
+
return unless loaded_from && source.is_a?(Bundler::Source::Git)
|
90
|
+
" #{source.revision[0..6]}"
|
91
|
+
end
|
92
|
+
|
73
93
|
private
|
74
94
|
|
95
|
+
def to_ary
|
96
|
+
nil
|
97
|
+
end
|
98
|
+
|
75
99
|
def _remote_specification
|
76
100
|
@_remote_specification ||= @spec_fetcher.fetch_spec([@name, @version, @platform])
|
77
101
|
@_remote_specification || raise(GemspecError, "Gemspec data for #{full_name} was" \
|
@@ -1,169 +1,9 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
2
3
|
module Bundler
|
3
4
|
class Resolver
|
4
5
|
require "bundler/vendored_molinillo"
|
5
|
-
|
6
|
-
class Molinillo::VersionConflict
|
7
|
-
def printable_dep(dep)
|
8
|
-
if dep.is_a?(Bundler::Dependency)
|
9
|
-
DepProxy.new(dep, dep.platforms.join(", ")).to_s.strip
|
10
|
-
else
|
11
|
-
dep.to_s
|
12
|
-
end
|
13
|
-
end
|
14
|
-
|
15
|
-
def message
|
16
|
-
conflicts.sort.reduce(String.new) do |o, (name, conflict)|
|
17
|
-
o << %(Bundler could not find compatible versions for gem "#{name}":\n)
|
18
|
-
if conflict.locked_requirement
|
19
|
-
o << %( In snapshot (#{Bundler.default_lockfile.basename}):\n)
|
20
|
-
o << %( #{printable_dep(conflict.locked_requirement)}\n)
|
21
|
-
o << %(\n)
|
22
|
-
end
|
23
|
-
o << %( In Gemfile:\n)
|
24
|
-
o << conflict.requirement_trees.sort_by {|t| t.reverse.map(&:name) }.map do |tree|
|
25
|
-
t = String.new
|
26
|
-
depth = 2
|
27
|
-
tree.each do |req|
|
28
|
-
t << " " * depth << req.to_s
|
29
|
-
unless tree.last == req
|
30
|
-
if spec = conflict.activated_by_name[req.name]
|
31
|
-
t << %( was resolved to #{spec.version}, which)
|
32
|
-
end
|
33
|
-
t << %( depends on)
|
34
|
-
end
|
35
|
-
t << %(\n)
|
36
|
-
depth += 1
|
37
|
-
end
|
38
|
-
t
|
39
|
-
end.join("\n")
|
40
|
-
|
41
|
-
if name == "bundler"
|
42
|
-
o << %(\n Current Bundler version:\n bundler (#{Bundler::VERSION}))
|
43
|
-
other_bundler_required = !conflict.requirement.requirement.satisfied_by?(Gem::Version.new Bundler::VERSION)
|
44
|
-
end
|
45
|
-
|
46
|
-
if name == "bundler" && other_bundler_required
|
47
|
-
o << "\n"
|
48
|
-
o << "This Gemfile requires a different version of Bundler.\n"
|
49
|
-
o << "Perhaps you need to update Bundler by running `gem install bundler`?\n"
|
50
|
-
end
|
51
|
-
if conflict.locked_requirement
|
52
|
-
o << "\n"
|
53
|
-
o << %(Running `bundle update` will rebuild your snapshot from scratch, using only\n)
|
54
|
-
o << %(the gems in your Gemfile, which may resolve the conflict.\n)
|
55
|
-
elsif !conflict.existing
|
56
|
-
o << "\n"
|
57
|
-
if conflict.requirement_trees.first.size > 1
|
58
|
-
o << "Could not find gem '#{conflict.requirement}', which is required by "
|
59
|
-
o << "gem '#{conflict.requirement_trees.first[-2]}', in any of the sources."
|
60
|
-
else
|
61
|
-
o << "Could not find gem '#{conflict.requirement}' in any of the sources\n"
|
62
|
-
end
|
63
|
-
end
|
64
|
-
o
|
65
|
-
end
|
66
|
-
end
|
67
|
-
end
|
68
|
-
|
69
|
-
class SpecGroup < Array
|
70
|
-
include GemHelpers
|
71
|
-
|
72
|
-
attr_reader :activated
|
73
|
-
|
74
|
-
def initialize(a)
|
75
|
-
super
|
76
|
-
@required_by = []
|
77
|
-
@activated_platforms = []
|
78
|
-
@dependencies = nil
|
79
|
-
@specs = Hash.new do |specs, platform|
|
80
|
-
specs[platform] = select_best_platform_match(self, platform)
|
81
|
-
end
|
82
|
-
end
|
83
|
-
|
84
|
-
def initialize_copy(o)
|
85
|
-
super
|
86
|
-
@activated_platforms = o.activated.dup
|
87
|
-
end
|
88
|
-
|
89
|
-
def to_specs
|
90
|
-
@activated_platforms.map do |p|
|
91
|
-
next unless s = @specs[p]
|
92
|
-
lazy_spec = LazySpecification.new(name, version, s.platform, source)
|
93
|
-
lazy_spec.dependencies.replace s.dependencies
|
94
|
-
lazy_spec
|
95
|
-
end.compact
|
96
|
-
end
|
97
|
-
|
98
|
-
def activate_platform!(platform)
|
99
|
-
return unless for?(platform)
|
100
|
-
return if @activated_platforms.include?(platform)
|
101
|
-
@activated_platforms << platform
|
102
|
-
end
|
103
|
-
|
104
|
-
def name
|
105
|
-
@name ||= first.name
|
106
|
-
end
|
107
|
-
|
108
|
-
def version
|
109
|
-
@version ||= first.version
|
110
|
-
end
|
111
|
-
|
112
|
-
def source
|
113
|
-
@source ||= first.source
|
114
|
-
end
|
115
|
-
|
116
|
-
def for?(platform)
|
117
|
-
spec = @specs[platform]
|
118
|
-
!spec.nil?
|
119
|
-
end
|
120
|
-
|
121
|
-
def to_s
|
122
|
-
"#{name} (#{version})"
|
123
|
-
end
|
124
|
-
|
125
|
-
def dependencies_for_activated_platforms
|
126
|
-
dependencies = @activated_platforms.map {|p| __dependencies[p] }
|
127
|
-
metadata_dependencies = @activated_platforms.map do |platform|
|
128
|
-
metadata_dependencies(@specs[platform], platform)
|
129
|
-
end
|
130
|
-
dependencies.concat(metadata_dependencies).flatten
|
131
|
-
end
|
132
|
-
|
133
|
-
def platforms_for_dependency_named(dependency)
|
134
|
-
__dependencies.select {|_, deps| deps.map(&:name).include? dependency }.keys
|
135
|
-
end
|
136
|
-
|
137
|
-
private
|
138
|
-
|
139
|
-
def __dependencies
|
140
|
-
@dependencies = Hash.new do |dependencies, platform|
|
141
|
-
dependencies[platform] = []
|
142
|
-
if spec = @specs[platform]
|
143
|
-
spec.dependencies.each do |dep|
|
144
|
-
next if dep.type == :development
|
145
|
-
dependencies[platform] << DepProxy.new(dep, platform)
|
146
|
-
end
|
147
|
-
end
|
148
|
-
dependencies[platform]
|
149
|
-
end
|
150
|
-
end
|
151
|
-
|
152
|
-
def metadata_dependencies(spec, platform)
|
153
|
-
return [] unless spec
|
154
|
-
# Only allow endpoint specifications since they won't hit the network to
|
155
|
-
# fetch the full gemspec when calling required_ruby_version
|
156
|
-
return [] if !spec.is_a?(EndpointSpecification) && !spec.is_a?(Gem::Specification)
|
157
|
-
dependencies = []
|
158
|
-
if !spec.required_ruby_version.nil? && !spec.required_ruby_version.none?
|
159
|
-
dependencies << DepProxy.new(Gem::Dependency.new("ruby\0", spec.required_ruby_version), platform)
|
160
|
-
end
|
161
|
-
if !spec.required_rubygems_version.nil? && !spec.required_rubygems_version.none?
|
162
|
-
dependencies << DepProxy.new(Gem::Dependency.new("rubygems\0", spec.required_rubygems_version), platform)
|
163
|
-
end
|
164
|
-
dependencies
|
165
|
-
end
|
166
|
-
end
|
6
|
+
require "bundler/resolver/spec_group"
|
167
7
|
|
168
8
|
# Figures out the best possible configuration of gems that satisfies
|
169
9
|
# the list of passed dependencies and any child dependencies without
|
@@ -175,14 +15,15 @@ module Bundler
|
|
175
15
|
# ==== Returns
|
176
16
|
# <GemBundle>,nil:: If the list of dependencies can be resolved, a
|
177
17
|
# collection of gemspecs is returned. Otherwise, nil is returned.
|
178
|
-
def self.resolve(requirements, index, source_requirements = {}, base = [], gem_version_promoter = GemVersionPromoter.new, additional_base_requirements = [])
|
18
|
+
def self.resolve(requirements, index, source_requirements = {}, base = [], gem_version_promoter = GemVersionPromoter.new, additional_base_requirements = [], platforms = nil)
|
19
|
+
platforms = Set.new(platforms) if platforms
|
179
20
|
base = SpecSet.new(base) unless base.is_a?(SpecSet)
|
180
|
-
resolver = new(index, source_requirements, base, gem_version_promoter, additional_base_requirements)
|
21
|
+
resolver = new(index, source_requirements, base, gem_version_promoter, additional_base_requirements, platforms)
|
181
22
|
result = resolver.start(requirements)
|
182
23
|
SpecSet.new(result)
|
183
24
|
end
|
184
25
|
|
185
|
-
def initialize(index, source_requirements, base, gem_version_promoter, additional_base_requirements)
|
26
|
+
def initialize(index, source_requirements, base, gem_version_promoter, additional_base_requirements, platforms)
|
186
27
|
@index = index
|
187
28
|
@source_requirements = source_requirements
|
188
29
|
@base = base
|
@@ -194,17 +35,25 @@ module Bundler
|
|
194
35
|
@base_dg.add_vertex(ls.name, DepProxy.new(dep, ls.platform), true)
|
195
36
|
end
|
196
37
|
additional_base_requirements.each {|d| @base_dg.add_vertex(d.name, d) }
|
38
|
+
@platforms = platforms
|
197
39
|
@gem_version_promoter = gem_version_promoter
|
40
|
+
@allow_bundler_dependency_conflicts = Bundler.feature_flag.allow_bundler_dependency_conflicts?
|
41
|
+
@lockfile_uses_separate_rubygems_sources = Bundler.feature_flag.lockfile_uses_separate_rubygems_sources?
|
42
|
+
@use_gvp = !@gem_version_promoter.major?
|
198
43
|
end
|
199
44
|
|
200
45
|
def start(requirements)
|
46
|
+
@gem_version_promoter.prerelease_specified = @prerelease_specified = {}
|
47
|
+
requirements.each {|dep| @prerelease_specified[dep.name] ||= dep.prerelease? }
|
48
|
+
|
201
49
|
verify_gemfile_dependencies_are_found!(requirements)
|
202
50
|
dg = @resolver.resolve(requirements, @base_dg)
|
203
51
|
dg.map(&:payload).
|
204
52
|
reject {|sg| sg.name.end_with?("\0") }.
|
205
53
|
map(&:to_specs).flatten
|
206
54
|
rescue Molinillo::VersionConflict => e
|
207
|
-
|
55
|
+
message = version_conflict_message(e)
|
56
|
+
raise VersionConflict.new(e.conflicts.keys.uniq, message)
|
208
57
|
rescue Molinillo::CircularDependencyError => e
|
209
58
|
names = e.dependencies.sort_by(&:name).map {|d| "gem '#{d.name}'" }
|
210
59
|
raise CyclicDependencyError, "Your bundle requires gems that depend" \
|
@@ -228,11 +77,11 @@ module Bundler
|
|
228
77
|
|
229
78
|
def debug?
|
230
79
|
return @debug_mode if defined?(@debug_mode)
|
231
|
-
@debug_mode = ENV["DEBUG_RESOLVER"] || ENV["DEBUG_RESOLVER_TREE"]
|
80
|
+
@debug_mode = ENV["DEBUG_RESOLVER"] || ENV["DEBUG_RESOLVER_TREE"] || false
|
232
81
|
end
|
233
82
|
|
234
83
|
def before_resolution
|
235
|
-
Bundler.ui.info "Resolving dependencies...",
|
84
|
+
Bundler.ui.info "Resolving dependencies...", debug?
|
236
85
|
end
|
237
86
|
|
238
87
|
def after_resolution
|
@@ -240,7 +89,7 @@ module Bundler
|
|
240
89
|
end
|
241
90
|
|
242
91
|
def indicate_progress
|
243
|
-
Bundler.ui.info ".", false
|
92
|
+
Bundler.ui.info ".", false unless debug?
|
244
93
|
end
|
245
94
|
|
246
95
|
include Molinillo::SpecificationProvider
|
@@ -255,9 +104,18 @@ module Bundler
|
|
255
104
|
search = @search_for[dependency] ||= begin
|
256
105
|
index = index_for(dependency)
|
257
106
|
results = index.search(dependency, @base[dependency.name])
|
107
|
+
|
258
108
|
if vertex = @base_dg.vertex_named(dependency.name)
|
259
109
|
locked_requirement = vertex.payload.requirement
|
260
110
|
end
|
111
|
+
|
112
|
+
if !@prerelease_specified[dependency.name] && (!@use_gvp || locked_requirement.nil?)
|
113
|
+
# Move prereleases to the beginning of the list, so they're considered
|
114
|
+
# last during resolution.
|
115
|
+
pre, results = results.partition {|spec| spec.version.prerelease? }
|
116
|
+
results = pre + results
|
117
|
+
end
|
118
|
+
|
261
119
|
spec_groups = if results.any?
|
262
120
|
nested = []
|
263
121
|
results.each do |spec|
|
@@ -270,7 +128,9 @@ module Bundler
|
|
270
128
|
end
|
271
129
|
nested.reduce([]) do |groups, (version, specs)|
|
272
130
|
next groups if locked_requirement && !locked_requirement.satisfied_by?(version)
|
273
|
-
|
131
|
+
spec_group = SpecGroup.new(specs)
|
132
|
+
spec_group.ignores_bundler_dependencies = @allow_bundler_dependency_conflicts
|
133
|
+
groups << spec_group
|
274
134
|
end
|
275
135
|
else
|
276
136
|
[]
|
@@ -287,7 +147,20 @@ module Bundler
|
|
287
147
|
end
|
288
148
|
|
289
149
|
def index_for(dependency)
|
290
|
-
@source_requirements[dependency.name]
|
150
|
+
source = @source_requirements[dependency.name]
|
151
|
+
if source
|
152
|
+
source.specs
|
153
|
+
elsif @lockfile_uses_separate_rubygems_sources
|
154
|
+
Index.build do |idx|
|
155
|
+
if dependency.all_sources
|
156
|
+
dependency.all_sources.each {|s| idx.add_source(s.specs) if s }
|
157
|
+
else
|
158
|
+
idx.add_source @source_requirements[:default].specs
|
159
|
+
end
|
160
|
+
end
|
161
|
+
else
|
162
|
+
@index
|
163
|
+
end
|
291
164
|
end
|
292
165
|
|
293
166
|
def name_for(dependency)
|
@@ -308,23 +181,57 @@ module Bundler
|
|
308
181
|
|
309
182
|
def requirement_satisfied_by?(requirement, activated, spec)
|
310
183
|
return false unless requirement.matches_spec?(spec) || spec.source.is_a?(Source::Gemspec)
|
311
|
-
spec.activate_platform!(requirement.__platform) ||
|
184
|
+
spec.activate_platform!(requirement.__platform) if !@platforms || @platforms.include?(requirement.__platform)
|
185
|
+
true
|
186
|
+
end
|
187
|
+
|
188
|
+
def relevant_sources_for_vertex(vertex)
|
189
|
+
if vertex.root?
|
190
|
+
[@source_requirements[vertex.name]]
|
191
|
+
elsif @lockfile_uses_separate_rubygems_sources
|
192
|
+
vertex.recursive_predecessors.map do |v|
|
193
|
+
@source_requirements[v.name]
|
194
|
+
end << @source_requirements[:default]
|
195
|
+
end
|
312
196
|
end
|
313
197
|
|
314
198
|
def sort_dependencies(dependencies, activated, conflicts)
|
315
199
|
dependencies.sort_by do |dependency|
|
200
|
+
dependency.all_sources = relevant_sources_for_vertex(activated.vertex_named(dependency.name))
|
316
201
|
name = name_for(dependency)
|
202
|
+
vertex = activated.vertex_named(name)
|
317
203
|
[
|
318
|
-
|
204
|
+
@base_dg.vertex_named(name) ? 0 : 1,
|
205
|
+
vertex.payload ? 0 : 1,
|
206
|
+
vertex.root? ? 0 : 1,
|
319
207
|
amount_constrained(dependency),
|
320
208
|
conflicts[name] ? 0 : 1,
|
321
|
-
|
209
|
+
vertex.payload ? 0 : search_for(dependency).count,
|
210
|
+
self.class.platform_sort_key(dependency.__platform),
|
322
211
|
]
|
323
212
|
end
|
324
213
|
end
|
325
214
|
|
215
|
+
# Sort platforms from most general to most specific
|
216
|
+
def self.sort_platforms(platforms)
|
217
|
+
platforms.sort_by do |platform|
|
218
|
+
platform_sort_key(platform)
|
219
|
+
end
|
220
|
+
end
|
221
|
+
|
222
|
+
def self.platform_sort_key(platform)
|
223
|
+
return ["", "", ""] if Gem::Platform::RUBY == platform
|
224
|
+
platform.to_a.map {|part| part || "" }
|
225
|
+
end
|
226
|
+
|
326
227
|
private
|
327
228
|
|
229
|
+
# returns an integer \in (-\infty, 0]
|
230
|
+
# a number closer to 0 means the dependency is less constraining
|
231
|
+
#
|
232
|
+
# dependencies w/ 0 or 1 possibilities (ignoring version requirements)
|
233
|
+
# are given very negative values, so they _always_ sort first,
|
234
|
+
# before dependencies that are unconstrained
|
328
235
|
def amount_constrained(dependency)
|
329
236
|
@amount_constrained ||= {}
|
330
237
|
@amount_constrained[dependency.name] ||= begin
|
@@ -332,10 +239,12 @@ module Bundler
|
|
332
239
|
dependency.requirement.satisfied_by?(base.first.version) ? 0 : 1
|
333
240
|
else
|
334
241
|
all = index_for(dependency).search(dependency.name).size
|
242
|
+
|
335
243
|
if all <= 1
|
336
|
-
all
|
244
|
+
all - 1_000_000
|
337
245
|
else
|
338
|
-
search = search_for(dependency)
|
246
|
+
search = search_for(dependency)
|
247
|
+
search = @prerelease_specified[dependency.name] ? search.count : search.count {|s| !s.version.prerelease? }
|
339
248
|
search - all
|
340
249
|
end
|
341
250
|
end
|
@@ -344,32 +253,34 @@ module Bundler
|
|
344
253
|
|
345
254
|
def verify_gemfile_dependencies_are_found!(requirements)
|
346
255
|
requirements.each do |requirement|
|
347
|
-
|
256
|
+
name = requirement.name
|
257
|
+
next if name == "bundler"
|
348
258
|
next unless search_for(requirement).empty?
|
349
|
-
|
259
|
+
|
260
|
+
cache_message = begin
|
261
|
+
" or in gems cached in #{Bundler.settings.app_cache_path}" if Bundler.app_cache.exist?
|
262
|
+
rescue GemfileNotFound
|
263
|
+
nil
|
264
|
+
end
|
265
|
+
|
266
|
+
if (base = @base[name]) && !base.empty?
|
350
267
|
version = base.first.version
|
351
268
|
message = "You have requested:\n" \
|
352
|
-
" #{
|
353
|
-
"The bundle currently has #{
|
354
|
-
"Try running `bundle update #{
|
269
|
+
" #{name} #{requirement.requirement}\n\n" \
|
270
|
+
"The bundle currently has #{name} locked at #{version}.\n" \
|
271
|
+
"Try running `bundle update #{name}`\n\n" \
|
355
272
|
"If you are updating multiple gems in your Gemfile at once,\n" \
|
356
273
|
"try passing them all to `bundle update`"
|
357
|
-
elsif
|
358
|
-
|
359
|
-
specs = @source_requirements[name][name]
|
274
|
+
elsif source = @source_requirements[name]
|
275
|
+
specs = source.specs[name]
|
360
276
|
versions_with_platforms = specs.map {|s| [s.version, s.platform] }
|
361
|
-
message = String.new("Could not find gem '#{requirement}' in #{
|
277
|
+
message = String.new("Could not find gem '#{SharedHelpers.pretty_dependency(requirement)}' in #{source}#{cache_message}.\n")
|
362
278
|
message << if versions_with_platforms.any?
|
363
|
-
"
|
279
|
+
"The source contains '#{name}' at: #{formatted_versions_with_platforms(versions_with_platforms)}"
|
364
280
|
else
|
365
|
-
"
|
281
|
+
"The source does not contain any versions of '#{name}'"
|
366
282
|
end
|
367
283
|
else
|
368
|
-
cache_message = begin
|
369
|
-
" or in gems cached in #{Bundler.settings.app_cache_path}" if Bundler.app_cache.exist?
|
370
|
-
rescue GemfileNotFound
|
371
|
-
nil
|
372
|
-
end
|
373
284
|
message = "Could not find gem '#{requirement}' in any of the gem sources " \
|
374
285
|
"listed in your Gemfile#{cache_message}."
|
375
286
|
end
|
@@ -382,9 +293,81 @@ module Bundler
|
|
382
293
|
version = vwp.first
|
383
294
|
platform = vwp.last
|
384
295
|
version_platform_str = String.new(version.to_s)
|
385
|
-
version_platform_str << " #{platform}" unless platform.nil?
|
296
|
+
version_platform_str << " #{platform}" unless platform.nil? || platform == Gem::Platform::RUBY
|
297
|
+
version_platform_str
|
386
298
|
end
|
387
299
|
version_platform_strs.join(", ")
|
388
300
|
end
|
301
|
+
|
302
|
+
def version_conflict_message(e)
|
303
|
+
e.message_with_trees(
|
304
|
+
:solver_name => "Bundler",
|
305
|
+
:possibility_type => "gem",
|
306
|
+
:reduce_trees => lambda do |trees|
|
307
|
+
# called first, because we want to reduce the amount of work required to find maximal empty sets
|
308
|
+
trees = trees.uniq {|t| t.flatten.map {|dep| [dep.name, dep.requirement] } }
|
309
|
+
|
310
|
+
# bail out if tree size is too big for Array#combination to make any sense
|
311
|
+
return trees if trees.size > 15
|
312
|
+
maximal = 1.upto(trees.size).map do |size|
|
313
|
+
trees.map(&:last).flatten(1).combination(size).to_a
|
314
|
+
end.flatten(1).select do |deps|
|
315
|
+
Bundler::VersionRanges.empty?(*Bundler::VersionRanges.for_many(deps.map(&:requirement)))
|
316
|
+
end.min_by(&:size)
|
317
|
+
trees.reject! {|t| !maximal.include?(t.last) } if maximal
|
318
|
+
|
319
|
+
trees = trees.sort_by {|t| t.flatten.map(&:to_s) }
|
320
|
+
trees.uniq! {|t| t.flatten.map {|dep| [dep.name, dep.requirement] } }
|
321
|
+
|
322
|
+
trees.sort_by {|t| t.reverse.map(&:name) }
|
323
|
+
end,
|
324
|
+
:printable_requirement => lambda {|req| SharedHelpers.pretty_dependency(req) },
|
325
|
+
:additional_message_for_conflict => lambda do |o, name, conflict|
|
326
|
+
if name == "bundler"
|
327
|
+
o << %(\n Current Bundler version:\n bundler (#{Bundler::VERSION}))
|
328
|
+
other_bundler_required = !conflict.requirement.requirement.satisfied_by?(Gem::Version.new Bundler::VERSION)
|
329
|
+
end
|
330
|
+
|
331
|
+
if name == "bundler" && other_bundler_required
|
332
|
+
o << "\n"
|
333
|
+
o << "This Gemfile requires a different version of Bundler.\n"
|
334
|
+
o << "Perhaps you need to update Bundler by running `gem install bundler`?\n"
|
335
|
+
end
|
336
|
+
if conflict.locked_requirement
|
337
|
+
o << "\n"
|
338
|
+
o << %(Running `bundle update` will rebuild your snapshot from scratch, using only\n)
|
339
|
+
o << %(the gems in your Gemfile, which may resolve the conflict.\n)
|
340
|
+
elsif !conflict.existing
|
341
|
+
o << "\n"
|
342
|
+
|
343
|
+
relevant_sources = if conflict.requirement.source
|
344
|
+
[conflict.requirement.source]
|
345
|
+
elsif conflict.requirement.all_sources
|
346
|
+
conflict.requirement.all_sources
|
347
|
+
elsif @lockfile_uses_separate_rubygems_sources
|
348
|
+
# every conflict should have an explicit group of sources when we
|
349
|
+
# enforce strict pinning
|
350
|
+
raise "no source set for #{conflict}"
|
351
|
+
else
|
352
|
+
[]
|
353
|
+
end.compact.map(&:to_s).uniq.sort
|
354
|
+
|
355
|
+
o << "Could not find gem '#{SharedHelpers.pretty_dependency(conflict.requirement)}'"
|
356
|
+
if conflict.requirement_trees.first.size > 1
|
357
|
+
o << ", which is required by "
|
358
|
+
o << "gem '#{SharedHelpers.pretty_dependency(conflict.requirement_trees.first[-2])}',"
|
359
|
+
end
|
360
|
+
o << " "
|
361
|
+
|
362
|
+
o << if relevant_sources.empty?
|
363
|
+
"in any of the sources.\n"
|
364
|
+
else
|
365
|
+
"in any of the relevant sources:\n #{relevant_sources * "\n "}\n"
|
366
|
+
end
|
367
|
+
end
|
368
|
+
end,
|
369
|
+
:version_for_spec => lambda {|spec| spec.version }
|
370
|
+
)
|
371
|
+
end
|
389
372
|
end
|
390
373
|
end
|