rubygems-update 3.2.0.rc.1 → 3.2.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CONTRIBUTING.md +23 -8
- data/History.txt +307 -239
- data/Manifest.txt +36 -54
- data/POLICIES.md +4 -3
- data/Rakefile +29 -51
- data/bundler/CHANGELOG.md +786 -690
- data/bundler/UPGRADING.md +3 -3
- data/bundler/lib/bundler.rb +17 -3
- data/bundler/lib/bundler/build_metadata.rb +4 -12
- data/bundler/lib/bundler/cli.rb +31 -15
- data/bundler/lib/bundler/cli/add.rb +1 -1
- data/bundler/lib/bundler/cli/binstubs.rb +6 -2
- data/bundler/lib/bundler/cli/cache.rb +1 -7
- data/bundler/lib/bundler/cli/clean.rb +1 -1
- data/bundler/lib/bundler/cli/common.rb +14 -0
- data/bundler/lib/bundler/cli/doctor.rb +1 -1
- data/bundler/lib/bundler/cli/exec.rb +4 -4
- data/bundler/lib/bundler/cli/fund.rb +36 -0
- data/bundler/lib/bundler/cli/gem.rb +1 -1
- data/bundler/lib/bundler/cli/info.rb +2 -1
- data/bundler/lib/bundler/cli/init.rb +1 -1
- data/bundler/lib/bundler/cli/inject.rb +1 -1
- data/bundler/lib/bundler/cli/install.rb +18 -7
- data/bundler/lib/bundler/cli/list.rb +1 -1
- data/bundler/lib/bundler/cli/outdated.rb +1 -3
- 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 +3 -1
- data/bundler/lib/bundler/compact_index_client.rb +1 -1
- data/bundler/lib/bundler/compact_index_client/cache.rb +6 -14
- data/bundler/lib/bundler/compact_index_client/gem_parser.rb +28 -0
- data/bundler/lib/bundler/compact_index_client/updater.rb +5 -5
- data/bundler/lib/bundler/definition.rb +49 -60
- data/bundler/lib/bundler/dep_proxy.rb +1 -1
- data/bundler/lib/bundler/dependency.rb +3 -1
- data/bundler/lib/bundler/dsl.rb +4 -4
- data/bundler/lib/bundler/endpoint_specification.rb +1 -1
- data/bundler/lib/bundler/env.rb +1 -1
- data/bundler/lib/bundler/feature_flag.rb +0 -1
- data/bundler/lib/bundler/fetcher.rb +3 -3
- data/bundler/lib/bundler/fetcher/base.rb +1 -1
- data/bundler/lib/bundler/fetcher/compact_index.rb +1 -1
- data/bundler/lib/bundler/fetcher/downloader.rb +1 -1
- data/bundler/lib/bundler/fetcher/index.rb +3 -4
- data/bundler/lib/bundler/friendly_errors.rb +18 -3
- data/bundler/lib/bundler/gem_helper.rb +17 -9
- data/bundler/lib/bundler/gem_helpers.rb +36 -25
- data/bundler/lib/bundler/gem_version_promoter.rb +1 -1
- data/bundler/lib/bundler/graph.rb +1 -1
- data/bundler/lib/bundler/index.rb +6 -2
- data/bundler/lib/bundler/injector.rb +10 -3
- data/bundler/lib/bundler/installer.rb +8 -6
- data/bundler/lib/bundler/installer/gem_installer.rb +1 -1
- data/bundler/lib/bundler/installer/parallel_installer.rb +1 -1
- data/bundler/lib/bundler/installer/standalone.rb +2 -2
- data/bundler/lib/bundler/lazy_specification.rb +22 -11
- data/bundler/lib/bundler/lockfile_generator.rb +1 -1
- data/bundler/lib/bundler/lockfile_parser.rb +1 -1
- data/bundler/lib/bundler/man/.document +1 -0
- data/bundler/{man/bundle-add.ronn → lib/bundler/man/bundle-add.1.ronn} +0 -0
- data/bundler/{man/bundle-binstubs.ronn → lib/bundler/man/bundle-binstubs.1.ronn} +2 -4
- data/bundler/{man/bundle-cache.ronn → lib/bundler/man/bundle-cache.1.ronn} +0 -0
- data/bundler/{man/bundle-check.ronn → lib/bundler/man/bundle-check.1.ronn} +0 -0
- data/bundler/{man/bundle-clean.ronn → lib/bundler/man/bundle-clean.1.ronn} +0 -0
- data/bundler/{man/bundle-config.ronn → lib/bundler/man/bundle-config.1.ronn} +14 -21
- data/bundler/{man/bundle-doctor.ronn → lib/bundler/man/bundle-doctor.1.ronn} +0 -0
- data/bundler/{man/bundle-exec.ronn → lib/bundler/man/bundle-exec.1.ronn} +0 -0
- data/bundler/{man/bundle-gem.ronn → lib/bundler/man/bundle-gem.1.ronn} +0 -0
- data/bundler/{man/bundle-info.ronn → lib/bundler/man/bundle-info.1.ronn} +0 -0
- data/bundler/{man/bundle-init.ronn → lib/bundler/man/bundle-init.1.ronn} +0 -0
- data/bundler/{man/bundle-inject.ronn → lib/bundler/man/bundle-inject.1.ronn} +0 -0
- data/bundler/{man/bundle-install.ronn → lib/bundler/man/bundle-install.1.ronn} +25 -3
- data/bundler/{man/bundle-list.ronn → lib/bundler/man/bundle-list.1.ronn} +0 -0
- data/bundler/{man/bundle-lock.ronn → lib/bundler/man/bundle-lock.1.ronn} +0 -0
- data/bundler/{man/bundle-open.ronn → lib/bundler/man/bundle-open.1.ronn} +0 -0
- data/bundler/{man/bundle-outdated.ronn → lib/bundler/man/bundle-outdated.1.ronn} +0 -0
- data/bundler/{man/bundle-platform.ronn → lib/bundler/man/bundle-platform.1.ronn} +0 -0
- data/bundler/{man/bundle-pristine.ronn → lib/bundler/man/bundle-pristine.1.ronn} +0 -0
- data/bundler/{man/bundle-remove.ronn → lib/bundler/man/bundle-remove.1.ronn} +0 -0
- data/bundler/{man/bundle-show.ronn → lib/bundler/man/bundle-show.1.ronn} +0 -0
- data/bundler/{man/bundle-update.ronn → lib/bundler/man/bundle-update.1.ronn} +0 -0
- data/bundler/{man/bundle-viz.ronn → lib/bundler/man/bundle-viz.1.ronn} +0 -0
- data/bundler/{man/bundle.ronn → lib/bundler/man/bundle.1.ronn} +0 -0
- data/bundler/{man → lib/bundler/man}/gemfile.5.ronn +4 -4
- data/bundler/lib/bundler/mirror.rb +2 -2
- data/bundler/lib/bundler/plugin.rb +5 -6
- data/bundler/lib/bundler/plugin/api/source.rb +1 -1
- data/bundler/lib/bundler/plugin/dsl.rb +1 -1
- data/bundler/lib/bundler/plugin/index.rb +1 -1
- data/bundler/lib/bundler/plugin/installer.rb +1 -1
- data/bundler/lib/bundler/plugin/installer/rubygems.rb +1 -1
- data/bundler/lib/bundler/plugin/source_list.rb +1 -1
- data/bundler/lib/bundler/remote_specification.rb +1 -1
- data/bundler/lib/bundler/resolver.rb +26 -30
- data/bundler/lib/bundler/resolver/spec_group.rb +21 -27
- data/bundler/lib/bundler/retry.rb +1 -1
- data/bundler/lib/bundler/ruby_version.rb +1 -1
- data/bundler/lib/bundler/rubygems_ext.rb +46 -1
- data/bundler/lib/bundler/rubygems_gem_installer.rb +2 -2
- data/bundler/lib/bundler/rubygems_integration.rb +22 -12
- data/bundler/lib/bundler/runtime.rb +2 -2
- data/bundler/lib/bundler/settings.rb +49 -43
- data/bundler/lib/bundler/shared_helpers.rb +1 -1
- data/bundler/lib/bundler/similarity_detector.rb +1 -1
- data/bundler/lib/bundler/source.rb +1 -1
- data/bundler/lib/bundler/source/git.rb +1 -1
- data/bundler/lib/bundler/source/git/git_proxy.rb +5 -3
- data/bundler/lib/bundler/source/path.rb +2 -2
- data/bundler/lib/bundler/source/path/installer.rb +1 -1
- data/bundler/lib/bundler/source/rubygems.rb +2 -2
- data/bundler/lib/bundler/source/rubygems/remote.rb +1 -1
- data/bundler/lib/bundler/source_list.rb +2 -2
- data/bundler/lib/bundler/spec_set.rb +7 -9
- data/bundler/lib/bundler/stub_specification.rb +1 -3
- data/bundler/lib/bundler/templates/newgem/README.md.tt +1 -2
- data/bundler/lib/bundler/templates/newgem/bin/console.tt +1 -2
- data/bundler/lib/bundler/templates/newgem/lib/newgem.rb.tt +2 -2
- data/bundler/lib/bundler/templates/newgem/newgem.gemspec.tt +8 -2
- data/bundler/lib/bundler/templates/newgem/spec/spec_helper.rb.tt +0 -1
- data/bundler/lib/bundler/ui/shell.rb +5 -5
- data/bundler/lib/bundler/uri_credentials_filter.rb +3 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo.rb +0 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb +34 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb +2 -2
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +38 -40
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +8 -1
- data/bundler/lib/bundler/vendor/tmpdir/lib/tmpdir.rb +154 -0
- data/bundler/lib/bundler/vendored_persistent.rb +0 -7
- data/bundler/lib/bundler/vendored_tmpdir.rb +4 -0
- data/bundler/lib/bundler/version.rb +1 -1
- data/bundler/lib/bundler/worker.rb +1 -1
- data/bundler/lib/bundler/yaml_serializer.rb +1 -1
- data/bundler/man/bundle-add.1 +1 -1
- data/bundler/man/bundle-binstubs.1 +5 -3
- data/bundler/man/bundle-cache.1 +1 -1
- data/bundler/man/bundle-check.1 +1 -1
- data/bundler/man/bundle-clean.1 +1 -1
- data/bundler/man/bundle-config.1 +14 -17
- data/bundler/man/bundle-doctor.1 +1 -1
- data/bundler/man/bundle-exec.1 +1 -1
- data/bundler/man/bundle-gem.1 +1 -1
- data/bundler/man/bundle-info.1 +1 -1
- data/bundler/man/bundle-init.1 +1 -1
- data/bundler/man/bundle-inject.1 +1 -1
- data/bundler/man/bundle-install.1 +30 -3
- data/bundler/man/bundle-list.1 +1 -1
- data/bundler/man/bundle-lock.1 +1 -1
- data/bundler/man/bundle-open.1 +1 -1
- data/bundler/man/bundle-outdated.1 +1 -1
- data/bundler/man/bundle-platform.1 +1 -1
- data/bundler/man/bundle-pristine.1 +1 -1
- data/bundler/man/bundle-remove.1 +1 -1
- data/bundler/man/bundle-show.1 +1 -1
- data/bundler/man/bundle-update.1 +1 -1
- data/bundler/man/bundle-viz.1 +1 -1
- data/bundler/man/bundle.1 +1 -1
- data/bundler/man/gemfile.5 +4 -4
- data/lib/rubygems.rb +8 -7
- data/lib/rubygems/available_set.rb +1 -3
- data/lib/rubygems/basic_specification.rb +0 -4
- data/lib/rubygems/command.rb +0 -2
- data/lib/rubygems/command_manager.rb +2 -4
- data/lib/rubygems/commands/build_command.rb +40 -20
- data/lib/rubygems/commands/cert_command.rb +1 -9
- data/lib/rubygems/commands/check_command.rb +0 -2
- data/lib/rubygems/commands/cleanup_command.rb +8 -4
- data/lib/rubygems/commands/contents_command.rb +0 -2
- data/lib/rubygems/commands/dependency_command.rb +0 -2
- data/lib/rubygems/commands/environment_command.rb +1 -3
- data/lib/rubygems/commands/fetch_command.rb +0 -2
- data/lib/rubygems/commands/generate_index_command.rb +0 -2
- data/lib/rubygems/commands/help_command.rb +2 -2
- data/lib/rubygems/commands/info_command.rb +0 -2
- data/lib/rubygems/commands/install_command.rb +0 -2
- data/lib/rubygems/commands/list_command.rb +0 -2
- data/lib/rubygems/commands/lock_command.rb +0 -2
- data/lib/rubygems/commands/mirror_command.rb +0 -2
- data/lib/rubygems/commands/open_command.rb +0 -2
- data/lib/rubygems/commands/outdated_command.rb +0 -2
- data/lib/rubygems/commands/owner_command.rb +9 -4
- data/lib/rubygems/commands/pristine_command.rb +1 -3
- data/lib/rubygems/commands/push_command.rb +6 -5
- data/lib/rubygems/commands/query_command.rb +16 -1
- data/lib/rubygems/commands/rdoc_command.rb +0 -2
- data/lib/rubygems/commands/search_command.rb +0 -2
- data/lib/rubygems/commands/server_command.rb +3 -1
- data/lib/rubygems/commands/setup_command.rb +21 -44
- data/lib/rubygems/commands/signin_command.rb +0 -2
- data/lib/rubygems/commands/signout_command.rb +0 -2
- data/lib/rubygems/commands/sources_command.rb +6 -4
- data/lib/rubygems/commands/specification_command.rb +6 -2
- data/lib/rubygems/commands/stale_command.rb +0 -2
- data/lib/rubygems/commands/uninstall_command.rb +0 -2
- data/lib/rubygems/commands/unpack_command.rb +0 -2
- data/lib/rubygems/commands/update_command.rb +20 -5
- data/lib/rubygems/commands/which_command.rb +0 -2
- data/lib/rubygems/commands/yank_command.rb +4 -7
- data/lib/rubygems/config_file.rb +0 -2
- data/lib/rubygems/core_ext/kernel_require.rb +3 -0
- data/lib/rubygems/core_ext/kernel_warn.rb +12 -13
- data/lib/rubygems/defaults.rb +2 -2
- data/lib/rubygems/dependency.rb +1 -3
- data/lib/rubygems/dependency_installer.rb +5 -5
- data/lib/rubygems/dependency_list.rb +0 -2
- data/lib/rubygems/doctor.rb +0 -2
- data/lib/rubygems/errors.rb +0 -12
- data/lib/rubygems/exceptions.rb +0 -20
- data/lib/rubygems/ext/builder.rb +13 -34
- data/lib/rubygems/ext/cmake_builder.rb +4 -6
- data/lib/rubygems/ext/configure_builder.rb +4 -6
- data/lib/rubygems/ext/ext_conf_builder.rb +19 -16
- data/lib/rubygems/ext/rake_builder.rb +4 -6
- data/lib/rubygems/gem_runner.rb +0 -2
- data/lib/rubygems/gemcutter_utilities.rb +101 -20
- data/lib/rubygems/indexer.rb +0 -3
- data/lib/rubygems/install_update_options.rb +2 -2
- data/lib/rubygems/installer.rb +16 -40
- data/lib/rubygems/installer_test_case.rb +7 -10
- data/lib/rubygems/mock_gem_ui.rb +0 -6
- data/lib/rubygems/name_tuple.rb +1 -3
- data/lib/rubygems/openssl.rb +7 -0
- data/lib/rubygems/package.rb +6 -12
- data/lib/rubygems/package/digest_io.rb +0 -2
- data/lib/rubygems/package/file_source.rb +0 -2
- data/lib/rubygems/package/io_source.rb +0 -2
- data/lib/rubygems/package/old.rb +0 -2
- data/lib/rubygems/package/tar_header.rb +1 -3
- data/lib/rubygems/package/tar_reader.rb +0 -2
- data/lib/rubygems/package/tar_reader/entry.rb +0 -2
- data/lib/rubygems/package/tar_test_case.rb +1 -3
- data/lib/rubygems/package/tar_writer.rb +0 -6
- data/lib/rubygems/package_task.rb +0 -2
- data/lib/rubygems/path_support.rb +0 -2
- data/lib/rubygems/platform.rb +18 -9
- data/lib/rubygems/psych_tree.rb +0 -2
- data/lib/rubygems/query_utils.rb +0 -9
- data/lib/rubygems/remote_fetcher.rb +6 -9
- data/lib/rubygems/request.rb +4 -11
- data/lib/rubygems/request/connection_pools.rb +0 -4
- data/lib/rubygems/request/http_pool.rb +0 -2
- data/lib/rubygems/request/https_pool.rb +0 -2
- data/lib/rubygems/request_set.rb +2 -15
- data/lib/rubygems/request_set/gem_dependency_api.rb +4 -6
- data/lib/rubygems/request_set/lockfile.rb +0 -4
- data/lib/rubygems/request_set/lockfile/parser.rb +0 -2
- data/lib/rubygems/request_set/lockfile/tokenizer.rb +0 -2
- data/lib/rubygems/requirement.rb +8 -8
- data/lib/rubygems/resolver.rb +7 -4
- data/lib/rubygems/resolver/activation_request.rb +9 -3
- data/lib/rubygems/resolver/api_set.rb +27 -20
- data/lib/rubygems/resolver/api_set/gem_parser.rb +20 -0
- data/lib/rubygems/resolver/api_specification.rb +23 -9
- data/lib/rubygems/resolver/best_set.rb +1 -3
- data/lib/rubygems/resolver/composed_set.rb +0 -2
- data/lib/rubygems/resolver/conflict.rb +1 -3
- data/lib/rubygems/resolver/current_set.rb +0 -2
- data/lib/rubygems/resolver/dependency_request.rb +1 -3
- data/lib/rubygems/resolver/git_set.rb +0 -2
- data/lib/rubygems/resolver/git_specification.rb +0 -2
- data/lib/rubygems/resolver/index_set.rb +0 -2
- data/lib/rubygems/resolver/index_specification.rb +26 -2
- data/lib/rubygems/resolver/installed_specification.rb +0 -2
- data/lib/rubygems/resolver/installer_set.rb +57 -10
- data/lib/rubygems/resolver/local_specification.rb +0 -2
- data/lib/rubygems/resolver/lock_set.rb +1 -3
- data/lib/rubygems/resolver/lock_specification.rb +0 -2
- data/lib/rubygems/resolver/molinillo/lib/molinillo.rb +6 -5
- data/lib/rubygems/resolver/molinillo/lib/molinillo/delegates/resolution_state.rb +7 -0
- data/lib/rubygems/resolver/molinillo/lib/molinillo/delegates/specification_provider.rb +1 -0
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph.rb +39 -5
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/action.rb +1 -0
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb +2 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_vertex.rb +2 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/delete_edge.rb +2 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb +2 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/log.rb +7 -6
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/set_payload.rb +2 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/tag.rb +4 -3
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/vertex.rb +43 -10
- data/lib/rubygems/resolver/molinillo/lib/molinillo/errors.rb +75 -7
- data/lib/rubygems/resolver/molinillo/lib/molinillo/gem_metadata.rb +2 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/modules/specification_provider.rb +1 -0
- data/lib/rubygems/resolver/molinillo/lib/molinillo/modules/ui.rb +3 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/resolution.rb +506 -165
- data/lib/rubygems/resolver/molinillo/lib/molinillo/resolver.rb +3 -2
- data/lib/rubygems/resolver/molinillo/lib/molinillo/state.rb +8 -4
- data/lib/rubygems/resolver/requirement_list.rb +0 -2
- data/lib/rubygems/resolver/set.rb +0 -2
- data/lib/rubygems/resolver/source_set.rb +0 -2
- data/lib/rubygems/resolver/spec_specification.rb +14 -2
- data/lib/rubygems/resolver/specification.rb +13 -3
- data/lib/rubygems/resolver/stats.rb +0 -2
- data/lib/rubygems/resolver/vendor_set.rb +0 -2
- data/lib/rubygems/resolver/vendor_specification.rb +0 -2
- data/lib/rubygems/s3_uri_signer.rb +2 -8
- data/lib/rubygems/security.rb +2 -9
- data/lib/rubygems/security/policy.rb +1 -5
- data/lib/rubygems/security/signer.rb +1 -3
- data/lib/rubygems/security/trust_dir.rb +0 -2
- data/lib/rubygems/server.rb +7 -4
- data/lib/rubygems/source.rb +23 -12
- data/lib/rubygems/source/git.rb +0 -2
- data/lib/rubygems/source/installed.rb +0 -2
- data/lib/rubygems/source/local.rb +0 -2
- data/lib/rubygems/source/lock.rb +0 -2
- data/lib/rubygems/source/specific_file.rb +0 -2
- data/lib/rubygems/source/vendor.rb +0 -2
- data/lib/rubygems/source_list.rb +0 -2
- data/lib/rubygems/spec_fetcher.rb +1 -3
- data/lib/rubygems/specification.rb +27 -19
- data/lib/rubygems/specification_policy.rb +0 -2
- 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 +1 -5
- data/lib/rubygems/syck_hack.rb +0 -2
- data/lib/rubygems/test_case.rb +18 -42
- data/lib/rubygems/test_utilities.rb +6 -13
- data/lib/rubygems/uninstaller.rb +0 -2
- data/lib/rubygems/uri_formatter.rb +2 -3
- data/lib/rubygems/uri_parser.rb +0 -2
- data/lib/rubygems/user_interaction.rb +0 -16
- data/lib/rubygems/util.rb +0 -2
- data/lib/rubygems/util/licenses.rb +0 -2
- data/lib/rubygems/util/list.rb +0 -2
- data/lib/rubygems/validator.rb +0 -2
- data/lib/rubygems/version.rb +0 -2
- data/lib/rubygems/version_option.rb +6 -0
- data/rubygems-update.gemspec +1 -1
- data/test/rubygems/plugin/load/rubygems_plugin.rb +0 -2
- data/test/rubygems/rubygems/commands/crash_command.rb +0 -2
- data/test/rubygems/rubygems_plugin.rb +0 -2
- data/test/rubygems/test_bundled_ca.rb +42 -41
- data/test/rubygems/test_config.rb +0 -2
- data/test/rubygems/test_deprecate.rb +0 -6
- data/test/rubygems/test_gem.rb +3 -5
- data/test/rubygems/test_gem_available_set.rb +0 -2
- data/test/rubygems/test_gem_bundler_version_finder.rb +0 -2
- data/test/rubygems/test_gem_command.rb +0 -4
- data/test/rubygems/test_gem_command_manager.rb +0 -2
- data/test/rubygems/test_gem_commands_build_command.rb +226 -13
- data/test/rubygems/test_gem_commands_cert_command.rb +2 -4
- data/test/rubygems/test_gem_commands_check_command.rb +0 -2
- data/test/rubygems/test_gem_commands_cleanup_command.rb +13 -4
- data/test/rubygems/test_gem_commands_contents_command.rb +2 -4
- data/test/rubygems/test_gem_commands_dependency_command.rb +0 -2
- data/test/rubygems/test_gem_commands_environment_command.rb +0 -2
- data/test/rubygems/test_gem_commands_fetch_command.rb +0 -2
- data/test/rubygems/test_gem_commands_generate_index_command.rb +0 -2
- data/test/rubygems/test_gem_commands_help_command.rb +15 -4
- data/test/rubygems/test_gem_commands_info_command.rb +0 -2
- data/test/rubygems/test_gem_commands_install_command.rb +132 -3
- data/test/rubygems/test_gem_commands_list_command.rb +0 -2
- data/test/rubygems/test_gem_commands_lock_command.rb +0 -2
- data/test/rubygems/test_gem_commands_mirror.rb +0 -2
- data/test/rubygems/test_gem_commands_open_command.rb +0 -2
- data/test/rubygems/test_gem_commands_outdated_command.rb +0 -2
- data/test/rubygems/test_gem_commands_owner_command.rb +48 -2
- data/test/rubygems/test_gem_commands_pristine_command.rb +2 -4
- data/test/rubygems/test_gem_commands_push_command.rb +70 -7
- data/test/rubygems/test_gem_commands_query_command.rb +3 -7
- data/test/rubygems/test_gem_commands_search_command.rb +0 -2
- data/test/rubygems/test_gem_commands_server_command.rb +0 -2
- data/test/rubygems/test_gem_commands_setup_command.rb +19 -30
- data/test/rubygems/test_gem_commands_signin_command.rb +27 -5
- data/test/rubygems/test_gem_commands_signout_command.rb +0 -2
- data/test/rubygems/test_gem_commands_sources_command.rb +60 -2
- data/test/rubygems/test_gem_commands_specification_command.rb +28 -2
- data/test/rubygems/test_gem_commands_stale_command.rb +0 -2
- data/test/rubygems/test_gem_commands_uninstall_command.rb +0 -2
- data/test/rubygems/test_gem_commands_unpack_command.rb +0 -2
- data/test/rubygems/test_gem_commands_update_command.rb +50 -4
- data/test/rubygems/test_gem_commands_which_command.rb +0 -2
- data/test/rubygems/test_gem_commands_yank_command.rb +30 -2
- data/test/rubygems/test_gem_config_file.rb +0 -2
- data/test/rubygems/test_gem_dependency.rb +0 -2
- data/test/rubygems/test_gem_dependency_installer.rb +38 -4
- data/test/rubygems/test_gem_dependency_list.rb +2 -4
- data/test/rubygems/test_gem_dependency_resolution_error.rb +0 -2
- data/test/rubygems/test_gem_doctor.rb +0 -2
- data/test/rubygems/test_gem_ext_builder.rb +12 -22
- data/test/rubygems/test_gem_ext_cmake_builder.rb +3 -11
- data/test/rubygems/test_gem_ext_configure_builder.rb +3 -11
- data/test/rubygems/test_gem_ext_ext_conf_builder.rb +9 -28
- data/test/rubygems/test_gem_ext_rake_builder.rb +30 -15
- data/test/rubygems/test_gem_gem_runner.rb +7 -6
- data/test/rubygems/test_gem_gemcutter_utilities.rb +3 -5
- data/test/rubygems/test_gem_impossible_dependencies_error.rb +0 -2
- data/test/rubygems/test_gem_indexer.rb +0 -2
- data/test/rubygems/test_gem_install_update_options.rb +14 -4
- data/test/rubygems/test_gem_installer.rb +113 -74
- data/test/rubygems/test_gem_local_remote_options.rb +0 -2
- data/test/rubygems/test_gem_name_tuple.rb +0 -2
- data/test/rubygems/test_gem_package.rb +25 -19
- data/test/rubygems/test_gem_package_old.rb +4 -6
- data/test/rubygems/test_gem_package_tar_header.rb +0 -2
- data/test/rubygems/test_gem_package_tar_reader.rb +0 -2
- data/test/rubygems/test_gem_package_tar_reader_entry.rb +0 -2
- data/test/rubygems/test_gem_package_tar_writer.rb +1 -3
- data/test/rubygems/test_gem_package_task.rb +0 -2
- data/test/rubygems/test_gem_path_support.rb +0 -2
- data/test/rubygems/test_gem_platform.rb +63 -6
- data/test/rubygems/test_gem_rdoc.rb +0 -2
- data/test/rubygems/test_gem_remote_fetcher.rb +18 -23
- data/test/rubygems/test_gem_request.rb +2 -6
- data/test/rubygems/test_gem_request_connection_pools.rb +0 -4
- data/test/rubygems/test_gem_request_set.rb +0 -2
- data/test/rubygems/test_gem_request_set_gem_dependency_api.rb +0 -2
- data/test/rubygems/test_gem_request_set_lockfile.rb +4 -6
- data/test/rubygems/test_gem_request_set_lockfile_parser.rb +0 -2
- data/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb +0 -2
- data/test/rubygems/test_gem_requirement.rb +8 -2
- data/test/rubygems/test_gem_resolver.rb +0 -2
- data/test/rubygems/test_gem_resolver_activation_request.rb +0 -2
- data/test/rubygems/test_gem_resolver_api_set.rb +58 -57
- data/test/rubygems/test_gem_resolver_api_specification.rb +3 -5
- data/test/rubygems/test_gem_resolver_best_set.rb +3 -5
- data/test/rubygems/test_gem_resolver_composed_set.rb +0 -2
- data/test/rubygems/test_gem_resolver_conflict.rb +1 -3
- data/test/rubygems/test_gem_resolver_dependency_request.rb +0 -2
- data/test/rubygems/test_gem_resolver_git_set.rb +0 -2
- data/test/rubygems/test_gem_resolver_git_specification.rb +0 -2
- data/test/rubygems/test_gem_resolver_index_set.rb +0 -2
- data/test/rubygems/test_gem_resolver_index_specification.rb +0 -2
- data/test/rubygems/test_gem_resolver_installed_specification.rb +0 -2
- data/test/rubygems/test_gem_resolver_installer_set.rb +0 -2
- data/test/rubygems/test_gem_resolver_local_specification.rb +0 -2
- data/test/rubygems/test_gem_resolver_lock_set.rb +0 -2
- data/test/rubygems/test_gem_resolver_lock_specification.rb +0 -2
- data/test/rubygems/test_gem_resolver_requirement_list.rb +0 -2
- data/test/rubygems/test_gem_resolver_specification.rb +0 -4
- data/test/rubygems/test_gem_resolver_vendor_set.rb +1 -3
- data/test/rubygems/test_gem_resolver_vendor_specification.rb +0 -2
- data/test/rubygems/test_gem_security.rb +2 -4
- data/test/rubygems/test_gem_security_policy.rb +2 -4
- data/test/rubygems/test_gem_security_signer.rb +2 -4
- data/test/rubygems/test_gem_security_trust_dir.rb +2 -4
- data/test/rubygems/test_gem_server.rb +0 -4
- data/test/rubygems/test_gem_silent_ui.rb +0 -2
- data/test/rubygems/test_gem_source.rb +7 -4
- data/test/rubygems/test_gem_source_fetch_problem.rb +0 -2
- data/test/rubygems/test_gem_source_git.rb +0 -2
- data/test/rubygems/test_gem_source_installed.rb +0 -2
- data/test/rubygems/test_gem_source_list.rb +1 -2
- data/test/rubygems/test_gem_source_local.rb +0 -2
- data/test/rubygems/test_gem_source_lock.rb +0 -2
- data/test/rubygems/test_gem_source_specific_file.rb +0 -2
- data/test/rubygems/test_gem_source_subpath_problem.rb +49 -0
- data/test/rubygems/test_gem_source_vendor.rb +0 -2
- data/test/rubygems/test_gem_spec_fetcher.rb +0 -2
- data/test/rubygems/test_gem_specification.rb +15 -14
- data/test/rubygems/test_gem_stream_ui.rb +0 -2
- data/test/rubygems/test_gem_stub_specification.rb +4 -6
- data/test/rubygems/test_gem_text.rb +0 -2
- data/test/rubygems/test_gem_uninstaller.rb +7 -9
- data/test/rubygems/test_gem_unsatisfiable_dependency_error.rb +0 -2
- data/test/rubygems/test_gem_uri_formatter.rb +0 -2
- data/test/rubygems/test_gem_util.rb +0 -2
- data/test/rubygems/test_gem_validator.rb +1 -3
- data/test/rubygems/test_gem_version.rb +0 -2
- data/test/rubygems/test_gem_version_option.rb +1 -3
- data/test/rubygems/test_kernel.rb +0 -2
- data/test/rubygems/test_project_sanity.rb +0 -2
- data/test/rubygems/test_remote_fetch_error.rb +0 -2
- data/test/rubygems/test_require.rb +50 -17
- data/test/test_changelog_generator.rb +17 -0
- metadata +59 -77
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/compatibility.rb +0 -26
- data/bundler/man/bundle-add.1.txt +0 -58
- data/bundler/man/bundle-binstubs.1.txt +0 -48
- data/bundler/man/bundle-cache.1.txt +0 -78
- data/bundler/man/bundle-check.1.txt +0 -33
- data/bundler/man/bundle-clean.1.txt +0 -26
- data/bundler/man/bundle-config.1.txt +0 -527
- data/bundler/man/bundle-doctor.1.txt +0 -44
- data/bundler/man/bundle-exec.1.txt +0 -181
- data/bundler/man/bundle-gem.1.txt +0 -117
- data/bundler/man/bundle-info.1.txt +0 -21
- data/bundler/man/bundle-init.1.txt +0 -34
- data/bundler/man/bundle-inject.1.txt +0 -32
- data/bundler/man/bundle-install.1.txt +0 -401
- data/bundler/man/bundle-list.1.txt +0 -44
- data/bundler/man/bundle-lock.1.txt +0 -93
- data/bundler/man/bundle-open.1.txt +0 -29
- data/bundler/man/bundle-outdated.1.txt +0 -131
- data/bundler/man/bundle-platform.1.txt +0 -57
- data/bundler/man/bundle-pristine.1.txt +0 -44
- data/bundler/man/bundle-remove.1.txt +0 -34
- data/bundler/man/bundle-show.1.txt +0 -27
- data/bundler/man/bundle-update.1.txt +0 -391
- data/bundler/man/bundle-viz.1.txt +0 -39
- data/bundler/man/bundle.1.txt +0 -116
- data/bundler/man/gemfile.5.txt +0 -651
- 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
@@ -10,7 +10,7 @@ module Bundler
|
|
10
10
|
# So that we don't have to override all there methods to dummy ones
|
11
11
|
# explicitly.
|
12
12
|
# They will be handled by method_missing
|
13
|
-
[:gemspec, :gem, :
|
13
|
+
[:gemspec, :gem, :install_if, :platforms, :env].each {|m| undef_method m }
|
14
14
|
|
15
15
|
# This lists the plugins that was added automatically and not specified by
|
16
16
|
# the user.
|
@@ -75,7 +75,7 @@ module Bundler
|
|
75
75
|
return unless debug?
|
76
76
|
debug_info = yield
|
77
77
|
debug_info = debug_info.inspect unless debug_info.is_a?(String)
|
78
|
-
|
78
|
+
puts debug_info.split("\n").map {|s| "BUNDLER: " + " " * depth + s }
|
79
79
|
end
|
80
80
|
|
81
81
|
def debug?
|
@@ -106,18 +106,19 @@ module Bundler
|
|
106
106
|
specification.dependencies_for_activated_platforms
|
107
107
|
end
|
108
108
|
|
109
|
-
def search_for(
|
110
|
-
platform =
|
111
|
-
dependency =
|
112
|
-
|
109
|
+
def search_for(dependency_proxy)
|
110
|
+
platform = dependency_proxy.__platform
|
111
|
+
dependency = dependency_proxy.dep
|
112
|
+
@search_for[dependency_proxy] ||= begin
|
113
|
+
name = dependency.name
|
113
114
|
index = index_for(dependency)
|
114
|
-
results = index.search(dependency, @base[
|
115
|
+
results = index.search(dependency, @base[name])
|
115
116
|
|
116
|
-
if vertex = @base_dg.vertex_named(
|
117
|
+
if vertex = @base_dg.vertex_named(name)
|
117
118
|
locked_requirement = vertex.payload.requirement
|
118
119
|
end
|
119
120
|
|
120
|
-
if !@prerelease_specified[
|
121
|
+
if !@prerelease_specified[name] && (!@use_gvp || locked_requirement.nil?)
|
121
122
|
# Move prereleases to the beginning of the list, so they're considered
|
122
123
|
# last during resolution.
|
123
124
|
pre, results = results.partition {|spec| spec.version.prerelease? }
|
@@ -145,32 +146,27 @@ module Bundler
|
|
145
146
|
end
|
146
147
|
# GVP handles major itself, but it's still a bit risky to trust it with it
|
147
148
|
# until we get it settled with new behavior. For 2.x it can take over all cases.
|
148
|
-
if !@use_gvp
|
149
|
+
search = if !@use_gvp
|
149
150
|
spec_groups
|
150
151
|
else
|
151
152
|
@gem_version_promoter.sort_versions(dependency, spec_groups)
|
152
153
|
end
|
153
|
-
|
154
|
-
|
155
|
-
|
156
|
-
|
157
|
-
|
158
|
-
|
159
|
-
|
160
|
-
|
161
|
-
|
162
|
-
|
163
|
-
|
164
|
-
|
165
|
-
if
|
166
|
-
sg_all_platforms = sg.copy_for(other_platform)
|
167
|
-
else
|
168
|
-
sg_all_platforms.activate_platform!(other_platform)
|
169
|
-
end
|
154
|
+
selected_sgs = []
|
155
|
+
search.each do |sg|
|
156
|
+
next unless sg.for?(platform)
|
157
|
+
sg_all_platforms = sg.copy_for(self.class.sort_platforms(@platforms).reverse)
|
158
|
+
next unless sg_all_platforms
|
159
|
+
|
160
|
+
selected_sgs << sg_all_platforms
|
161
|
+
|
162
|
+
next if sg_all_platforms.activated_platforms == [Gem::Platform::RUBY]
|
163
|
+
# Add a spec group for "non platform specific spec" as the fallback
|
164
|
+
# spec group.
|
165
|
+
sg_ruby = sg.copy_for([Gem::Platform::RUBY])
|
166
|
+
selected_sgs.insert(-2, sg_ruby) if sg_ruby
|
170
167
|
end
|
171
|
-
selected_sgs
|
168
|
+
selected_sgs
|
172
169
|
end
|
173
|
-
selected_sgs
|
174
170
|
end
|
175
171
|
|
176
172
|
def index_for(dependency)
|
@@ -250,7 +246,7 @@ module Bundler
|
|
250
246
|
["00", *platform.to_a.map {|part| part || "" }]
|
251
247
|
end
|
252
248
|
|
253
|
-
|
249
|
+
private
|
254
250
|
|
255
251
|
# returns an integer \in (-\infty, 0]
|
256
252
|
# a number closer to 0 means the dependency is less constraining
|
@@ -302,7 +298,7 @@ module Bundler
|
|
302
298
|
versions_with_platforms = specs.map {|s| [s.version, s.platform] }
|
303
299
|
message = String.new("Could not find gem '#{SharedHelpers.pretty_dependency(requirement)}' in #{source}#{cache_message}.\n")
|
304
300
|
message << if versions_with_platforms.any?
|
305
|
-
"The source contains '#{name}'
|
301
|
+
"The source contains the following versions of '#{name}': #{formatted_versions_with_platforms(versions_with_platforms)}"
|
306
302
|
else
|
307
303
|
"The source does not contain any versions of '#{name}'"
|
308
304
|
end
|
@@ -6,7 +6,7 @@ module Bundler
|
|
6
6
|
include GemHelpers
|
7
7
|
|
8
8
|
attr_accessor :name, :version, :source
|
9
|
-
attr_accessor :ignores_bundler_dependencies
|
9
|
+
attr_accessor :ignores_bundler_dependencies, :activated_platforms
|
10
10
|
|
11
11
|
def initialize(all_specs)
|
12
12
|
@all_specs = all_specs
|
@@ -25,33 +25,29 @@ module Bundler
|
|
25
25
|
|
26
26
|
def to_specs
|
27
27
|
@activated_platforms.map do |p|
|
28
|
-
|
29
|
-
|
30
|
-
lazy_spec.dependencies.replace s.dependencies
|
31
|
-
lazy_spec
|
32
|
-
end.compact.uniq
|
33
|
-
end
|
28
|
+
specs = @specs[p]
|
29
|
+
next unless specs.any?
|
34
30
|
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
31
|
+
specs.map do |s|
|
32
|
+
lazy_spec = LazySpecification.new(name, version, s.platform, source)
|
33
|
+
lazy_spec.dependencies.replace s.dependencies
|
34
|
+
lazy_spec
|
35
|
+
end
|
36
|
+
end.flatten.compact.uniq
|
39
37
|
end
|
40
38
|
|
41
|
-
def copy_for(
|
39
|
+
def copy_for(platforms)
|
40
|
+
platforms.select! {|p| for?(p) }
|
41
|
+
return unless platforms.any?
|
42
|
+
|
42
43
|
copied_sg = self.class.new(@all_specs)
|
43
44
|
copied_sg.ignores_bundler_dependencies = @ignores_bundler_dependencies
|
44
|
-
|
45
|
-
copied_sg.activate_platform!(platform)
|
45
|
+
copied_sg.activated_platforms = platforms
|
46
46
|
copied_sg
|
47
47
|
end
|
48
48
|
|
49
|
-
def spec_for(platform)
|
50
|
-
@specs[platform]
|
51
|
-
end
|
52
|
-
|
53
49
|
def for?(platform)
|
54
|
-
|
50
|
+
@specs[platform].any?
|
55
51
|
end
|
56
52
|
|
57
53
|
def to_s
|
@@ -62,7 +58,7 @@ module Bundler
|
|
62
58
|
def dependencies_for_activated_platforms
|
63
59
|
dependencies = @activated_platforms.map {|p| __dependencies[p] }
|
64
60
|
metadata_dependencies = @activated_platforms.map do |platform|
|
65
|
-
metadata_dependencies(@specs[platform], platform)
|
61
|
+
metadata_dependencies(@specs[platform].first, platform)
|
66
62
|
end
|
67
63
|
dependencies.concat(metadata_dependencies).flatten
|
68
64
|
end
|
@@ -87,18 +83,19 @@ module Bundler
|
|
87
83
|
name.hash ^ version.hash ^ sorted_activated_platforms.hash ^ source.hash
|
88
84
|
end
|
89
85
|
|
90
|
-
|
86
|
+
protected
|
91
87
|
|
92
88
|
def sorted_activated_platforms
|
93
89
|
@activated_platforms.sort_by(&:to_s)
|
94
90
|
end
|
95
91
|
|
96
|
-
|
92
|
+
private
|
97
93
|
|
98
94
|
def __dependencies
|
99
95
|
@dependencies = Hash.new do |dependencies, platform|
|
100
96
|
dependencies[platform] = []
|
101
|
-
|
97
|
+
specs = @specs[platform]
|
98
|
+
if spec = specs.first
|
102
99
|
spec.dependencies.each do |dep|
|
103
100
|
next if dep.type == :development
|
104
101
|
next if @ignores_bundler_dependencies && dep.name == "bundler".freeze
|
@@ -110,10 +107,7 @@ module Bundler
|
|
110
107
|
end
|
111
108
|
|
112
109
|
def metadata_dependencies(spec, platform)
|
113
|
-
return [] unless spec
|
114
|
-
# Only allow endpoint specifications since they won't hit the network to
|
115
|
-
# fetch the full gemspec when calling required_ruby_version
|
116
|
-
return [] if !spec.is_a?(EndpointSpecification) && !spec.is_a?(Gem::Specification)
|
110
|
+
return [] unless spec && spec.is_a?(Gem::Specification)
|
117
111
|
dependencies = []
|
118
112
|
if !spec.required_ruby_version.nil? && !spec.required_ruby_version.none?
|
119
113
|
dependencies << DepProxy.new(Gem::Dependency.new("Ruby\0", spec.required_ruby_version), platform)
|
@@ -85,7 +85,7 @@ module Gem
|
|
85
85
|
dependencies - development_dependencies
|
86
86
|
end
|
87
87
|
|
88
|
-
|
88
|
+
private
|
89
89
|
|
90
90
|
def dependencies_to_gemfile(dependencies, group = nil)
|
91
91
|
gemfile = String.new
|
@@ -129,6 +129,35 @@ module Gem
|
|
129
129
|
end
|
130
130
|
end
|
131
131
|
|
132
|
+
# comparison is done order independently since rubygems 3.2.0.rc.2
|
133
|
+
unless Gem::Requirement.new("> 1", "< 2") == Gem::Requirement.new("< 2", "> 1")
|
134
|
+
class Requirement
|
135
|
+
module OrderIndependentComparison
|
136
|
+
def ==(other)
|
137
|
+
if _requirements_sorted? && other._requirements_sorted?
|
138
|
+
super
|
139
|
+
else
|
140
|
+
_with_sorted_requirements == other._with_sorted_requirements
|
141
|
+
end
|
142
|
+
end
|
143
|
+
|
144
|
+
protected
|
145
|
+
|
146
|
+
def _requirements_sorted?
|
147
|
+
return @_are_requirements_sorted if defined?(@_are_requirements_sorted)
|
148
|
+
strings = as_list
|
149
|
+
@_are_requirements_sorted = strings == strings.sort
|
150
|
+
end
|
151
|
+
|
152
|
+
def _with_sorted_requirements
|
153
|
+
@_with_sorted_requirements ||= _requirements_sorted? ? self : self.class.new(as_list.sort)
|
154
|
+
end
|
155
|
+
end
|
156
|
+
|
157
|
+
prepend OrderIndependentComparison
|
158
|
+
end
|
159
|
+
end
|
160
|
+
|
132
161
|
class Platform
|
133
162
|
JAVA = Gem::Platform.new("java") unless defined?(JAVA)
|
134
163
|
MSWIN = Gem::Platform.new("mswin32") unless defined?(MSWIN)
|
@@ -144,6 +173,22 @@ module Gem
|
|
144
173
|
undef_method :eql? if method_defined? :eql?
|
145
174
|
alias_method :eql?, :==
|
146
175
|
end
|
176
|
+
|
177
|
+
require "rubygems/util"
|
178
|
+
|
179
|
+
Util.singleton_class.module_eval do
|
180
|
+
if Util.singleton_methods.include?(:glob_files_in_dir) # since 3.0.0.beta.2
|
181
|
+
remove_method :glob_files_in_dir
|
182
|
+
end
|
183
|
+
|
184
|
+
def glob_files_in_dir(glob, base_path)
|
185
|
+
if RUBY_VERSION >= "2.5"
|
186
|
+
Dir.glob(glob, :base => base_path).map! {|f| File.expand_path(f, base_path) }
|
187
|
+
else
|
188
|
+
Dir.glob(File.join(base_path.to_s.gsub(/[\[\]]/, '\\\\\\&'), glob)).map! {|f| File.expand_path(f) }
|
189
|
+
end
|
190
|
+
end
|
191
|
+
end
|
147
192
|
end
|
148
193
|
|
149
194
|
module Gem
|
@@ -34,7 +34,7 @@ module Bundler
|
|
34
34
|
end
|
35
35
|
end
|
36
36
|
|
37
|
-
|
37
|
+
private
|
38
38
|
|
39
39
|
def validate_bundler_checksum(checksum)
|
40
40
|
return true if Bundler.settings[:disable_checksum_validation]
|
@@ -60,7 +60,7 @@ module Bundler
|
|
60
60
|
|
61
61
|
If you wish to continue installing the downloaded gem, and are certain it does not pose a \
|
62
62
|
security issue despite the mismatching checksum, do the following:
|
63
|
-
1. run `bundle config set disable_checksum_validation true` to turn off checksum verification
|
63
|
+
1. run `bundle config set --local disable_checksum_validation true` to turn off checksum verification
|
64
64
|
2. run `bundle install`
|
65
65
|
|
66
66
|
(More info: The expected SHA256 checksum was #{checksum.inspect}, but the \
|
@@ -110,11 +110,6 @@ module Bundler
|
|
110
110
|
obj.to_s
|
111
111
|
end
|
112
112
|
|
113
|
-
def platforms
|
114
|
-
return [Gem::Platform::RUBY] if Bundler.settings[:force_ruby_platform]
|
115
|
-
Gem.platforms
|
116
|
-
end
|
117
|
-
|
118
113
|
def configuration
|
119
114
|
require_relative "psyched_yaml"
|
120
115
|
Gem.configuration
|
@@ -227,6 +222,10 @@ module Bundler
|
|
227
222
|
Gem.load_plugin_files(files) if Gem.respond_to?(:load_plugin_files)
|
228
223
|
end
|
229
224
|
|
225
|
+
def load_env_plugins
|
226
|
+
Gem.load_env_plugins if Gem.respond_to?(:load_env_plugins)
|
227
|
+
end
|
228
|
+
|
230
229
|
def ui=(obj)
|
231
230
|
Gem::DefaultUserInteraction.ui = obj
|
232
231
|
end
|
@@ -313,8 +312,13 @@ module Bundler
|
|
313
312
|
end
|
314
313
|
|
315
314
|
message = if spec.nil?
|
315
|
+
target_file = begin
|
316
|
+
Bundler.default_gemfile.basename
|
317
|
+
rescue GemfileNotFound
|
318
|
+
"inline Gemfile"
|
319
|
+
end
|
316
320
|
"#{dep.name} is not part of the bundle." \
|
317
|
-
" Add it to your #{
|
321
|
+
" Add it to your #{target_file}."
|
318
322
|
else
|
319
323
|
"can't activate #{dep}, already activated #{spec.full_name}. " \
|
320
324
|
"Make sure all dependencies are added to Gemfile."
|
@@ -406,6 +410,17 @@ module Bundler
|
|
406
410
|
# Replace or hook into RubyGems to provide a bundlerized view
|
407
411
|
# of the world.
|
408
412
|
def replace_entrypoints(specs)
|
413
|
+
specs_by_name = add_default_gems_to(specs)
|
414
|
+
|
415
|
+
replace_gem(specs, specs_by_name)
|
416
|
+
stub_rubygems(specs)
|
417
|
+
replace_bin_path(specs_by_name)
|
418
|
+
|
419
|
+
Gem.clear_paths
|
420
|
+
end
|
421
|
+
|
422
|
+
# Add default gems not already present in specs, and return them as a hash.
|
423
|
+
def add_default_gems_to(specs)
|
409
424
|
specs_by_name = specs.reduce({}) do |h, s|
|
410
425
|
h[s.name] = s
|
411
426
|
h
|
@@ -420,11 +435,7 @@ module Bundler
|
|
420
435
|
specs_by_name[default_spec_name] = default_spec
|
421
436
|
end
|
422
437
|
|
423
|
-
|
424
|
-
stub_rubygems(specs)
|
425
|
-
replace_bin_path(specs_by_name)
|
426
|
-
|
427
|
-
Gem.clear_paths
|
438
|
+
specs_by_name
|
428
439
|
end
|
429
440
|
|
430
441
|
def undo_replacements
|
@@ -549,7 +560,6 @@ module Bundler
|
|
549
560
|
end
|
550
561
|
|
551
562
|
def all_specs
|
552
|
-
require_relative "remote_specification"
|
553
563
|
Gem::Specification.stubs.map do |stub|
|
554
564
|
StubSpecification.from_stub(stub)
|
555
565
|
end
|