rubygems-update 2.6.11 → 2.7.11
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.travis.yml +8 -22
- data/CONTRIBUTING.rdoc +53 -54
- data/History.txt +405 -0
- data/Manifest.txt +46 -15
- data/POLICIES.rdoc +3 -3
- data/README.md +72 -0
- data/Rakefile +55 -12
- data/appveyor.yml +29 -1
- data/bin/gem +1 -1
- data/bin/update_rubygems +2 -2
- data/bundler/CHANGELOG.md +412 -9
- data/bundler/CODE_OF_CONDUCT.md +1 -1
- data/bundler/CONTRIBUTING.md +10 -29
- data/bundler/README.md +27 -11
- data/bundler/bundler.gemspec +58 -0
- data/bundler/exe/bundle +5 -7
- data/bundler/exe/bundle_ruby +4 -3
- data/bundler/lib/bundler.rb +103 -79
- data/bundler/lib/bundler/build_metadata.rb +53 -0
- data/bundler/lib/bundler/capistrano.rb +5 -0
- data/bundler/lib/bundler/cli.rb +231 -66
- data/bundler/lib/bundler/cli/add.rb +25 -0
- data/bundler/lib/bundler/cli/binstubs.rb +9 -7
- data/bundler/lib/bundler/cli/cache.rb +5 -4
- data/bundler/lib/bundler/cli/check.rb +3 -5
- data/bundler/lib/bundler/cli/clean.rb +5 -6
- data/bundler/lib/bundler/cli/common.rb +18 -2
- data/bundler/lib/bundler/cli/config.rb +26 -7
- data/bundler/lib/bundler/cli/console.rb +2 -1
- data/bundler/lib/bundler/cli/doctor.rb +1 -0
- data/bundler/lib/bundler/cli/exec.rb +6 -5
- data/bundler/lib/bundler/cli/gem.rb +42 -18
- data/bundler/lib/bundler/cli/info.rb +50 -0
- data/bundler/lib/bundler/cli/init.rb +21 -7
- data/bundler/lib/bundler/cli/inject.rb +13 -4
- data/bundler/lib/bundler/cli/install.rb +61 -77
- data/bundler/lib/bundler/cli/issue.rb +40 -0
- data/bundler/lib/bundler/cli/list.rb +22 -0
- data/bundler/lib/bundler/cli/lock.rb +4 -2
- data/bundler/lib/bundler/cli/open.rb +2 -2
- data/bundler/lib/bundler/cli/outdated.rb +30 -28
- data/bundler/lib/bundler/cli/package.rb +9 -6
- data/bundler/lib/bundler/cli/platform.rb +1 -0
- data/bundler/lib/bundler/cli/plugin.rb +1 -0
- data/bundler/lib/bundler/cli/pristine.rb +43 -0
- data/bundler/lib/bundler/cli/show.rb +1 -1
- data/bundler/lib/bundler/cli/update.rb +36 -13
- data/bundler/lib/bundler/cli/viz.rb +5 -1
- data/bundler/lib/bundler/compact_index_client.rb +1 -0
- data/bundler/lib/bundler/compact_index_client/cache.rb +1 -2
- data/bundler/lib/bundler/compact_index_client/updater.rb +36 -8
- data/bundler/lib/bundler/compatibility_guard.rb +14 -0
- data/bundler/lib/bundler/constants.rb +1 -0
- data/bundler/lib/bundler/current_ruby.rb +16 -8
- data/bundler/lib/bundler/definition.rb +252 -170
- data/bundler/lib/bundler/dep_proxy.rb +3 -1
- data/bundler/lib/bundler/dependency.rb +7 -7
- data/bundler/lib/bundler/deployment.rb +1 -1
- data/bundler/lib/bundler/deprecate.rb +15 -3
- data/bundler/lib/bundler/dsl.rb +103 -62
- data/bundler/lib/bundler/endpoint_specification.rb +13 -3
- data/bundler/lib/bundler/env.rb +101 -38
- data/bundler/lib/bundler/environment_preserver.rb +27 -6
- data/bundler/lib/bundler/errors.rb +3 -1
- data/bundler/lib/bundler/feature_flag.rb +39 -4
- data/bundler/lib/bundler/fetcher.rb +18 -11
- data/bundler/lib/bundler/fetcher/base.rb +1 -0
- data/bundler/lib/bundler/fetcher/compact_index.rb +2 -12
- data/bundler/lib/bundler/fetcher/dependency.rb +2 -1
- data/bundler/lib/bundler/fetcher/downloader.rb +14 -7
- data/bundler/lib/bundler/fetcher/index.rb +3 -2
- data/bundler/lib/bundler/friendly_errors.rb +7 -2
- data/bundler/lib/bundler/gem_helper.rb +24 -10
- data/bundler/lib/bundler/gem_helpers.rb +1 -0
- data/bundler/lib/bundler/gem_remote_fetcher.rb +1 -0
- data/bundler/lib/bundler/gem_tasks.rb +1 -0
- data/bundler/lib/bundler/gem_version_promoter.rb +13 -0
- data/bundler/lib/bundler/gemdeps.rb +1 -0
- data/bundler/lib/bundler/graph.rb +1 -0
- data/bundler/lib/bundler/index.rb +19 -11
- data/bundler/lib/bundler/injector.rb +54 -30
- data/bundler/lib/bundler/inline.rb +10 -10
- data/bundler/lib/bundler/installer.rb +114 -52
- data/bundler/lib/bundler/installer/gem_installer.rb +14 -4
- data/bundler/lib/bundler/installer/parallel_installer.rb +91 -42
- data/bundler/lib/bundler/installer/standalone.rb +1 -0
- data/bundler/lib/bundler/lazy_specification.rb +17 -4
- data/bundler/lib/bundler/lockfile_generator.rb +95 -0
- data/bundler/lib/bundler/lockfile_parser.rb +49 -35
- data/bundler/lib/bundler/match_platform.rb +1 -0
- data/bundler/lib/bundler/mirror.rb +10 -5
- data/bundler/lib/bundler/plugin.rb +8 -3
- data/bundler/lib/bundler/plugin/api/source.rb +16 -3
- data/bundler/lib/bundler/plugin/index.rb +9 -2
- data/bundler/lib/bundler/plugin/installer.rb +7 -6
- data/bundler/lib/bundler/plugin/source_list.rb +7 -8
- data/bundler/lib/bundler/process_lock.rb +24 -0
- data/bundler/lib/bundler/psyched_yaml.rb +10 -0
- data/bundler/lib/bundler/remote_specification.rb +25 -1
- data/bundler/lib/bundler/resolver.rb +176 -193
- data/bundler/lib/bundler/resolver/spec_group.rb +106 -0
- data/bundler/lib/bundler/retry.rb +1 -0
- data/bundler/lib/bundler/ruby_dsl.rb +1 -0
- data/bundler/lib/bundler/ruby_version.rb +7 -2
- data/bundler/lib/bundler/rubygems_ext.rb +18 -8
- data/bundler/lib/bundler/rubygems_gem_installer.rb +25 -2
- data/bundler/lib/bundler/rubygems_integration.rb +166 -69
- data/bundler/lib/bundler/runtime.rb +29 -19
- data/bundler/lib/bundler/settings.rb +202 -87
- data/bundler/lib/bundler/settings/validator.rb +79 -0
- data/bundler/lib/bundler/setup.rb +4 -7
- data/bundler/lib/bundler/shared_helpers.rb +143 -27
- data/bundler/lib/bundler/similarity_detector.rb +1 -0
- data/bundler/lib/bundler/source.rb +53 -1
- data/bundler/lib/bundler/source/gemspec.rb +1 -0
- data/bundler/lib/bundler/source/git.rb +51 -22
- data/bundler/lib/bundler/source/git/git_proxy.rb +23 -13
- data/bundler/lib/bundler/source/metadata.rb +63 -0
- data/bundler/lib/bundler/source/path.rb +38 -17
- data/bundler/lib/bundler/source/path/installer.rb +4 -2
- data/bundler/lib/bundler/source/rubygems.rb +161 -82
- data/bundler/lib/bundler/source/rubygems/remote.rb +12 -2
- data/bundler/lib/bundler/source_list.rb +75 -15
- data/bundler/lib/bundler/spec_set.rb +37 -21
- data/bundler/lib/bundler/ssl_certs/certificate_manager.rb +2 -1
- data/bundler/lib/bundler/stub_specification.rb +86 -2
- data/bundler/lib/bundler/templates/.document +1 -0
- data/bundler/lib/bundler/templates/Executable +13 -1
- data/bundler/lib/bundler/templates/Executable.bundler +105 -0
- data/bundler/lib/bundler/templates/Executable.standalone +5 -5
- data/bundler/lib/bundler/templates/Gemfile +3 -0
- data/bundler/lib/bundler/templates/gems.rb +8 -0
- data/bundler/lib/bundler/templates/newgem/Gemfile.tt +4 -2
- data/bundler/lib/bundler/templates/newgem/LICENSE.txt.tt +1 -1
- data/bundler/lib/bundler/templates/newgem/README.md.tt +14 -8
- data/bundler/lib/bundler/templates/newgem/Rakefile.tt +5 -5
- data/bundler/lib/bundler/templates/newgem/ext/newgem/newgem.c.tt +4 -4
- data/bundler/lib/bundler/templates/newgem/ext/newgem/newgem.h.tt +3 -3
- data/bundler/lib/bundler/templates/newgem/gitignore.tt +0 -1
- data/bundler/lib/bundler/templates/newgem/lib/newgem.rb.tt +6 -6
- data/bundler/lib/bundler/templates/newgem/lib/newgem/version.rb.tt +4 -4
- data/bundler/lib/bundler/templates/newgem/newgem.gemspec.tt +21 -12
- data/bundler/lib/bundler/templates/newgem/rspec.tt +1 -0
- data/bundler/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt +0 -2
- data/bundler/lib/bundler/templates/newgem/spec/spec_helper.rb.tt +3 -0
- data/bundler/lib/bundler/templates/newgem/test/newgem_test.rb.tt +1 -1
- data/bundler/lib/bundler/templates/newgem/test/test_helper.rb.tt +3 -3
- data/bundler/lib/bundler/templates/newgem/{.travis.yml.tt → travis.yml.tt} +2 -0
- data/bundler/lib/bundler/ui.rb +1 -0
- data/bundler/lib/bundler/ui/rg_proxy.rb +1 -0
- data/bundler/lib/bundler/ui/shell.rb +26 -10
- data/bundler/lib/bundler/ui/silent.rb +12 -1
- data/bundler/lib/bundler/uri_credentials_filter.rb +1 -0
- data/bundler/lib/bundler/vendor/fileutils/lib/fileutils.rb +1638 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo.rb +2 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/compatibility.rb +26 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb +7 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb +1 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb +16 -5
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/action.rb +1 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb +10 -2
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb +1 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb +1 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb +1 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/log.rb +1 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb +1 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb +1 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb +16 -5
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb +75 -7
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb +2 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/modules/specification_provider.rb +1 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/modules/ui.rb +3 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +501 -138
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb +1 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/state.rb +8 -4
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +3 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor.rb +46 -21
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions.rb +24 -22
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/create_file.rb +2 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/create_link.rb +2 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/directory.rb +2 -2
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/empty_directory.rb +16 -8
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/file_manipulation.rb +66 -18
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb +17 -15
- data/bundler/lib/bundler/vendor/thor/lib/thor/base.rb +55 -32
- data/bundler/lib/bundler/vendor/thor/lib/thor/command.rb +13 -11
- data/bundler/lib/bundler/vendor/thor/lib/thor/core_ext/hash_with_indifferent_access.rb +21 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/core_ext/io_binary_read.rb +7 -5
- data/bundler/lib/bundler/vendor/thor/lib/thor/core_ext/ordered_hash.rb +94 -63
- data/bundler/lib/bundler/vendor/thor/lib/thor/error.rb +3 -3
- data/bundler/lib/bundler/vendor/thor/lib/thor/group.rb +13 -13
- data/bundler/lib/bundler/vendor/thor/lib/thor/invocation.rb +4 -5
- data/bundler/lib/bundler/vendor/thor/lib/thor/line_editor/basic.rb +2 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/parser/argument.rb +4 -7
- data/bundler/lib/bundler/vendor/thor/lib/thor/parser/arguments.rb +16 -16
- data/bundler/lib/bundler/vendor/thor/lib/thor/parser/option.rb +42 -21
- data/bundler/lib/bundler/vendor/thor/lib/thor/parser/options.rb +13 -10
- data/bundler/lib/bundler/vendor/thor/lib/thor/runner.rb +31 -29
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell/basic.rb +49 -33
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell/color.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell/html.rb +4 -4
- data/bundler/lib/bundler/vendor/thor/lib/thor/util.rb +8 -7
- data/bundler/lib/bundler/vendor/thor/lib/thor/version.rb +1 -1
- data/bundler/lib/bundler/vendored_fileutils.rb +9 -0
- data/bundler/lib/bundler/vendored_molinillo.rb +1 -0
- data/bundler/lib/bundler/vendored_persistent.rb +35 -0
- data/bundler/lib/bundler/vendored_thor.rb +6 -2
- data/bundler/lib/bundler/version.rb +19 -2
- data/bundler/lib/bundler/version_ranges.rb +76 -0
- data/bundler/lib/bundler/vlad.rb +5 -0
- data/bundler/lib/bundler/worker.rb +3 -1
- data/bundler/lib/bundler/yaml_serializer.rb +3 -3
- data/bundler/man/bundle-add.ronn +29 -0
- data/bundler/man/bundle-binstubs.ronn +15 -1
- data/bundler/man/bundle-check.ronn +26 -0
- data/bundler/man/bundle-clean.ronn +18 -0
- data/bundler/man/bundle-config.ronn +193 -69
- data/bundler/man/bundle-doctor.ronn +33 -0
- data/bundler/man/bundle-exec.ronn +10 -3
- data/bundler/man/bundle-gem.ronn +3 -2
- data/bundler/man/bundle-info.ronn +17 -0
- data/bundler/man/bundle-init.ronn +29 -0
- data/bundler/man/bundle-inject.ronn +22 -0
- data/bundler/man/bundle-install.ronn +44 -35
- data/bundler/man/bundle-list.ronn +15 -0
- data/bundler/man/bundle-lock.ronn +1 -1
- data/bundler/man/bundle-open.ronn +19 -0
- data/bundler/man/bundle-outdated.ronn +2 -2
- data/bundler/man/bundle-package.ronn +7 -2
- data/bundler/man/bundle-pristine.ronn +34 -0
- data/bundler/man/bundle-show.ronn +21 -0
- data/bundler/man/bundle-update.ronn +24 -17
- data/bundler/man/bundle-viz.ronn +30 -0
- data/bundler/man/bundle.ronn +36 -45
- data/bundler/man/gemfile.5.ronn +77 -71
- data/lib/rubygems.rb +102 -46
- data/lib/rubygems/basic_specification.rb +8 -4
- data/lib/rubygems/bundler_version_finder.rb +99 -0
- data/lib/rubygems/command.rb +10 -2
- data/lib/rubygems/command_manager.rb +8 -4
- data/lib/rubygems/commands/cert_command.rb +31 -6
- data/lib/rubygems/commands/cleanup_command.rb +10 -3
- data/lib/rubygems/commands/generate_index_command.rb +1 -1
- data/lib/rubygems/commands/help_command.rb +1 -1
- data/lib/rubygems/commands/install_command.rb +7 -0
- data/lib/rubygems/commands/open_command.rb +1 -1
- data/lib/rubygems/commands/owner_command.rb +7 -2
- data/lib/rubygems/commands/pristine_command.rb +11 -8
- data/lib/rubygems/commands/push_command.rb +39 -5
- data/lib/rubygems/commands/query_command.rb +17 -17
- data/lib/rubygems/commands/setup_command.rb +174 -69
- data/lib/rubygems/commands/signin_command.rb +33 -0
- data/lib/rubygems/commands/signout_command.rb +33 -0
- data/lib/rubygems/commands/sources_command.rb +1 -1
- data/lib/rubygems/commands/uninstall_command.rb +5 -4
- data/lib/rubygems/commands/unpack_command.rb +19 -7
- data/lib/rubygems/commands/update_command.rb +1 -1
- data/lib/rubygems/commands/which_command.rb +1 -1
- data/lib/rubygems/commands/yank_command.rb +4 -11
- data/lib/rubygems/config_file.rb +15 -26
- data/lib/rubygems/core_ext/kernel_require.rb +12 -16
- data/lib/rubygems/dependency.rb +3 -0
- data/lib/rubygems/dependency_installer.rb +8 -2
- data/lib/rubygems/dependency_list.rb +1 -1
- data/lib/rubygems/errors.rb +3 -0
- data/lib/rubygems/exceptions.rb +11 -1
- data/lib/rubygems/ext/builder.rb +2 -2
- data/lib/rubygems/ext/ext_conf_builder.rb +2 -4
- data/lib/rubygems/ext/rake_builder.rb +1 -1
- data/lib/rubygems/gem_runner.rb +5 -1
- data/lib/rubygems/gemcutter_utilities.rb +5 -2
- data/lib/rubygems/indexer.rb +6 -5
- data/lib/rubygems/install_update_options.rb +6 -29
- data/lib/rubygems/installer.rb +60 -13
- data/lib/rubygems/installer_test_case.rb +6 -3
- data/lib/rubygems/package.rb +55 -8
- data/lib/rubygems/package/file_source.rb +2 -2
- data/lib/rubygems/package/old.rb +3 -3
- data/lib/rubygems/package/tar_header.rb +17 -10
- data/lib/rubygems/package/tar_writer.rb +4 -3
- data/lib/rubygems/platform.rb +1 -1
- data/lib/rubygems/remote_fetcher.rb +2 -2
- data/lib/rubygems/request.rb +1 -1
- data/lib/rubygems/request_set.rb +47 -19
- data/lib/rubygems/request_set/gem_dependency_api.rb +3 -3
- data/lib/rubygems/request_set/lockfile.rb +1 -1
- data/lib/rubygems/requirement.rb +19 -4
- data/lib/rubygems/resolver.rb +24 -3
- data/lib/rubygems/resolver/api_specification.rb +5 -0
- data/lib/rubygems/resolver/installer_set.rb +4 -6
- data/lib/rubygems/safe_yaml.rb +51 -0
- data/lib/rubygems/security.rb +18 -6
- data/lib/rubygems/security/trust_dir.rb +1 -1
- data/lib/rubygems/security_option.rb +43 -0
- data/lib/rubygems/server.rb +21 -17
- data/lib/rubygems/source.rb +9 -6
- data/lib/rubygems/source/git.rb +2 -1
- data/lib/rubygems/source/local.rb +38 -35
- data/lib/rubygems/source/lock.rb +4 -1
- data/lib/rubygems/source_local.rb +3 -1
- data/lib/rubygems/source_specific_file.rb +3 -2
- data/lib/rubygems/spec_fetcher.rb +7 -3
- data/lib/rubygems/specification.rb +315 -249
- data/lib/rubygems/ssl_certs/{index.rubygems.org → rubygems.org}/GlobalSignRootCA.pem +0 -0
- data/lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA_R3.pem +21 -0
- data/lib/rubygems/stub_specification.rb +4 -3
- data/lib/rubygems/test_case.rb +51 -11
- data/lib/rubygems/test_utilities.rb +2 -2
- data/lib/rubygems/text.rb +14 -1
- data/lib/rubygems/user_interaction.rb +24 -15
- data/lib/rubygems/util.rb +6 -16
- data/lib/rubygems/util/licenses.rb +72 -4
- data/lib/rubygems/validator.rb +3 -3
- data/lib/rubygems/version.rb +24 -4
- data/lib/rubygems/version_option.rb +6 -1
- data/lib/ubygems.rb +3 -0
- data/setup.rb +1 -1
- data/test/rubygems/private3072_key.pem +40 -0
- data/test/rubygems/public3072_cert.pem +25 -0
- data/test/rubygems/test_bundled_ca.rb +7 -4
- data/test/rubygems/test_config.rb +1 -1
- data/test/rubygems/test_gem.rb +158 -39
- data/test/rubygems/test_gem_bundler_version_finder.rb +126 -0
- data/test/rubygems/test_gem_command.rb +7 -1
- data/test/rubygems/test_gem_command_manager.rb +2 -2
- data/test/rubygems/test_gem_commands_build_command.rb +29 -1
- data/test/rubygems/test_gem_commands_cert_command.rb +64 -0
- data/test/rubygems/test_gem_commands_cleanup_command.rb +44 -1
- data/test/rubygems/test_gem_commands_install_command.rb +73 -2
- data/test/rubygems/test_gem_commands_open_command.rb +2 -1
- data/test/rubygems/test_gem_commands_owner_command.rb +25 -0
- data/test/rubygems/test_gem_commands_pristine_command.rb +1 -1
- data/test/rubygems/test_gem_commands_push_command.rb +25 -5
- data/test/rubygems/test_gem_commands_query_command.rb +154 -1
- data/test/rubygems/test_gem_commands_setup_command.rb +140 -10
- data/test/rubygems/test_gem_commands_signin_command.rb +98 -0
- data/test/rubygems/test_gem_commands_signout_command.rb +37 -0
- data/test/rubygems/test_gem_commands_sources_command.rb +52 -0
- data/test/rubygems/test_gem_commands_uninstall_command.rb +15 -3
- data/test/rubygems/test_gem_commands_update_command.rb +1 -7
- data/test/rubygems/test_gem_commands_which_command.rb +3 -3
- data/test/rubygems/test_gem_dependency.rb +28 -0
- data/test/rubygems/test_gem_dependency_installer.rb +1 -1
- data/test/rubygems/test_gem_doctor.rb +2 -2
- data/test/rubygems/test_gem_ext_builder.rb +8 -8
- data/test/rubygems/test_gem_ext_configure_builder.rb +1 -1
- data/test/rubygems/test_gem_ext_rake_builder.rb +2 -6
- data/test/rubygems/test_gem_gemcutter_utilities.rb +4 -4
- data/test/rubygems/test_gem_indexer.rb +1 -2
- data/test/rubygems/test_gem_install_update_options.rb +6 -1
- data/test/rubygems/test_gem_installer.rb +168 -31
- data/test/rubygems/test_gem_package.rb +183 -26
- data/test/rubygems/test_gem_package_old.rb +1 -1
- data/test/rubygems/test_gem_package_tar_header.rb +21 -0
- data/test/rubygems/test_gem_rdoc.rb +2 -0
- data/test/rubygems/test_gem_remote_fetcher.rb +24 -5
- data/test/rubygems/test_gem_request.rb +5 -2
- data/test/rubygems/test_gem_request_connection_pools.rb +6 -7
- data/test/rubygems/test_gem_request_set.rb +7 -7
- data/test/rubygems/test_gem_request_set_gem_dependency_api.rb +3 -3
- data/test/rubygems/test_gem_request_set_lockfile.rb +4 -4
- data/test/rubygems/test_gem_request_set_lockfile_parser.rb +1 -1
- data/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb +1 -1
- data/test/rubygems/test_gem_requirement.rb +12 -0
- data/test/rubygems/test_gem_resolver.rb +26 -0
- data/test/rubygems/test_gem_resolver_api_specification.rb +24 -0
- data/test/rubygems/test_gem_resolver_conflict.rb +1 -1
- data/test/rubygems/test_gem_resolver_git_specification.rb +1 -1
- data/test/rubygems/test_gem_resolver_installer_set.rb +1 -1
- data/test/rubygems/test_gem_security.rb +5 -0
- data/test/rubygems/test_gem_security_policy.rb +27 -27
- data/test/rubygems/test_gem_security_signer.rb +6 -6
- data/test/rubygems/test_gem_security_trust_dir.rb +2 -2
- data/test/rubygems/test_gem_server.rb +194 -12
- data/test/rubygems/test_gem_source.rb +12 -3
- data/test/rubygems/test_gem_source_git.rb +1 -1
- data/test/rubygems/test_gem_spec_fetcher.rb +20 -0
- data/test/rubygems/test_gem_specification.rb +180 -42
- data/test/rubygems/test_gem_stream_ui.rb +8 -8
- data/test/rubygems/test_gem_stub_specification.rb +26 -8
- data/test/rubygems/test_gem_text.rb +16 -0
- data/test/rubygems/test_gem_util.rb +26 -0
- data/test/rubygems/test_gem_version.rb +68 -9
- data/test/rubygems/test_gem_version_option.rb +15 -0
- data/test/rubygems/test_kernel.rb +30 -0
- data/test/rubygems/test_require.rb +70 -21
- data/util/ci +1 -0
- data/util/generate_spdx_license_list.rb +16 -6
- data/util/update_bundled_ca_certificates.rb +1 -3
- metadata +61 -57
- data/README.rdoc +0 -54
- data/bundler/DEVELOPMENT.md +0 -150
- data/bundler/ISSUES.md +0 -117
- data/bundler/lib/bundler/postit_trampoline.rb +0 -73
- data/bundler/lib/bundler/vendor/postit/lib/postit.rb +0 -15
- data/bundler/lib/bundler/vendor/postit/lib/postit/environment.rb +0 -44
- data/bundler/lib/bundler/vendor/postit/lib/postit/installer.rb +0 -28
- data/bundler/lib/bundler/vendor/postit/lib/postit/parser.rb +0 -21
- data/bundler/lib/bundler/vendor/postit/lib/postit/setup.rb +0 -12
- data/bundler/lib/bundler/vendor/postit/lib/postit/version.rb +0 -3
- data/bundler/man/index.txt +0 -8
- data/lib/rubygems/ssl_certs/rubygems.global.ssl.fastly.net/DigiCertHighAssuranceEVRootCA.pem +0 -23
- data/lib/rubygems/ssl_certs/rubygems.org/AddTrustExternalCARoot.pem +0 -25
@@ -1,19 +1,24 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
2
3
|
module Bundler
|
3
4
|
# used for Creating Specifications from the Gemcutter Endpoint
|
4
5
|
class EndpointSpecification < Gem::Specification
|
5
6
|
ILLFORMED_MESSAGE = 'Ill-formed requirement ["#<YAML::Syck::DefaultKey'.freeze
|
6
7
|
include MatchPlatform
|
7
8
|
|
8
|
-
attr_reader :name, :version, :platform, :
|
9
|
-
attr_accessor :source, :remote
|
9
|
+
attr_reader :name, :version, :platform, :required_rubygems_version, :required_ruby_version, :checksum
|
10
|
+
attr_accessor :source, :remote, :dependencies
|
10
11
|
|
11
12
|
def initialize(name, version, platform, dependencies, metadata = nil)
|
13
|
+
super()
|
12
14
|
@name = name
|
13
15
|
@version = Gem::Version.create version
|
14
16
|
@platform = platform
|
15
17
|
@dependencies = dependencies.map {|dep, reqs| build_dependency(dep, reqs) }
|
16
18
|
|
19
|
+
@loaded_from = nil
|
20
|
+
@remote_specification = nil
|
21
|
+
|
17
22
|
parse_metadata(metadata)
|
18
23
|
end
|
19
24
|
|
@@ -71,6 +76,8 @@ module Bundler
|
|
71
76
|
@remote_specification.post_install_message
|
72
77
|
elsif _local_specification
|
73
78
|
_local_specification.post_install_message
|
79
|
+
else
|
80
|
+
super
|
74
81
|
end
|
75
82
|
end
|
76
83
|
|
@@ -80,6 +87,8 @@ module Bundler
|
|
80
87
|
@remote_specification.extensions
|
81
88
|
elsif _local_specification
|
82
89
|
_local_specification.extensions
|
90
|
+
else
|
91
|
+
super
|
83
92
|
end
|
84
93
|
end
|
85
94
|
|
@@ -91,6 +100,7 @@ module Bundler
|
|
91
100
|
end
|
92
101
|
|
93
102
|
def __swap__(spec)
|
103
|
+
SharedHelpers.ensure_same_dependencies(self, dependencies, spec.dependencies)
|
94
104
|
@remote_specification = spec
|
95
105
|
end
|
96
106
|
|
@@ -113,7 +123,7 @@ module Bundler
|
|
113
123
|
@required_ruby_version = Gem::Requirement.new(v)
|
114
124
|
end
|
115
125
|
end
|
116
|
-
rescue => e
|
126
|
+
rescue StandardError => e
|
117
127
|
raise GemspecError, "There was an error parsing the metadata for the gem #{name} (#{version}): #{e.class}\n#{e}\nThe metadata was #{data.inspect}"
|
118
128
|
end
|
119
129
|
|
data/bundler/lib/bundler/env.rb
CHANGED
@@ -1,49 +1,48 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
2
3
|
require "bundler/rubygems_integration"
|
3
4
|
require "bundler/source/git/git_proxy"
|
4
5
|
|
5
6
|
module Bundler
|
6
7
|
class Env
|
7
|
-
def write(io)
|
8
|
-
io.write report
|
8
|
+
def self.write(io)
|
9
|
+
io.write report
|
9
10
|
end
|
10
11
|
|
11
|
-
def report(options = {})
|
12
|
-
print_gemfile = options.delete(:print_gemfile)
|
13
|
-
print_gemspecs = options.delete(:print_gemspecs)
|
14
|
-
|
15
|
-
out = String.new("## Environment\n\n```\n")
|
16
|
-
out << "Bundler #{Bundler::VERSION}\n"
|
17
|
-
out << "Rubygems #{Gem::VERSION}\n"
|
18
|
-
out << "Ruby #{ruby_version}"
|
19
|
-
out << "GEM_HOME #{ENV["GEM_HOME"]}\n" unless ENV["GEM_HOME"].nil? || ENV["GEM_HOME"].empty?
|
20
|
-
out << "GEM_PATH #{ENV["GEM_PATH"]}\n" unless ENV["GEM_PATH"] == ENV["GEM_HOME"]
|
21
|
-
out << "RVM #{ENV["rvm_version"]}\n" if ENV["rvm_version"]
|
22
|
-
out << "Git #{git_version}\n"
|
23
|
-
out << "Platform #{Gem::Platform.local}\n"
|
24
|
-
out << "OpenSSL #{OpenSSL::OPENSSL_VERSION}\n" if defined?(OpenSSL::OPENSSL_VERSION)
|
25
|
-
%w(rubygems-bundler open_gem).each do |name|
|
26
|
-
specs = Bundler.rubygems.find_name(name)
|
27
|
-
out << "#{name} (#{specs.map(&:version).join(",")})\n" unless specs.empty?
|
28
|
-
end
|
12
|
+
def self.report(options = {})
|
13
|
+
print_gemfile = options.delete(:print_gemfile) { true }
|
14
|
+
print_gemspecs = options.delete(:print_gemspecs) { true }
|
29
15
|
|
30
|
-
out
|
16
|
+
out = String.new
|
17
|
+
append_formatted_table("Environment", environment, out)
|
18
|
+
append_formatted_table("Bundler Build Metadata", BuildMetadata.to_h, out)
|
31
19
|
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
20
|
+
unless Bundler.settings.all.empty?
|
21
|
+
out << "\n## Bundler settings\n\n```\n"
|
22
|
+
Bundler.settings.all.each do |setting|
|
23
|
+
out << setting << "\n"
|
24
|
+
Bundler.settings.pretty_values_for(setting).each do |line|
|
25
|
+
out << " " << line << "\n"
|
26
|
+
end
|
37
27
|
end
|
28
|
+
out << "```\n"
|
38
29
|
end
|
39
|
-
out << "```\n"
|
40
30
|
|
41
31
|
return out unless SharedHelpers.in_bundle?
|
42
32
|
|
43
33
|
if print_gemfile
|
34
|
+
gemfiles = [Bundler.default_gemfile]
|
35
|
+
begin
|
36
|
+
gemfiles = Bundler.definition.gemfiles
|
37
|
+
rescue GemfileNotFound
|
38
|
+
nil
|
39
|
+
end
|
40
|
+
|
44
41
|
out << "\n## Gemfile\n"
|
45
|
-
|
46
|
-
|
42
|
+
gemfiles.each do |gemfile|
|
43
|
+
out << "\n### #{Pathname.new(gemfile).relative_path_from(SharedHelpers.pwd)}\n\n"
|
44
|
+
out << "```ruby\n" << read_file(gemfile).chomp << "\n```\n"
|
45
|
+
end
|
47
46
|
|
48
47
|
out << "\n### #{Bundler.default_lockfile.relative_path_from(SharedHelpers.pwd)}\n\n"
|
49
48
|
out << "```\n" << read_file(Bundler.default_lockfile).chomp << "\n```\n"
|
@@ -61,32 +60,96 @@ module Bundler
|
|
61
60
|
out
|
62
61
|
end
|
63
62
|
|
64
|
-
|
65
|
-
|
66
|
-
def read_file(filename)
|
67
|
-
File.read(filename.to_s).strip
|
63
|
+
def self.read_file(filename)
|
64
|
+
Bundler.read_file(filename.to_s).strip
|
68
65
|
rescue Errno::ENOENT
|
69
66
|
"<No #{filename} found>"
|
70
|
-
rescue => e
|
67
|
+
rescue RuntimeError => e
|
71
68
|
"#{e.class}: #{e.message}"
|
72
69
|
end
|
73
70
|
|
74
|
-
def ruby_version
|
71
|
+
def self.ruby_version
|
75
72
|
str = String.new("#{RUBY_VERSION}")
|
76
73
|
if RUBY_VERSION < "1.9"
|
77
74
|
str << " (#{RUBY_RELEASE_DATE}"
|
78
75
|
str << " patchlevel #{RUBY_PATCHLEVEL}" if defined? RUBY_PATCHLEVEL
|
79
|
-
str << ") [#{RUBY_PLATFORM}]
|
76
|
+
str << ") [#{RUBY_PLATFORM}]"
|
80
77
|
else
|
81
78
|
str << "p#{RUBY_PATCHLEVEL}" if defined? RUBY_PATCHLEVEL
|
82
|
-
str << " (#{RUBY_RELEASE_DATE} revision #{RUBY_REVISION}) [#{RUBY_PLATFORM}]
|
79
|
+
str << " (#{RUBY_RELEASE_DATE} revision #{RUBY_REVISION}) [#{RUBY_PLATFORM}]"
|
83
80
|
end
|
84
81
|
end
|
85
82
|
|
86
|
-
def git_version
|
83
|
+
def self.git_version
|
87
84
|
Bundler::Source::Git::GitProxy.new(nil, nil, nil).full_version
|
88
85
|
rescue Bundler::Source::Git::GitNotInstalledError
|
89
86
|
"not installed"
|
90
87
|
end
|
88
|
+
|
89
|
+
def self.version_of(script)
|
90
|
+
return "not installed" unless Bundler.which(script)
|
91
|
+
`#{script} --version`.chomp
|
92
|
+
end
|
93
|
+
|
94
|
+
def self.chruby_version
|
95
|
+
return "not installed" unless Bundler.which("chruby-exec")
|
96
|
+
`chruby-exec -- chruby --version`.
|
97
|
+
sub(/.*^chruby: (#{Gem::Version::VERSION_PATTERN}).*/m, '\1')
|
98
|
+
end
|
99
|
+
|
100
|
+
def self.environment
|
101
|
+
out = []
|
102
|
+
|
103
|
+
out << ["Bundler", Bundler::VERSION]
|
104
|
+
out << [" Platforms", Gem.platforms.join(", ")]
|
105
|
+
out << ["Ruby", ruby_version]
|
106
|
+
out << [" Full Path", Gem.ruby]
|
107
|
+
out << [" Config Dir", Pathname.new(Gem::ConfigFile::SYSTEM_WIDE_CONFIG_FILE).dirname]
|
108
|
+
out << ["RubyGems", Gem::VERSION]
|
109
|
+
out << [" Gem Home", ENV.fetch("GEM_HOME") { Gem.dir }]
|
110
|
+
out << [" Gem Path", ENV.fetch("GEM_PATH") { Gem.path.join(File::PATH_SEPARATOR) }]
|
111
|
+
out << [" User Path", Gem.user_dir]
|
112
|
+
out << [" Bin Dir", Gem.bindir]
|
113
|
+
if defined?(OpenSSL)
|
114
|
+
out << ["OpenSSL"]
|
115
|
+
out << [" Compiled", OpenSSL::OPENSSL_VERSION] if defined?(OpenSSL::OPENSSL_VERSION)
|
116
|
+
out << [" Loaded", OpenSSL::OPENSSL_LIBRARY_VERSION] if defined?(OpenSSL::OPENSSL_LIBRARY_VERSION)
|
117
|
+
out << [" Cert File", OpenSSL::X509::DEFAULT_CERT_FILE] if defined?(OpenSSL::X509::DEFAULT_CERT_FILE)
|
118
|
+
out << [" Cert Dir", OpenSSL::X509::DEFAULT_CERT_DIR] if defined?(OpenSSL::X509::DEFAULT_CERT_DIR)
|
119
|
+
end
|
120
|
+
out << ["Tools"]
|
121
|
+
out << [" Git", git_version]
|
122
|
+
out << [" RVM", ENV.fetch("rvm_version") { version_of("rvm") }]
|
123
|
+
out << [" rbenv", version_of("rbenv")]
|
124
|
+
out << [" chruby", chruby_version]
|
125
|
+
|
126
|
+
%w[rubygems-bundler open_gem].each do |name|
|
127
|
+
specs = Bundler.rubygems.find_name(name)
|
128
|
+
out << [" #{name}", "(#{specs.map(&:version).join(",")})"] unless specs.empty?
|
129
|
+
end
|
130
|
+
if (exe = caller.last.split(":").first) && exe =~ %r{(exe|bin)/bundler?\z}
|
131
|
+
shebang = File.read(exe).lines.first
|
132
|
+
shebang.sub!(/^#!\s*/, "")
|
133
|
+
unless shebang.start_with?(Gem.ruby, "/usr/bin/env ruby")
|
134
|
+
out << ["Gem.ruby", Gem.ruby]
|
135
|
+
out << ["bundle #!", shebang]
|
136
|
+
end
|
137
|
+
end
|
138
|
+
|
139
|
+
out
|
140
|
+
end
|
141
|
+
|
142
|
+
def self.append_formatted_table(title, pairs, out)
|
143
|
+
return if pairs.empty?
|
144
|
+
out << "\n" unless out.empty?
|
145
|
+
out << "## #{title}\n\n```\n"
|
146
|
+
ljust = pairs.map {|k, _v| k.to_s.length }.max
|
147
|
+
pairs.each do |k, v|
|
148
|
+
out << "#{k.to_s.ljust(ljust)} #{v}\n"
|
149
|
+
end
|
150
|
+
out << "```\n"
|
151
|
+
end
|
152
|
+
|
153
|
+
private_class_method :read_file, :ruby_version, :git_version, :append_formatted_table, :version_of, :chruby_version
|
91
154
|
end
|
92
155
|
end
|
@@ -1,12 +1,29 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
2
3
|
module Bundler
|
3
4
|
class EnvironmentPreserver
|
5
|
+
INTENTIONALLY_NIL = "BUNDLER_ENVIRONMENT_PRESERVER_INTENTIONALLY_NIL".freeze
|
6
|
+
BUNDLER_KEYS = %w[
|
7
|
+
BUNDLE_BIN_PATH
|
8
|
+
BUNDLE_GEMFILE
|
9
|
+
BUNDLER_ORIG_MANPATH
|
10
|
+
BUNDLER_VERSION
|
11
|
+
GEM_HOME
|
12
|
+
GEM_PATH
|
13
|
+
MANPATH
|
14
|
+
PATH
|
15
|
+
RB_USER_INSTALL
|
16
|
+
RUBYLIB
|
17
|
+
RUBYOPT
|
18
|
+
].map(&:freeze).freeze
|
19
|
+
BUNDLER_PREFIX = "BUNDLER_ORIG_".freeze
|
20
|
+
|
4
21
|
# @param env [ENV]
|
5
22
|
# @param keys [Array<String>]
|
6
23
|
def initialize(env, keys)
|
7
24
|
@original = env.to_hash
|
8
25
|
@keys = keys
|
9
|
-
@prefix =
|
26
|
+
@prefix = BUNDLER_PREFIX
|
10
27
|
end
|
11
28
|
|
12
29
|
# @return [Hash]
|
@@ -14,9 +31,10 @@ module Bundler
|
|
14
31
|
env = @original.clone
|
15
32
|
@keys.each do |key|
|
16
33
|
value = env[key]
|
17
|
-
|
18
|
-
|
19
|
-
|
34
|
+
if !value.nil? && !value.empty?
|
35
|
+
env[@prefix + key] ||= value
|
36
|
+
elsif value.nil?
|
37
|
+
env[@prefix + key] ||= INTENTIONALLY_NIL
|
20
38
|
end
|
21
39
|
end
|
22
40
|
env
|
@@ -27,10 +45,13 @@ module Bundler
|
|
27
45
|
env = @original.clone
|
28
46
|
@keys.each do |key|
|
29
47
|
value_original = env[@prefix + key]
|
30
|
-
|
48
|
+
next if value_original.nil? || value_original.empty?
|
49
|
+
if value_original == INTENTIONALLY_NIL
|
50
|
+
env.delete(key)
|
51
|
+
else
|
31
52
|
env[key] = value_original
|
32
|
-
env.delete(@prefix + key)
|
33
53
|
end
|
54
|
+
env.delete(@prefix + key)
|
34
55
|
end
|
35
56
|
env
|
36
57
|
end
|
@@ -1,4 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
2
3
|
module Bundler
|
3
4
|
class BundlerError < StandardError
|
4
5
|
def self.status_code(code)
|
@@ -54,6 +55,7 @@ module Bundler
|
|
54
55
|
class PluginError < BundlerError; status_code(29); end
|
55
56
|
class SudoNotPermittedError < BundlerError; status_code(30); end
|
56
57
|
class ThreadCreationError < BundlerError; status_code(33); end
|
58
|
+
class APIResponseMismatchError < BundlerError; status_code(34); end
|
57
59
|
class GemfileEvalError < GemfileError; end
|
58
60
|
class MarshalError < StandardError; end
|
59
61
|
|
@@ -137,7 +139,7 @@ module Bundler
|
|
137
139
|
class NoSpaceOnDeviceError < PermissionError
|
138
140
|
def message
|
139
141
|
"There was an error while trying to #{action} `#{@path}`. " \
|
140
|
-
"There was
|
142
|
+
"There was insufficient space remaining on the device."
|
141
143
|
end
|
142
144
|
|
143
145
|
status_code(31)
|
@@ -1,22 +1,59 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
2
3
|
module Bundler
|
3
4
|
class FeatureFlag
|
4
5
|
def self.settings_flag(flag, &default)
|
5
6
|
unless Bundler::Settings::BOOL_KEYS.include?(flag.to_s)
|
6
7
|
raise "Cannot use `#{flag}` as a settings feature flag since it isn't a bool key"
|
7
8
|
end
|
8
|
-
|
9
|
-
|
9
|
+
|
10
|
+
settings_method("#{flag}?", flag, &default)
|
11
|
+
end
|
12
|
+
private_class_method :settings_flag
|
13
|
+
|
14
|
+
def self.settings_option(key, &default)
|
15
|
+
settings_method(key, key, &default)
|
16
|
+
end
|
17
|
+
private_class_method :settings_option
|
18
|
+
|
19
|
+
def self.settings_method(name, key, &default)
|
20
|
+
define_method(name) do
|
21
|
+
value = Bundler.settings[key]
|
10
22
|
value = instance_eval(&default) if value.nil? && !default.nil?
|
11
23
|
value
|
12
24
|
end
|
13
25
|
end
|
26
|
+
private_class_method :settings_method
|
14
27
|
|
15
28
|
(1..10).each {|v| define_method("bundler_#{v}_mode?") { major_version >= v } }
|
16
29
|
|
30
|
+
settings_flag(:allow_bundler_dependency_conflicts) { bundler_2_mode? }
|
17
31
|
settings_flag(:allow_offline_install) { bundler_2_mode? }
|
32
|
+
settings_flag(:auto_clean_without_path) { bundler_2_mode? }
|
33
|
+
settings_flag(:cache_all) { bundler_2_mode? }
|
34
|
+
settings_flag(:cache_command_is_package) { bundler_2_mode? }
|
35
|
+
settings_flag(:console_command) { !bundler_2_mode? }
|
36
|
+
settings_flag(:default_install_uses_path) { bundler_2_mode? }
|
37
|
+
settings_flag(:deployment_means_frozen) { bundler_2_mode? }
|
38
|
+
settings_flag(:disable_multisource) { bundler_2_mode? }
|
39
|
+
settings_flag(:error_on_stderr) { bundler_2_mode? }
|
40
|
+
settings_flag(:forget_cli_options) { bundler_2_mode? }
|
41
|
+
settings_flag(:global_gem_cache) { bundler_2_mode? }
|
42
|
+
settings_flag(:init_gems_rb) { bundler_2_mode? }
|
43
|
+
settings_flag(:list_command) { bundler_2_mode? }
|
44
|
+
settings_flag(:lockfile_uses_separate_rubygems_sources) { bundler_2_mode? }
|
18
45
|
settings_flag(:only_update_to_newer_versions) { bundler_2_mode? }
|
19
46
|
settings_flag(:plugins) { @bundler_version >= Gem::Version.new("1.14") }
|
47
|
+
settings_flag(:prefer_gems_rb) { bundler_2_mode? }
|
48
|
+
settings_flag(:print_only_version_number) { bundler_2_mode? }
|
49
|
+
settings_flag(:setup_makes_kernel_gem_public) { !bundler_2_mode? }
|
50
|
+
settings_flag(:skip_default_git_sources) { bundler_2_mode? }
|
51
|
+
settings_flag(:specific_platform) { bundler_2_mode? }
|
52
|
+
settings_flag(:suppress_install_using_messages) { bundler_2_mode? }
|
53
|
+
settings_flag(:unlock_source_unlocks_spec) { !bundler_2_mode? }
|
54
|
+
settings_flag(:update_requires_all_flag) { bundler_2_mode? }
|
55
|
+
|
56
|
+
settings_option(:default_cli_command) { bundler_2_mode? ? :cli_help : :install }
|
20
57
|
|
21
58
|
def initialize(bundler_version)
|
22
59
|
@bundler_version = Gem::Version.create(bundler_version)
|
@@ -26,7 +63,5 @@ module Bundler
|
|
26
63
|
@bundler_version.segments.first
|
27
64
|
end
|
28
65
|
private :major_version
|
29
|
-
|
30
|
-
class << self; private :settings_flag; end
|
31
66
|
end
|
32
67
|
end
|
@@ -1,4 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
2
3
|
require "bundler/vendored_persistent"
|
3
4
|
require "cgi"
|
4
5
|
require "securerandom"
|
@@ -95,11 +96,11 @@ module Bundler
|
|
95
96
|
|
96
97
|
uri = URI.parse("#{remote_uri}#{Gem::MARSHAL_SPEC_DIR}#{spec_file_name}.rz")
|
97
98
|
if uri.scheme == "file"
|
98
|
-
Bundler.load_marshal
|
99
|
+
Bundler.load_marshal Bundler.rubygems.inflate(Gem.read_binary(uri.path))
|
99
100
|
elsif cached_spec_path = gemspec_cached_path(spec_file_name)
|
100
101
|
Bundler.load_gemspec(cached_spec_path)
|
101
102
|
else
|
102
|
-
Bundler.load_marshal
|
103
|
+
Bundler.load_marshal Bundler.rubygems.inflate(downloader.fetch(uri).body)
|
103
104
|
end
|
104
105
|
rescue MarshalError
|
105
106
|
raise HTTPError, "Gemspec #{spec} contained invalid data.\n" \
|
@@ -177,7 +178,7 @@ module Bundler
|
|
177
178
|
# engine_version raises on unknown engines
|
178
179
|
engine_version = begin
|
179
180
|
ruby.engine_versions
|
180
|
-
rescue
|
181
|
+
rescue RuntimeError
|
181
182
|
"???"
|
182
183
|
end
|
183
184
|
agent << " #{ruby.engine}/#{ruby.versions_string(engine_version)}"
|
@@ -237,7 +238,7 @@ module Bundler
|
|
237
238
|
Bundler.settings[:ssl_client_cert]
|
238
239
|
raise SSLError if needs_ssl && !defined?(OpenSSL::SSL)
|
239
240
|
|
240
|
-
con =
|
241
|
+
con = PersistentHTTP.new "bundler", :ENV
|
241
242
|
if gem_proxy = Bundler.rubygems.configuration[:http_proxy]
|
242
243
|
con.proxy = URI.parse(gem_proxy) if gem_proxy != :no_proxy
|
243
244
|
end
|
@@ -248,8 +249,11 @@ module Bundler
|
|
248
249
|
con.cert_store = bundler_cert_store
|
249
250
|
end
|
250
251
|
|
251
|
-
|
252
|
-
|
252
|
+
ssl_client_cert = Bundler.settings[:ssl_client_cert] ||
|
253
|
+
(Bundler.rubygems.configuration.ssl_client_cert if
|
254
|
+
Bundler.rubygems.configuration.respond_to?(:ssl_client_cert))
|
255
|
+
if ssl_client_cert
|
256
|
+
pem = File.read(ssl_client_cert)
|
253
257
|
con.cert = OpenSSL::X509::Certificate.new(pem)
|
254
258
|
con.key = OpenSSL::PKey::RSA.new(pem)
|
255
259
|
end
|
@@ -273,16 +277,19 @@ module Bundler
|
|
273
277
|
Timeout::Error, EOFError, SocketError, Errno::ENETDOWN, Errno::ENETUNREACH,
|
274
278
|
Errno::EINVAL, Errno::ECONNRESET, Errno::ETIMEDOUT, Errno::EAGAIN,
|
275
279
|
Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError,
|
276
|
-
|
280
|
+
PersistentHTTP::Error, Zlib::BufError, Errno::EHOSTUNREACH
|
277
281
|
].freeze
|
278
282
|
|
279
283
|
def bundler_cert_store
|
280
284
|
store = OpenSSL::X509::Store.new
|
281
|
-
|
282
|
-
|
283
|
-
|
285
|
+
ssl_ca_cert = Bundler.settings[:ssl_ca_cert] ||
|
286
|
+
(Bundler.rubygems.configuration.ssl_ca_cert if
|
287
|
+
Bundler.rubygems.configuration.respond_to?(:ssl_ca_cert))
|
288
|
+
if ssl_ca_cert
|
289
|
+
if File.directory? ssl_ca_cert
|
290
|
+
store.add_path ssl_ca_cert
|
284
291
|
else
|
285
|
-
store.add_file
|
292
|
+
store.add_file ssl_ca_cert
|
286
293
|
end
|
287
294
|
else
|
288
295
|
store.set_default_paths
|