rubygems-update 3.0.8 → 3.1.0.pre1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.rubocop.yml +31 -8
- data/.travis.yml +9 -27
- data/CONTRIBUTING.md +13 -0
- data/History.txt +24 -21
- data/MAINTAINERS.txt +1 -6
- data/Manifest.txt +62 -13
- data/Rakefile +39 -23
- data/bin/gem +0 -6
- data/bundler/CHANGELOG.md +746 -570
- data/bundler/CODE_OF_CONDUCT.md +117 -23
- data/bundler/LICENSE.md +18 -19
- data/bundler/README.md +9 -8
- data/bundler/bundler.gemspec +8 -25
- data/bundler/exe/bundle +19 -3
- data/bundler/lib/bundler.rb +120 -67
- data/bundler/lib/bundler/build_metadata.rb +1 -3
- data/bundler/lib/bundler/capistrano.rb +4 -4
- data/bundler/lib/bundler/cli.rb +129 -121
- data/bundler/lib/bundler/cli/add.rb +27 -16
- data/bundler/lib/bundler/cli/common.rb +11 -12
- data/bundler/lib/bundler/cli/config.rb +161 -86
- data/bundler/lib/bundler/cli/console.rb +1 -1
- data/bundler/lib/bundler/cli/doctor.rb +4 -4
- data/bundler/lib/bundler/cli/exec.rb +4 -9
- data/bundler/lib/bundler/cli/gem.rb +5 -5
- data/bundler/lib/bundler/cli/info.rb +17 -5
- data/bundler/lib/bundler/cli/init.rb +1 -1
- data/bundler/lib/bundler/cli/install.rb +11 -10
- data/bundler/lib/bundler/cli/issue.rb +3 -3
- data/bundler/lib/bundler/cli/open.rb +10 -6
- data/bundler/lib/bundler/cli/outdated.rb +85 -81
- data/bundler/lib/bundler/cli/package.rb +8 -9
- data/bundler/lib/bundler/cli/plugin.rb +9 -2
- data/bundler/lib/bundler/cli/pristine.rb +1 -1
- data/bundler/lib/bundler/cli/show.rb +1 -1
- data/bundler/lib/bundler/cli/update.rb +31 -11
- data/bundler/lib/bundler/compact_index_client.rb +25 -9
- data/bundler/lib/bundler/compact_index_client/updater.rb +2 -6
- data/bundler/lib/bundler/current_ruby.rb +9 -7
- data/bundler/lib/bundler/definition.rb +35 -26
- data/bundler/lib/bundler/dependency.rb +16 -4
- data/bundler/lib/bundler/deployment.rb +1 -1
- data/bundler/lib/bundler/dsl.rb +15 -39
- data/bundler/lib/bundler/env.rb +8 -13
- data/bundler/lib/bundler/environment_preserver.rb +0 -1
- data/bundler/lib/bundler/feature_flag.rb +23 -34
- data/bundler/lib/bundler/fetcher.rb +14 -11
- data/bundler/lib/bundler/fetcher/compact_index.rb +26 -12
- data/bundler/lib/bundler/fetcher/dependency.rb +1 -1
- data/bundler/lib/bundler/fetcher/downloader.rb +4 -1
- data/bundler/lib/bundler/fetcher/index.rb +4 -2
- data/bundler/lib/bundler/friendly_errors.rb +4 -5
- data/bundler/lib/bundler/gem_helper.rb +39 -24
- data/bundler/lib/bundler/gem_helpers.rb +2 -4
- data/bundler/lib/bundler/gem_tasks.rb +1 -1
- data/bundler/lib/bundler/gem_version_promoter.rb +3 -3
- data/bundler/lib/bundler/graph.rb +2 -2
- data/bundler/lib/bundler/injector.rb +10 -8
- data/bundler/lib/bundler/inline.rb +19 -18
- data/bundler/lib/bundler/installer.rb +7 -14
- data/bundler/lib/bundler/installer/gem_installer.rb +5 -1
- data/bundler/lib/bundler/installer/parallel_installer.rb +4 -8
- data/bundler/lib/bundler/installer/standalone.rb +1 -2
- data/bundler/lib/bundler/lazy_specification.rb +2 -2
- data/bundler/lib/bundler/lockfile_parser.rb +13 -21
- data/bundler/lib/bundler/match_platform.rb +1 -1
- data/bundler/lib/bundler/plugin.rb +42 -29
- data/bundler/lib/bundler/plugin/api.rb +1 -1
- data/bundler/lib/bundler/plugin/api/source.rb +2 -2
- data/bundler/lib/bundler/plugin/index.rb +14 -3
- data/bundler/lib/bundler/plugin/installer.rb +28 -15
- data/bundler/lib/bundler/psyched_yaml.rb +1 -1
- data/bundler/lib/bundler/resolver.rb +72 -24
- data/bundler/lib/bundler/resolver/spec_group.rb +3 -2
- data/bundler/lib/bundler/retry.rb +2 -2
- data/bundler/lib/bundler/ruby_version.rb +4 -19
- data/bundler/lib/bundler/rubygems_ext.rb +10 -66
- data/bundler/lib/bundler/rubygems_gem_installer.rb +1 -8
- data/bundler/lib/bundler/rubygems_integration.rb +144 -395
- data/bundler/lib/bundler/runtime.rb +2 -9
- data/bundler/lib/bundler/settings.rb +15 -47
- data/bundler/lib/bundler/setup.rb +6 -5
- data/bundler/lib/bundler/shared_helpers.rb +58 -71
- data/bundler/lib/bundler/similarity_detector.rb +2 -2
- data/bundler/lib/bundler/source.rb +5 -5
- data/bundler/lib/bundler/source/git.rb +19 -12
- data/bundler/lib/bundler/source/git/git_proxy.rb +35 -39
- data/bundler/lib/bundler/source/metadata.rb +7 -2
- data/bundler/lib/bundler/source/path.rb +13 -8
- data/bundler/lib/bundler/source/rubygems.rb +11 -5
- data/bundler/lib/bundler/source/rubygems/remote.rb +1 -2
- data/bundler/lib/bundler/source_list.rb +9 -12
- data/bundler/lib/bundler/spec_set.rb +23 -12
- data/bundler/lib/bundler/stub_specification.rb +18 -30
- data/bundler/lib/bundler/templates/Executable.bundler +23 -14
- data/bundler/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt +3 -3
- data/bundler/lib/bundler/templates/newgem/Gemfile.tt +8 -2
- data/bundler/lib/bundler/templates/newgem/README.md.tt +4 -3
- data/bundler/lib/bundler/templates/newgem/newgem.gemspec.tt +6 -27
- data/bundler/lib/bundler/templates/newgem/test/test_helper.rb.tt +1 -1
- data/bundler/lib/bundler/templates/newgem/travis.yml.tt +0 -1
- data/bundler/lib/bundler/ui.rb +3 -3
- data/bundler/lib/bundler/ui/rg_proxy.rb +1 -1
- data/bundler/lib/bundler/ui/shell.rb +4 -8
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool.rb +161 -0
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/monotonic_time.rb +66 -0
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb +176 -0
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/version.rb +3 -0
- data/bundler/lib/bundler/vendor/fileutils/lib/fileutils.rb +151 -48
- data/bundler/lib/bundler/vendor/fileutils/lib/fileutils/version.rb +5 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo.rb +6 -6
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb +2 -2
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/log.rb +6 -6
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb +30 -8
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +4 -4
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb +2 -2
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +248 -279
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/connection.rb +40 -0
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/pool.rb +53 -0
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/timed_stack_multi.rb +79 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor.rb +7 -2
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions.rb +21 -11
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/create_file.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/create_link.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/directory.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/file_manipulation.rb +11 -2
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/base.rb +16 -17
- data/bundler/lib/bundler/vendor/thor/lib/thor/error.rb +82 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/group.rb +3 -3
- data/bundler/lib/bundler/vendor/thor/lib/thor/line_editor.rb +2 -2
- data/bundler/lib/bundler/vendor/thor/lib/thor/parser.rb +4 -4
- data/bundler/lib/bundler/vendor/thor/lib/thor/parser/options.rb +7 -2
- data/bundler/lib/bundler/vendor/thor/lib/thor/runner.rb +6 -6
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell.rb +4 -4
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell/basic.rb +52 -7
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell/color.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell/html.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/util.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/version.rb +1 -1
- data/bundler/lib/bundler/vendored_fileutils.rb +1 -6
- data/bundler/lib/bundler/vendored_molinillo.rb +1 -1
- data/bundler/lib/bundler/vendored_persistent.rb +7 -5
- data/bundler/lib/bundler/vendored_thor.rb +2 -2
- data/bundler/lib/bundler/version.rb +1 -20
- data/bundler/lib/bundler/version_ranges.rb +51 -5
- data/bundler/lib/bundler/vlad.rb +2 -2
- data/bundler/lib/bundler/worker.rb +1 -3
- data/bundler/lib/bundler/yaml_serializer.rb +2 -3
- data/bundler/man/bundle-add.1 +66 -0
- data/bundler/man/bundle-add.1.txt +58 -0
- data/bundler/man/bundle-add.ronn +7 -1
- data/bundler/man/bundle-binstubs.1 +40 -0
- data/bundler/man/bundle-binstubs.1.txt +48 -0
- data/bundler/man/bundle-binstubs.ronn +1 -1
- data/bundler/man/bundle-check.1 +31 -0
- data/bundler/man/bundle-check.1.txt +33 -0
- data/bundler/man/bundle-clean.1 +24 -0
- data/bundler/man/bundle-clean.1.txt +26 -0
- data/bundler/man/bundle-config.1 +497 -0
- data/bundler/man/bundle-config.1.txt +528 -0
- data/bundler/man/bundle-config.ronn +42 -40
- data/bundler/man/bundle-doctor.1 +44 -0
- data/bundler/man/bundle-doctor.1.txt +44 -0
- data/bundler/man/bundle-exec.1 +165 -0
- data/bundler/man/bundle-exec.1.txt +178 -0
- data/bundler/man/bundle-exec.ronn +1 -1
- data/bundler/man/bundle-gem.1 +80 -0
- data/bundler/man/bundle-gem.1.txt +91 -0
- data/bundler/man/bundle-info.1 +20 -0
- data/bundler/man/bundle-info.1.txt +21 -0
- data/bundler/man/bundle-init.1 +25 -0
- data/bundler/man/bundle-init.1.txt +34 -0
- data/bundler/man/bundle-init.ronn +1 -1
- data/bundler/man/bundle-inject.1 +33 -0
- data/bundler/man/bundle-inject.1.txt +32 -0
- data/bundler/man/bundle-install.1 +311 -0
- data/bundler/man/bundle-install.1.txt +401 -0
- data/bundler/man/bundle-install.ronn +9 -4
- data/bundler/man/bundle-list.1 +50 -0
- data/bundler/man/bundle-list.1.txt +43 -0
- data/bundler/man/bundle-lock.1 +84 -0
- data/bundler/man/bundle-lock.1.txt +93 -0
- data/bundler/man/bundle-open.1 +32 -0
- data/bundler/man/bundle-open.1.txt +29 -0
- data/bundler/man/bundle-outdated.1 +155 -0
- data/bundler/man/bundle-outdated.1.txt +131 -0
- data/bundler/man/bundle-package.1 +55 -0
- data/bundler/man/bundle-package.1.txt +79 -0
- data/bundler/man/bundle-platform.1 +61 -0
- data/bundler/man/bundle-platform.1.txt +57 -0
- data/bundler/man/bundle-pristine.1 +34 -0
- data/bundler/man/bundle-pristine.1.txt +44 -0
- data/bundler/man/bundle-remove.1 +31 -0
- data/bundler/man/bundle-remove.1.txt +34 -0
- data/bundler/man/bundle-show.1 +23 -0
- data/bundler/man/bundle-show.1.txt +27 -0
- data/bundler/man/bundle-update.1 +394 -0
- data/bundler/man/bundle-update.1.txt +390 -0
- data/bundler/man/bundle-update.ronn +3 -3
- data/bundler/man/bundle-viz.1 +39 -0
- data/bundler/man/bundle-viz.1.txt +39 -0
- data/bundler/man/bundle.1 +136 -0
- data/bundler/man/bundle.1.txt +116 -0
- data/bundler/man/bundle.ronn +2 -2
- data/bundler/man/gemfile.5 +686 -0
- data/bundler/man/gemfile.5.ronn +14 -18
- data/bundler/man/gemfile.5.txt +649 -0
- data/bundler/man/index.txt +25 -0
- data/lib/rubygems.rb +80 -48
- data/lib/rubygems/available_set.rb +1 -0
- data/lib/rubygems/basic_specification.rb +17 -6
- data/lib/rubygems/bundler_version_finder.rb +5 -0
- data/lib/rubygems/command.rb +34 -5
- data/lib/rubygems/command_manager.rb +0 -6
- data/lib/rubygems/commands/build_command.rb +21 -8
- data/lib/rubygems/commands/cert_command.rb +0 -1
- data/lib/rubygems/commands/cleanup_command.rb +7 -7
- data/lib/rubygems/commands/contents_command.rb +3 -3
- data/lib/rubygems/commands/dependency_command.rb +4 -3
- data/lib/rubygems/commands/environment_command.rb +0 -3
- data/lib/rubygems/commands/info_command.rb +2 -0
- data/lib/rubygems/commands/install_command.rb +12 -52
- data/lib/rubygems/commands/lock_command.rb +2 -2
- data/lib/rubygems/commands/mirror_command.rb +1 -0
- data/lib/rubygems/commands/open_command.rb +2 -1
- data/lib/rubygems/commands/outdated_command.rb +1 -0
- data/lib/rubygems/commands/owner_command.rb +2 -7
- data/lib/rubygems/commands/pristine_command.rb +3 -0
- data/lib/rubygems/commands/push_command.rb +4 -6
- data/lib/rubygems/commands/query_command.rb +94 -80
- data/lib/rubygems/commands/rdoc_command.rb +1 -0
- data/lib/rubygems/commands/setup_command.rb +10 -8
- data/lib/rubygems/commands/signin_command.rb +1 -0
- data/lib/rubygems/commands/specification_command.rb +1 -0
- data/lib/rubygems/commands/stale_command.rb +2 -0
- data/lib/rubygems/commands/uninstall_command.rb +1 -0
- data/lib/rubygems/commands/unpack_command.rb +2 -29
- data/lib/rubygems/commands/update_command.rb +14 -14
- data/lib/rubygems/commands/which_command.rb +1 -0
- data/lib/rubygems/commands/yank_command.rb +8 -2
- data/lib/rubygems/compatibility.rb +4 -4
- data/lib/rubygems/config_file.rb +28 -23
- data/lib/rubygems/core_ext/kernel_gem.rb +2 -5
- data/lib/rubygems/core_ext/kernel_require.rb +29 -2
- data/lib/rubygems/core_ext/kernel_warn.rb +10 -4
- data/lib/rubygems/defaults.rb +10 -17
- data/lib/rubygems/dependency.rb +21 -6
- data/lib/rubygems/dependency_installer.rb +19 -102
- data/lib/rubygems/dependency_list.rb +11 -10
- data/lib/rubygems/deprecate.rb +5 -5
- data/lib/rubygems/errors.rb +11 -2
- data/lib/rubygems/exceptions.rb +9 -0
- data/lib/rubygems/ext/builder.rb +24 -43
- data/lib/rubygems/ext/cmake_builder.rb +2 -0
- data/lib/rubygems/ext/ext_conf_builder.rb +11 -9
- data/lib/rubygems/ext/rake_builder.rb +1 -1
- data/lib/rubygems/gemcutter_utilities.rb +19 -26
- data/lib/rubygems/indexer.rb +9 -5
- data/lib/rubygems/installer.rb +26 -13
- data/lib/rubygems/installer_test_case.rb +86 -38
- data/lib/rubygems/local_remote_options.rb +1 -1
- data/lib/rubygems/mock_gem_ui.rb +4 -1
- data/lib/rubygems/name_tuple.rb +1 -0
- data/lib/rubygems/package.rb +37 -9
- data/lib/rubygems/package/tar_writer.rb +4 -4
- data/lib/rubygems/path_support.rb +2 -0
- data/lib/rubygems/platform.rb +2 -1
- data/lib/rubygems/psych_tree.rb +2 -0
- data/lib/rubygems/remote_fetcher.rb +5 -1
- data/lib/rubygems/request.rb +5 -3
- data/lib/rubygems/request/connection_pools.rb +4 -4
- data/lib/rubygems/request/http_pool.rb +1 -0
- data/lib/rubygems/request/https_pool.rb +2 -0
- data/lib/rubygems/request_set.rb +2 -2
- data/lib/rubygems/request_set/gem_dependency_api.rb +2 -2
- data/lib/rubygems/request_set/lockfile.rb +5 -2
- data/lib/rubygems/request_set/lockfile/parser.rb +4 -2
- data/lib/rubygems/request_set/lockfile/tokenizer.rb +2 -0
- data/lib/rubygems/requirement.rb +20 -18
- data/lib/rubygems/resolver.rb +4 -5
- data/lib/rubygems/resolver/activation_request.rb +19 -49
- data/lib/rubygems/resolver/best_set.rb +2 -2
- data/lib/rubygems/resolver/conflict.rb +0 -5
- data/lib/rubygems/resolver/installer_set.rb +3 -3
- data/lib/rubygems/resolver/lock_set.rb +1 -1
- data/lib/rubygems/resolver/lock_specification.rb +2 -2
- data/lib/rubygems/resolver/requirement_list.rb +1 -0
- data/lib/rubygems/resolver/specification.rb +1 -0
- data/lib/rubygems/resolver/stats.rb +2 -0
- data/lib/rubygems/security/signer.rb +3 -2
- data/lib/rubygems/server.rb +5 -4
- data/lib/rubygems/source_list.rb +1 -0
- data/lib/rubygems/spec_fetcher.rb +3 -16
- data/lib/rubygems/specification.rb +69 -133
- data/lib/rubygems/specification_policy.rb +7 -2
- data/lib/rubygems/stub_specification.rb +5 -2
- data/lib/rubygems/syck_hack.rb +2 -0
- data/lib/rubygems/test_case.rb +78 -227
- data/lib/rubygems/test_utilities.rb +17 -6
- data/lib/rubygems/text.rb +2 -3
- data/lib/rubygems/uninstaller.rb +15 -15
- data/lib/rubygems/user_interaction.rb +9 -1
- data/lib/rubygems/util.rb +5 -41
- data/lib/rubygems/util/licenses.rb +398 -396
- data/lib/rubygems/util/list.rb +2 -0
- data/lib/rubygems/validator.rb +9 -29
- data/lib/rubygems/version.rb +5 -3
- data/rubygems-update.gemspec +3 -3
- data/test/rubygems/plugin/load/rubygems_plugin.rb +2 -0
- data/test/rubygems/test_deprecate.rb +3 -0
- data/test/rubygems/test_gem.rb +183 -176
- data/test/rubygems/test_gem_available_set.rb +3 -2
- data/test/rubygems/test_gem_bundler_version_finder.rb +3 -1
- data/test/rubygems/test_gem_command.rb +94 -5
- data/test/rubygems/test_gem_command_manager.rb +5 -13
- data/test/rubygems/test_gem_commands_build_command.rb +142 -4
- data/test/rubygems/test_gem_commands_cert_command.rb +15 -1
- data/test/rubygems/test_gem_commands_cleanup_command.rb +22 -6
- data/test/rubygems/test_gem_commands_dependency_command.rb +1 -1
- data/test/rubygems/test_gem_commands_environment_command.rb +1 -11
- data/test/rubygems/test_gem_commands_help_command.rb +2 -0
- data/test/rubygems/test_gem_commands_info_command.rb +1 -0
- data/test/rubygems/test_gem_commands_install_command.rb +207 -2
- data/test/rubygems/test_gem_commands_mirror.rb +1 -0
- data/test/rubygems/test_gem_commands_outdated_command.rb +1 -0
- data/test/rubygems/test_gem_commands_owner_command.rb +4 -5
- data/test/rubygems/test_gem_commands_pristine_command.rb +56 -4
- data/test/rubygems/test_gem_commands_push_command.rb +19 -14
- data/test/rubygems/test_gem_commands_query_command.rb +27 -2
- data/test/rubygems/test_gem_commands_setup_command.rb +62 -37
- data/test/rubygems/test_gem_commands_signin_command.rb +5 -4
- data/test/rubygems/test_gem_commands_sources_command.rb +20 -6
- data/test/rubygems/test_gem_commands_uninstall_command.rb +107 -50
- data/test/rubygems/test_gem_commands_update_command.rb +86 -23
- data/test/rubygems/test_gem_commands_yank_command.rb +46 -1
- data/test/rubygems/test_gem_config_file.rb +9 -2
- data/test/rubygems/test_gem_dependency.rb +6 -0
- data/test/rubygems/test_gem_dependency_installer.rb +67 -36
- data/test/rubygems/test_gem_dependency_list.rb +21 -14
- data/test/rubygems/test_gem_ext_builder.rb +5 -1
- data/test/rubygems/test_gem_ext_cmake_builder.rb +2 -0
- data/test/rubygems/test_gem_ext_configure_builder.rb +8 -0
- data/test/rubygems/test_gem_ext_ext_conf_builder.rb +12 -0
- data/test/rubygems/test_gem_ext_rake_builder.rb +2 -0
- data/test/rubygems/test_gem_gemcutter_utilities.rb +8 -8
- data/test/rubygems/test_gem_indexer.rb +31 -40
- data/test/rubygems/test_gem_install_update_options.rb +31 -17
- data/test/rubygems/test_gem_installer.rb +383 -223
- data/test/rubygems/test_gem_package.rb +99 -14
- data/test/rubygems/test_gem_package_old.rb +57 -54
- data/test/rubygems/test_gem_package_tar_reader_entry.rb +6 -5
- data/test/rubygems/test_gem_package_tar_writer.rb +11 -6
- data/test/rubygems/test_gem_path_support.rb +19 -13
- data/test/rubygems/test_gem_platform.rb +4 -2
- data/test/rubygems/test_gem_rdoc.rb +1 -0
- data/test/rubygems/test_gem_remote_fetcher.rb +29 -16
- data/test/rubygems/test_gem_request.rb +19 -4
- data/test/rubygems/test_gem_request_connection_pools.rb +6 -2
- data/test/rubygems/test_gem_request_set.rb +33 -8
- data/test/rubygems/test_gem_request_set_gem_dependency_api.rb +1 -1
- data/test/rubygems/test_gem_request_set_lockfile.rb +1 -0
- data/test/rubygems/test_gem_request_set_lockfile_parser.rb +2 -1
- data/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb +2 -0
- data/test/rubygems/test_gem_requirement.rb +7 -1
- data/test/rubygems/test_gem_resolver.rb +67 -23
- data/test/rubygems/test_gem_resolver_activation_request.rb +3 -32
- data/test/rubygems/test_gem_resolver_conflict.rb +0 -4
- data/test/rubygems/test_gem_resolver_git_specification.rb +1 -0
- data/test/rubygems/test_gem_resolver_index_specification.rb +7 -2
- data/test/rubygems/test_gem_resolver_installed_specification.rb +0 -1
- data/test/rubygems/test_gem_resolver_installer_set.rb +3 -1
- data/test/rubygems/test_gem_resolver_specification.rb +2 -0
- data/test/rubygems/test_gem_security.rb +6 -2
- data/test/rubygems/test_gem_security_signer.rb +1 -0
- data/test/rubygems/test_gem_server.rb +7 -2
- data/test/rubygems/test_gem_silent_ui.rb +1 -0
- data/test/rubygems/test_gem_source.rb +7 -7
- data/test/rubygems/test_gem_source_fetch_problem.rb +1 -0
- data/test/rubygems/test_gem_source_git.rb +4 -9
- data/test/rubygems/test_gem_source_installed.rb +6 -6
- data/test/rubygems/test_gem_source_list.rb +1 -0
- data/test/rubygems/test_gem_source_local.rb +5 -4
- data/test/rubygems/test_gem_source_lock.rb +12 -12
- data/test/rubygems/test_gem_source_specific_file.rb +7 -6
- data/test/rubygems/test_gem_source_vendor.rb +4 -4
- data/test/rubygems/test_gem_specification.rb +75 -43
- data/test/rubygems/test_gem_stream_ui.rb +2 -0
- data/test/rubygems/test_gem_stub_specification.rb +3 -1
- data/test/rubygems/test_gem_text.rb +1 -0
- data/test/rubygems/test_gem_uninstaller.rb +31 -10
- data/test/rubygems/test_gem_util.rb +6 -4
- data/test/rubygems/test_gem_validator.rb +3 -4
- data/test/rubygems/test_gem_version.rb +16 -8
- data/test/rubygems/test_kernel.rb +1 -0
- data/test/rubygems/test_rake_package.rb +26 -0
- data/test/rubygems/test_remote_fetch_error.rb +1 -0
- data/test/rubygems/test_require.rb +107 -3
- data/util/bisect +31 -0
- data/util/ci.sh +50 -0
- data/util/generate_spdx_license_list.rb +4 -2
- data/util/rubocop +2 -2
- metadata +90 -18
- data/appveyor.yml +0 -43
- data/bundler/CONTRIBUTING.md +0 -17
- data/bundler/exe/bundle_ruby +0 -60
- data/bundler/lib/bundler/cli/cache.rb +0 -36
- data/bundler/lib/bundler/compatibility_guard.rb +0 -14
- data/bundler/lib/bundler/ssl_certs/.document +0 -1
- data/bundler/lib/bundler/ssl_certs/certificate_manager.rb +0 -66
- data/bundler/lib/bundler/ssl_certs/index.rubygems.org/GlobalSignRootCA.pem +0 -21
- data/bundler/lib/bundler/ssl_certs/rubygems.global.ssl.fastly.net/DigiCertHighAssuranceEVRootCA.pem +0 -23
- data/bundler/lib/bundler/ssl_certs/rubygems.org/AddTrustExternalCARoot.pem +0 -25
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/faster.rb +0 -27
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/ssl_reuse.rb +0 -129
- data/util/ci +0 -82
@@ -34,14 +34,7 @@ module Bundler
|
|
34
34
|
spec.load_paths.reject {|path| $LOAD_PATH.include?(path) }
|
35
35
|
end.reverse.flatten
|
36
36
|
|
37
|
-
|
38
|
-
if insert_index = Bundler.rubygems.load_path_insert_index
|
39
|
-
# Gem directories must come after -I and ENV['RUBYLIB']
|
40
|
-
$LOAD_PATH.insert(insert_index, *load_paths)
|
41
|
-
else
|
42
|
-
# We are probably testing in core, -I and RUBYLIB don't apply
|
43
|
-
$LOAD_PATH.unshift(*load_paths)
|
44
|
-
end
|
37
|
+
Bundler.rubygems.add_to_load_path(load_paths)
|
45
38
|
|
46
39
|
setup_manpath
|
47
40
|
|
@@ -163,7 +156,7 @@ module Bundler
|
|
163
156
|
gem_dirs = Dir["#{Gem.dir}/gems/*"]
|
164
157
|
gem_files = Dir["#{Gem.dir}/cache/*.gem"]
|
165
158
|
gemspec_files = Dir["#{Gem.dir}/specifications/*.gemspec"]
|
166
|
-
extension_dirs = Dir["#{Gem.dir}/extensions/*/*/*"]
|
159
|
+
extension_dirs = Dir["#{Gem.dir}/extensions/*/*/*"] + Dir["#{Gem.dir}/bundler/gems/extensions/*/*/*"]
|
167
160
|
spec_gem_paths = []
|
168
161
|
# need to keep git sources around
|
169
162
|
spec_git_paths = @definition.spec_git_paths
|
@@ -4,9 +4,9 @@ require "uri"
|
|
4
4
|
|
5
5
|
module Bundler
|
6
6
|
class Settings
|
7
|
-
autoload :Mirror, "
|
8
|
-
autoload :Mirrors, "
|
9
|
-
autoload :Validator, "
|
7
|
+
autoload :Mirror, File.expand_path("mirror", __dir__)
|
8
|
+
autoload :Mirrors, File.expand_path("mirror", __dir__)
|
9
|
+
autoload :Validator, File.expand_path("settings/validator", __dir__)
|
10
10
|
|
11
11
|
BOOL_KEYS = %w[
|
12
12
|
allow_bundler_dependency_conflicts
|
@@ -17,8 +17,6 @@ module Bundler
|
|
17
17
|
auto_config_jobs
|
18
18
|
cache_all
|
19
19
|
cache_all_platforms
|
20
|
-
cache_command_is_package
|
21
|
-
console_command
|
22
20
|
default_install_uses_path
|
23
21
|
deployment
|
24
22
|
deployment_means_frozen
|
@@ -29,28 +27,24 @@ module Bundler
|
|
29
27
|
disable_platform_warnings
|
30
28
|
disable_shared_gems
|
31
29
|
disable_version_check
|
32
|
-
error_on_stderr
|
33
30
|
force_ruby_platform
|
34
31
|
forget_cli_options
|
35
32
|
frozen
|
36
33
|
gem.coc
|
37
34
|
gem.mit
|
38
|
-
global_path_appends_ruby_scope
|
39
35
|
global_gem_cache
|
40
36
|
ignore_messages
|
41
37
|
init_gems_rb
|
42
|
-
list_command
|
43
|
-
lockfile_uses_separate_rubygems_sources
|
44
|
-
major_deprecations
|
45
38
|
no_install
|
46
39
|
no_prune
|
47
40
|
only_update_to_newer_versions
|
48
41
|
path_relative_to_cwd
|
49
42
|
path.system
|
50
43
|
plugins
|
51
|
-
|
44
|
+
prefer_patch
|
52
45
|
print_only_version_number
|
53
46
|
setup_makes_kernel_gem_public
|
47
|
+
silence_deprecations
|
54
48
|
silence_root_warning
|
55
49
|
skip_default_git_sources
|
56
50
|
specific_platform
|
@@ -58,7 +52,6 @@ module Bundler
|
|
58
52
|
unlock_source_unlocks_spec
|
59
53
|
update_requires_all_flag
|
60
54
|
use_gem_version_promoter_for_major_updates
|
61
|
-
viz_command
|
62
55
|
].freeze
|
63
56
|
|
64
57
|
NUMBER_KEYS = %w[
|
@@ -75,7 +68,9 @@ module Bundler
|
|
75
68
|
].freeze
|
76
69
|
|
77
70
|
DEFAULT_CONFIG = {
|
71
|
+
:silence_deprecations => false,
|
78
72
|
:disable_version_check => true,
|
73
|
+
:prefer_patch => false,
|
79
74
|
:redirect => 5,
|
80
75
|
:retry => 3,
|
81
76
|
:timeout => 10,
|
@@ -106,18 +101,6 @@ module Bundler
|
|
106
101
|
temporary(key => value)
|
107
102
|
value
|
108
103
|
else
|
109
|
-
command = if value.nil?
|
110
|
-
"bundle config --delete #{key}"
|
111
|
-
else
|
112
|
-
"bundle config #{key} #{Array(value).join(":")}"
|
113
|
-
end
|
114
|
-
|
115
|
-
Bundler::SharedHelpers.major_deprecation 2,\
|
116
|
-
"flags passed to commands " \
|
117
|
-
"will no longer be automatically remembered. Instead please set flags " \
|
118
|
-
"you want remembered between commands using `bundle config " \
|
119
|
-
"<setting name> <setting value>`, i.e. `#{command}`"
|
120
|
-
|
121
104
|
set_local(key, value)
|
122
105
|
end
|
123
106
|
end
|
@@ -220,23 +203,22 @@ module Bundler
|
|
220
203
|
locations
|
221
204
|
end
|
222
205
|
|
223
|
-
# for legacy reasons, in Bundler
|
224
|
-
# nor do we respect :disable_shared_gems
|
206
|
+
# for legacy reasons, in Bundler 2, we do not respect :disable_shared_gems
|
225
207
|
def path
|
226
208
|
key = key_for(:path)
|
227
209
|
path = ENV[key] || @global_config[key]
|
228
210
|
if path && !@temporary.key?(key) && !@local_config.key?(key)
|
229
|
-
return Path.new(path,
|
211
|
+
return Path.new(path, false, false)
|
230
212
|
end
|
231
213
|
|
232
214
|
system_path = self["path.system"] || (self[:disable_shared_gems] == false)
|
233
|
-
Path.new(self[:path],
|
215
|
+
Path.new(self[:path], system_path, Bundler.feature_flag.default_install_uses_path?)
|
234
216
|
end
|
235
217
|
|
236
|
-
Path = Struct.new(:explicit_path, :
|
218
|
+
Path = Struct.new(:explicit_path, :system_path, :default_install_uses_path) do
|
237
219
|
def path
|
238
220
|
path = base_path
|
239
|
-
path = File.join(path, Bundler.ruby_scope)
|
221
|
+
path = File.join(path, Bundler.ruby_scope) unless use_system_gems?
|
240
222
|
path
|
241
223
|
end
|
242
224
|
|
@@ -371,7 +353,7 @@ module Bundler
|
|
371
353
|
return unless file
|
372
354
|
SharedHelpers.filesystem_access(file) do |p|
|
373
355
|
FileUtils.mkdir_p(p.dirname)
|
374
|
-
|
356
|
+
require_relative "yaml_serializer"
|
375
357
|
p.open("w") {|f| f.write(YAMLSerializer.dump(hash)) }
|
376
358
|
end
|
377
359
|
end
|
@@ -406,26 +388,12 @@ module Bundler
|
|
406
388
|
Pathname.new(@root).join("config") if @root
|
407
389
|
end
|
408
390
|
|
409
|
-
CONFIG_REGEX = %r{ # rubocop:disable Style/RegexpLiteral
|
410
|
-
^
|
411
|
-
(BUNDLE_.+):\s # the key
|
412
|
-
(?: !\s)? # optional exclamation mark found with ruby 1.9.3
|
413
|
-
(['"]?) # optional opening quote
|
414
|
-
(.* # contents of the value
|
415
|
-
(?: # optionally, up until the next key
|
416
|
-
(\n(?!BUNDLE).+)*
|
417
|
-
)
|
418
|
-
)
|
419
|
-
\2 # matching closing quote
|
420
|
-
$
|
421
|
-
}xo
|
422
|
-
|
423
391
|
def load_config(config_file)
|
424
392
|
return {} if !config_file || ignore_config?
|
425
393
|
SharedHelpers.filesystem_access(config_file, :read) do |file|
|
426
394
|
valid_file = file.exist? && !file.size.zero?
|
427
395
|
return {} unless valid_file
|
428
|
-
|
396
|
+
require_relative "yaml_serializer"
|
429
397
|
YAMLSerializer.load file.read
|
430
398
|
end
|
431
399
|
end
|
@@ -441,7 +409,7 @@ module Bundler
|
|
441
409
|
(https?.*?) # URI
|
442
410
|
(\.#{Regexp.union(PER_URI_OPTIONS)})? # optional suffix key
|
443
411
|
\z
|
444
|
-
/ix
|
412
|
+
/ix.freeze
|
445
413
|
|
446
414
|
# TODO: duplicates Rubygems#normalize_uri
|
447
415
|
# TODO: is this the correct place to validate mirror URIs?
|
@@ -1,18 +1,19 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
|
3
|
+
require_relative "shared_helpers"
|
4
4
|
|
5
5
|
if Bundler::SharedHelpers.in_bundle?
|
6
|
-
|
6
|
+
require_relative "../bundler"
|
7
7
|
|
8
8
|
if STDOUT.tty? || ENV["BUNDLER_FORCE_TTY"]
|
9
|
+
Bundler.ui = Bundler::UI::Shell.new
|
9
10
|
begin
|
10
11
|
Bundler.setup
|
11
12
|
rescue Bundler::BundlerError => e
|
12
|
-
|
13
|
-
|
13
|
+
Bundler.ui.warn "\e[31m#{e.message}\e[0m"
|
14
|
+
Bundler.ui.warn e.backtrace.join("\n") if ENV["DEBUG"]
|
14
15
|
if e.is_a?(Bundler::GemNotFound)
|
15
|
-
|
16
|
+
Bundler.ui.warn "\e[33mRun `bundle install` to install missing gems.\e[0m"
|
16
17
|
end
|
17
18
|
exit e.status_code
|
18
19
|
end
|
@@ -1,25 +1,12 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require "bundler/compatibility_guard"
|
4
|
-
|
5
3
|
require "pathname"
|
6
|
-
require "
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
module Gem
|
14
|
-
class Dependency
|
15
|
-
# This is only needed for RubyGems < 1.4
|
16
|
-
unless method_defined? :requirement
|
17
|
-
def requirement
|
18
|
-
version_requirements
|
19
|
-
end
|
20
|
-
end
|
21
|
-
end
|
22
|
-
end
|
4
|
+
require "rbconfig"
|
5
|
+
|
6
|
+
require_relative "version"
|
7
|
+
require_relative "constants"
|
8
|
+
require_relative "rubygems_integration"
|
9
|
+
require_relative "current_ruby"
|
23
10
|
|
24
11
|
module Bundler
|
25
12
|
module SharedHelpers
|
@@ -30,7 +17,7 @@ module Bundler
|
|
30
17
|
end
|
31
18
|
|
32
19
|
def default_gemfile
|
33
|
-
gemfile = find_gemfile
|
20
|
+
gemfile = find_gemfile
|
34
21
|
raise GemfileNotFound, "Could not locate Gemfile" unless gemfile
|
35
22
|
Pathname.new(gemfile).untaint.expand_path
|
36
23
|
end
|
@@ -113,9 +100,7 @@ module Bundler
|
|
113
100
|
#
|
114
101
|
# @see {Bundler::PermissionError}
|
115
102
|
def filesystem_access(path, action = :write, &block)
|
116
|
-
|
117
|
-
# See https://github.com/bundler/bundler/issues/5341 for details
|
118
|
-
block.call(path.dup.untaint)
|
103
|
+
yield(path.dup.untaint)
|
119
104
|
rescue Errno::EACCES
|
120
105
|
raise PermissionError.new(path, action)
|
121
106
|
rescue Errno::EAGAIN
|
@@ -140,33 +125,29 @@ module Bundler
|
|
140
125
|
end
|
141
126
|
|
142
127
|
def major_deprecation(major_version, message)
|
143
|
-
|
144
|
-
|
145
|
-
|
128
|
+
bundler_major_version = Bundler.bundler_major_version
|
129
|
+
if bundler_major_version > major_version
|
130
|
+
require_relative "errors"
|
131
|
+
raise DeprecatedError, "[REMOVED] #{message}"
|
146
132
|
end
|
147
133
|
|
148
|
-
return unless prints_major_deprecations?
|
134
|
+
return unless bundler_major_version >= major_version && prints_major_deprecations?
|
149
135
|
@major_deprecation_ui ||= Bundler::UI::Shell.new("no-color" => true)
|
150
|
-
|
151
|
-
|
136
|
+
with_major_deprecation_ui do |ui|
|
137
|
+
ui.warn("[DEPRECATED] #{message}")
|
138
|
+
end
|
152
139
|
end
|
153
140
|
|
154
141
|
def print_major_deprecations!
|
155
142
|
multiple_gemfiles = search_up(".") do |dir|
|
156
143
|
gemfiles = gemfile_names.select {|gf| File.file? File.expand_path(gf, dir) }
|
157
144
|
next if gemfiles.empty?
|
158
|
-
break
|
159
|
-
end
|
160
|
-
if multiple_gemfiles && Bundler.bundler_major_version == 1
|
161
|
-
Bundler::SharedHelpers.major_deprecation 2, \
|
162
|
-
"gems.rb and gems.locked will be preferred to Gemfile and Gemfile.lock."
|
163
|
-
end
|
164
|
-
|
165
|
-
if RUBY_VERSION < "2"
|
166
|
-
major_deprecation(2, "Bundler will only support ruby >= 2.0, you are running #{RUBY_VERSION}")
|
145
|
+
break gemfiles.size != 1
|
167
146
|
end
|
168
|
-
return
|
169
|
-
|
147
|
+
return unless multiple_gemfiles
|
148
|
+
message = "Multiple gemfiles (gems.rb and Gemfile) detected. " \
|
149
|
+
"Make sure you remove Gemfile and Gemfile.lock since bundler is ignoring them in favor of gems.rb and gems.rb.locked."
|
150
|
+
Bundler.ui.warn message
|
170
151
|
end
|
171
152
|
|
172
153
|
def trap(signal, override = false, &block)
|
@@ -231,6 +212,21 @@ module Bundler
|
|
231
212
|
|
232
213
|
private
|
233
214
|
|
215
|
+
def with_major_deprecation_ui(&block)
|
216
|
+
ui = Bundler.ui
|
217
|
+
|
218
|
+
if ui.is_a?(@major_deprecation_ui.class)
|
219
|
+
yield ui
|
220
|
+
else
|
221
|
+
begin
|
222
|
+
Bundler.ui = @major_deprecation_ui
|
223
|
+
yield Bundler.ui
|
224
|
+
ensure
|
225
|
+
Bundler.ui = ui
|
226
|
+
end
|
227
|
+
end
|
228
|
+
end
|
229
|
+
|
234
230
|
def validate_bundle_path
|
235
231
|
path_separator = Bundler.rubygems.path_separator
|
236
232
|
return unless Bundler.bundle_path.to_s.split(path_separator).size > 1
|
@@ -243,16 +239,14 @@ module Bundler
|
|
243
239
|
raise Bundler::PathError, message
|
244
240
|
end
|
245
241
|
|
246
|
-
def find_gemfile
|
242
|
+
def find_gemfile
|
247
243
|
given = ENV["BUNDLE_GEMFILE"]
|
248
244
|
return given if given && !given.empty?
|
249
|
-
|
250
|
-
names.reverse! if order_matters && Bundler.feature_flag.prefer_gems_rb?
|
251
|
-
find_file(*names)
|
245
|
+
find_file(*gemfile_names)
|
252
246
|
end
|
253
247
|
|
254
248
|
def gemfile_names
|
255
|
-
["
|
249
|
+
["gems.rb", "Gemfile"]
|
256
250
|
end
|
257
251
|
|
258
252
|
def find_file(*names)
|
@@ -274,9 +268,9 @@ module Bundler
|
|
274
268
|
until !File.directory?(current) || current == previous
|
275
269
|
if ENV["BUNDLE_SPEC_RUN"]
|
276
270
|
# avoid stepping above the tmp directory when testing
|
277
|
-
gemspec = if ENV["
|
271
|
+
gemspec = if ENV["GEM_COMMAND"]
|
278
272
|
# for Ruby Core
|
279
|
-
"lib/bundler.gemspec"
|
273
|
+
"lib/bundler/bundler.gemspec"
|
280
274
|
else
|
281
275
|
"bundler.gemspec"
|
282
276
|
end
|
@@ -306,21 +300,17 @@ module Bundler
|
|
306
300
|
public :set_env
|
307
301
|
|
308
302
|
def set_bundle_variables
|
309
|
-
|
310
|
-
|
311
|
-
|
312
|
-
|
313
|
-
|
314
|
-
Bundler::SharedHelpers.set_env "BUNDLE_BIN_PATH", exe_file
|
315
|
-
rescue Gem::GemNotFoundException
|
316
|
-
exe_file = File.expand_path("../../../exe/bundle", __FILE__)
|
317
|
-
# for Ruby core repository
|
318
|
-
exe_file = File.expand_path("../../../../bin/bundle", __FILE__) unless File.exist?(exe_file)
|
319
|
-
Bundler::SharedHelpers.set_env "BUNDLE_BIN_PATH", exe_file
|
320
|
-
end
|
303
|
+
# bundler exe & lib folders have same root folder, typical gem installation
|
304
|
+
exe_file = File.expand_path("../../../exe/bundle", __FILE__)
|
305
|
+
|
306
|
+
# for Ruby core repository testing
|
307
|
+
exe_file = File.expand_path("../../../libexec/bundle", __FILE__) unless File.exist?(exe_file)
|
321
308
|
|
322
|
-
#
|
323
|
-
Bundler
|
309
|
+
# bundler is a default gem, exe path is separate
|
310
|
+
exe_file = Bundler.rubygems.bin_path("bundler", "bundle", VERSION) unless File.exist?(exe_file)
|
311
|
+
|
312
|
+
Bundler::SharedHelpers.set_env "BUNDLE_BIN_PATH", exe_file
|
313
|
+
Bundler::SharedHelpers.set_env "BUNDLE_GEMFILE", find_gemfile.to_s
|
324
314
|
Bundler::SharedHelpers.set_env "BUNDLER_VERSION", Bundler::VERSION
|
325
315
|
end
|
326
316
|
|
@@ -333,14 +323,15 @@ module Bundler
|
|
333
323
|
|
334
324
|
def set_rubyopt
|
335
325
|
rubyopt = [ENV["RUBYOPT"]].compact
|
336
|
-
|
337
|
-
rubyopt.
|
326
|
+
setup_require = "-r#{File.expand_path("setup", __dir__)}"
|
327
|
+
return if !rubyopt.empty? && rubyopt.first =~ /#{setup_require}/
|
328
|
+
rubyopt.unshift setup_require
|
338
329
|
Bundler::SharedHelpers.set_env "RUBYOPT", rubyopt.join(" ")
|
339
330
|
end
|
340
331
|
|
341
332
|
def set_rubylib
|
342
333
|
rubylib = (ENV["RUBYLIB"] || "").split(File::PATH_SEPARATOR)
|
343
|
-
rubylib.unshift bundler_ruby_lib
|
334
|
+
rubylib.unshift bundler_ruby_lib unless RbConfig::CONFIG["rubylibdir"] == bundler_ruby_lib
|
344
335
|
Bundler::SharedHelpers.set_env "RUBYLIB", rubylib.uniq.join(File::PATH_SEPARATOR)
|
345
336
|
end
|
346
337
|
|
@@ -349,9 +340,6 @@ module Bundler
|
|
349
340
|
end
|
350
341
|
|
351
342
|
def clean_load_path
|
352
|
-
# handle 1.9 where system gems are always on the load path
|
353
|
-
return unless defined?(::Gem)
|
354
|
-
|
355
343
|
bundler_lib = bundler_ruby_lib
|
356
344
|
|
357
345
|
loaded_gem_paths = Bundler.rubygems.loaded_gem_paths
|
@@ -371,10 +359,9 @@ module Bundler
|
|
371
359
|
end
|
372
360
|
|
373
361
|
def prints_major_deprecations?
|
374
|
-
|
375
|
-
|
376
|
-
|
377
|
-
require "bundler/deprecate"
|
362
|
+
require_relative "../bundler"
|
363
|
+
return false if Bundler.settings[:silence_deprecations]
|
364
|
+
require_relative "deprecate"
|
378
365
|
return false if Bundler::Deprecate.skip
|
379
366
|
true
|
380
367
|
end
|
@@ -28,7 +28,7 @@ module Bundler
|
|
28
28
|
|
29
29
|
protected
|
30
30
|
|
31
|
-
#
|
31
|
+
# https://www.informit.com/articles/article.aspx?p=683059&seqNum=36
|
32
32
|
def levenshtein_distance(this, that, ins = 2, del = 2, sub = 1)
|
33
33
|
# ins, del, sub are weighted costs
|
34
34
|
return nil if this.nil?
|
@@ -51,7 +51,7 @@ module Bundler
|
|
51
51
|
dm[i][j] = [
|
52
52
|
dm[i - 1][j - 1] + (this[j - 1] == that[i - 1] ? 0 : sub),
|
53
53
|
dm[i][j - 1] + ins,
|
54
|
-
dm[i - 1][j] + del
|
54
|
+
dm[i - 1][j] + del,
|
55
55
|
].min
|
56
56
|
end
|
57
57
|
end
|