rubygems-update 2.6.3 → 2.7.7
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of rubygems-update might be problematic. Click here for more details.
- checksums.yaml +5 -5
- data/.travis.yml +17 -34
- data/CODE_OF_CONDUCT.md +36 -33
- data/CONTRIBUTING.rdoc +56 -55
- data/History.txt +467 -10
- data/Manifest.txt +276 -4
- data/POLICIES.rdoc +4 -4
- data/README.md +72 -0
- data/Rakefile +77 -10
- data/appveyor.yml +61 -31
- data/bin/gem +1 -1
- data/bin/update_rubygems +2 -2
- data/bundler/CHANGELOG.md +2910 -0
- data/bundler/CODE_OF_CONDUCT.md +42 -0
- data/bundler/CONTRIBUTING.md +17 -0
- data/bundler/LICENSE.md +23 -0
- data/bundler/README.md +63 -0
- data/bundler/bundler.gemspec +57 -0
- data/bundler/exe/bundle +31 -0
- data/bundler/exe/bundle_ruby +60 -0
- data/bundler/exe/bundler +4 -0
- data/bundler/lib/bundler/build_metadata.rb +36 -0
- data/bundler/lib/bundler/capistrano.rb +22 -0
- data/bundler/lib/bundler/cli/add.rb +25 -0
- data/bundler/lib/bundler/cli/binstubs.rb +43 -0
- data/bundler/lib/bundler/cli/cache.rb +36 -0
- data/bundler/lib/bundler/cli/check.rb +38 -0
- data/bundler/lib/bundler/cli/clean.rb +25 -0
- data/bundler/lib/bundler/cli/common.rb +102 -0
- data/bundler/lib/bundler/cli/config.rb +119 -0
- data/bundler/lib/bundler/cli/console.rb +43 -0
- data/bundler/lib/bundler/cli/doctor.rb +94 -0
- data/bundler/lib/bundler/cli/exec.rb +104 -0
- data/bundler/lib/bundler/cli/gem.rb +252 -0
- data/bundler/lib/bundler/cli/info.rb +50 -0
- data/bundler/lib/bundler/cli/init.rb +47 -0
- data/bundler/lib/bundler/cli/inject.rb +60 -0
- data/bundler/lib/bundler/cli/install.rb +214 -0
- 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 +63 -0
- data/bundler/lib/bundler/cli/open.rb +26 -0
- data/bundler/lib/bundler/cli/outdated.rb +260 -0
- data/bundler/lib/bundler/cli/package.rb +49 -0
- data/bundler/lib/bundler/cli/platform.rb +46 -0
- data/bundler/lib/bundler/cli/plugin.rb +24 -0
- data/bundler/lib/bundler/cli/pristine.rb +43 -0
- data/bundler/lib/bundler/cli/show.rb +75 -0
- data/bundler/lib/bundler/cli/update.rb +91 -0
- data/bundler/lib/bundler/cli/viz.rb +31 -0
- data/bundler/lib/bundler/cli.rb +748 -0
- data/bundler/lib/bundler/compact_index_client/cache.rb +118 -0
- data/bundler/lib/bundler/compact_index_client/updater.rb +116 -0
- data/bundler/lib/bundler/compact_index_client.rb +109 -0
- data/bundler/lib/bundler/compatibility_guard.rb +14 -0
- data/bundler/lib/bundler/constants.rb +7 -0
- data/bundler/lib/bundler/current_ruby.rb +86 -0
- data/bundler/lib/bundler/definition.rb +989 -0
- data/bundler/lib/bundler/dep_proxy.rb +48 -0
- data/bundler/lib/bundler/dependency.rb +138 -0
- data/bundler/lib/bundler/deployment.rb +69 -0
- data/bundler/lib/bundler/deprecate.rb +43 -0
- data/bundler/lib/bundler/dsl.rb +599 -0
- data/bundler/lib/bundler/endpoint_specification.rb +141 -0
- data/bundler/lib/bundler/env.rb +153 -0
- data/bundler/lib/bundler/environment_preserver.rb +59 -0
- data/bundler/lib/bundler/errors.rb +158 -0
- data/bundler/lib/bundler/feature_flag.rb +67 -0
- data/bundler/lib/bundler/fetcher/base.rb +52 -0
- data/bundler/lib/bundler/fetcher/compact_index.rb +126 -0
- data/bundler/lib/bundler/fetcher/dependency.rb +82 -0
- data/bundler/lib/bundler/fetcher/downloader.rb +79 -0
- data/bundler/lib/bundler/fetcher/index.rb +52 -0
- data/bundler/lib/bundler/fetcher.rb +312 -0
- data/bundler/lib/bundler/friendly_errors.rb +131 -0
- data/bundler/lib/bundler/gem_helper.rb +202 -0
- data/bundler/lib/bundler/gem_helpers.rb +101 -0
- data/bundler/lib/bundler/gem_remote_fetcher.rb +43 -0
- data/bundler/lib/bundler/gem_tasks.rb +7 -0
- data/bundler/lib/bundler/gem_version_promoter.rb +176 -0
- data/bundler/lib/bundler/gemdeps.rb +29 -0
- data/bundler/lib/bundler/graph.rb +152 -0
- data/bundler/lib/bundler/index.rb +213 -0
- data/bundler/lib/bundler/injector.rb +94 -0
- data/bundler/lib/bundler/inline.rb +74 -0
- data/bundler/lib/bundler/installer/gem_installer.rb +83 -0
- data/bundler/lib/bundler/installer/parallel_installer.rb +228 -0
- data/bundler/lib/bundler/installer/standalone.rb +53 -0
- data/bundler/lib/bundler/installer.rb +295 -0
- data/bundler/lib/bundler/lazy_specification.rb +123 -0
- data/bundler/lib/bundler/lockfile_generator.rb +95 -0
- data/bundler/lib/bundler/lockfile_parser.rb +256 -0
- data/bundler/lib/bundler/match_platform.rb +24 -0
- data/bundler/lib/bundler/mirror.rb +223 -0
- data/bundler/lib/bundler/plugin/api/source.rb +306 -0
- data/bundler/lib/bundler/plugin/api.rb +81 -0
- data/bundler/lib/bundler/plugin/dsl.rb +53 -0
- data/bundler/lib/bundler/plugin/index.rb +162 -0
- data/bundler/lib/bundler/plugin/installer/git.rb +38 -0
- data/bundler/lib/bundler/plugin/installer/rubygems.rb +27 -0
- data/bundler/lib/bundler/plugin/installer.rb +96 -0
- data/bundler/lib/bundler/plugin/source_list.rb +27 -0
- data/bundler/lib/bundler/plugin.rb +285 -0
- data/bundler/lib/bundler/process_lock.rb +24 -0
- data/bundler/lib/bundler/psyched_yaml.rb +37 -0
- data/bundler/lib/bundler/remote_specification.rb +114 -0
- data/bundler/lib/bundler/resolver/spec_group.rb +110 -0
- data/bundler/lib/bundler/resolver.rb +372 -0
- data/bundler/lib/bundler/retry.rb +66 -0
- data/bundler/lib/bundler/ruby_dsl.rb +18 -0
- data/bundler/lib/bundler/ruby_version.rb +152 -0
- data/bundler/lib/bundler/rubygems_ext.rb +210 -0
- data/bundler/lib/bundler/rubygems_gem_installer.rb +99 -0
- data/bundler/lib/bundler/rubygems_integration.rb +898 -0
- data/bundler/lib/bundler/runtime.rb +316 -0
- data/bundler/lib/bundler/settings/validator.rb +79 -0
- data/bundler/lib/bundler/settings.rb +442 -0
- data/bundler/lib/bundler/setup.rb +28 -0
- data/bundler/lib/bundler/shared_helpers.rb +356 -0
- data/bundler/lib/bundler/similarity_detector.rb +63 -0
- data/bundler/lib/bundler/source/gemspec.rb +18 -0
- data/bundler/lib/bundler/source/git/git_proxy.rb +262 -0
- data/bundler/lib/bundler/source/git.rb +329 -0
- data/bundler/lib/bundler/source/metadata.rb +63 -0
- data/bundler/lib/bundler/source/path/installer.rb +74 -0
- data/bundler/lib/bundler/source/path.rb +249 -0
- data/bundler/lib/bundler/source/rubygems/remote.rb +66 -0
- data/bundler/lib/bundler/source/rubygems.rb +535 -0
- data/bundler/lib/bundler/source.rb +94 -0
- data/bundler/lib/bundler/source_list.rb +186 -0
- data/bundler/lib/bundler/spec_set.rb +192 -0
- data/bundler/lib/bundler/ssl_certs/.document +1 -0
- data/bundler/lib/bundler/ssl_certs/certificate_manager.rb +66 -0
- data/bundler/lib/bundler/ssl_certs/index.rubygems.org/GlobalSignRootCA.pem +21 -0
- data/bundler/lib/bundler/ssl_certs/rubygems.global.ssl.fastly.net/DigiCertHighAssuranceEVRootCA.pem +23 -0
- data/bundler/lib/bundler/stub_specification.rb +108 -0
- data/bundler/lib/bundler/templates/.document +1 -0
- data/bundler/lib/bundler/templates/Executable +29 -0
- data/bundler/lib/bundler/templates/Executable.bundler +105 -0
- data/bundler/lib/bundler/templates/Executable.standalone +14 -0
- data/bundler/lib/bundler/templates/Gemfile +7 -0
- data/bundler/lib/bundler/templates/gems.rb +8 -0
- data/bundler/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt +74 -0
- data/bundler/lib/bundler/templates/newgem/Gemfile.tt +6 -0
- data/bundler/lib/bundler/templates/newgem/LICENSE.txt.tt +21 -0
- data/bundler/lib/bundler/templates/newgem/README.md.tt +47 -0
- data/bundler/lib/bundler/templates/newgem/Rakefile.tt +29 -0
- data/bundler/lib/bundler/templates/newgem/bin/console.tt +14 -0
- data/bundler/lib/bundler/templates/newgem/bin/setup.tt +8 -0
- data/bundler/lib/bundler/templates/newgem/exe/newgem.tt +3 -0
- data/bundler/lib/bundler/templates/newgem/ext/newgem/extconf.rb.tt +3 -0
- data/bundler/lib/bundler/templates/newgem/ext/newgem/newgem.c.tt +9 -0
- data/bundler/lib/bundler/templates/newgem/ext/newgem/newgem.h.tt +6 -0
- data/bundler/lib/bundler/templates/newgem/gitignore.tt +20 -0
- data/bundler/lib/bundler/templates/newgem/lib/newgem/version.rb.tt +7 -0
- data/bundler/lib/bundler/templates/newgem/lib/newgem.rb.tt +12 -0
- data/bundler/lib/bundler/templates/newgem/newgem.gemspec.tt +51 -0
- data/bundler/lib/bundler/templates/newgem/rspec.tt +3 -0
- data/bundler/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt +9 -0
- data/bundler/lib/bundler/templates/newgem/spec/spec_helper.rb.tt +14 -0
- data/bundler/lib/bundler/templates/newgem/test/newgem_test.rb.tt +11 -0
- data/bundler/lib/bundler/templates/newgem/test/test_helper.rb.tt +4 -0
- data/bundler/lib/bundler/templates/newgem/travis.yml.tt +5 -0
- data/bundler/lib/bundler/ui/rg_proxy.rb +19 -0
- data/bundler/lib/bundler/ui/shell.rb +146 -0
- data/bundler/lib/bundler/ui/silent.rb +69 -0
- data/bundler/lib/bundler/ui.rb +9 -0
- data/bundler/lib/bundler/uri_credentials_filter.rb +37 -0
- data/bundler/lib/bundler/vendor/fileutils/lib/fileutils.rb +1638 -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 +57 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb +81 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/action.rb +36 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb +66 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb +62 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb +63 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb +61 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/log.rb +126 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb +46 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb +36 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb +126 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb +223 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb +138 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb +6 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/modules/specification_provider.rb +101 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/modules/ui.rb +67 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +837 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb +46 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/state.rb +58 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo.rb +12 -0
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/faster.rb +27 -0
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/ssl_reuse.rb +129 -0
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +1233 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/create_file.rb +104 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/create_link.rb +60 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/directory.rb +118 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/empty_directory.rb +143 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/file_manipulation.rb +364 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb +109 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions.rb +321 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/base.rb +679 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/command.rb +135 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/core_ext/hash_with_indifferent_access.rb +97 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/core_ext/io_binary_read.rb +12 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/core_ext/ordered_hash.rb +129 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/error.rb +32 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/group.rb +281 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/invocation.rb +177 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/line_editor/basic.rb +37 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/line_editor/readline.rb +88 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/line_editor.rb +17 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/parser/argument.rb +70 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/parser/arguments.rb +175 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/parser/option.rb +146 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/parser/options.rb +221 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/parser.rb +4 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/rake_compat.rb +71 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/runner.rb +324 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell/basic.rb +437 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell/color.rb +149 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell/html.rb +126 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell.rb +81 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/util.rb +268 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/version.rb +3 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor.rb +509 -0
- data/bundler/lib/bundler/vendored_fileutils.rb +9 -0
- data/bundler/lib/bundler/vendored_molinillo.rb +4 -0
- data/bundler/lib/bundler/vendored_persistent.rb +52 -0
- data/bundler/lib/bundler/vendored_thor.rb +8 -0
- data/bundler/lib/bundler/version.rb +28 -0
- data/bundler/lib/bundler/version_ranges.rb +76 -0
- data/bundler/lib/bundler/vlad.rb +17 -0
- data/bundler/lib/bundler/worker.rb +106 -0
- data/bundler/lib/bundler/yaml_serializer.rb +90 -0
- data/bundler/lib/bundler.rb +545 -0
- data/bundler/man/bundle-add.ronn +29 -0
- data/bundler/man/bundle-binstubs.ronn +43 -0
- data/bundler/man/bundle-check.ronn +26 -0
- data/bundler/man/bundle-clean.ronn +18 -0
- data/bundler/man/bundle-config.ronn +376 -0
- data/bundler/man/bundle-doctor.ronn +33 -0
- data/bundler/man/bundle-exec.ronn +152 -0
- data/bundler/man/bundle-gem.ronn +78 -0
- 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 +369 -0
- data/bundler/man/bundle-list.ronn +15 -0
- data/bundler/man/bundle-lock.ronn +94 -0
- data/bundler/man/bundle-open.ronn +19 -0
- data/bundler/man/bundle-outdated.ronn +107 -0
- data/bundler/man/bundle-package.ronn +72 -0
- data/bundler/man/bundle-platform.ronn +42 -0
- data/bundler/man/bundle-pristine.ronn +34 -0
- data/bundler/man/bundle-show.ronn +20 -0
- data/bundler/man/bundle-update.ronn +346 -0
- data/bundler/man/bundle-viz.ronn +30 -0
- data/bundler/man/bundle.ronn +108 -0
- data/bundler/man/gemfile.5.ronn +506 -0
- data/lib/rubygems/basic_specification.rb +8 -4
- data/lib/rubygems/bundler_version_finder.rb +116 -0
- data/lib/rubygems/command.rb +10 -2
- data/lib/rubygems/command_manager.rb +3 -1
- 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/open_command.rb +1 -1
- data/lib/rubygems/commands/owner_command.rb +4 -2
- data/lib/rubygems/commands/pristine_command.rb +11 -8
- data/lib/rubygems/commands/push_command.rb +3 -2
- data/lib/rubygems/commands/query_command.rb +17 -17
- data/lib/rubygems/commands/setup_command.rb +175 -70
- 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 +4 -3
- data/lib/rubygems/commands/unpack_command.rb +19 -7
- data/lib/rubygems/commands/update_command.rb +2 -2
- data/lib/rubygems/commands/which_command.rb +1 -1
- data/lib/rubygems/commands/yank_command.rb +4 -11
- data/lib/rubygems/config_file.rb +21 -28
- data/lib/rubygems/core_ext/kernel_require.rb +10 -9
- data/lib/rubygems/defaults.rb +18 -0
- data/lib/rubygems/dependency.rb +10 -4
- data/lib/rubygems/dependency_installer.rb +8 -2
- data/lib/rubygems/dependency_list.rb +1 -1
- data/lib/rubygems/errors.rb +4 -0
- data/lib/rubygems/exceptions.rb +11 -1
- data/lib/rubygems/ext/builder.rb +2 -2
- data/lib/rubygems/ext/ext_conf_builder.rb +7 -7
- data/lib/rubygems/ext/rake_builder.rb +2 -2
- data/lib/rubygems/gem_runner.rb +5 -1
- data/lib/rubygems/indexer.rb +6 -5
- data/lib/rubygems/install_update_options.rb +5 -28
- data/lib/rubygems/installer.rb +53 -22
- data/lib/rubygems/installer_test_case.rb +6 -3
- data/lib/rubygems/package/file_source.rb +2 -2
- data/lib/rubygems/package/old.rb +3 -3
- data/lib/rubygems/package/tar_header.rb +14 -9
- data/lib/rubygems/package/tar_writer.rb +12 -16
- data/lib/rubygems/package.rb +48 -9
- data/lib/rubygems/platform.rb +1 -1
- data/lib/rubygems/remote_fetcher.rb +13 -18
- data/lib/rubygems/request.rb +47 -1
- data/lib/rubygems/request_set/gem_dependency_api.rb +3 -3
- data/lib/rubygems/request_set/lockfile/tokenizer.rb +1 -1
- data/lib/rubygems/request_set/lockfile.rb +1 -1
- data/lib/rubygems/request_set.rb +22 -3
- data/lib/rubygems/requirement.rb +5 -1
- data/lib/rubygems/resolver/installer_set.rb +4 -6
- data/lib/rubygems/resolver/molinillo/lib/molinillo/delegates/resolution_state.rb +50 -0
- data/lib/rubygems/resolver/molinillo/lib/molinillo/delegates/specification_provider.rb +80 -0
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/action.rb +35 -0
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb +65 -0
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_vertex.rb +61 -0
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/delete_edge.rb +62 -0
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb +60 -0
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/log.rb +125 -0
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/set_payload.rb +45 -0
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/tag.rb +35 -0
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/vertex.rb +125 -0
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph.rb +78 -147
- data/lib/rubygems/resolver/molinillo/lib/molinillo/errors.rb +1 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/gem_metadata.rb +1 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/modules/ui.rb +1 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/resolution.rb +110 -75
- data/lib/rubygems/resolver/molinillo/lib/molinillo/state.rb +4 -2
- data/lib/rubygems/resolver/set.rb +1 -1
- data/lib/rubygems/resolver.rb +61 -5
- data/lib/rubygems/safe_yaml.rb +51 -0
- data/lib/rubygems/security/signer.rb +2 -0
- data/lib/rubygems/security/trust_dir.rb +1 -1
- data/lib/rubygems/security.rb +12 -5
- data/lib/rubygems/security_option.rb +43 -0
- data/lib/rubygems/server.rb +49 -40
- 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.rb +9 -6
- 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 +317 -251
- data/lib/rubygems/ssl_certs/index.rubygems.org/GlobalSignRootCA.pem +21 -0
- data/lib/rubygems/ssl_certs/rubygems.org/AddTrustExternalCARoot.pem +25 -0
- data/lib/rubygems/stub_specification.rb +10 -4
- 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 +22 -20
- data/lib/rubygems/util/licenses.rb +37 -0
- data/lib/rubygems/util.rb +6 -16
- data/lib/rubygems/validator.rb +3 -3
- data/lib/rubygems/version.rb +24 -5
- data/lib/rubygems/version_option.rb +6 -1
- data/lib/rubygems.rb +147 -45
- data/lib/ubygems.rb +3 -0
- data/setup.rb +1 -1
- data/test/rubygems/alternate_cert.pem +10 -9
- data/test/rubygems/alternate_cert_32.pem +10 -9
- data/test/rubygems/child_cert.pem +11 -9
- data/test/rubygems/child_cert_32.pem +11 -9
- data/test/rubygems/encrypted_private_key.pem +26 -26
- data/test/rubygems/expired_cert.pem +9 -8
- data/test/rubygems/future_cert.pem +9 -8
- data/test/rubygems/future_cert_32.pem +9 -8
- data/test/rubygems/grandchild_cert.pem +11 -9
- data/test/rubygems/grandchild_cert_32.pem +11 -9
- data/test/rubygems/invalid_issuer_cert.pem +11 -9
- data/test/rubygems/invalid_issuer_cert_32.pem +11 -9
- data/test/rubygems/invalid_signer_cert.pem +10 -9
- data/test/rubygems/invalid_signer_cert_32.pem +10 -9
- data/test/rubygems/invalidchild_cert.pem +11 -9
- data/test/rubygems/invalidchild_cert_32.pem +11 -9
- data/test/rubygems/private3072_key.pem +40 -0
- data/test/rubygems/public3072_cert.pem +25 -0
- data/test/rubygems/public_cert.pem +11 -9
- data/test/rubygems/public_cert_32.pem +10 -9
- data/test/rubygems/rubygems_plugin.rb +4 -0
- data/test/rubygems/test_bundled_ca.rb +1 -1
- data/test/rubygems/test_config.rb +1 -1
- data/test/rubygems/test_gem.rb +168 -55
- data/test/rubygems/test_gem_bundler_version_finder.rb +125 -0
- data/test/rubygems/test_gem_command.rb +7 -1
- data/test/rubygems/test_gem_commands_build_command.rb +27 -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 +36 -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 +5 -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 +14 -2
- 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_config_file.rb +1 -2
- 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_ext_conf_builder.rb +23 -0
- data/test/rubygems/test_gem_ext_rake_builder.rb +33 -16
- 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 +4 -1
- data/test/rubygems/test_gem_installer.rb +230 -32
- data/test/rubygems/test_gem_package.rb +156 -29
- 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_package_tar_writer.rb +24 -0
- data/test/rubygems/test_gem_rdoc.rb +2 -0
- data/test/rubygems/test_gem_remote_fetcher.rb +38 -19
- data/test/rubygems/test_gem_request.rb +132 -0
- 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 +6 -0
- data/test/rubygems/test_gem_resolver.rb +29 -3
- 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_security.rb +5 -0
- data/test/rubygems/test_gem_security_policy.rb +27 -27
- data/test/rubygems/test_gem_security_signer.rb +14 -6
- data/test/rubygems/test_gem_security_trust_dir.rb +2 -2
- data/test/rubygems/test_gem_server.rb +210 -12
- data/test/rubygems/test_gem_source.rb +12 -3
- data/test/rubygems/test_gem_source_fetch_problem.rb +8 -0
- 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 +163 -32
- data/test/rubygems/test_gem_stream_ui.rb +6 -6
- data/test/rubygems/test_gem_stub_specification.rb +85 -6
- data/test/rubygems/test_gem_text.rb +11 -0
- data/test/rubygems/test_gem_util.rb +26 -0
- data/test/rubygems/test_gem_version.rb +46 -7
- data/test/rubygems/test_gem_version_option.rb +15 -0
- data/test/rubygems/test_kernel.rb +30 -0
- data/test/rubygems/test_remote_fetch_error.rb +21 -0
- data/test/rubygems/test_require.rb +95 -21
- data/test/rubygems/wrong_key_cert.pem +10 -9
- data/test/rubygems/wrong_key_cert_32.pem +10 -9
- data/util/ci +74 -0
- data/util/create_certs.rb +64 -49
- data/util/generate_spdx_license_list.rb +2 -1
- data/util/patch_with_prs.rb +77 -0
- data/util/update_bundled_ca_certificates.rb +23 -2
- data/util/update_changelog.rb +67 -0
- metadata +301 -48
- data/README.rdoc +0 -54
- data/lib/gauntlet_rubygems.rb +0 -51
- data/lib/rubygems/ssl_certs/index.rubygems.org/GlobalSignRoot.pem +0 -18
- /data/{lib/rubygems/ssl_certs/rubygems.org/AddTrustExternalCARoot-2048.pem → bundler/lib/bundler/ssl_certs/rubygems.org/AddTrustExternalCARoot.pem} +0 -0
@@ -0,0 +1,372 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Bundler
|
4
|
+
class Resolver
|
5
|
+
require "bundler/vendored_molinillo"
|
6
|
+
require "bundler/resolver/spec_group"
|
7
|
+
|
8
|
+
# Figures out the best possible configuration of gems that satisfies
|
9
|
+
# the list of passed dependencies and any child dependencies without
|
10
|
+
# causing any gem activation errors.
|
11
|
+
#
|
12
|
+
# ==== Parameters
|
13
|
+
# *dependencies<Gem::Dependency>:: The list of dependencies to resolve
|
14
|
+
#
|
15
|
+
# ==== Returns
|
16
|
+
# <GemBundle>,nil:: If the list of dependencies can be resolved, a
|
17
|
+
# collection of gemspecs is returned. Otherwise, nil is returned.
|
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
|
20
|
+
base = SpecSet.new(base) unless base.is_a?(SpecSet)
|
21
|
+
resolver = new(index, source_requirements, base, gem_version_promoter, additional_base_requirements, platforms)
|
22
|
+
result = resolver.start(requirements)
|
23
|
+
SpecSet.new(result)
|
24
|
+
end
|
25
|
+
|
26
|
+
def initialize(index, source_requirements, base, gem_version_promoter, additional_base_requirements, platforms)
|
27
|
+
@index = index
|
28
|
+
@source_requirements = source_requirements
|
29
|
+
@base = base
|
30
|
+
@resolver = Molinillo::Resolver.new(self, self)
|
31
|
+
@search_for = {}
|
32
|
+
@base_dg = Molinillo::DependencyGraph.new
|
33
|
+
@base.each do |ls|
|
34
|
+
dep = Dependency.new(ls.name, ls.version)
|
35
|
+
@base_dg.add_vertex(ls.name, DepProxy.new(dep, ls.platform), true)
|
36
|
+
end
|
37
|
+
additional_base_requirements.each {|d| @base_dg.add_vertex(d.name, d) }
|
38
|
+
@platforms = platforms
|
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
|
+
end
|
43
|
+
|
44
|
+
def start(requirements)
|
45
|
+
@prerelease_specified = {}
|
46
|
+
requirements.each {|dep| @prerelease_specified[dep.name] ||= dep.prerelease? }
|
47
|
+
|
48
|
+
verify_gemfile_dependencies_are_found!(requirements)
|
49
|
+
dg = @resolver.resolve(requirements, @base_dg)
|
50
|
+
dg.map(&:payload).
|
51
|
+
reject {|sg| sg.name.end_with?("\0") }.
|
52
|
+
map(&:to_specs).flatten
|
53
|
+
rescue Molinillo::VersionConflict => e
|
54
|
+
message = version_conflict_message(e)
|
55
|
+
raise VersionConflict.new(e.conflicts.keys.uniq, message)
|
56
|
+
rescue Molinillo::CircularDependencyError => e
|
57
|
+
names = e.dependencies.sort_by(&:name).map {|d| "gem '#{d.name}'" }
|
58
|
+
raise CyclicDependencyError, "Your bundle requires gems that depend" \
|
59
|
+
" on each other, creating an infinite loop. Please remove" \
|
60
|
+
" #{names.count > 1 ? "either " : ""}#{names.join(" or ")}" \
|
61
|
+
" and try again."
|
62
|
+
end
|
63
|
+
|
64
|
+
include Molinillo::UI
|
65
|
+
|
66
|
+
# Conveys debug information to the user.
|
67
|
+
#
|
68
|
+
# @param [Integer] depth the current depth of the resolution process.
|
69
|
+
# @return [void]
|
70
|
+
def debug(depth = 0)
|
71
|
+
return unless debug?
|
72
|
+
debug_info = yield
|
73
|
+
debug_info = debug_info.inspect unless debug_info.is_a?(String)
|
74
|
+
STDERR.puts debug_info.split("\n").map {|s| " " * depth + s }
|
75
|
+
end
|
76
|
+
|
77
|
+
def debug?
|
78
|
+
return @debug_mode if defined?(@debug_mode)
|
79
|
+
@debug_mode = ENV["DEBUG_RESOLVER"] || ENV["DEBUG_RESOLVER_TREE"] || false
|
80
|
+
end
|
81
|
+
|
82
|
+
def before_resolution
|
83
|
+
Bundler.ui.info "Resolving dependencies...", debug?
|
84
|
+
end
|
85
|
+
|
86
|
+
def after_resolution
|
87
|
+
Bundler.ui.info ""
|
88
|
+
end
|
89
|
+
|
90
|
+
def indicate_progress
|
91
|
+
Bundler.ui.info ".", false unless debug?
|
92
|
+
end
|
93
|
+
|
94
|
+
include Molinillo::SpecificationProvider
|
95
|
+
|
96
|
+
def dependencies_for(specification)
|
97
|
+
specification.dependencies_for_activated_platforms
|
98
|
+
end
|
99
|
+
|
100
|
+
def search_for(dependency)
|
101
|
+
platform = dependency.__platform
|
102
|
+
dependency = dependency.dep unless dependency.is_a? Gem::Dependency
|
103
|
+
search = @search_for[dependency] ||= begin
|
104
|
+
index = index_for(dependency)
|
105
|
+
results = index.search(dependency, @base[dependency.name])
|
106
|
+
|
107
|
+
unless @prerelease_specified[dependency.name]
|
108
|
+
# Move prereleases to the beginning of the list, so they're considered
|
109
|
+
# last during resolution.
|
110
|
+
pre, results = results.partition {|spec| spec.version.prerelease? }
|
111
|
+
results = pre + results
|
112
|
+
end
|
113
|
+
|
114
|
+
if vertex = @base_dg.vertex_named(dependency.name)
|
115
|
+
locked_requirement = vertex.payload.requirement
|
116
|
+
end
|
117
|
+
spec_groups = if results.any?
|
118
|
+
nested = []
|
119
|
+
results.each do |spec|
|
120
|
+
version, specs = nested.last
|
121
|
+
if version == spec.version
|
122
|
+
specs << spec
|
123
|
+
else
|
124
|
+
nested << [spec.version, [spec]]
|
125
|
+
end
|
126
|
+
end
|
127
|
+
nested.reduce([]) do |groups, (version, specs)|
|
128
|
+
next groups if locked_requirement && !locked_requirement.satisfied_by?(version)
|
129
|
+
spec_group = SpecGroup.new(specs)
|
130
|
+
spec_group.ignores_bundler_dependencies = @allow_bundler_dependency_conflicts
|
131
|
+
groups << spec_group
|
132
|
+
end
|
133
|
+
else
|
134
|
+
[]
|
135
|
+
end
|
136
|
+
# GVP handles major itself, but it's still a bit risky to trust it with it
|
137
|
+
# until we get it settled with new behavior. For 2.x it can take over all cases.
|
138
|
+
if @gem_version_promoter.major?
|
139
|
+
spec_groups
|
140
|
+
else
|
141
|
+
@gem_version_promoter.sort_versions(dependency, spec_groups)
|
142
|
+
end
|
143
|
+
end
|
144
|
+
search.select {|sg| sg.for?(platform) }.each {|sg| sg.activate_platform!(platform) }
|
145
|
+
end
|
146
|
+
|
147
|
+
def index_for(dependency)
|
148
|
+
source = @source_requirements[dependency.name]
|
149
|
+
if source
|
150
|
+
source.specs
|
151
|
+
elsif @lockfile_uses_separate_rubygems_sources
|
152
|
+
Index.build do |idx|
|
153
|
+
if dependency.all_sources
|
154
|
+
dependency.all_sources.each {|s| idx.add_source(s.specs) if s }
|
155
|
+
else
|
156
|
+
idx.add_source @source_requirements[:default].specs
|
157
|
+
end
|
158
|
+
end
|
159
|
+
else
|
160
|
+
@index
|
161
|
+
end
|
162
|
+
end
|
163
|
+
|
164
|
+
def name_for(dependency)
|
165
|
+
dependency.name
|
166
|
+
end
|
167
|
+
|
168
|
+
def name_for_explicit_dependency_source
|
169
|
+
Bundler.default_gemfile.basename.to_s
|
170
|
+
rescue
|
171
|
+
"Gemfile"
|
172
|
+
end
|
173
|
+
|
174
|
+
def name_for_locking_dependency_source
|
175
|
+
Bundler.default_lockfile.basename.to_s
|
176
|
+
rescue
|
177
|
+
"Gemfile.lock"
|
178
|
+
end
|
179
|
+
|
180
|
+
def requirement_satisfied_by?(requirement, activated, spec)
|
181
|
+
return false unless requirement.matches_spec?(spec) || spec.source.is_a?(Source::Gemspec)
|
182
|
+
if spec.version.prerelease? && !requirement.prerelease? && search_for(requirement).any? {|sg| !sg.version.prerelease? }
|
183
|
+
vertex = activated.vertex_named(spec.name)
|
184
|
+
return false if vertex.requirements.none?(&:prerelease?)
|
185
|
+
end
|
186
|
+
spec.activate_platform!(requirement.__platform) if !@platforms || @platforms.include?(requirement.__platform)
|
187
|
+
true
|
188
|
+
end
|
189
|
+
|
190
|
+
def relevant_sources_for_vertex(vertex)
|
191
|
+
if vertex.root?
|
192
|
+
[@source_requirements[vertex.name]]
|
193
|
+
elsif @lockfile_uses_separate_rubygems_sources
|
194
|
+
vertex.recursive_predecessors.map do |v|
|
195
|
+
@source_requirements[v.name]
|
196
|
+
end << @source_requirements[:default]
|
197
|
+
end
|
198
|
+
end
|
199
|
+
|
200
|
+
def sort_dependencies(dependencies, activated, conflicts)
|
201
|
+
dependencies.sort_by do |dependency|
|
202
|
+
dependency.all_sources = relevant_sources_for_vertex(activated.vertex_named(dependency.name))
|
203
|
+
name = name_for(dependency)
|
204
|
+
vertex = activated.vertex_named(name)
|
205
|
+
[
|
206
|
+
@base_dg.vertex_named(name) ? 0 : 1,
|
207
|
+
vertex.payload ? 0 : 1,
|
208
|
+
vertex.root? ? 0 : 1,
|
209
|
+
amount_constrained(dependency),
|
210
|
+
conflicts[name] ? 0 : 1,
|
211
|
+
vertex.payload ? 0 : search_for(dependency).count,
|
212
|
+
self.class.platform_sort_key(dependency.__platform),
|
213
|
+
]
|
214
|
+
end
|
215
|
+
end
|
216
|
+
|
217
|
+
# Sort platforms from most general to most specific
|
218
|
+
def self.sort_platforms(platforms)
|
219
|
+
platforms.sort_by do |platform|
|
220
|
+
platform_sort_key(platform)
|
221
|
+
end
|
222
|
+
end
|
223
|
+
|
224
|
+
def self.platform_sort_key(platform)
|
225
|
+
return ["", "", ""] if Gem::Platform::RUBY == platform
|
226
|
+
platform.to_a.map {|part| part || "" }
|
227
|
+
end
|
228
|
+
|
229
|
+
private
|
230
|
+
|
231
|
+
# returns an integer \in (-\infty, 0]
|
232
|
+
# a number closer to 0 means the dependency is less constraining
|
233
|
+
#
|
234
|
+
# dependencies w/ 0 or 1 possibilities (ignoring version requirements)
|
235
|
+
# are given very negative values, so they _always_ sort first,
|
236
|
+
# before dependencies that are unconstrained
|
237
|
+
def amount_constrained(dependency)
|
238
|
+
@amount_constrained ||= {}
|
239
|
+
@amount_constrained[dependency.name] ||= begin
|
240
|
+
if (base = @base[dependency.name]) && !base.empty?
|
241
|
+
dependency.requirement.satisfied_by?(base.first.version) ? 0 : 1
|
242
|
+
else
|
243
|
+
all = index_for(dependency).search(dependency.name).size
|
244
|
+
|
245
|
+
if all <= 1
|
246
|
+
all - 1_000_000
|
247
|
+
else
|
248
|
+
search = search_for(dependency)
|
249
|
+
search = @prerelease_specified[dependency.name] ? search.count : search.count {|s| !s.version.prerelease? }
|
250
|
+
search - all
|
251
|
+
end
|
252
|
+
end
|
253
|
+
end
|
254
|
+
end
|
255
|
+
|
256
|
+
def verify_gemfile_dependencies_are_found!(requirements)
|
257
|
+
requirements.each do |requirement|
|
258
|
+
name = requirement.name
|
259
|
+
next if name == "bundler"
|
260
|
+
next unless search_for(requirement).empty?
|
261
|
+
|
262
|
+
cache_message = begin
|
263
|
+
" or in gems cached in #{Bundler.settings.app_cache_path}" if Bundler.app_cache.exist?
|
264
|
+
rescue GemfileNotFound
|
265
|
+
nil
|
266
|
+
end
|
267
|
+
|
268
|
+
if (base = @base[name]) && !base.empty?
|
269
|
+
version = base.first.version
|
270
|
+
message = "You have requested:\n" \
|
271
|
+
" #{name} #{requirement.requirement}\n\n" \
|
272
|
+
"The bundle currently has #{name} locked at #{version}.\n" \
|
273
|
+
"Try running `bundle update #{name}`\n\n" \
|
274
|
+
"If you are updating multiple gems in your Gemfile at once,\n" \
|
275
|
+
"try passing them all to `bundle update`"
|
276
|
+
elsif source = @source_requirements[name]
|
277
|
+
specs = source.specs[name]
|
278
|
+
versions_with_platforms = specs.map {|s| [s.version, s.platform] }
|
279
|
+
message = String.new("Could not find gem '#{SharedHelpers.pretty_dependency(requirement)}' in #{source}#{cache_message}.\n")
|
280
|
+
message << if versions_with_platforms.any?
|
281
|
+
"The source contains '#{name}' at: #{formatted_versions_with_platforms(versions_with_platforms)}"
|
282
|
+
else
|
283
|
+
"The source does not contain any versions of '#{name}'"
|
284
|
+
end
|
285
|
+
else
|
286
|
+
message = "Could not find gem '#{requirement}' in any of the gem sources " \
|
287
|
+
"listed in your Gemfile#{cache_message}."
|
288
|
+
end
|
289
|
+
raise GemNotFound, message
|
290
|
+
end
|
291
|
+
end
|
292
|
+
|
293
|
+
def formatted_versions_with_platforms(versions_with_platforms)
|
294
|
+
version_platform_strs = versions_with_platforms.map do |vwp|
|
295
|
+
version = vwp.first
|
296
|
+
platform = vwp.last
|
297
|
+
version_platform_str = String.new(version.to_s)
|
298
|
+
version_platform_str << " #{platform}" unless platform.nil? || platform == Gem::Platform::RUBY
|
299
|
+
version_platform_str
|
300
|
+
end
|
301
|
+
version_platform_strs.join(", ")
|
302
|
+
end
|
303
|
+
|
304
|
+
def version_conflict_message(e)
|
305
|
+
e.message_with_trees(
|
306
|
+
:solver_name => "Bundler",
|
307
|
+
:possibility_type => "gem",
|
308
|
+
:reduce_trees => lambda do |trees|
|
309
|
+
# bail out if tree size is too big for Array#combination to make any sense
|
310
|
+
return trees if trees.size > 15
|
311
|
+
maximal = 1.upto(trees.size).map do |size|
|
312
|
+
trees.map(&:last).flatten(1).combination(size).to_a
|
313
|
+
end.flatten(1).select do |deps|
|
314
|
+
Bundler::VersionRanges.empty?(*Bundler::VersionRanges.for_many(deps.map(&:requirement)))
|
315
|
+
end.min_by(&:size)
|
316
|
+
trees.reject! {|t| !maximal.include?(t.last) } if maximal
|
317
|
+
|
318
|
+
trees = trees.sort_by {|t| t.flatten.map(&:to_s) }
|
319
|
+
trees.uniq! {|t| t.flatten.map {|dep| [dep.name, dep.requirement] } }
|
320
|
+
|
321
|
+
trees.sort_by {|t| t.reverse.map(&:name) }
|
322
|
+
end,
|
323
|
+
:printable_requirement => lambda {|req| SharedHelpers.pretty_dependency(req) },
|
324
|
+
:additional_message_for_conflict => lambda do |o, name, conflict|
|
325
|
+
if name == "bundler"
|
326
|
+
o << %(\n Current Bundler version:\n bundler (#{Bundler::VERSION}))
|
327
|
+
other_bundler_required = !conflict.requirement.requirement.satisfied_by?(Gem::Version.new Bundler::VERSION)
|
328
|
+
end
|
329
|
+
|
330
|
+
if name == "bundler" && other_bundler_required
|
331
|
+
o << "\n"
|
332
|
+
o << "This Gemfile requires a different version of Bundler.\n"
|
333
|
+
o << "Perhaps you need to update Bundler by running `gem install bundler`?\n"
|
334
|
+
end
|
335
|
+
if conflict.locked_requirement
|
336
|
+
o << "\n"
|
337
|
+
o << %(Running `bundle update` will rebuild your snapshot from scratch, using only\n)
|
338
|
+
o << %(the gems in your Gemfile, which may resolve the conflict.\n)
|
339
|
+
elsif !conflict.existing
|
340
|
+
o << "\n"
|
341
|
+
|
342
|
+
relevant_sources = if conflict.requirement.source
|
343
|
+
[conflict.requirement.source]
|
344
|
+
elsif conflict.requirement.all_sources
|
345
|
+
conflict.requirement.all_sources
|
346
|
+
elsif @lockfile_uses_separate_rubygems_sources
|
347
|
+
# every conflict should have an explicit group of sources when we
|
348
|
+
# enforce strict pinning
|
349
|
+
raise "no source set for #{conflict}"
|
350
|
+
else
|
351
|
+
[]
|
352
|
+
end.compact.map(&:to_s).uniq.sort
|
353
|
+
|
354
|
+
o << "Could not find gem '#{SharedHelpers.pretty_dependency(conflict.requirement)}'"
|
355
|
+
if conflict.requirement_trees.first.size > 1
|
356
|
+
o << ", which is required by "
|
357
|
+
o << "gem '#{SharedHelpers.pretty_dependency(conflict.requirement_trees.first[-2])}',"
|
358
|
+
end
|
359
|
+
o << " "
|
360
|
+
|
361
|
+
o << if relevant_sources.empty?
|
362
|
+
"in any of the sources.\n"
|
363
|
+
else
|
364
|
+
"in any of the relevant sources:\n #{relevant_sources * "\n "}\n"
|
365
|
+
end
|
366
|
+
end
|
367
|
+
end,
|
368
|
+
:version_for_spec => lambda {|spec| spec.version }
|
369
|
+
)
|
370
|
+
end
|
371
|
+
end
|
372
|
+
end
|
@@ -0,0 +1,66 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Bundler
|
4
|
+
# General purpose class for retrying code that may fail
|
5
|
+
class Retry
|
6
|
+
attr_accessor :name, :total_runs, :current_run
|
7
|
+
|
8
|
+
class << self
|
9
|
+
def default_attempts
|
10
|
+
default_retries + 1
|
11
|
+
end
|
12
|
+
alias_method :attempts, :default_attempts
|
13
|
+
|
14
|
+
def default_retries
|
15
|
+
Bundler.settings[:retry]
|
16
|
+
end
|
17
|
+
end
|
18
|
+
|
19
|
+
def initialize(name, exceptions = nil, retries = self.class.default_retries)
|
20
|
+
@name = name
|
21
|
+
@retries = retries
|
22
|
+
@exceptions = Array(exceptions) || []
|
23
|
+
@total_runs = @retries + 1 # will run once, then upto attempts.times
|
24
|
+
end
|
25
|
+
|
26
|
+
def attempt(&block)
|
27
|
+
@current_run = 0
|
28
|
+
@failed = false
|
29
|
+
@error = nil
|
30
|
+
run(&block) while keep_trying?
|
31
|
+
@result
|
32
|
+
end
|
33
|
+
alias_method :attempts, :attempt
|
34
|
+
|
35
|
+
private
|
36
|
+
|
37
|
+
def run(&block)
|
38
|
+
@failed = false
|
39
|
+
@current_run += 1
|
40
|
+
@result = block.call
|
41
|
+
rescue => e
|
42
|
+
fail_attempt(e)
|
43
|
+
end
|
44
|
+
|
45
|
+
def fail_attempt(e)
|
46
|
+
@failed = true
|
47
|
+
if last_attempt? || @exceptions.any? {|k| e.is_a?(k) }
|
48
|
+
Bundler.ui.info "" unless Bundler.ui.debug?
|
49
|
+
raise e
|
50
|
+
end
|
51
|
+
return true unless name
|
52
|
+
Bundler.ui.info "" unless Bundler.ui.debug? # Add new line incase dots preceded this
|
53
|
+
Bundler.ui.warn "Retrying #{name} due to error (#{current_run.next}/#{total_runs}): #{e.class} #{e.message}", Bundler.ui.debug?
|
54
|
+
end
|
55
|
+
|
56
|
+
def keep_trying?
|
57
|
+
return true if current_run.zero?
|
58
|
+
return false if last_attempt?
|
59
|
+
return true if @failed
|
60
|
+
end
|
61
|
+
|
62
|
+
def last_attempt?
|
63
|
+
current_run >= total_runs
|
64
|
+
end
|
65
|
+
end
|
66
|
+
end
|
@@ -0,0 +1,18 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Bundler
|
4
|
+
module RubyDsl
|
5
|
+
def ruby(*ruby_version)
|
6
|
+
options = ruby_version.last.is_a?(Hash) ? ruby_version.pop : {}
|
7
|
+
ruby_version.flatten!
|
8
|
+
raise GemfileError, "Please define :engine_version" if options[:engine] && options[:engine_version].nil?
|
9
|
+
raise GemfileError, "Please define :engine" if options[:engine_version] && options[:engine].nil?
|
10
|
+
|
11
|
+
if options[:engine] == "ruby" && options[:engine_version] &&
|
12
|
+
ruby_version != Array(options[:engine_version])
|
13
|
+
raise GemfileEvalError, "ruby_version must match the :engine_version for MRI"
|
14
|
+
end
|
15
|
+
@ruby_version = RubyVersion.new(ruby_version, options[:patchlevel], options[:engine], options[:engine_version])
|
16
|
+
end
|
17
|
+
end
|
18
|
+
end
|
@@ -0,0 +1,152 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Bundler
|
4
|
+
class RubyVersion
|
5
|
+
attr_reader :versions,
|
6
|
+
:patchlevel,
|
7
|
+
:engine,
|
8
|
+
:engine_versions,
|
9
|
+
:gem_version,
|
10
|
+
:engine_gem_version
|
11
|
+
|
12
|
+
def initialize(versions, patchlevel, engine, engine_version)
|
13
|
+
# The parameters to this method must satisfy the
|
14
|
+
# following constraints, which are verified in
|
15
|
+
# the DSL:
|
16
|
+
#
|
17
|
+
# * If an engine is specified, an engine version
|
18
|
+
# must also be specified
|
19
|
+
# * If an engine version is specified, an engine
|
20
|
+
# must also be specified
|
21
|
+
# * If the engine is "ruby", the engine version
|
22
|
+
# must not be specified, or the engine version
|
23
|
+
# specified must match the version.
|
24
|
+
|
25
|
+
@versions = Array(versions).map do |v|
|
26
|
+
op, v = Gem::Requirement.parse(v)
|
27
|
+
op == "=" ? v.to_s : "#{op} #{v}"
|
28
|
+
end
|
29
|
+
|
30
|
+
@gem_version = Gem::Requirement.create(@versions.first).requirements.first.last
|
31
|
+
@input_engine = engine && engine.to_s
|
32
|
+
@engine = engine && engine.to_s || "ruby"
|
33
|
+
@engine_versions = (engine_version && Array(engine_version)) || @versions
|
34
|
+
@engine_gem_version = Gem::Requirement.create(@engine_versions.first).requirements.first.last
|
35
|
+
@patchlevel = patchlevel
|
36
|
+
end
|
37
|
+
|
38
|
+
def to_s(versions = self.versions)
|
39
|
+
output = String.new("ruby #{versions_string(versions)}")
|
40
|
+
output << "p#{patchlevel}" if patchlevel
|
41
|
+
output << " (#{engine} #{versions_string(engine_versions)})" unless engine == "ruby"
|
42
|
+
|
43
|
+
output
|
44
|
+
end
|
45
|
+
|
46
|
+
# @private
|
47
|
+
PATTERN = /
|
48
|
+
ruby\s
|
49
|
+
([\d.]+) # ruby version
|
50
|
+
(?:p(-?\d+))? # optional patchlevel
|
51
|
+
(?:\s\((\S+)\s(.+)\))? # optional engine info
|
52
|
+
/xo
|
53
|
+
|
54
|
+
# Returns a RubyVersion from the given string.
|
55
|
+
# @param [String] the version string to match.
|
56
|
+
# @return [RubyVersion,Nil] The version if the string is a valid RubyVersion
|
57
|
+
# description, and nil otherwise.
|
58
|
+
def self.from_string(string)
|
59
|
+
new($1, $2, $3, $4) if string =~ PATTERN
|
60
|
+
end
|
61
|
+
|
62
|
+
def single_version_string
|
63
|
+
to_s(gem_version)
|
64
|
+
end
|
65
|
+
|
66
|
+
def ==(other)
|
67
|
+
versions == other.versions &&
|
68
|
+
engine == other.engine &&
|
69
|
+
engine_versions == other.engine_versions &&
|
70
|
+
patchlevel == other.patchlevel
|
71
|
+
end
|
72
|
+
|
73
|
+
def host
|
74
|
+
@host ||= [
|
75
|
+
RbConfig::CONFIG["host_cpu"],
|
76
|
+
RbConfig::CONFIG["host_vendor"],
|
77
|
+
RbConfig::CONFIG["host_os"]
|
78
|
+
].join("-")
|
79
|
+
end
|
80
|
+
|
81
|
+
# Returns a tuple of these things:
|
82
|
+
# [diff, this, other]
|
83
|
+
# The priority of attributes are
|
84
|
+
# 1. engine
|
85
|
+
# 2. ruby_version
|
86
|
+
# 3. engine_version
|
87
|
+
def diff(other)
|
88
|
+
raise ArgumentError, "Can only diff with a RubyVersion, not a #{other.class}" unless other.is_a?(RubyVersion)
|
89
|
+
if engine != other.engine && @input_engine
|
90
|
+
[:engine, engine, other.engine]
|
91
|
+
elsif versions.empty? || !matches?(versions, other.gem_version)
|
92
|
+
[:version, versions_string(versions), versions_string(other.versions)]
|
93
|
+
elsif @input_engine && !matches?(engine_versions, other.engine_gem_version)
|
94
|
+
[:engine_version, versions_string(engine_versions), versions_string(other.engine_versions)]
|
95
|
+
elsif patchlevel && (!patchlevel.is_a?(String) || !other.patchlevel.is_a?(String) || !matches?(patchlevel, other.patchlevel))
|
96
|
+
[:patchlevel, patchlevel, other.patchlevel]
|
97
|
+
end
|
98
|
+
end
|
99
|
+
|
100
|
+
def versions_string(versions)
|
101
|
+
Array(versions).join(", ")
|
102
|
+
end
|
103
|
+
|
104
|
+
def self.system
|
105
|
+
ruby_engine = if defined?(RUBY_ENGINE) && !RUBY_ENGINE.nil?
|
106
|
+
RUBY_ENGINE.dup
|
107
|
+
else
|
108
|
+
# not defined in ruby 1.8.7
|
109
|
+
"ruby"
|
110
|
+
end
|
111
|
+
# :sob: mocking RUBY_VERSION breaks stuff on 1.8.7
|
112
|
+
ruby_version = ENV.fetch("BUNDLER_SPEC_RUBY_VERSION") { RUBY_VERSION }.dup
|
113
|
+
ruby_engine_version = case ruby_engine
|
114
|
+
when "ruby"
|
115
|
+
ruby_version
|
116
|
+
when "rbx"
|
117
|
+
Rubinius::VERSION.dup
|
118
|
+
when "jruby"
|
119
|
+
JRUBY_VERSION.dup
|
120
|
+
else
|
121
|
+
raise BundlerError, "RUBY_ENGINE value #{RUBY_ENGINE} is not recognized"
|
122
|
+
end
|
123
|
+
patchlevel = RUBY_PATCHLEVEL.to_s
|
124
|
+
|
125
|
+
@ruby_version ||= RubyVersion.new(ruby_version, patchlevel, ruby_engine, ruby_engine_version)
|
126
|
+
end
|
127
|
+
|
128
|
+
def to_gem_version_with_patchlevel
|
129
|
+
@gem_version_with_patch ||= begin
|
130
|
+
Gem::Version.create("#{@gem_version}.#{@patchlevel}")
|
131
|
+
rescue ArgumentError
|
132
|
+
@gem_version
|
133
|
+
end
|
134
|
+
end
|
135
|
+
|
136
|
+
def exact?
|
137
|
+
return @exact if defined?(@exact)
|
138
|
+
@exact = versions.all? {|v| Gem::Requirement.create(v).exact? }
|
139
|
+
end
|
140
|
+
|
141
|
+
private
|
142
|
+
|
143
|
+
def matches?(requirements, version)
|
144
|
+
# Handles RUBY_PATCHLEVEL of -1 for instances like ruby-head
|
145
|
+
return requirements == version if requirements.to_s == "-1" || version.to_s == "-1"
|
146
|
+
|
147
|
+
Array(requirements).all? do |requirement|
|
148
|
+
Gem::Requirement.create(requirement).satisfied_by?(Gem::Version.create(version))
|
149
|
+
end
|
150
|
+
end
|
151
|
+
end
|
152
|
+
end
|