rubygems-update 2.6.14 → 2.7.0
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 +4 -4
- data/.travis.yml +10 -7
- data/CONTRIBUTING.rdoc +53 -54
- data/History.txt +173 -9
- data/Manifest.txt +39 -11
- data/POLICIES.rdoc +3 -3
- data/README.md +72 -0
- data/Rakefile +30 -5
- data/appveyor.yml +29 -1
- data/bin/gem +1 -1
- data/bin/update_rubygems +2 -2
- data/bundler/CHANGELOG.md +269 -9
- data/bundler/CODE_OF_CONDUCT.md +1 -1
- data/bundler/CONTRIBUTING.md +10 -29
- data/bundler/README.md +22 -10
- data/bundler/exe/bundle +5 -7
- data/bundler/exe/bundle_ruby +4 -3
- data/bundler/lib/bundler.rb +94 -74
- data/bundler/lib/bundler/build_metadata.rb +36 -0
- data/bundler/lib/bundler/capistrano.rb +5 -0
- data/bundler/lib/bundler/cli.rb +229 -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 +3 -2
- data/bundler/lib/bundler/cli/gem.rb +36 -15
- data/bundler/lib/bundler/cli/info.rb +50 -0
- data/bundler/lib/bundler/cli/init.rb +20 -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 +32 -11
- 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 +26 -7
- data/bundler/lib/bundler/compatibility_guard.rb +14 -0
- data/bundler/lib/bundler/constants.rb +1 -0
- data/bundler/lib/bundler/current_ruby.rb +8 -7
- data/bundler/lib/bundler/definition.rb +231 -159
- data/bundler/lib/bundler/dep_proxy.rb +2 -0
- data/bundler/lib/bundler/dependency.rb +6 -7
- data/bundler/lib/bundler/deployment.rb +1 -1
- data/bundler/lib/bundler/deprecate.rb +14 -3
- data/bundler/lib/bundler/dsl.rb +103 -62
- data/bundler/lib/bundler/endpoint_specification.rb +12 -2
- data/bundler/lib/bundler/env.rb +97 -36
- 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 +15 -8
- 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 +4 -2
- data/bundler/lib/bundler/fetcher/index.rb +1 -0
- data/bundler/lib/bundler/friendly_errors.rb +5 -2
- data/bundler/lib/bundler/gem_helper.rb +23 -9
- 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 +1 -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 +51 -27
- data/bundler/lib/bundler/inline.rb +10 -10
- data/bundler/lib/bundler/installer.rb +104 -50
- data/bundler/lib/bundler/installer/gem_installer.rb +5 -2
- 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 +8 -3
- data/bundler/lib/bundler/plugin.rb +6 -1
- data/bundler/lib/bundler/plugin/api/source.rb +16 -3
- data/bundler/lib/bundler/plugin/index.rb +2 -0
- 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 +171 -192
- data/bundler/lib/bundler/resolver/spec_group.rb +111 -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 +6 -1
- 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 +157 -66
- data/bundler/lib/bundler/runtime.rb +28 -18
- 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 +129 -25
- 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 +49 -21
- data/bundler/lib/bundler/source/git/git_proxy.rb +17 -12
- 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 +154 -82
- data/bundler/lib/bundler/source/rubygems/remote.rb +8 -1
- data/bundler/lib/bundler/source_list.rb +75 -15
- data/bundler/lib/bundler/spec_set.rb +34 -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/Executable +5 -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 +13 -10
- 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/ui.rb +1 -0
- data/bundler/lib/bundler/ui/rg_proxy.rb +1 -0
- data/bundler/lib/bundler/ui/shell.rb +24 -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 +5 -4
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb +69 -6
- 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 +14 -0
- data/bundler/man/bundle-check.ronn +26 -0
- data/bundler/man/bundle-clean.ronn +18 -0
- data/bundler/man/bundle-config.ronn +180 -60
- data/bundler/man/bundle-exec.ronn +7 -0
- data/bundler/man/bundle-gem.ronn +3 -2
- data/bundler/man/bundle-info.ronn +17 -0
- data/bundler/man/bundle-init.ronn +18 -0
- data/bundler/man/bundle-inject.ronn +22 -0
- data/bundler/man/bundle-install.ronn +32 -32
- data/bundler/man/bundle-list.ronn +15 -0
- data/bundler/man/bundle-open.ronn +19 -0
- data/bundler/man/bundle-outdated.ronn +1 -1
- data/bundler/man/bundle-package.ronn +5 -0
- data/bundler/man/bundle-pristine.ronn +34 -0
- data/bundler/man/bundle-show.ronn +20 -0
- data/bundler/man/bundle-update.ronn +6 -3
- data/bundler/man/bundle-viz.ronn +30 -0
- data/bundler/man/bundle.ronn +11 -20
- data/bundler/man/gemfile.5.ronn +55 -64
- data/lib/rubygems.rb +79 -36
- data/lib/rubygems/basic_specification.rb +8 -4
- data/lib/rubygems/bundler_version_finder.rb +112 -0
- data/lib/rubygems/command.rb +1 -1
- data/lib/rubygems/command_manager.rb +3 -1
- data/lib/rubygems/commands/cert_command.rb +31 -6
- data/lib/rubygems/commands/cleanup_command.rb +1 -1
- data/lib/rubygems/commands/help_command.rb +1 -1
- data/lib/rubygems/commands/owner_command.rb +3 -1
- data/lib/rubygems/commands/pristine_command.rb +11 -8
- data/lib/rubygems/commands/push_command.rb +2 -1
- data/lib/rubygems/commands/query_command.rb +13 -14
- data/lib/rubygems/commands/setup_command.rb +124 -69
- data/lib/rubygems/commands/signin_command.rb +33 -0
- data/lib/rubygems/commands/signout_command.rb +33 -0
- data/lib/rubygems/commands/uninstall_command.rb +4 -3
- data/lib/rubygems/commands/unpack_command.rb +16 -4
- 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 +13 -24
- data/lib/rubygems/core_ext/kernel_require.rb +10 -9
- data/lib/rubygems/dependency.rb +2 -0
- data/lib/rubygems/dependency_installer.rb +4 -0
- data/lib/rubygems/errors.rb +3 -0
- data/lib/rubygems/exceptions.rb +6 -0
- data/lib/rubygems/ext/builder.rb +1 -1
- 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/install_update_options.rb +5 -28
- data/lib/rubygems/installer.rb +12 -7
- data/lib/rubygems/installer_test_case.rb +6 -3
- data/lib/rubygems/package/old.rb +1 -1
- data/lib/rubygems/request.rb +1 -1
- data/lib/rubygems/request_set.rb +20 -3
- data/lib/rubygems/request_set/gem_dependency_api.rb +3 -3
- data/lib/rubygems/requirement.rb +5 -1
- data/lib/rubygems/resolver.rb +24 -3
- data/lib/rubygems/resolver/installer_set.rb +4 -6
- data/lib/rubygems/safe_yaml.rb +4 -1
- data/lib/rubygems/security.rb +10 -3
- data/lib/rubygems/security_option.rb +43 -0
- data/lib/rubygems/server.rb +4 -12
- data/lib/rubygems/source.rb +7 -4
- 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 +281 -231
- data/lib/rubygems/stub_specification.rb +2 -3
- data/lib/rubygems/test_case.rb +14 -1
- data/lib/rubygems/user_interaction.rb +15 -13
- data/lib/rubygems/util.rb +6 -17
- data/lib/rubygems/version.rb +17 -3
- data/lib/rubygems/version_option.rb +6 -1
- 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_config.rb +1 -1
- data/test/rubygems/test_gem.rb +72 -14
- data/test/rubygems/test_gem_bundler_version_finder.rb +125 -0
- data/test/rubygems/test_gem_command.rb +1 -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_install_command.rb +35 -2
- data/test/rubygems/test_gem_commands_pristine_command.rb +1 -1
- data/test/rubygems/test_gem_commands_query_command.rb +19 -0
- data/test/rubygems/test_gem_commands_setup_command.rb +17 -0
- data/test/rubygems/test_gem_commands_signin_command.rb +95 -0
- data/test/rubygems/test_gem_commands_signout_command.rb +37 -0
- data/test/rubygems/test_gem_commands_sources_command.rb +1 -1
- data/test/rubygems/test_gem_commands_uninstall_command.rb +12 -0
- data/test/rubygems/test_gem_commands_update_command.rb +1 -1
- 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_ext_builder.rb +2 -2
- data/test/rubygems/test_gem_ext_rake_builder.rb +2 -2
- data/test/rubygems/test_gem_install_update_options.rb +2 -1
- data/test/rubygems/test_gem_installer.rb +29 -27
- data/test/rubygems/test_gem_package.rb +5 -5
- data/test/rubygems/test_gem_remote_fetcher.rb +2 -2
- data/test/rubygems/test_gem_request_set_gem_dependency_api.rb +3 -3
- data/test/rubygems/test_gem_requirement.rb +6 -0
- data/test/rubygems/test_gem_resolver.rb +26 -0
- data/test/rubygems/test_gem_resolver_conflict.rb +1 -1
- data/test/rubygems/test_gem_security.rb +5 -0
- data/test/rubygems/test_gem_security_policy.rb +24 -24
- 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 +18 -1
- data/test/rubygems/test_gem_source.rb +9 -0
- data/test/rubygems/test_gem_spec_fetcher.rb +20 -0
- data/test/rubygems/test_gem_specification.rb +85 -10
- data/test/rubygems/test_gem_stream_ui.rb +6 -6
- data/test/rubygems/test_gem_stub_specification.rb +19 -1
- data/test/rubygems/test_gem_util.rb +1 -0
- data/test/rubygems/test_gem_version.rb +28 -7
- data/test/rubygems/test_gem_version_option.rb +15 -0
- data/test/rubygems/test_kernel.rb +30 -0
- data/test/rubygems/test_require.rb +44 -0
- metadata +47 -46
- 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
@@ -1,4 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
2
3
|
require "rubygems/dependency"
|
3
4
|
require "bundler/shared_helpers"
|
4
5
|
require "bundler/rubygems_ext"
|
@@ -90,16 +91,14 @@ module Bundler
|
|
90
91
|
@autorequire = Array(options["require"] || []) if options.key?("require")
|
91
92
|
end
|
92
93
|
|
94
|
+
# Returns the platforms this dependency is valid for, in the same order as
|
95
|
+
# passed in the `valid_platforms` parameter
|
93
96
|
def gem_platforms(valid_platforms)
|
94
97
|
return valid_platforms if @platforms.empty?
|
95
98
|
|
96
|
-
platforms
|
97
|
-
|
98
|
-
|
99
|
-
next unless valid_platforms.include?(platform)
|
100
|
-
platforms |= [platform]
|
101
|
-
end
|
102
|
-
platforms
|
99
|
+
@gem_platforms ||= @platforms.map {|pl| PLATFORM_MAP[pl] }.compact.uniq
|
100
|
+
|
101
|
+
valid_platforms & @gem_platforms
|
103
102
|
end
|
104
103
|
|
105
104
|
def should_include?
|
@@ -1,7 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
3
|
require "bundler/shared_helpers"
|
4
|
-
Bundler::SharedHelpers.major_deprecation "Bundler no longer integrates with " \
|
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."
|
7
7
|
|
@@ -1,11 +1,22 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
3
|
+
begin
|
4
|
+
require "rubygems/deprecate"
|
5
|
+
rescue LoadError
|
6
|
+
# it's fine if it doesn't exist on the current RubyGems...
|
7
|
+
nil
|
8
|
+
end
|
9
|
+
|
2
10
|
module Bundler
|
3
|
-
if defined? ::Deprecate
|
11
|
+
if defined? Bundler::Deprecate
|
12
|
+
# nothing to do!
|
13
|
+
elsif defined? ::Deprecate
|
4
14
|
Deprecate = ::Deprecate
|
5
15
|
elsif defined? Gem::Deprecate
|
6
16
|
Deprecate = Gem::Deprecate
|
7
17
|
else
|
8
|
-
class Deprecate
|
18
|
+
class Deprecate
|
19
|
+
end
|
9
20
|
end
|
10
21
|
|
11
22
|
unless Deprecate.respond_to?(:skip_during)
|
@@ -20,7 +31,7 @@ module Bundler
|
|
20
31
|
|
21
32
|
unless Deprecate.respond_to?(:skip)
|
22
33
|
def Deprecate.skip
|
23
|
-
@skip
|
34
|
+
@skip ||= false
|
24
35
|
end
|
25
36
|
end
|
26
37
|
|
data/bundler/lib/bundler/dsl.rb
CHANGED
@@ -1,4 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
2
3
|
require "bundler/dependency"
|
3
4
|
require "bundler/ruby_dsl"
|
4
5
|
|
@@ -14,6 +15,9 @@ module Bundler
|
|
14
15
|
|
15
16
|
VALID_PLATFORMS = Bundler::Dependency::PLATFORM_MAP.keys.freeze
|
16
17
|
|
18
|
+
VALID_KEYS = %w[group groups git path glob name branch ref tag require submodules
|
19
|
+
platform platforms type source install_if].freeze
|
20
|
+
|
17
21
|
attr_reader :gemspecs
|
18
22
|
attr_accessor :dependencies
|
19
23
|
|
@@ -30,14 +34,16 @@ module Bundler
|
|
30
34
|
@ruby_version = nil
|
31
35
|
@gemspecs = []
|
32
36
|
@gemfile = nil
|
37
|
+
@gemfiles = []
|
33
38
|
add_git_sources
|
34
39
|
end
|
35
40
|
|
36
41
|
def eval_gemfile(gemfile, contents = nil)
|
37
|
-
expanded_gemfile_path = Pathname.new(gemfile).expand_path
|
42
|
+
expanded_gemfile_path = Pathname.new(gemfile).expand_path(@gemfile && @gemfile.parent)
|
38
43
|
original_gemfile = @gemfile
|
39
44
|
@gemfile = expanded_gemfile_path
|
40
|
-
|
45
|
+
@gemfiles << expanded_gemfile_path
|
46
|
+
contents ||= Bundler.read_file(@gemfile.to_s)
|
41
47
|
instance_eval(contents.dup.untaint, gemfile.to_s, 1)
|
42
48
|
rescue Exception => e
|
43
49
|
message = "There was an error " \
|
@@ -95,10 +101,10 @@ module Bundler
|
|
95
101
|
|
96
102
|
# if there's already a dependency with this name we try to prefer one
|
97
103
|
if current = @dependencies.find {|d| d.name == dep.name }
|
104
|
+
deleted_dep = @dependencies.delete(current) if current.type == :development
|
105
|
+
|
98
106
|
if current.requirement != dep.requirement
|
99
|
-
|
100
|
-
@dependencies.delete current
|
101
|
-
else
|
107
|
+
unless deleted_dep
|
102
108
|
return if dep.type == :development
|
103
109
|
raise GemfileError, "You cannot specify the same gem twice with different version requirements.\n" \
|
104
110
|
"You specified: #{current.name} (#{current.requirement}) and #{dep.name} (#{dep.requirement})"
|
@@ -111,9 +117,7 @@ module Bundler
|
|
111
117
|
end
|
112
118
|
|
113
119
|
if current.source != dep.source
|
114
|
-
|
115
|
-
@dependencies.delete current
|
116
|
-
else
|
120
|
+
unless deleted_dep
|
117
121
|
return if dep.type == :development
|
118
122
|
raise GemfileError, "You cannot specify the same gem twice coming from different sources.\n" \
|
119
123
|
"You specified that #{dep.name} (#{dep.requirement}) should come from " \
|
@@ -128,10 +132,12 @@ module Bundler
|
|
128
132
|
def source(source, *args, &blk)
|
129
133
|
options = args.last.is_a?(Hash) ? args.pop.dup : {}
|
130
134
|
options = normalize_hash(options)
|
135
|
+
source = normalize_source(source)
|
136
|
+
|
131
137
|
if options.key?("type")
|
132
138
|
options["type"] = options["type"].to_s
|
133
139
|
unless Plugin.source?(options["type"])
|
134
|
-
raise "No sources available for #{options["type"]}"
|
140
|
+
raise InvalidOption, "No plugin sources available for #{options["type"]}"
|
135
141
|
end
|
136
142
|
|
137
143
|
unless block_given?
|
@@ -141,12 +147,10 @@ module Bundler
|
|
141
147
|
source_opts = options.merge("uri" => source)
|
142
148
|
with_source(@sources.add_plugin_source(options["type"], source_opts), &blk)
|
143
149
|
elsif block_given?
|
144
|
-
source = normalize_source(source)
|
145
150
|
with_source(@sources.add_rubygems_source("remotes" => source), &blk)
|
146
151
|
else
|
147
|
-
source = normalize_source(source)
|
148
152
|
check_primary_source_safety(@sources)
|
149
|
-
@sources.
|
153
|
+
@sources.global_rubygems_source = source
|
150
154
|
end
|
151
155
|
end
|
152
156
|
|
@@ -164,6 +168,19 @@ module Bundler
|
|
164
168
|
end
|
165
169
|
|
166
170
|
def path(path, options = {}, &blk)
|
171
|
+
unless block_given?
|
172
|
+
msg = "You can no longer specify a path source by itself. Instead, \n" \
|
173
|
+
"either use the :path option on a gem, or specify the gems that \n" \
|
174
|
+
"bundler should find in the path source by passing a block to \n" \
|
175
|
+
"the path method, like: \n\n" \
|
176
|
+
" path 'dir/containing/rails' do\n" \
|
177
|
+
" gem 'rails'\n" \
|
178
|
+
" end\n\n"
|
179
|
+
|
180
|
+
raise DeprecatedError, msg if Bundler.feature_flag.disable_multisource?
|
181
|
+
SharedHelpers.major_deprecation(2, msg.strip)
|
182
|
+
end
|
183
|
+
|
167
184
|
source_options = normalize_hash(options).merge(
|
168
185
|
"path" => Pathname.new(path),
|
169
186
|
"root_path" => gemfile_root,
|
@@ -189,7 +206,8 @@ module Bundler
|
|
189
206
|
end
|
190
207
|
|
191
208
|
def github(repo, options = {})
|
192
|
-
raise ArgumentError, "
|
209
|
+
raise ArgumentError, "GitHub sources require a block" unless block_given?
|
210
|
+
raise DeprecatedError, "The #github method has been removed" if Bundler.feature_flag.skip_default_git_sources?
|
193
211
|
github_uri = @git_sources["github"].call(repo)
|
194
212
|
git_options = normalize_hash(options).merge("uri" => github_uri)
|
195
213
|
git_source = @sources.add_git_source(git_options)
|
@@ -197,16 +215,16 @@ module Bundler
|
|
197
215
|
end
|
198
216
|
|
199
217
|
def to_definition(lockfile, unlock)
|
200
|
-
Definition.new(lockfile, @dependencies, @sources, unlock, @ruby_version, @optional_groups)
|
218
|
+
Definition.new(lockfile, @dependencies, @sources, unlock, @ruby_version, @optional_groups, @gemfiles)
|
201
219
|
end
|
202
220
|
|
203
221
|
def group(*args, &blk)
|
204
|
-
|
205
|
-
normalize_group_options(
|
222
|
+
options = args.last.is_a?(Hash) ? args.pop.dup : {}
|
223
|
+
normalize_group_options(options, args)
|
206
224
|
|
207
225
|
@groups.concat args
|
208
226
|
|
209
|
-
if
|
227
|
+
if options["optional"]
|
210
228
|
optional_groups = args - @optional_groups
|
211
229
|
@optional_groups.concat optional_groups
|
212
230
|
end
|
@@ -216,9 +234,9 @@ module Bundler
|
|
216
234
|
args.each { @groups.pop }
|
217
235
|
end
|
218
236
|
|
219
|
-
def install_if(*args
|
237
|
+
def install_if(*args)
|
220
238
|
@install_conditionals.concat args
|
221
|
-
|
239
|
+
yield
|
222
240
|
ensure
|
223
241
|
args.each { @install_conditionals.pop }
|
224
242
|
end
|
@@ -250,7 +268,12 @@ module Bundler
|
|
250
268
|
private
|
251
269
|
|
252
270
|
def add_git_sources
|
271
|
+
return if Bundler.feature_flag.skip_default_git_sources?
|
272
|
+
|
253
273
|
git_source(:github) do |repo_name|
|
274
|
+
warn_deprecated_git_source(:github, <<-'RUBY'.strip, 'Change any "reponame" :github sources to "username/reponame".')
|
275
|
+
"https://github.com/#{repo_name}.git"
|
276
|
+
RUBY
|
254
277
|
# It would be better to use https instead of the git protocol, but this
|
255
278
|
# can break deployment of existing locked bundles when switching between
|
256
279
|
# different versions of Bundler. The change will be made in 2.0, which
|
@@ -267,23 +290,29 @@ module Bundler
|
|
267
290
|
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
|
268
291
|
# TODO: 2.0 upgrade this setting to the default
|
269
292
|
if Bundler.settings["github.https"]
|
293
|
+
Bundler::SharedHelpers.major_deprecation 2, "The `github.https` setting will be removed"
|
270
294
|
"https://github.com/#{repo_name}.git"
|
271
295
|
else
|
272
|
-
warn_github_source_change(repo_name)
|
273
296
|
"git://github.com/#{repo_name}.git"
|
274
297
|
end
|
275
298
|
end
|
276
299
|
|
277
300
|
# TODO: 2.0 remove this deprecated git source
|
278
301
|
git_source(:gist) do |repo_name|
|
279
|
-
warn_deprecated_git_source(:gist, 'https://gist.github.com/#{repo_name}.git')
|
302
|
+
warn_deprecated_git_source(:gist, '"https://gist.github.com/#{repo_name}.git"')
|
303
|
+
|
280
304
|
"https://gist.github.com/#{repo_name}.git"
|
281
305
|
end
|
282
306
|
|
283
307
|
# TODO: 2.0 remove this deprecated git source
|
284
308
|
git_source(:bitbucket) do |repo_name|
|
285
|
-
|
286
|
-
|
309
|
+
warn_deprecated_git_source(:bitbucket, <<-'RUBY'.strip)
|
310
|
+
user_name, repo_name = repo_name.split("/")
|
311
|
+
repo_name ||= user_name
|
312
|
+
"https://#{user_name}@bitbucket.org/#{user_name}/#{repo_name}.git"
|
313
|
+
RUBY
|
314
|
+
|
315
|
+
user_name, repo_name = repo_name.split("/")
|
287
316
|
repo_name ||= user_name
|
288
317
|
"https://#{user_name}@bitbucket.org/#{user_name}/#{repo_name}.git"
|
289
318
|
end
|
@@ -308,7 +337,7 @@ module Bundler
|
|
308
337
|
end
|
309
338
|
|
310
339
|
def valid_keys
|
311
|
-
@valid_keys ||=
|
340
|
+
@valid_keys ||= VALID_KEYS
|
312
341
|
end
|
313
342
|
|
314
343
|
def normalize_options(name, version, opts)
|
@@ -318,6 +347,9 @@ module Bundler
|
|
318
347
|
if name =~ /\s/
|
319
348
|
raise GemfileError, %('#{name}' is not a valid gem name because it contains whitespace)
|
320
349
|
end
|
350
|
+
if name.empty?
|
351
|
+
raise GemfileError, %(an empty gem name is not valid)
|
352
|
+
end
|
321
353
|
|
322
354
|
normalize_hash(opts)
|
323
355
|
|
@@ -355,7 +387,7 @@ module Bundler
|
|
355
387
|
opts["git"] = @git_sources[git_name].call(opts[git_name])
|
356
388
|
end
|
357
389
|
|
358
|
-
%w
|
390
|
+
%w[git path].each do |type|
|
359
391
|
next unless param = opts[type]
|
360
392
|
if version.first && version.first =~ /^\s*=?\s*(\d[^\s]*)\s*$/
|
361
393
|
options = opts.merge("name" => name, "version" => $1)
|
@@ -366,8 +398,8 @@ module Bundler
|
|
366
398
|
opts["source"] = source
|
367
399
|
end
|
368
400
|
|
369
|
-
opts["source"]
|
370
|
-
opts["env"]
|
401
|
+
opts["source"] ||= @source
|
402
|
+
opts["env"] ||= @env
|
371
403
|
opts["platforms"] = platforms.dup
|
372
404
|
opts["group"] = groups
|
373
405
|
opts["should_include"] = install_if
|
@@ -377,32 +409,38 @@ module Bundler
|
|
377
409
|
normalize_hash(opts)
|
378
410
|
|
379
411
|
groups = groups.map {|group| ":#{group}" }.join(", ")
|
380
|
-
validate_keys("group #{groups}", opts, %w
|
412
|
+
validate_keys("group #{groups}", opts, %w[optional])
|
381
413
|
|
382
414
|
opts["optional"] ||= false
|
383
415
|
end
|
384
416
|
|
385
417
|
def validate_keys(command, opts, valid_keys)
|
386
418
|
invalid_keys = opts.keys - valid_keys
|
387
|
-
|
388
|
-
|
389
|
-
|
390
|
-
|
391
|
-
"as options for #{command}, but they are invalid."
|
392
|
-
else
|
393
|
-
"as an option for #{command}, but it is invalid."
|
394
|
-
end
|
395
|
-
|
396
|
-
message << " Valid options are: #{valid_keys.join(", ")}."
|
397
|
-
message << " You may be able to resolve this by upgrading Bundler to the newest version."
|
398
|
-
raise InvalidOption, message
|
419
|
+
|
420
|
+
git_source = opts.keys & @git_sources.keys.map(&:to_s)
|
421
|
+
if opts["branch"] && !(opts["git"] || opts["github"] || git_source.any?)
|
422
|
+
raise GemfileError, %(The `branch` option for `#{command}` is not allowed. Only gems with a git source can specify a branch)
|
399
423
|
end
|
424
|
+
|
425
|
+
return true unless invalid_keys.any?
|
426
|
+
|
427
|
+
message = String.new
|
428
|
+
message << "You passed #{invalid_keys.map {|k| ":" + k }.join(", ")} "
|
429
|
+
message << if invalid_keys.size > 1
|
430
|
+
"as options for #{command}, but they are invalid."
|
431
|
+
else
|
432
|
+
"as an option for #{command}, but it is invalid."
|
433
|
+
end
|
434
|
+
|
435
|
+
message << " Valid options are: #{valid_keys.join(", ")}."
|
436
|
+
message << " You may be able to resolve this by upgrading Bundler to the newest version."
|
437
|
+
raise InvalidOption, message
|
400
438
|
end
|
401
439
|
|
402
440
|
def normalize_source(source)
|
403
441
|
case source
|
404
442
|
when :gemcutter, :rubygems, :rubyforge
|
405
|
-
Bundler::SharedHelpers.major_deprecation "The source :#{source} is deprecated because HTTP " \
|
443
|
+
Bundler::SharedHelpers.major_deprecation 2, "The source :#{source} is deprecated because HTTP " \
|
406
444
|
"requests are insecure.\nPlease change your source to 'https://" \
|
407
445
|
"rubygems.org' if possible, or 'http://rubygems.org' if not."
|
408
446
|
"http://rubygems.org"
|
@@ -413,17 +451,20 @@ module Bundler
|
|
413
451
|
end
|
414
452
|
end
|
415
453
|
|
416
|
-
def check_primary_source_safety(
|
417
|
-
return
|
454
|
+
def check_primary_source_safety(source_list)
|
455
|
+
return if source_list.rubygems_primary_remotes.empty? && source_list.global_rubygems_source.nil?
|
418
456
|
|
419
|
-
|
420
|
-
|
421
|
-
raise GemfileError, "Warning: this Gemfile contains multiple primary sources. " \
|
457
|
+
if Bundler.feature_flag.disable_multisource?
|
458
|
+
msg = "This Gemfile contains multiple primary sources. " \
|
422
459
|
"Each source after the first must include a block to indicate which gems " \
|
423
|
-
"should come from that source
|
424
|
-
|
460
|
+
"should come from that source"
|
461
|
+
unless Bundler.feature_flag.bundler_2_mode?
|
462
|
+
msg += ". To downgrade this error to a warning, run " \
|
463
|
+
"`bundle config --delete disable_multisource`"
|
464
|
+
end
|
465
|
+
raise GemfileEvalError, msg
|
425
466
|
else
|
426
|
-
Bundler::SharedHelpers.major_deprecation "Your Gemfile contains multiple primary sources. " \
|
467
|
+
Bundler::SharedHelpers.major_deprecation 2, "Your Gemfile contains multiple primary sources. " \
|
427
468
|
"Using `source` more than once without a block is a security risk, and " \
|
428
469
|
"may result in installing unexpected gems. To resolve this warning, use " \
|
429
470
|
"a block to indicate which gems should come from the secondary source. " \
|
@@ -432,20 +473,20 @@ module Bundler
|
|
432
473
|
end
|
433
474
|
end
|
434
475
|
|
435
|
-
def
|
476
|
+
def warn_deprecated_git_source(name, replacement, additional_message = nil)
|
436
477
|
# TODO: 2.0 remove deprecation
|
437
|
-
|
438
|
-
|
439
|
-
"
|
440
|
-
|
478
|
+
additional_message &&= " #{additional_message}"
|
479
|
+
replacement = if replacement.count("\n").zero?
|
480
|
+
"{|repo_name| #{replacement} }"
|
481
|
+
else
|
482
|
+
"do |repo_name|\n#{replacement.to_s.gsub(/^/, " ")}\n end"
|
483
|
+
end
|
484
|
+
|
485
|
+
Bundler::SharedHelpers.major_deprecation 2, <<-EOS
|
486
|
+
The :#{name} git source is deprecated, and will be removed in Bundler 2.0.#{additional_message} Add this code to the top of your Gemfile to ensure it continues to work:
|
487
|
+
|
488
|
+
git_source(:#{name}) #{replacement}
|
441
489
|
|
442
|
-
def warn_deprecated_git_source(name, repo_string)
|
443
|
-
# TODO: 2.0 remove deprecation
|
444
|
-
Bundler::SharedHelpers.major_deprecation <<-EOS
|
445
|
-
The :#{name} git source is deprecated, and will be removed in Bundler 2.0. Add this code to your Gemfile to ensure it continues to work:
|
446
|
-
git_source(:#{name}) do |repo_name|
|
447
|
-
"#{repo_string}"
|
448
|
-
end
|
449
490
|
EOS
|
450
491
|
end
|
451
492
|
|
@@ -524,7 +565,7 @@ The :#{name} git source is deprecated, and will be removed in Bundler 2.0. Add t
|
|
524
565
|
lines = contents.lines.to_a
|
525
566
|
indent = " # "
|
526
567
|
indicator = indent.tr("#", ">")
|
527
|
-
first_line =
|
568
|
+
first_line = line_numer.zero?
|
528
569
|
last_line = (line_numer == (lines.count - 1))
|
529
570
|
|
530
571
|
m << "\n"
|
@@ -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
|
|