rubygems-update 3.0.9 → 3.1.0.pre1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.rubocop.yml +31 -8
- data/.travis.yml +9 -27
- data/CONTRIBUTING.md +13 -0
- data/History.txt +24 -28
- data/MAINTAINERS.txt +1 -6
- data/Manifest.txt +65 -15
- data/Rakefile +39 -23
- data/bin/gem +0 -6
- data/bundler/CHANGELOG.md +746 -570
- data/bundler/CODE_OF_CONDUCT.md +117 -23
- data/bundler/LICENSE.md +18 -19
- data/bundler/README.md +9 -8
- data/bundler/bundler.gemspec +8 -25
- data/bundler/exe/bundle +19 -3
- data/bundler/lib/bundler.rb +120 -67
- data/bundler/lib/bundler/build_metadata.rb +1 -3
- data/bundler/lib/bundler/capistrano.rb +4 -4
- data/bundler/lib/bundler/cli.rb +129 -121
- data/bundler/lib/bundler/cli/add.rb +27 -16
- data/bundler/lib/bundler/cli/common.rb +11 -12
- data/bundler/lib/bundler/cli/config.rb +161 -86
- data/bundler/lib/bundler/cli/console.rb +1 -1
- data/bundler/lib/bundler/cli/doctor.rb +4 -4
- data/bundler/lib/bundler/cli/exec.rb +4 -9
- data/bundler/lib/bundler/cli/gem.rb +5 -5
- data/bundler/lib/bundler/cli/info.rb +17 -5
- data/bundler/lib/bundler/cli/init.rb +1 -1
- data/bundler/lib/bundler/cli/install.rb +11 -10
- data/bundler/lib/bundler/cli/issue.rb +3 -3
- data/bundler/lib/bundler/cli/open.rb +10 -6
- data/bundler/lib/bundler/cli/outdated.rb +85 -81
- data/bundler/lib/bundler/cli/package.rb +8 -9
- data/bundler/lib/bundler/cli/plugin.rb +9 -2
- data/bundler/lib/bundler/cli/pristine.rb +1 -1
- data/bundler/lib/bundler/cli/show.rb +1 -1
- data/bundler/lib/bundler/cli/update.rb +31 -11
- data/bundler/lib/bundler/compact_index_client.rb +25 -9
- data/bundler/lib/bundler/compact_index_client/updater.rb +2 -6
- data/bundler/lib/bundler/current_ruby.rb +9 -7
- data/bundler/lib/bundler/definition.rb +35 -26
- data/bundler/lib/bundler/dependency.rb +16 -4
- data/bundler/lib/bundler/deployment.rb +1 -1
- data/bundler/lib/bundler/dsl.rb +15 -39
- data/bundler/lib/bundler/env.rb +8 -13
- data/bundler/lib/bundler/environment_preserver.rb +0 -1
- data/bundler/lib/bundler/feature_flag.rb +23 -34
- data/bundler/lib/bundler/fetcher.rb +14 -11
- data/bundler/lib/bundler/fetcher/compact_index.rb +26 -12
- data/bundler/lib/bundler/fetcher/dependency.rb +1 -1
- data/bundler/lib/bundler/fetcher/downloader.rb +4 -1
- data/bundler/lib/bundler/fetcher/index.rb +4 -2
- data/bundler/lib/bundler/friendly_errors.rb +4 -5
- data/bundler/lib/bundler/gem_helper.rb +39 -24
- data/bundler/lib/bundler/gem_helpers.rb +2 -4
- data/bundler/lib/bundler/gem_tasks.rb +1 -1
- data/bundler/lib/bundler/gem_version_promoter.rb +3 -3
- data/bundler/lib/bundler/graph.rb +2 -2
- data/bundler/lib/bundler/injector.rb +10 -8
- data/bundler/lib/bundler/inline.rb +19 -18
- data/bundler/lib/bundler/installer.rb +7 -14
- data/bundler/lib/bundler/installer/gem_installer.rb +5 -1
- data/bundler/lib/bundler/installer/parallel_installer.rb +4 -8
- data/bundler/lib/bundler/installer/standalone.rb +1 -2
- data/bundler/lib/bundler/lazy_specification.rb +2 -2
- data/bundler/lib/bundler/lockfile_parser.rb +13 -21
- data/bundler/lib/bundler/match_platform.rb +1 -1
- data/bundler/lib/bundler/plugin.rb +42 -29
- data/bundler/lib/bundler/plugin/api.rb +1 -1
- data/bundler/lib/bundler/plugin/api/source.rb +2 -2
- data/bundler/lib/bundler/plugin/index.rb +14 -3
- data/bundler/lib/bundler/plugin/installer.rb +28 -15
- data/bundler/lib/bundler/psyched_yaml.rb +1 -1
- data/bundler/lib/bundler/resolver.rb +72 -24
- data/bundler/lib/bundler/resolver/spec_group.rb +3 -2
- data/bundler/lib/bundler/retry.rb +2 -2
- data/bundler/lib/bundler/ruby_version.rb +4 -19
- data/bundler/lib/bundler/rubygems_ext.rb +10 -66
- data/bundler/lib/bundler/rubygems_gem_installer.rb +1 -8
- data/bundler/lib/bundler/rubygems_integration.rb +144 -395
- data/bundler/lib/bundler/runtime.rb +2 -9
- data/bundler/lib/bundler/settings.rb +15 -47
- data/bundler/lib/bundler/setup.rb +6 -5
- data/bundler/lib/bundler/shared_helpers.rb +58 -71
- data/bundler/lib/bundler/similarity_detector.rb +2 -2
- data/bundler/lib/bundler/source.rb +5 -5
- data/bundler/lib/bundler/source/git.rb +19 -12
- data/bundler/lib/bundler/source/git/git_proxy.rb +35 -39
- data/bundler/lib/bundler/source/metadata.rb +7 -2
- data/bundler/lib/bundler/source/path.rb +13 -8
- data/bundler/lib/bundler/source/rubygems.rb +11 -5
- data/bundler/lib/bundler/source/rubygems/remote.rb +1 -2
- data/bundler/lib/bundler/source_list.rb +9 -12
- data/bundler/lib/bundler/spec_set.rb +23 -12
- data/bundler/lib/bundler/stub_specification.rb +18 -30
- data/bundler/lib/bundler/templates/Executable.bundler +23 -14
- data/bundler/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt +3 -3
- data/bundler/lib/bundler/templates/newgem/Gemfile.tt +8 -2
- data/bundler/lib/bundler/templates/newgem/README.md.tt +4 -3
- data/bundler/lib/bundler/templates/newgem/newgem.gemspec.tt +6 -27
- data/bundler/lib/bundler/templates/newgem/test/test_helper.rb.tt +1 -1
- data/bundler/lib/bundler/templates/newgem/travis.yml.tt +0 -1
- data/bundler/lib/bundler/ui.rb +3 -3
- data/bundler/lib/bundler/ui/rg_proxy.rb +1 -1
- data/bundler/lib/bundler/ui/shell.rb +4 -8
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool.rb +161 -0
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/monotonic_time.rb +66 -0
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb +176 -0
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/version.rb +3 -0
- data/bundler/lib/bundler/vendor/fileutils/lib/fileutils.rb +151 -48
- data/bundler/lib/bundler/vendor/fileutils/lib/fileutils/version.rb +5 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo.rb +6 -6
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb +2 -2
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/log.rb +6 -6
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb +30 -8
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +4 -4
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb +2 -2
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +248 -279
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/connection.rb +40 -0
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/pool.rb +53 -0
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/timed_stack_multi.rb +79 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor.rb +7 -2
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions.rb +21 -11
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/create_file.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/create_link.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/directory.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/file_manipulation.rb +11 -2
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/base.rb +16 -17
- data/bundler/lib/bundler/vendor/thor/lib/thor/error.rb +82 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/group.rb +3 -3
- data/bundler/lib/bundler/vendor/thor/lib/thor/line_editor.rb +2 -2
- data/bundler/lib/bundler/vendor/thor/lib/thor/parser.rb +4 -4
- data/bundler/lib/bundler/vendor/thor/lib/thor/parser/options.rb +7 -2
- data/bundler/lib/bundler/vendor/thor/lib/thor/runner.rb +6 -6
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell.rb +4 -4
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell/basic.rb +52 -7
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell/color.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell/html.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/util.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/version.rb +1 -1
- data/bundler/lib/bundler/vendored_fileutils.rb +1 -6
- data/bundler/lib/bundler/vendored_molinillo.rb +1 -1
- data/bundler/lib/bundler/vendored_persistent.rb +7 -5
- data/bundler/lib/bundler/vendored_thor.rb +2 -2
- data/bundler/lib/bundler/version.rb +1 -20
- data/bundler/lib/bundler/version_ranges.rb +51 -5
- data/bundler/lib/bundler/vlad.rb +2 -2
- data/bundler/lib/bundler/worker.rb +1 -3
- data/bundler/lib/bundler/yaml_serializer.rb +2 -3
- data/bundler/man/bundle-add.1 +66 -0
- data/bundler/man/bundle-add.1.txt +58 -0
- data/bundler/man/bundle-add.ronn +7 -1
- data/bundler/man/bundle-binstubs.1 +40 -0
- data/bundler/man/bundle-binstubs.1.txt +48 -0
- data/bundler/man/bundle-binstubs.ronn +1 -1
- data/bundler/man/bundle-check.1 +31 -0
- data/bundler/man/bundle-check.1.txt +33 -0
- data/bundler/man/bundle-clean.1 +24 -0
- data/bundler/man/bundle-clean.1.txt +26 -0
- data/bundler/man/bundle-config.1 +497 -0
- data/bundler/man/bundle-config.1.txt +528 -0
- data/bundler/man/bundle-config.ronn +42 -40
- data/bundler/man/bundle-doctor.1 +44 -0
- data/bundler/man/bundle-doctor.1.txt +44 -0
- data/bundler/man/bundle-exec.1 +165 -0
- data/bundler/man/bundle-exec.1.txt +178 -0
- data/bundler/man/bundle-exec.ronn +1 -1
- data/bundler/man/bundle-gem.1 +80 -0
- data/bundler/man/bundle-gem.1.txt +91 -0
- data/bundler/man/bundle-info.1 +20 -0
- data/bundler/man/bundle-info.1.txt +21 -0
- data/bundler/man/bundle-init.1 +25 -0
- data/bundler/man/bundle-init.1.txt +34 -0
- data/bundler/man/bundle-init.ronn +1 -1
- data/bundler/man/bundle-inject.1 +33 -0
- data/bundler/man/bundle-inject.1.txt +32 -0
- data/bundler/man/bundle-install.1 +311 -0
- data/bundler/man/bundle-install.1.txt +401 -0
- data/bundler/man/bundle-install.ronn +9 -4
- data/bundler/man/bundle-list.1 +50 -0
- data/bundler/man/bundle-list.1.txt +43 -0
- data/bundler/man/bundle-lock.1 +84 -0
- data/bundler/man/bundle-lock.1.txt +93 -0
- data/bundler/man/bundle-open.1 +32 -0
- data/bundler/man/bundle-open.1.txt +29 -0
- data/bundler/man/bundle-outdated.1 +155 -0
- data/bundler/man/bundle-outdated.1.txt +131 -0
- data/bundler/man/bundle-package.1 +55 -0
- data/bundler/man/bundle-package.1.txt +79 -0
- data/bundler/man/bundle-platform.1 +61 -0
- data/bundler/man/bundle-platform.1.txt +57 -0
- data/bundler/man/bundle-pristine.1 +34 -0
- data/bundler/man/bundle-pristine.1.txt +44 -0
- data/bundler/man/bundle-remove.1 +31 -0
- data/bundler/man/bundle-remove.1.txt +34 -0
- data/bundler/man/bundle-show.1 +23 -0
- data/bundler/man/bundle-show.1.txt +27 -0
- data/bundler/man/bundle-update.1 +394 -0
- data/bundler/man/bundle-update.1.txt +390 -0
- data/bundler/man/bundle-update.ronn +3 -3
- data/bundler/man/bundle-viz.1 +39 -0
- data/bundler/man/bundle-viz.1.txt +39 -0
- data/bundler/man/bundle.1 +136 -0
- data/bundler/man/bundle.1.txt +116 -0
- data/bundler/man/bundle.ronn +2 -2
- data/bundler/man/gemfile.5 +686 -0
- data/bundler/man/gemfile.5.ronn +14 -18
- data/bundler/man/gemfile.5.txt +649 -0
- data/bundler/man/index.txt +25 -0
- data/lib/rubygems.rb +80 -48
- data/lib/rubygems/available_set.rb +1 -0
- data/lib/rubygems/basic_specification.rb +17 -6
- data/lib/rubygems/bundler_version_finder.rb +5 -0
- data/lib/rubygems/command.rb +34 -5
- data/lib/rubygems/command_manager.rb +0 -6
- data/lib/rubygems/commands/build_command.rb +21 -8
- data/lib/rubygems/commands/cert_command.rb +0 -1
- data/lib/rubygems/commands/cleanup_command.rb +7 -7
- data/lib/rubygems/commands/contents_command.rb +3 -3
- data/lib/rubygems/commands/dependency_command.rb +4 -3
- data/lib/rubygems/commands/environment_command.rb +0 -3
- data/lib/rubygems/commands/info_command.rb +2 -0
- data/lib/rubygems/commands/install_command.rb +12 -52
- data/lib/rubygems/commands/lock_command.rb +2 -2
- data/lib/rubygems/commands/mirror_command.rb +1 -0
- data/lib/rubygems/commands/open_command.rb +2 -1
- data/lib/rubygems/commands/outdated_command.rb +1 -0
- data/lib/rubygems/commands/owner_command.rb +2 -7
- data/lib/rubygems/commands/pristine_command.rb +3 -0
- data/lib/rubygems/commands/push_command.rb +4 -6
- data/lib/rubygems/commands/query_command.rb +94 -80
- data/lib/rubygems/commands/rdoc_command.rb +1 -0
- data/lib/rubygems/commands/setup_command.rb +10 -8
- data/lib/rubygems/commands/signin_command.rb +1 -0
- data/lib/rubygems/commands/specification_command.rb +1 -0
- data/lib/rubygems/commands/stale_command.rb +2 -0
- data/lib/rubygems/commands/uninstall_command.rb +1 -0
- data/lib/rubygems/commands/unpack_command.rb +2 -29
- data/lib/rubygems/commands/update_command.rb +14 -14
- data/lib/rubygems/commands/which_command.rb +1 -0
- data/lib/rubygems/commands/yank_command.rb +8 -2
- data/lib/rubygems/compatibility.rb +4 -4
- data/lib/rubygems/config_file.rb +28 -23
- data/lib/rubygems/core_ext/kernel_gem.rb +2 -5
- data/lib/rubygems/core_ext/kernel_require.rb +29 -2
- data/lib/rubygems/core_ext/kernel_warn.rb +10 -4
- data/lib/rubygems/defaults.rb +10 -17
- data/lib/rubygems/dependency.rb +21 -6
- data/lib/rubygems/dependency_installer.rb +19 -102
- data/lib/rubygems/dependency_list.rb +11 -10
- data/lib/rubygems/deprecate.rb +5 -5
- data/lib/rubygems/errors.rb +11 -2
- data/lib/rubygems/exceptions.rb +9 -0
- data/lib/rubygems/ext/builder.rb +24 -43
- data/lib/rubygems/ext/cmake_builder.rb +2 -0
- data/lib/rubygems/ext/ext_conf_builder.rb +11 -9
- data/lib/rubygems/ext/rake_builder.rb +1 -1
- data/lib/rubygems/gemcutter_utilities.rb +19 -26
- data/lib/rubygems/indexer.rb +9 -5
- data/lib/rubygems/installer.rb +26 -13
- data/lib/rubygems/installer_test_case.rb +86 -38
- data/lib/rubygems/local_remote_options.rb +1 -1
- data/lib/rubygems/mock_gem_ui.rb +4 -1
- data/lib/rubygems/name_tuple.rb +1 -0
- data/lib/rubygems/package.rb +37 -9
- data/lib/rubygems/package/tar_writer.rb +4 -4
- data/lib/rubygems/path_support.rb +2 -0
- data/lib/rubygems/platform.rb +2 -1
- data/lib/rubygems/psych_tree.rb +2 -0
- data/lib/rubygems/remote_fetcher.rb +5 -1
- data/lib/rubygems/request.rb +5 -3
- data/lib/rubygems/request/connection_pools.rb +4 -4
- data/lib/rubygems/request/http_pool.rb +1 -0
- data/lib/rubygems/request/https_pool.rb +2 -0
- data/lib/rubygems/request_set.rb +2 -2
- data/lib/rubygems/request_set/gem_dependency_api.rb +2 -2
- data/lib/rubygems/request_set/lockfile.rb +5 -2
- data/lib/rubygems/request_set/lockfile/parser.rb +4 -2
- data/lib/rubygems/request_set/lockfile/tokenizer.rb +2 -0
- data/lib/rubygems/requirement.rb +20 -18
- data/lib/rubygems/resolver.rb +4 -5
- data/lib/rubygems/resolver/activation_request.rb +19 -49
- data/lib/rubygems/resolver/best_set.rb +2 -2
- data/lib/rubygems/resolver/conflict.rb +0 -5
- data/lib/rubygems/resolver/installer_set.rb +3 -3
- data/lib/rubygems/resolver/lock_set.rb +1 -1
- data/lib/rubygems/resolver/lock_specification.rb +2 -2
- data/lib/rubygems/resolver/requirement_list.rb +1 -0
- data/lib/rubygems/resolver/specification.rb +1 -0
- data/lib/rubygems/resolver/stats.rb +2 -0
- data/lib/rubygems/security/signer.rb +3 -2
- data/lib/rubygems/server.rb +5 -4
- data/lib/rubygems/source_list.rb +1 -0
- data/lib/rubygems/spec_fetcher.rb +3 -16
- data/lib/rubygems/specification.rb +69 -133
- data/lib/rubygems/specification_policy.rb +7 -2
- data/{bundler/lib/bundler → lib/rubygems}/ssl_certs/index.rubygems.org/GlobalSignRootCA.pem +0 -0
- data/{bundler/lib/bundler → lib/rubygems}/ssl_certs/rubygems.global.ssl.fastly.net/DigiCertHighAssuranceEVRootCA.pem +0 -0
- data/{bundler/lib/bundler → lib/rubygems}/ssl_certs/rubygems.org/AddTrustExternalCARoot.pem +0 -0
- data/lib/rubygems/stub_specification.rb +5 -2
- data/lib/rubygems/syck_hack.rb +2 -0
- data/lib/rubygems/test_case.rb +78 -227
- data/lib/rubygems/test_utilities.rb +17 -6
- data/lib/rubygems/text.rb +2 -3
- data/lib/rubygems/uninstaller.rb +15 -15
- data/lib/rubygems/user_interaction.rb +9 -1
- data/lib/rubygems/util.rb +5 -41
- data/lib/rubygems/util/licenses.rb +398 -396
- data/lib/rubygems/util/list.rb +2 -0
- data/lib/rubygems/validator.rb +9 -29
- data/lib/rubygems/version.rb +5 -3
- data/rubygems-update.gemspec +3 -3
- data/test/rubygems/plugin/load/rubygems_plugin.rb +2 -0
- data/test/rubygems/test_bundled_ca.rb +4 -7
- data/test/rubygems/test_deprecate.rb +3 -0
- data/test/rubygems/test_gem.rb +183 -176
- data/test/rubygems/test_gem_available_set.rb +3 -2
- data/test/rubygems/test_gem_bundler_version_finder.rb +3 -1
- data/test/rubygems/test_gem_command.rb +94 -5
- data/test/rubygems/test_gem_command_manager.rb +5 -13
- data/test/rubygems/test_gem_commands_build_command.rb +142 -4
- data/test/rubygems/test_gem_commands_cert_command.rb +15 -1
- data/test/rubygems/test_gem_commands_cleanup_command.rb +22 -6
- data/test/rubygems/test_gem_commands_dependency_command.rb +1 -1
- data/test/rubygems/test_gem_commands_environment_command.rb +1 -11
- data/test/rubygems/test_gem_commands_help_command.rb +2 -0
- data/test/rubygems/test_gem_commands_info_command.rb +1 -0
- data/test/rubygems/test_gem_commands_install_command.rb +207 -2
- data/test/rubygems/test_gem_commands_mirror.rb +1 -0
- data/test/rubygems/test_gem_commands_outdated_command.rb +1 -0
- data/test/rubygems/test_gem_commands_owner_command.rb +4 -5
- data/test/rubygems/test_gem_commands_pristine_command.rb +56 -4
- data/test/rubygems/test_gem_commands_push_command.rb +19 -14
- data/test/rubygems/test_gem_commands_query_command.rb +27 -2
- data/test/rubygems/test_gem_commands_setup_command.rb +62 -37
- data/test/rubygems/test_gem_commands_signin_command.rb +5 -4
- data/test/rubygems/test_gem_commands_sources_command.rb +20 -6
- data/test/rubygems/test_gem_commands_uninstall_command.rb +107 -50
- data/test/rubygems/test_gem_commands_update_command.rb +86 -23
- data/test/rubygems/test_gem_commands_yank_command.rb +46 -1
- data/test/rubygems/test_gem_config_file.rb +9 -2
- data/test/rubygems/test_gem_dependency.rb +6 -0
- data/test/rubygems/test_gem_dependency_installer.rb +67 -36
- data/test/rubygems/test_gem_dependency_list.rb +21 -14
- data/test/rubygems/test_gem_ext_builder.rb +5 -1
- data/test/rubygems/test_gem_ext_cmake_builder.rb +2 -0
- data/test/rubygems/test_gem_ext_configure_builder.rb +8 -0
- data/test/rubygems/test_gem_ext_ext_conf_builder.rb +12 -0
- data/test/rubygems/test_gem_ext_rake_builder.rb +2 -0
- data/test/rubygems/test_gem_gemcutter_utilities.rb +8 -8
- data/test/rubygems/test_gem_indexer.rb +31 -40
- data/test/rubygems/test_gem_install_update_options.rb +31 -17
- data/test/rubygems/test_gem_installer.rb +383 -223
- data/test/rubygems/test_gem_package.rb +99 -14
- data/test/rubygems/test_gem_package_old.rb +57 -54
- data/test/rubygems/test_gem_package_tar_reader_entry.rb +6 -5
- data/test/rubygems/test_gem_package_tar_writer.rb +11 -6
- data/test/rubygems/test_gem_path_support.rb +19 -13
- data/test/rubygems/test_gem_platform.rb +4 -2
- data/test/rubygems/test_gem_rdoc.rb +1 -0
- data/test/rubygems/test_gem_remote_fetcher.rb +29 -16
- data/test/rubygems/test_gem_request.rb +19 -4
- data/test/rubygems/test_gem_request_connection_pools.rb +6 -2
- data/test/rubygems/test_gem_request_set.rb +33 -8
- data/test/rubygems/test_gem_request_set_gem_dependency_api.rb +1 -1
- data/test/rubygems/test_gem_request_set_lockfile.rb +1 -0
- data/test/rubygems/test_gem_request_set_lockfile_parser.rb +2 -1
- data/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb +2 -0
- data/test/rubygems/test_gem_requirement.rb +7 -1
- data/test/rubygems/test_gem_resolver.rb +67 -23
- data/test/rubygems/test_gem_resolver_activation_request.rb +3 -32
- data/test/rubygems/test_gem_resolver_conflict.rb +0 -4
- data/test/rubygems/test_gem_resolver_git_specification.rb +1 -0
- data/test/rubygems/test_gem_resolver_index_specification.rb +7 -2
- data/test/rubygems/test_gem_resolver_installed_specification.rb +0 -1
- data/test/rubygems/test_gem_resolver_installer_set.rb +3 -1
- data/test/rubygems/test_gem_resolver_specification.rb +2 -0
- data/test/rubygems/test_gem_security.rb +6 -2
- data/test/rubygems/test_gem_security_signer.rb +1 -0
- data/test/rubygems/test_gem_server.rb +7 -2
- data/test/rubygems/test_gem_silent_ui.rb +1 -0
- data/test/rubygems/test_gem_source.rb +7 -7
- data/test/rubygems/test_gem_source_fetch_problem.rb +1 -0
- data/test/rubygems/test_gem_source_git.rb +4 -9
- data/test/rubygems/test_gem_source_installed.rb +6 -6
- data/test/rubygems/test_gem_source_list.rb +1 -0
- data/test/rubygems/test_gem_source_local.rb +5 -4
- data/test/rubygems/test_gem_source_lock.rb +12 -12
- data/test/rubygems/test_gem_source_specific_file.rb +7 -6
- data/test/rubygems/test_gem_source_vendor.rb +4 -4
- data/test/rubygems/test_gem_specification.rb +75 -43
- data/test/rubygems/test_gem_stream_ui.rb +2 -0
- data/test/rubygems/test_gem_stub_specification.rb +3 -1
- data/test/rubygems/test_gem_text.rb +1 -0
- data/test/rubygems/test_gem_uninstaller.rb +31 -10
- data/test/rubygems/test_gem_util.rb +6 -4
- data/test/rubygems/test_gem_validator.rb +3 -4
- data/test/rubygems/test_gem_version.rb +16 -8
- data/test/rubygems/test_kernel.rb +1 -0
- data/test/rubygems/test_rake_package.rb +26 -0
- data/test/rubygems/test_remote_fetch_error.rb +1 -0
- data/test/rubygems/test_require.rb +107 -3
- data/util/bisect +31 -0
- data/util/ci.sh +50 -0
- data/util/generate_spdx_license_list.rb +4 -2
- data/util/rubocop +2 -2
- data/util/update_bundled_ca_certificates.rb +3 -1
- metadata +97 -25
- data/appveyor.yml +0 -43
- data/bundler/CONTRIBUTING.md +0 -17
- data/bundler/exe/bundle_ruby +0 -60
- data/bundler/lib/bundler/cli/cache.rb +0 -36
- data/bundler/lib/bundler/compatibility_guard.rb +0 -14
- data/bundler/lib/bundler/ssl_certs/.document +0 -1
- data/bundler/lib/bundler/ssl_certs/certificate_manager.rb +0 -66
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/faster.rb +0 -27
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/ssl_reuse.rb +0 -129
- data/lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA.pem +0 -21
- data/lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA_R3.pem +0 -21
- data/util/ci +0 -82
@@ -1,13 +1,13 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
3
|
require "rubygems/dependency"
|
4
|
-
|
5
|
-
|
4
|
+
require_relative "shared_helpers"
|
5
|
+
require_relative "rubygems_ext"
|
6
6
|
|
7
7
|
module Bundler
|
8
8
|
class Dependency < Gem::Dependency
|
9
9
|
attr_reader :autorequire
|
10
|
-
attr_reader :groups, :platforms, :gemfile
|
10
|
+
attr_reader :groups, :platforms, :gemfile, :git, :branch
|
11
11
|
|
12
12
|
PLATFORM_MAP = {
|
13
13
|
:ruby => Gem::Platform::RUBY,
|
@@ -19,6 +19,7 @@ module Bundler
|
|
19
19
|
:ruby_23 => Gem::Platform::RUBY,
|
20
20
|
:ruby_24 => Gem::Platform::RUBY,
|
21
21
|
:ruby_25 => Gem::Platform::RUBY,
|
22
|
+
:ruby_26 => Gem::Platform::RUBY,
|
22
23
|
:mri => Gem::Platform::RUBY,
|
23
24
|
:mri_18 => Gem::Platform::RUBY,
|
24
25
|
:mri_19 => Gem::Platform::RUBY,
|
@@ -28,6 +29,7 @@ module Bundler
|
|
28
29
|
:mri_23 => Gem::Platform::RUBY,
|
29
30
|
:mri_24 => Gem::Platform::RUBY,
|
30
31
|
:mri_25 => Gem::Platform::RUBY,
|
32
|
+
:mri_26 => Gem::Platform::RUBY,
|
31
33
|
:rbx => Gem::Platform::RUBY,
|
32
34
|
:truffleruby => Gem::Platform::RUBY,
|
33
35
|
:jruby => Gem::Platform::JAVA,
|
@@ -42,6 +44,7 @@ module Bundler
|
|
42
44
|
:mswin_23 => Gem::Platform::MSWIN,
|
43
45
|
:mswin_24 => Gem::Platform::MSWIN,
|
44
46
|
:mswin_25 => Gem::Platform::MSWIN,
|
47
|
+
:mswin_26 => Gem::Platform::MSWIN,
|
45
48
|
:mswin64 => Gem::Platform::MSWIN64,
|
46
49
|
:mswin64_19 => Gem::Platform::MSWIN64,
|
47
50
|
:mswin64_20 => Gem::Platform::MSWIN64,
|
@@ -50,6 +53,7 @@ module Bundler
|
|
50
53
|
:mswin64_23 => Gem::Platform::MSWIN64,
|
51
54
|
:mswin64_24 => Gem::Platform::MSWIN64,
|
52
55
|
:mswin64_25 => Gem::Platform::MSWIN64,
|
56
|
+
:mswin64_26 => Gem::Platform::MSWIN64,
|
53
57
|
:mingw => Gem::Platform::MINGW,
|
54
58
|
:mingw_18 => Gem::Platform::MINGW,
|
55
59
|
:mingw_19 => Gem::Platform::MINGW,
|
@@ -59,6 +63,7 @@ module Bundler
|
|
59
63
|
:mingw_23 => Gem::Platform::MINGW,
|
60
64
|
:mingw_24 => Gem::Platform::MINGW,
|
61
65
|
:mingw_25 => Gem::Platform::MINGW,
|
66
|
+
:mingw_26 => Gem::Platform::MINGW,
|
62
67
|
:x64_mingw => Gem::Platform::X64_MINGW,
|
63
68
|
:x64_mingw_20 => Gem::Platform::X64_MINGW,
|
64
69
|
:x64_mingw_21 => Gem::Platform::X64_MINGW,
|
@@ -66,6 +71,7 @@ module Bundler
|
|
66
71
|
:x64_mingw_23 => Gem::Platform::X64_MINGW,
|
67
72
|
:x64_mingw_24 => Gem::Platform::X64_MINGW,
|
68
73
|
:x64_mingw_25 => Gem::Platform::X64_MINGW,
|
74
|
+
:x64_mingw_26 => Gem::Platform::X64_MINGW,
|
69
75
|
}.freeze
|
70
76
|
|
71
77
|
REVERSE_PLATFORM_MAP = {}.tap do |reverse_platform_map|
|
@@ -84,6 +90,8 @@ module Bundler
|
|
84
90
|
@autorequire = nil
|
85
91
|
@groups = Array(options["group"] || :default).map(&:to_sym)
|
86
92
|
@source = options["source"]
|
93
|
+
@git = options["git"]
|
94
|
+
@branch = options["branch"]
|
87
95
|
@platforms = Array(options["platforms"])
|
88
96
|
@env = options["env"]
|
89
97
|
@should_include = options.fetch("should_include", true)
|
@@ -97,11 +105,15 @@ module Bundler
|
|
97
105
|
def gem_platforms(valid_platforms)
|
98
106
|
return valid_platforms if @platforms.empty?
|
99
107
|
|
100
|
-
@gem_platforms ||=
|
108
|
+
@gem_platforms ||= expanded_platforms.compact.uniq
|
101
109
|
|
102
110
|
valid_platforms & @gem_platforms
|
103
111
|
end
|
104
112
|
|
113
|
+
def expanded_platforms
|
114
|
+
@platforms.map {|pl| PLATFORM_MAP[pl] }
|
115
|
+
end
|
116
|
+
|
105
117
|
def should_include?
|
106
118
|
@should_include && current_env? && current_platform?
|
107
119
|
end
|
@@ -1,6 +1,6 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
|
3
|
+
require_relative "shared_helpers"
|
4
4
|
Bundler::SharedHelpers.major_deprecation 2, "Bundler no longer integrates with " \
|
5
5
|
"Capistrano, but Capistrano provides its own integration with " \
|
6
6
|
"Bundler via the capistrano-bundler gem. Use it instead."
|
data/bundler/lib/bundler/dsl.rb
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
|
4
|
-
|
3
|
+
require_relative "dependency"
|
4
|
+
require_relative "ruby_dsl"
|
5
5
|
|
6
6
|
module Bundler
|
7
7
|
class Dsl
|
@@ -45,7 +45,7 @@ module Bundler
|
|
45
45
|
@gemfiles << expanded_gemfile_path
|
46
46
|
contents ||= Bundler.read_file(@gemfile.to_s)
|
47
47
|
instance_eval(contents.dup.untaint, gemfile.to_s, 1)
|
48
|
-
rescue Exception => e
|
48
|
+
rescue Exception => e # rubocop:disable Lint/RescueException
|
49
49
|
message = "There was an error " \
|
50
50
|
"#{e.is_a?(GemfileEvalError) ? "evaluating" : "parsing"} " \
|
51
51
|
"`#{File.basename gemfile.to_s}`: #{e.message}"
|
@@ -128,7 +128,7 @@ module Bundler
|
|
128
128
|
else
|
129
129
|
Bundler.ui.warn "Your Gemfile lists the gem #{current.name} (#{current.requirement}) more than once.\n" \
|
130
130
|
"You should probably keep only one of them.\n" \
|
131
|
-
"Remove any duplicate entries and specify the gem only once
|
131
|
+
"Remove any duplicate entries and specify the gem only once.\n" \
|
132
132
|
"While it's not a problem now, it could cause errors if you change the version of one of them later."
|
133
133
|
end
|
134
134
|
|
@@ -290,37 +290,16 @@ module Bundler
|
|
290
290
|
warn_deprecated_git_source(:github, <<-'RUBY'.strip, 'Change any "reponame" :github sources to "username/reponame".')
|
291
291
|
"https://github.com/#{repo_name}.git"
|
292
292
|
RUBY
|
293
|
-
# It would be better to use https instead of the git protocol, but this
|
294
|
-
# can break deployment of existing locked bundles when switching between
|
295
|
-
# different versions of Bundler. The change will be made in 2.0, which
|
296
|
-
# does not guarantee compatibility with the 1.x series.
|
297
|
-
#
|
298
|
-
# See https://github.com/bundler/bundler/pull/2569 for discussion
|
299
|
-
#
|
300
|
-
# This can be overridden by adding this code to your Gemfiles:
|
301
|
-
#
|
302
|
-
# git_source(:github) do |repo_name|
|
303
|
-
# repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
|
304
|
-
# "https://github.com/#{repo_name}.git"
|
305
|
-
# end
|
306
293
|
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
|
307
|
-
|
308
|
-
if Bundler.feature_flag.github_https?
|
309
|
-
Bundler::SharedHelpers.major_deprecation 2, "The `github.https` setting will be removed"
|
310
|
-
"https://github.com/#{repo_name}.git"
|
311
|
-
else
|
312
|
-
"git://github.com/#{repo_name}.git"
|
313
|
-
end
|
294
|
+
"https://github.com/#{repo_name}.git"
|
314
295
|
end
|
315
296
|
|
316
|
-
# TODO: 2.0 remove this deprecated git source
|
317
297
|
git_source(:gist) do |repo_name|
|
318
298
|
warn_deprecated_git_source(:gist, '"https://gist.github.com/#{repo_name}.git"')
|
319
299
|
|
320
300
|
"https://gist.github.com/#{repo_name}.git"
|
321
301
|
end
|
322
302
|
|
323
|
-
# TODO: 2.0 remove this deprecated git source
|
324
303
|
git_source(:bitbucket) do |repo_name|
|
325
304
|
warn_deprecated_git_source(:bitbucket, <<-'RUBY'.strip)
|
326
305
|
user_name, repo_name = repo_name.split("/")
|
@@ -363,9 +342,7 @@ repo_name ||= user_name
|
|
363
342
|
if name =~ /\s/
|
364
343
|
raise GemfileError, %('#{name}' is not a valid gem name because it contains whitespace)
|
365
344
|
end
|
366
|
-
if name.empty?
|
367
|
-
raise GemfileError, %(an empty gem name is not valid)
|
368
|
-
end
|
345
|
+
raise GemfileError, %(an empty gem name is not valid) if name.empty?
|
369
346
|
|
370
347
|
normalize_hash(opts)
|
371
348
|
|
@@ -443,10 +420,10 @@ repo_name ||= user_name
|
|
443
420
|
message = String.new
|
444
421
|
message << "You passed #{invalid_keys.map {|k| ":" + k }.join(", ")} "
|
445
422
|
message << if invalid_keys.size > 1
|
446
|
-
|
447
|
-
|
448
|
-
|
449
|
-
|
423
|
+
"as options for #{command}, but they are invalid."
|
424
|
+
else
|
425
|
+
"as an option for #{command}, but it is invalid."
|
426
|
+
end
|
450
427
|
|
451
428
|
message << " Valid options are: #{valid_keys.join(", ")}."
|
452
429
|
message << " You may be able to resolve this by upgrading Bundler to the newest version."
|
@@ -476,7 +453,7 @@ repo_name ||= user_name
|
|
476
453
|
"should come from that source"
|
477
454
|
unless Bundler.feature_flag.bundler_2_mode?
|
478
455
|
msg += ". To downgrade this error to a warning, run " \
|
479
|
-
"`bundle config
|
456
|
+
"`bundle config unset disable_multisource`"
|
480
457
|
end
|
481
458
|
raise GemfileEvalError, msg
|
482
459
|
else
|
@@ -484,13 +461,12 @@ repo_name ||= user_name
|
|
484
461
|
"Using `source` more than once without a block is a security risk, and " \
|
485
462
|
"may result in installing unexpected gems. To resolve this warning, use " \
|
486
463
|
"a block to indicate which gems should come from the secondary source. " \
|
487
|
-
"To upgrade this warning to an error, run `bundle config " \
|
464
|
+
"To upgrade this warning to an error, run `bundle config set " \
|
488
465
|
"disable_multisource true`."
|
489
466
|
end
|
490
467
|
end
|
491
468
|
|
492
469
|
def warn_deprecated_git_source(name, replacement, additional_message = nil)
|
493
|
-
# TODO: 2.0 remove deprecation
|
494
470
|
additional_message &&= " #{additional_message}"
|
495
471
|
replacement = if replacement.count("\n").zero?
|
496
472
|
"{|repo_name| #{replacement} }"
|
@@ -498,8 +474,8 @@ repo_name ||= user_name
|
|
498
474
|
"do |repo_name|\n#{replacement.to_s.gsub(/^/, " ")}\n end"
|
499
475
|
end
|
500
476
|
|
501
|
-
Bundler::SharedHelpers.major_deprecation
|
502
|
-
The :#{name} git source is deprecated, and will be removed in
|
477
|
+
Bundler::SharedHelpers.major_deprecation 3, <<-EOS
|
478
|
+
The :#{name} git source is deprecated, and will be removed in the future.#{additional_message} Add this code to the top of your Gemfile to ensure it continues to work:
|
503
479
|
|
504
480
|
git_source(:#{name}) #{replacement}
|
505
481
|
|
@@ -601,7 +577,7 @@ The :#{name} git source is deprecated, and will be removed in Bundler 2.0.#{addi
|
|
601
577
|
description = self.description
|
602
578
|
if dsl_path && description =~ /((#{Regexp.quote File.expand_path(dsl_path)}|#{Regexp.quote dsl_path.to_s}):\d+)/
|
603
579
|
trace_line = Regexp.last_match[1]
|
604
|
-
description = description.sub(/#{Regexp.quote trace_line}:\s*/, "").sub("\n", " - ")
|
580
|
+
description = description.sub(/\n.*\n(\.\.\.)? *\^~+$/, "").sub(/#{Regexp.quote trace_line}:\s*/, "").sub("\n", " - ")
|
605
581
|
end
|
606
582
|
[trace_line, description]
|
607
583
|
end
|
data/bundler/lib/bundler/env.rb
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
|
4
|
-
|
3
|
+
require_relative "rubygems_integration"
|
4
|
+
require_relative "source/git/git_proxy"
|
5
5
|
|
6
6
|
module Bundler
|
7
7
|
class Env
|
@@ -69,15 +69,9 @@ module Bundler
|
|
69
69
|
end
|
70
70
|
|
71
71
|
def self.ruby_version
|
72
|
-
str = String.new(
|
73
|
-
|
74
|
-
|
75
|
-
str << " patchlevel #{RUBY_PATCHLEVEL}" if defined? RUBY_PATCHLEVEL
|
76
|
-
str << ") [#{RUBY_PLATFORM}]"
|
77
|
-
else
|
78
|
-
str << "p#{RUBY_PATCHLEVEL}" if defined? RUBY_PATCHLEVEL
|
79
|
-
str << " (#{RUBY_RELEASE_DATE} revision #{RUBY_REVISION}) [#{RUBY_PLATFORM}]"
|
80
|
-
end
|
72
|
+
str = String.new(RUBY_VERSION)
|
73
|
+
str << "p#{RUBY_PATCHLEVEL}" if defined? RUBY_PATCHLEVEL
|
74
|
+
str << " (#{RUBY_RELEASE_DATE} revision #{RUBY_REVISION}) [#{RUBY_PLATFORM}]"
|
81
75
|
end
|
82
76
|
|
83
77
|
def self.git_version
|
@@ -106,8 +100,9 @@ module Bundler
|
|
106
100
|
out << [" Full Path", Gem.ruby]
|
107
101
|
out << [" Config Dir", Pathname.new(Gem::ConfigFile::SYSTEM_WIDE_CONFIG_FILE).dirname]
|
108
102
|
out << ["RubyGems", Gem::VERSION]
|
109
|
-
out << [" Gem Home",
|
110
|
-
out << [" Gem Path",
|
103
|
+
out << [" Gem Home", Gem.dir]
|
104
|
+
out << [" Gem Path", Gem.path.join(File::PATH_SEPARATOR)]
|
105
|
+
out << [" User Home", Gem.user_home]
|
111
106
|
out << [" User Path", Gem.user_dir]
|
112
107
|
out << [" Bin Dir", Gem.bindir]
|
113
108
|
if defined?(OpenSSL)
|
@@ -19,7 +19,7 @@ module Bundler
|
|
19
19
|
def self.settings_method(name, key, &default)
|
20
20
|
define_method(name) do
|
21
21
|
value = Bundler.settings[key]
|
22
|
-
value = instance_eval(&default) if value.nil?
|
22
|
+
value = instance_eval(&default) if value.nil?
|
23
23
|
value
|
24
24
|
end
|
25
25
|
end
|
@@ -27,40 +27,29 @@ module Bundler
|
|
27
27
|
|
28
28
|
(1..10).each {|v| define_method("bundler_#{v}_mode?") { major_version >= v } }
|
29
29
|
|
30
|
-
settings_flag(:allow_bundler_dependency_conflicts) {
|
31
|
-
settings_flag(:allow_offline_install) {
|
32
|
-
settings_flag(:auto_clean_without_path) {
|
33
|
-
settings_flag(:auto_config_jobs) {
|
34
|
-
settings_flag(:cache_all) {
|
35
|
-
settings_flag(:
|
36
|
-
settings_flag(:
|
37
|
-
settings_flag(:
|
38
|
-
settings_flag(:
|
39
|
-
settings_flag(:
|
40
|
-
settings_flag(:
|
41
|
-
settings_flag(:
|
42
|
-
settings_flag(:global_path_appends_ruby_scope) { bundler_2_mode? }
|
43
|
-
settings_flag(:global_gem_cache) { bundler_2_mode? }
|
44
|
-
settings_flag(:init_gems_rb) { bundler_2_mode? }
|
45
|
-
settings_flag(:list_command) { bundler_2_mode? }
|
46
|
-
settings_flag(:lockfile_uses_separate_rubygems_sources) { bundler_2_mode? }
|
47
|
-
settings_flag(:only_update_to_newer_versions) { bundler_2_mode? }
|
48
|
-
settings_flag(:path_relative_to_cwd) { bundler_2_mode? }
|
30
|
+
settings_flag(:allow_bundler_dependency_conflicts) { bundler_3_mode? }
|
31
|
+
settings_flag(:allow_offline_install) { bundler_3_mode? }
|
32
|
+
settings_flag(:auto_clean_without_path) { bundler_3_mode? }
|
33
|
+
settings_flag(:auto_config_jobs) { bundler_3_mode? }
|
34
|
+
settings_flag(:cache_all) { bundler_3_mode? }
|
35
|
+
settings_flag(:default_install_uses_path) { bundler_3_mode? }
|
36
|
+
settings_flag(:deployment_means_frozen) { bundler_3_mode? }
|
37
|
+
settings_flag(:disable_multisource) { bundler_3_mode? }
|
38
|
+
settings_flag(:forget_cli_options) { bundler_3_mode? }
|
39
|
+
settings_flag(:global_gem_cache) { bundler_3_mode? }
|
40
|
+
settings_flag(:only_update_to_newer_versions) { bundler_3_mode? }
|
41
|
+
settings_flag(:path_relative_to_cwd) { bundler_3_mode? }
|
49
42
|
settings_flag(:plugins) { @bundler_version >= Gem::Version.new("1.14") }
|
50
|
-
settings_flag(:
|
51
|
-
settings_flag(:
|
52
|
-
settings_flag(:
|
53
|
-
settings_flag(:
|
54
|
-
settings_flag(:
|
55
|
-
settings_flag(:
|
56
|
-
settings_flag(:
|
57
|
-
settings_flag(:
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
settings_option(:default_cli_command) { bundler_2_mode? ? :cli_help : :install }
|
62
|
-
|
63
|
-
settings_method(:github_https?, "github.https") { bundler_2_mode? }
|
43
|
+
settings_flag(:print_only_version_number) { bundler_3_mode? }
|
44
|
+
settings_flag(:setup_makes_kernel_gem_public) { !bundler_3_mode? }
|
45
|
+
settings_flag(:skip_default_git_sources) { bundler_3_mode? }
|
46
|
+
settings_flag(:specific_platform) { bundler_3_mode? }
|
47
|
+
settings_flag(:suppress_install_using_messages) { bundler_3_mode? }
|
48
|
+
settings_flag(:unlock_source_unlocks_spec) { !bundler_3_mode? }
|
49
|
+
settings_flag(:update_requires_all_flag) { bundler_3_mode? }
|
50
|
+
settings_flag(:use_gem_version_promoter_for_major_updates) { bundler_3_mode? }
|
51
|
+
|
52
|
+
settings_option(:default_cli_command) { bundler_3_mode? ? :cli_help : :install }
|
64
53
|
|
65
54
|
def initialize(bundler_version)
|
66
55
|
@bundler_version = Gem::Version.create(bundler_version)
|
@@ -1,20 +1,23 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
|
3
|
+
require_relative "vendored_persistent"
|
4
4
|
require "cgi"
|
5
5
|
require "securerandom"
|
6
6
|
require "zlib"
|
7
|
+
require "rubygems/request"
|
7
8
|
|
8
9
|
module Bundler
|
9
10
|
# Handles all the fetching with the rubygems server
|
10
11
|
class Fetcher
|
11
|
-
autoload :CompactIndex, "
|
12
|
-
autoload :Downloader, "
|
13
|
-
autoload :Dependency, "
|
14
|
-
autoload :Index, "
|
12
|
+
autoload :CompactIndex, File.expand_path("fetcher/compact_index", __dir__)
|
13
|
+
autoload :Downloader, File.expand_path("fetcher/downloader", __dir__)
|
14
|
+
autoload :Dependency, File.expand_path("fetcher/dependency", __dir__)
|
15
|
+
autoload :Index, File.expand_path("fetcher/index", __dir__)
|
15
16
|
|
16
17
|
# This error is raised when it looks like the network is down
|
17
18
|
class NetworkDownError < HTTPError; end
|
19
|
+
# This error is raised if we should rate limit our requests to the API
|
20
|
+
class TooManyRequestsError < HTTPError; end
|
18
21
|
# This error is raised if the API returns a 413 (only printed in verbose)
|
19
22
|
class FallbackError < HTTPError; end
|
20
23
|
# This is the error raised if OpenSSL fails the cert verification
|
@@ -44,7 +47,7 @@ module Bundler
|
|
44
47
|
remote_uri = filter_uri(remote_uri)
|
45
48
|
super "Authentication is required for #{remote_uri}.\n" \
|
46
49
|
"Please supply credentials for this source. You can do this by running:\n" \
|
47
|
-
" bundle config #{remote_uri} username:password"
|
50
|
+
" bundle config set #{remote_uri} username:password"
|
48
51
|
end
|
49
52
|
end
|
50
53
|
# This error is raised if HTTP authentication is provided, but incorrect.
|
@@ -96,7 +99,8 @@ module Bundler
|
|
96
99
|
|
97
100
|
uri = URI.parse("#{remote_uri}#{Gem::MARSHAL_SPEC_DIR}#{spec_file_name}.rz")
|
98
101
|
if uri.scheme == "file"
|
99
|
-
|
102
|
+
path = Bundler.rubygems.correct_for_windows_path(uri.path)
|
103
|
+
Bundler.load_marshal Bundler.rubygems.inflate(Gem.read_binary(path))
|
100
104
|
elsif cached_spec_path = gemspec_cached_path(spec_file_name)
|
101
105
|
Bundler.load_gemspec(cached_spec_path)
|
102
106
|
else
|
@@ -226,7 +230,7 @@ module Bundler
|
|
226
230
|
"GO_SERVER_URL" => "go",
|
227
231
|
"SNAP_CI" => "snap",
|
228
232
|
"CI_NAME" => ENV["CI_NAME"],
|
229
|
-
"CI" => "ci"
|
233
|
+
"CI" => "ci",
|
230
234
|
}
|
231
235
|
env_cis.find_all {|env, _| ENV[env] }.map {|_, ci| ci }
|
232
236
|
end
|
@@ -238,7 +242,7 @@ module Bundler
|
|
238
242
|
Bundler.settings[:ssl_client_cert]
|
239
243
|
raise SSLError if needs_ssl && !defined?(OpenSSL::SSL)
|
240
244
|
|
241
|
-
con = PersistentHTTP.new "bundler", :ENV
|
245
|
+
con = PersistentHTTP.new :name => "bundler", :proxy => :ENV
|
242
246
|
if gem_proxy = Bundler.rubygems.configuration[:http_proxy]
|
243
247
|
con.proxy = URI.parse(gem_proxy) if gem_proxy != :no_proxy
|
244
248
|
end
|
@@ -293,8 +297,7 @@ module Bundler
|
|
293
297
|
end
|
294
298
|
else
|
295
299
|
store.set_default_paths
|
296
|
-
|
297
|
-
Dir.glob(certs).each {|c| store.add_file c }
|
300
|
+
Gem::Request.get_cert_files.each {|c| store.add_file c }
|
298
301
|
end
|
299
302
|
store
|
300
303
|
end
|
@@ -1,10 +1,10 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
|
4
|
-
|
3
|
+
require_relative "base"
|
4
|
+
require_relative "../worker"
|
5
5
|
|
6
6
|
module Bundler
|
7
|
-
autoload :CompactIndexClient, "
|
7
|
+
autoload :CompactIndexClient, File.expand_path("../compact_index_client", __dir__)
|
8
8
|
|
9
9
|
class Fetcher
|
10
10
|
class CompactIndex < Base
|
@@ -39,7 +39,13 @@ module Bundler
|
|
39
39
|
until remaining_gems.empty?
|
40
40
|
log_specs "Looking up gems #{remaining_gems.inspect}"
|
41
41
|
|
42
|
-
deps =
|
42
|
+
deps = begin
|
43
|
+
parallel_compact_index_client.dependencies(remaining_gems)
|
44
|
+
rescue TooManyRequestsError
|
45
|
+
@bundle_worker.stop if @bundle_worker
|
46
|
+
@bundle_worker = nil # reset it. Not sure if necessary
|
47
|
+
serial_compact_index_client.dependencies(remaining_gems)
|
48
|
+
end
|
43
49
|
next_gems = deps.map {|d| d[3].map(&:first).flatten(1) }.flatten(1).uniq
|
44
50
|
deps.each {|dep| gem_info << dep }
|
45
51
|
complete_gems.concat(deps.map(&:first)).uniq!
|
@@ -80,18 +86,26 @@ module Bundler
|
|
80
86
|
private
|
81
87
|
|
82
88
|
def compact_index_client
|
83
|
-
@compact_index_client ||=
|
89
|
+
@compact_index_client ||=
|
84
90
|
SharedHelpers.filesystem_access(cache_path) do
|
85
91
|
CompactIndexClient.new(cache_path, client_fetcher)
|
86
|
-
end.tap do |client|
|
87
|
-
client.in_parallel = lambda do |inputs, &blk|
|
88
|
-
func = lambda {|object, _index| blk.call(object) }
|
89
|
-
worker = bundle_worker(func)
|
90
|
-
inputs.each {|input| worker.enq(input) }
|
91
|
-
inputs.map { worker.deq }
|
92
|
-
end
|
93
92
|
end
|
93
|
+
end
|
94
|
+
|
95
|
+
def parallel_compact_index_client
|
96
|
+
compact_index_client.execution_mode = lambda do |inputs, &blk|
|
97
|
+
func = lambda {|object, _index| blk.call(object) }
|
98
|
+
worker = bundle_worker(func)
|
99
|
+
inputs.each {|input| worker.enq(input) }
|
100
|
+
inputs.map { worker.deq }
|
94
101
|
end
|
102
|
+
|
103
|
+
compact_index_client
|
104
|
+
end
|
105
|
+
|
106
|
+
def serial_compact_index_client
|
107
|
+
compact_index_client.sequential_execution_mode!
|
108
|
+
compact_index_client
|
95
109
|
end
|
96
110
|
|
97
111
|
def bundle_worker(func = nil)
|