rubygems-update 3.0.9 → 3.1.0.pre1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.rubocop.yml +31 -8
- data/.travis.yml +9 -27
- data/CONTRIBUTING.md +13 -0
- data/History.txt +24 -28
- data/MAINTAINERS.txt +1 -6
- data/Manifest.txt +65 -15
- data/Rakefile +39 -23
- data/bin/gem +0 -6
- data/bundler/CHANGELOG.md +746 -570
- data/bundler/CODE_OF_CONDUCT.md +117 -23
- data/bundler/LICENSE.md +18 -19
- data/bundler/README.md +9 -8
- data/bundler/bundler.gemspec +8 -25
- data/bundler/exe/bundle +19 -3
- data/bundler/lib/bundler.rb +120 -67
- data/bundler/lib/bundler/build_metadata.rb +1 -3
- data/bundler/lib/bundler/capistrano.rb +4 -4
- data/bundler/lib/bundler/cli.rb +129 -121
- data/bundler/lib/bundler/cli/add.rb +27 -16
- data/bundler/lib/bundler/cli/common.rb +11 -12
- data/bundler/lib/bundler/cli/config.rb +161 -86
- data/bundler/lib/bundler/cli/console.rb +1 -1
- data/bundler/lib/bundler/cli/doctor.rb +4 -4
- data/bundler/lib/bundler/cli/exec.rb +4 -9
- data/bundler/lib/bundler/cli/gem.rb +5 -5
- data/bundler/lib/bundler/cli/info.rb +17 -5
- data/bundler/lib/bundler/cli/init.rb +1 -1
- data/bundler/lib/bundler/cli/install.rb +11 -10
- data/bundler/lib/bundler/cli/issue.rb +3 -3
- data/bundler/lib/bundler/cli/open.rb +10 -6
- data/bundler/lib/bundler/cli/outdated.rb +85 -81
- data/bundler/lib/bundler/cli/package.rb +8 -9
- data/bundler/lib/bundler/cli/plugin.rb +9 -2
- data/bundler/lib/bundler/cli/pristine.rb +1 -1
- data/bundler/lib/bundler/cli/show.rb +1 -1
- data/bundler/lib/bundler/cli/update.rb +31 -11
- data/bundler/lib/bundler/compact_index_client.rb +25 -9
- data/bundler/lib/bundler/compact_index_client/updater.rb +2 -6
- data/bundler/lib/bundler/current_ruby.rb +9 -7
- data/bundler/lib/bundler/definition.rb +35 -26
- data/bundler/lib/bundler/dependency.rb +16 -4
- data/bundler/lib/bundler/deployment.rb +1 -1
- data/bundler/lib/bundler/dsl.rb +15 -39
- data/bundler/lib/bundler/env.rb +8 -13
- data/bundler/lib/bundler/environment_preserver.rb +0 -1
- data/bundler/lib/bundler/feature_flag.rb +23 -34
- data/bundler/lib/bundler/fetcher.rb +14 -11
- data/bundler/lib/bundler/fetcher/compact_index.rb +26 -12
- data/bundler/lib/bundler/fetcher/dependency.rb +1 -1
- data/bundler/lib/bundler/fetcher/downloader.rb +4 -1
- data/bundler/lib/bundler/fetcher/index.rb +4 -2
- data/bundler/lib/bundler/friendly_errors.rb +4 -5
- data/bundler/lib/bundler/gem_helper.rb +39 -24
- data/bundler/lib/bundler/gem_helpers.rb +2 -4
- data/bundler/lib/bundler/gem_tasks.rb +1 -1
- data/bundler/lib/bundler/gem_version_promoter.rb +3 -3
- data/bundler/lib/bundler/graph.rb +2 -2
- data/bundler/lib/bundler/injector.rb +10 -8
- data/bundler/lib/bundler/inline.rb +19 -18
- data/bundler/lib/bundler/installer.rb +7 -14
- data/bundler/lib/bundler/installer/gem_installer.rb +5 -1
- data/bundler/lib/bundler/installer/parallel_installer.rb +4 -8
- data/bundler/lib/bundler/installer/standalone.rb +1 -2
- data/bundler/lib/bundler/lazy_specification.rb +2 -2
- data/bundler/lib/bundler/lockfile_parser.rb +13 -21
- data/bundler/lib/bundler/match_platform.rb +1 -1
- data/bundler/lib/bundler/plugin.rb +42 -29
- data/bundler/lib/bundler/plugin/api.rb +1 -1
- data/bundler/lib/bundler/plugin/api/source.rb +2 -2
- data/bundler/lib/bundler/plugin/index.rb +14 -3
- data/bundler/lib/bundler/plugin/installer.rb +28 -15
- data/bundler/lib/bundler/psyched_yaml.rb +1 -1
- data/bundler/lib/bundler/resolver.rb +72 -24
- data/bundler/lib/bundler/resolver/spec_group.rb +3 -2
- data/bundler/lib/bundler/retry.rb +2 -2
- data/bundler/lib/bundler/ruby_version.rb +4 -19
- data/bundler/lib/bundler/rubygems_ext.rb +10 -66
- data/bundler/lib/bundler/rubygems_gem_installer.rb +1 -8
- data/bundler/lib/bundler/rubygems_integration.rb +144 -395
- data/bundler/lib/bundler/runtime.rb +2 -9
- data/bundler/lib/bundler/settings.rb +15 -47
- data/bundler/lib/bundler/setup.rb +6 -5
- data/bundler/lib/bundler/shared_helpers.rb +58 -71
- data/bundler/lib/bundler/similarity_detector.rb +2 -2
- data/bundler/lib/bundler/source.rb +5 -5
- data/bundler/lib/bundler/source/git.rb +19 -12
- data/bundler/lib/bundler/source/git/git_proxy.rb +35 -39
- data/bundler/lib/bundler/source/metadata.rb +7 -2
- data/bundler/lib/bundler/source/path.rb +13 -8
- data/bundler/lib/bundler/source/rubygems.rb +11 -5
- data/bundler/lib/bundler/source/rubygems/remote.rb +1 -2
- data/bundler/lib/bundler/source_list.rb +9 -12
- data/bundler/lib/bundler/spec_set.rb +23 -12
- data/bundler/lib/bundler/stub_specification.rb +18 -30
- data/bundler/lib/bundler/templates/Executable.bundler +23 -14
- data/bundler/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt +3 -3
- data/bundler/lib/bundler/templates/newgem/Gemfile.tt +8 -2
- data/bundler/lib/bundler/templates/newgem/README.md.tt +4 -3
- data/bundler/lib/bundler/templates/newgem/newgem.gemspec.tt +6 -27
- data/bundler/lib/bundler/templates/newgem/test/test_helper.rb.tt +1 -1
- data/bundler/lib/bundler/templates/newgem/travis.yml.tt +0 -1
- data/bundler/lib/bundler/ui.rb +3 -3
- data/bundler/lib/bundler/ui/rg_proxy.rb +1 -1
- data/bundler/lib/bundler/ui/shell.rb +4 -8
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool.rb +161 -0
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/monotonic_time.rb +66 -0
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb +176 -0
- data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/version.rb +3 -0
- data/bundler/lib/bundler/vendor/fileutils/lib/fileutils.rb +151 -48
- data/bundler/lib/bundler/vendor/fileutils/lib/fileutils/version.rb +5 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo.rb +6 -6
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb +2 -2
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/log.rb +6 -6
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb +30 -8
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +4 -4
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb +2 -2
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +248 -279
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/connection.rb +40 -0
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/pool.rb +53 -0
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/timed_stack_multi.rb +79 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor.rb +7 -2
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions.rb +21 -11
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/create_file.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/create_link.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/directory.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/file_manipulation.rb +11 -2
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/base.rb +16 -17
- data/bundler/lib/bundler/vendor/thor/lib/thor/error.rb +82 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/group.rb +3 -3
- data/bundler/lib/bundler/vendor/thor/lib/thor/line_editor.rb +2 -2
- data/bundler/lib/bundler/vendor/thor/lib/thor/parser.rb +4 -4
- data/bundler/lib/bundler/vendor/thor/lib/thor/parser/options.rb +7 -2
- data/bundler/lib/bundler/vendor/thor/lib/thor/runner.rb +6 -6
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell.rb +4 -4
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell/basic.rb +52 -7
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell/color.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell/html.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/util.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/version.rb +1 -1
- data/bundler/lib/bundler/vendored_fileutils.rb +1 -6
- data/bundler/lib/bundler/vendored_molinillo.rb +1 -1
- data/bundler/lib/bundler/vendored_persistent.rb +7 -5
- data/bundler/lib/bundler/vendored_thor.rb +2 -2
- data/bundler/lib/bundler/version.rb +1 -20
- data/bundler/lib/bundler/version_ranges.rb +51 -5
- data/bundler/lib/bundler/vlad.rb +2 -2
- data/bundler/lib/bundler/worker.rb +1 -3
- data/bundler/lib/bundler/yaml_serializer.rb +2 -3
- data/bundler/man/bundle-add.1 +66 -0
- data/bundler/man/bundle-add.1.txt +58 -0
- data/bundler/man/bundle-add.ronn +7 -1
- data/bundler/man/bundle-binstubs.1 +40 -0
- data/bundler/man/bundle-binstubs.1.txt +48 -0
- data/bundler/man/bundle-binstubs.ronn +1 -1
- data/bundler/man/bundle-check.1 +31 -0
- data/bundler/man/bundle-check.1.txt +33 -0
- data/bundler/man/bundle-clean.1 +24 -0
- data/bundler/man/bundle-clean.1.txt +26 -0
- data/bundler/man/bundle-config.1 +497 -0
- data/bundler/man/bundle-config.1.txt +528 -0
- data/bundler/man/bundle-config.ronn +42 -40
- data/bundler/man/bundle-doctor.1 +44 -0
- data/bundler/man/bundle-doctor.1.txt +44 -0
- data/bundler/man/bundle-exec.1 +165 -0
- data/bundler/man/bundle-exec.1.txt +178 -0
- data/bundler/man/bundle-exec.ronn +1 -1
- data/bundler/man/bundle-gem.1 +80 -0
- data/bundler/man/bundle-gem.1.txt +91 -0
- data/bundler/man/bundle-info.1 +20 -0
- data/bundler/man/bundle-info.1.txt +21 -0
- data/bundler/man/bundle-init.1 +25 -0
- data/bundler/man/bundle-init.1.txt +34 -0
- data/bundler/man/bundle-init.ronn +1 -1
- data/bundler/man/bundle-inject.1 +33 -0
- data/bundler/man/bundle-inject.1.txt +32 -0
- data/bundler/man/bundle-install.1 +311 -0
- data/bundler/man/bundle-install.1.txt +401 -0
- data/bundler/man/bundle-install.ronn +9 -4
- data/bundler/man/bundle-list.1 +50 -0
- data/bundler/man/bundle-list.1.txt +43 -0
- data/bundler/man/bundle-lock.1 +84 -0
- data/bundler/man/bundle-lock.1.txt +93 -0
- data/bundler/man/bundle-open.1 +32 -0
- data/bundler/man/bundle-open.1.txt +29 -0
- data/bundler/man/bundle-outdated.1 +155 -0
- data/bundler/man/bundle-outdated.1.txt +131 -0
- data/bundler/man/bundle-package.1 +55 -0
- data/bundler/man/bundle-package.1.txt +79 -0
- data/bundler/man/bundle-platform.1 +61 -0
- data/bundler/man/bundle-platform.1.txt +57 -0
- data/bundler/man/bundle-pristine.1 +34 -0
- data/bundler/man/bundle-pristine.1.txt +44 -0
- data/bundler/man/bundle-remove.1 +31 -0
- data/bundler/man/bundle-remove.1.txt +34 -0
- data/bundler/man/bundle-show.1 +23 -0
- data/bundler/man/bundle-show.1.txt +27 -0
- data/bundler/man/bundle-update.1 +394 -0
- data/bundler/man/bundle-update.1.txt +390 -0
- data/bundler/man/bundle-update.ronn +3 -3
- data/bundler/man/bundle-viz.1 +39 -0
- data/bundler/man/bundle-viz.1.txt +39 -0
- data/bundler/man/bundle.1 +136 -0
- data/bundler/man/bundle.1.txt +116 -0
- data/bundler/man/bundle.ronn +2 -2
- data/bundler/man/gemfile.5 +686 -0
- data/bundler/man/gemfile.5.ronn +14 -18
- data/bundler/man/gemfile.5.txt +649 -0
- data/bundler/man/index.txt +25 -0
- data/lib/rubygems.rb +80 -48
- data/lib/rubygems/available_set.rb +1 -0
- data/lib/rubygems/basic_specification.rb +17 -6
- data/lib/rubygems/bundler_version_finder.rb +5 -0
- data/lib/rubygems/command.rb +34 -5
- data/lib/rubygems/command_manager.rb +0 -6
- data/lib/rubygems/commands/build_command.rb +21 -8
- data/lib/rubygems/commands/cert_command.rb +0 -1
- data/lib/rubygems/commands/cleanup_command.rb +7 -7
- data/lib/rubygems/commands/contents_command.rb +3 -3
- data/lib/rubygems/commands/dependency_command.rb +4 -3
- data/lib/rubygems/commands/environment_command.rb +0 -3
- data/lib/rubygems/commands/info_command.rb +2 -0
- data/lib/rubygems/commands/install_command.rb +12 -52
- data/lib/rubygems/commands/lock_command.rb +2 -2
- data/lib/rubygems/commands/mirror_command.rb +1 -0
- data/lib/rubygems/commands/open_command.rb +2 -1
- data/lib/rubygems/commands/outdated_command.rb +1 -0
- data/lib/rubygems/commands/owner_command.rb +2 -7
- data/lib/rubygems/commands/pristine_command.rb +3 -0
- data/lib/rubygems/commands/push_command.rb +4 -6
- data/lib/rubygems/commands/query_command.rb +94 -80
- data/lib/rubygems/commands/rdoc_command.rb +1 -0
- data/lib/rubygems/commands/setup_command.rb +10 -8
- data/lib/rubygems/commands/signin_command.rb +1 -0
- data/lib/rubygems/commands/specification_command.rb +1 -0
- data/lib/rubygems/commands/stale_command.rb +2 -0
- data/lib/rubygems/commands/uninstall_command.rb +1 -0
- data/lib/rubygems/commands/unpack_command.rb +2 -29
- data/lib/rubygems/commands/update_command.rb +14 -14
- data/lib/rubygems/commands/which_command.rb +1 -0
- data/lib/rubygems/commands/yank_command.rb +8 -2
- data/lib/rubygems/compatibility.rb +4 -4
- data/lib/rubygems/config_file.rb +28 -23
- data/lib/rubygems/core_ext/kernel_gem.rb +2 -5
- data/lib/rubygems/core_ext/kernel_require.rb +29 -2
- data/lib/rubygems/core_ext/kernel_warn.rb +10 -4
- data/lib/rubygems/defaults.rb +10 -17
- data/lib/rubygems/dependency.rb +21 -6
- data/lib/rubygems/dependency_installer.rb +19 -102
- data/lib/rubygems/dependency_list.rb +11 -10
- data/lib/rubygems/deprecate.rb +5 -5
- data/lib/rubygems/errors.rb +11 -2
- data/lib/rubygems/exceptions.rb +9 -0
- data/lib/rubygems/ext/builder.rb +24 -43
- data/lib/rubygems/ext/cmake_builder.rb +2 -0
- data/lib/rubygems/ext/ext_conf_builder.rb +11 -9
- data/lib/rubygems/ext/rake_builder.rb +1 -1
- data/lib/rubygems/gemcutter_utilities.rb +19 -26
- data/lib/rubygems/indexer.rb +9 -5
- data/lib/rubygems/installer.rb +26 -13
- data/lib/rubygems/installer_test_case.rb +86 -38
- data/lib/rubygems/local_remote_options.rb +1 -1
- data/lib/rubygems/mock_gem_ui.rb +4 -1
- data/lib/rubygems/name_tuple.rb +1 -0
- data/lib/rubygems/package.rb +37 -9
- data/lib/rubygems/package/tar_writer.rb +4 -4
- data/lib/rubygems/path_support.rb +2 -0
- data/lib/rubygems/platform.rb +2 -1
- data/lib/rubygems/psych_tree.rb +2 -0
- data/lib/rubygems/remote_fetcher.rb +5 -1
- data/lib/rubygems/request.rb +5 -3
- data/lib/rubygems/request/connection_pools.rb +4 -4
- data/lib/rubygems/request/http_pool.rb +1 -0
- data/lib/rubygems/request/https_pool.rb +2 -0
- data/lib/rubygems/request_set.rb +2 -2
- data/lib/rubygems/request_set/gem_dependency_api.rb +2 -2
- data/lib/rubygems/request_set/lockfile.rb +5 -2
- data/lib/rubygems/request_set/lockfile/parser.rb +4 -2
- data/lib/rubygems/request_set/lockfile/tokenizer.rb +2 -0
- data/lib/rubygems/requirement.rb +20 -18
- data/lib/rubygems/resolver.rb +4 -5
- data/lib/rubygems/resolver/activation_request.rb +19 -49
- data/lib/rubygems/resolver/best_set.rb +2 -2
- data/lib/rubygems/resolver/conflict.rb +0 -5
- data/lib/rubygems/resolver/installer_set.rb +3 -3
- data/lib/rubygems/resolver/lock_set.rb +1 -1
- data/lib/rubygems/resolver/lock_specification.rb +2 -2
- data/lib/rubygems/resolver/requirement_list.rb +1 -0
- data/lib/rubygems/resolver/specification.rb +1 -0
- data/lib/rubygems/resolver/stats.rb +2 -0
- data/lib/rubygems/security/signer.rb +3 -2
- data/lib/rubygems/server.rb +5 -4
- data/lib/rubygems/source_list.rb +1 -0
- data/lib/rubygems/spec_fetcher.rb +3 -16
- data/lib/rubygems/specification.rb +69 -133
- data/lib/rubygems/specification_policy.rb +7 -2
- data/{bundler/lib/bundler → lib/rubygems}/ssl_certs/index.rubygems.org/GlobalSignRootCA.pem +0 -0
- data/{bundler/lib/bundler → lib/rubygems}/ssl_certs/rubygems.global.ssl.fastly.net/DigiCertHighAssuranceEVRootCA.pem +0 -0
- data/{bundler/lib/bundler → lib/rubygems}/ssl_certs/rubygems.org/AddTrustExternalCARoot.pem +0 -0
- data/lib/rubygems/stub_specification.rb +5 -2
- data/lib/rubygems/syck_hack.rb +2 -0
- data/lib/rubygems/test_case.rb +78 -227
- data/lib/rubygems/test_utilities.rb +17 -6
- data/lib/rubygems/text.rb +2 -3
- data/lib/rubygems/uninstaller.rb +15 -15
- data/lib/rubygems/user_interaction.rb +9 -1
- data/lib/rubygems/util.rb +5 -41
- data/lib/rubygems/util/licenses.rb +398 -396
- data/lib/rubygems/util/list.rb +2 -0
- data/lib/rubygems/validator.rb +9 -29
- data/lib/rubygems/version.rb +5 -3
- data/rubygems-update.gemspec +3 -3
- data/test/rubygems/plugin/load/rubygems_plugin.rb +2 -0
- data/test/rubygems/test_bundled_ca.rb +4 -7
- data/test/rubygems/test_deprecate.rb +3 -0
- data/test/rubygems/test_gem.rb +183 -176
- data/test/rubygems/test_gem_available_set.rb +3 -2
- data/test/rubygems/test_gem_bundler_version_finder.rb +3 -1
- data/test/rubygems/test_gem_command.rb +94 -5
- data/test/rubygems/test_gem_command_manager.rb +5 -13
- data/test/rubygems/test_gem_commands_build_command.rb +142 -4
- data/test/rubygems/test_gem_commands_cert_command.rb +15 -1
- data/test/rubygems/test_gem_commands_cleanup_command.rb +22 -6
- data/test/rubygems/test_gem_commands_dependency_command.rb +1 -1
- data/test/rubygems/test_gem_commands_environment_command.rb +1 -11
- data/test/rubygems/test_gem_commands_help_command.rb +2 -0
- data/test/rubygems/test_gem_commands_info_command.rb +1 -0
- data/test/rubygems/test_gem_commands_install_command.rb +207 -2
- data/test/rubygems/test_gem_commands_mirror.rb +1 -0
- data/test/rubygems/test_gem_commands_outdated_command.rb +1 -0
- data/test/rubygems/test_gem_commands_owner_command.rb +4 -5
- data/test/rubygems/test_gem_commands_pristine_command.rb +56 -4
- data/test/rubygems/test_gem_commands_push_command.rb +19 -14
- data/test/rubygems/test_gem_commands_query_command.rb +27 -2
- data/test/rubygems/test_gem_commands_setup_command.rb +62 -37
- data/test/rubygems/test_gem_commands_signin_command.rb +5 -4
- data/test/rubygems/test_gem_commands_sources_command.rb +20 -6
- data/test/rubygems/test_gem_commands_uninstall_command.rb +107 -50
- data/test/rubygems/test_gem_commands_update_command.rb +86 -23
- data/test/rubygems/test_gem_commands_yank_command.rb +46 -1
- data/test/rubygems/test_gem_config_file.rb +9 -2
- data/test/rubygems/test_gem_dependency.rb +6 -0
- data/test/rubygems/test_gem_dependency_installer.rb +67 -36
- data/test/rubygems/test_gem_dependency_list.rb +21 -14
- data/test/rubygems/test_gem_ext_builder.rb +5 -1
- data/test/rubygems/test_gem_ext_cmake_builder.rb +2 -0
- data/test/rubygems/test_gem_ext_configure_builder.rb +8 -0
- data/test/rubygems/test_gem_ext_ext_conf_builder.rb +12 -0
- data/test/rubygems/test_gem_ext_rake_builder.rb +2 -0
- data/test/rubygems/test_gem_gemcutter_utilities.rb +8 -8
- data/test/rubygems/test_gem_indexer.rb +31 -40
- data/test/rubygems/test_gem_install_update_options.rb +31 -17
- data/test/rubygems/test_gem_installer.rb +383 -223
- data/test/rubygems/test_gem_package.rb +99 -14
- data/test/rubygems/test_gem_package_old.rb +57 -54
- data/test/rubygems/test_gem_package_tar_reader_entry.rb +6 -5
- data/test/rubygems/test_gem_package_tar_writer.rb +11 -6
- data/test/rubygems/test_gem_path_support.rb +19 -13
- data/test/rubygems/test_gem_platform.rb +4 -2
- data/test/rubygems/test_gem_rdoc.rb +1 -0
- data/test/rubygems/test_gem_remote_fetcher.rb +29 -16
- data/test/rubygems/test_gem_request.rb +19 -4
- data/test/rubygems/test_gem_request_connection_pools.rb +6 -2
- data/test/rubygems/test_gem_request_set.rb +33 -8
- data/test/rubygems/test_gem_request_set_gem_dependency_api.rb +1 -1
- data/test/rubygems/test_gem_request_set_lockfile.rb +1 -0
- data/test/rubygems/test_gem_request_set_lockfile_parser.rb +2 -1
- data/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb +2 -0
- data/test/rubygems/test_gem_requirement.rb +7 -1
- data/test/rubygems/test_gem_resolver.rb +67 -23
- data/test/rubygems/test_gem_resolver_activation_request.rb +3 -32
- data/test/rubygems/test_gem_resolver_conflict.rb +0 -4
- data/test/rubygems/test_gem_resolver_git_specification.rb +1 -0
- data/test/rubygems/test_gem_resolver_index_specification.rb +7 -2
- data/test/rubygems/test_gem_resolver_installed_specification.rb +0 -1
- data/test/rubygems/test_gem_resolver_installer_set.rb +3 -1
- data/test/rubygems/test_gem_resolver_specification.rb +2 -0
- data/test/rubygems/test_gem_security.rb +6 -2
- data/test/rubygems/test_gem_security_signer.rb +1 -0
- data/test/rubygems/test_gem_server.rb +7 -2
- data/test/rubygems/test_gem_silent_ui.rb +1 -0
- data/test/rubygems/test_gem_source.rb +7 -7
- data/test/rubygems/test_gem_source_fetch_problem.rb +1 -0
- data/test/rubygems/test_gem_source_git.rb +4 -9
- data/test/rubygems/test_gem_source_installed.rb +6 -6
- data/test/rubygems/test_gem_source_list.rb +1 -0
- data/test/rubygems/test_gem_source_local.rb +5 -4
- data/test/rubygems/test_gem_source_lock.rb +12 -12
- data/test/rubygems/test_gem_source_specific_file.rb +7 -6
- data/test/rubygems/test_gem_source_vendor.rb +4 -4
- data/test/rubygems/test_gem_specification.rb +75 -43
- data/test/rubygems/test_gem_stream_ui.rb +2 -0
- data/test/rubygems/test_gem_stub_specification.rb +3 -1
- data/test/rubygems/test_gem_text.rb +1 -0
- data/test/rubygems/test_gem_uninstaller.rb +31 -10
- data/test/rubygems/test_gem_util.rb +6 -4
- data/test/rubygems/test_gem_validator.rb +3 -4
- data/test/rubygems/test_gem_version.rb +16 -8
- data/test/rubygems/test_kernel.rb +1 -0
- data/test/rubygems/test_rake_package.rb +26 -0
- data/test/rubygems/test_remote_fetch_error.rb +1 -0
- data/test/rubygems/test_require.rb +107 -3
- data/util/bisect +31 -0
- data/util/ci.sh +50 -0
- data/util/generate_spdx_license_list.rb +4 -2
- data/util/rubocop +2 -2
- data/util/update_bundled_ca_certificates.rb +3 -1
- metadata +97 -25
- data/appveyor.yml +0 -43
- data/bundler/CONTRIBUTING.md +0 -17
- data/bundler/exe/bundle_ruby +0 -60
- data/bundler/lib/bundler/cli/cache.rb +0 -36
- data/bundler/lib/bundler/compatibility_guard.rb +0 -14
- data/bundler/lib/bundler/ssl_certs/.document +0 -1
- data/bundler/lib/bundler/ssl_certs/certificate_manager.rb +0 -66
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/faster.rb +0 -27
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/ssl_reuse.rb +0 -129
- data/lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA.pem +0 -21
- data/lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA_R3.pem +0 -21
- data/util/ci +0 -82
@@ -2,34 +2,45 @@
|
|
2
2
|
|
3
3
|
module Bundler
|
4
4
|
class CLI::Add
|
5
|
+
attr_reader :gems, :options, :version
|
6
|
+
|
5
7
|
def initialize(options, gems)
|
6
8
|
@gems = gems
|
7
9
|
@options = options
|
8
|
-
@options[:group] =
|
10
|
+
@options[:group] = options[:group].split(",").map(&:strip) unless options[:group].nil?
|
11
|
+
@version = options[:version].split(",").map(&:strip) unless options[:version].nil?
|
9
12
|
end
|
10
13
|
|
11
14
|
def run
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
15
|
+
validate_options!
|
16
|
+
inject_dependencies
|
17
|
+
perform_bundle_install unless options["skip-install"]
|
18
|
+
end
|
16
19
|
|
17
|
-
|
20
|
+
private
|
18
21
|
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
end
|
23
|
-
end
|
22
|
+
def perform_bundle_install
|
23
|
+
Installer.install(Bundler.root, Bundler.definition)
|
24
|
+
end
|
24
25
|
|
25
|
-
|
26
|
+
def inject_dependencies
|
27
|
+
dependencies = gems.map {|g| Bundler::Dependency.new(g, version, options) }
|
26
28
|
|
27
29
|
Injector.inject(dependencies,
|
28
|
-
:conservative_versioning =>
|
29
|
-
:optimistic =>
|
30
|
-
:strict =>
|
30
|
+
:conservative_versioning => options[:version].nil?, # Perform conservative versioning only when version is not specified
|
31
|
+
:optimistic => options[:optimistic],
|
32
|
+
:strict => options[:strict])
|
33
|
+
end
|
34
|
+
|
35
|
+
def validate_options!
|
36
|
+
raise InvalidOption, "You can not specify `--strict` and `--optimistic` at the same time." if options[:strict] && options[:optimistic]
|
31
37
|
|
32
|
-
|
38
|
+
# raise error when no gems are specified
|
39
|
+
raise InvalidOption, "Please specify gems to add." if gems.empty?
|
40
|
+
|
41
|
+
version.to_a.each do |v|
|
42
|
+
raise InvalidOption, "Invalid gem requirement pattern '#{v}'" unless Gem::Requirement::PATTERN =~ v.to_s
|
43
|
+
end
|
33
44
|
end
|
34
45
|
end
|
35
46
|
end
|
@@ -14,17 +14,18 @@ module Bundler
|
|
14
14
|
Bundler.ui.info msg
|
15
15
|
end
|
16
16
|
|
17
|
-
def self.output_without_groups_message
|
17
|
+
def self.output_without_groups_message(command)
|
18
18
|
return if Bundler.settings[:without].empty?
|
19
|
-
Bundler.ui.confirm without_groups_message
|
19
|
+
Bundler.ui.confirm without_groups_message(command)
|
20
20
|
end
|
21
21
|
|
22
|
-
def self.without_groups_message
|
22
|
+
def self.without_groups_message(command)
|
23
|
+
command_in_past_tense = command == :install ? "installed" : "updated"
|
23
24
|
groups = Bundler.settings[:without]
|
24
25
|
group_list = [groups[0...-1].join(", "), groups[-1..-1]].
|
25
26
|
reject {|s| s.to_s.empty? }.join(" and ")
|
26
|
-
group_str =
|
27
|
-
"Gems in the #{group_str} #{group_list} were not
|
27
|
+
group_str = groups.size == 1 ? "group" : "groups"
|
28
|
+
"Gems in the #{group_str} #{group_list} were not #{command_in_past_tense}."
|
28
29
|
end
|
29
30
|
|
30
31
|
def self.select_spec(name, regex_match = nil)
|
@@ -49,10 +50,6 @@ module Bundler
|
|
49
50
|
end
|
50
51
|
|
51
52
|
def self.ask_for_spec_from(specs)
|
52
|
-
if !$stdout.tty? && ENV["BUNDLE_SPEC_RUN"].nil?
|
53
|
-
raise GemNotFound, gem_not_found_message(name, Bundler.definition.dependencies)
|
54
|
-
end
|
55
|
-
|
56
53
|
specs.each_with_index do |spec, index|
|
57
54
|
Bundler.ui.info "#{index.succ} : #{spec.name}", true
|
58
55
|
end
|
@@ -63,7 +60,7 @@ module Bundler
|
|
63
60
|
end
|
64
61
|
|
65
62
|
def self.gem_not_found_message(missing_gem_name, alternatives)
|
66
|
-
|
63
|
+
require_relative "../similarity_detector"
|
67
64
|
message = "Could not find gem '#{missing_gem_name}'."
|
68
65
|
alternate_names = alternatives.map {|a| a.respond_to?(:name) ? a.name : a }
|
69
66
|
suggestions = SimilarityDetector.new(alternate_names).similar_word_list(missing_gem_name)
|
@@ -72,7 +69,7 @@ module Bundler
|
|
72
69
|
end
|
73
70
|
|
74
71
|
def self.ensure_all_gems_in_lockfile!(names, locked_gems = Bundler.locked_gems)
|
75
|
-
locked_names = locked_gems.specs.map(&:name)
|
72
|
+
locked_names = locked_gems.specs.map(&:name).uniq
|
76
73
|
names.-(locked_names).each do |g|
|
77
74
|
raise GemNotFound, gem_not_found_message(g, locked_names)
|
78
75
|
end
|
@@ -80,10 +77,12 @@ module Bundler
|
|
80
77
|
|
81
78
|
def self.configure_gem_version_promoter(definition, options)
|
82
79
|
patch_level = patch_level_options(options)
|
80
|
+
patch_level << :patch if patch_level.empty? && Bundler.settings[:prefer_patch]
|
83
81
|
raise InvalidOption, "Provide only one of the following options: #{patch_level.join(", ")}" unless patch_level.length <= 1
|
82
|
+
|
84
83
|
definition.gem_version_promoter.tap do |gvp|
|
85
84
|
gvp.level = patch_level.first || :major
|
86
|
-
gvp.strict = options[:strict] || options["update-strict"]
|
85
|
+
gvp.strict = options[:strict] || options["update-strict"] || options["filter-strict"]
|
87
86
|
end
|
88
87
|
end
|
89
88
|
|
@@ -1,119 +1,194 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
3
|
module Bundler
|
4
|
-
class CLI::Config
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
@args = args
|
11
|
-
@thor = thor
|
12
|
-
@name = peek = args.shift
|
13
|
-
@scope = "global"
|
14
|
-
return unless peek && peek.start_with?("--")
|
15
|
-
@name = args.shift
|
16
|
-
@scope = peek[2..-1]
|
4
|
+
class CLI::Config < Thor
|
5
|
+
class_option :parseable, :type => :boolean, :banner => "Use minimal formatting for more parseable output"
|
6
|
+
|
7
|
+
def self.scope_options
|
8
|
+
method_option :global, :type => :boolean, :banner => "Only change the global config"
|
9
|
+
method_option :local, :type => :boolean, :banner => "Only change the local config"
|
17
10
|
end
|
11
|
+
private_class_method :scope_options
|
18
12
|
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
13
|
+
desc "base NAME [VALUE]", "The Bundler 1 config interface", :hide => true
|
14
|
+
scope_options
|
15
|
+
method_option :delete, :type => :boolean, :banner => "delete"
|
16
|
+
def base(name = nil, *value)
|
17
|
+
new_args =
|
18
|
+
if ARGV.size == 1
|
19
|
+
["config", "list"]
|
20
|
+
elsif ARGV.include?("--delete")
|
21
|
+
ARGV.map {|arg| arg == "--delete" ? "unset" : arg }
|
22
|
+
elsif ARGV.include?("--global") || ARGV.include?("--local") || ARGV.size == 3
|
23
|
+
["config", "set", *ARGV[1..-1]]
|
24
|
+
else
|
25
|
+
["config", "get", ARGV[1]]
|
26
|
+
end
|
24
27
|
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
28
|
+
SharedHelpers.major_deprecation 2,
|
29
|
+
"Using the `config` command without a subcommand [list, get, set, unset] is deprecated and will be removed in the future. Use `bundle #{new_args.join(" ")}` instead."
|
30
|
+
|
31
|
+
Base.new(options, name, value, self).run
|
32
|
+
end
|
33
|
+
|
34
|
+
desc "list", "List out all configured settings"
|
35
|
+
def list
|
36
|
+
Base.new(options, nil, nil, self).run
|
37
|
+
end
|
38
|
+
|
39
|
+
desc "get NAME", "Returns the value for the given key"
|
40
|
+
def get(name)
|
41
|
+
Base.new(options, name, nil, self).run
|
42
|
+
end
|
43
|
+
|
44
|
+
desc "set NAME VALUE", "Sets the given value for the given key"
|
45
|
+
scope_options
|
46
|
+
def set(name, value, *value_)
|
47
|
+
Base.new(options, name, value_.unshift(value), self).run
|
48
|
+
end
|
29
49
|
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
50
|
+
desc "unset NAME", "Unsets the value for the given key"
|
51
|
+
scope_options
|
52
|
+
def unset(name)
|
53
|
+
options[:delete] = true
|
54
|
+
Base.new(options, name, nil, self).run
|
55
|
+
end
|
56
|
+
|
57
|
+
default_task :base
|
58
|
+
|
59
|
+
class Base
|
60
|
+
attr_reader :name, :value, :options, :scope, :thor
|
61
|
+
|
62
|
+
def initialize(options, name, value, thor)
|
63
|
+
@options = options
|
64
|
+
@name = name
|
65
|
+
value = Array(value)
|
66
|
+
@value = value.empty? ? nil : value.join(" ")
|
67
|
+
@thor = thor
|
68
|
+
validate_scope!
|
34
69
|
end
|
35
70
|
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
71
|
+
def run
|
72
|
+
unless name
|
73
|
+
warn_unused_scope "Ignoring --#{scope}"
|
74
|
+
confirm_all
|
75
|
+
return
|
76
|
+
end
|
77
|
+
|
78
|
+
if options[:delete]
|
79
|
+
if !explicit_scope? || scope != "global"
|
80
|
+
Bundler.settings.set_local(name, nil)
|
81
|
+
end
|
82
|
+
if !explicit_scope? || scope != "local"
|
83
|
+
Bundler.settings.set_global(name, nil)
|
40
84
|
end
|
41
85
|
return
|
42
86
|
end
|
43
87
|
|
44
|
-
|
45
|
-
|
46
|
-
end
|
88
|
+
if value.nil?
|
89
|
+
warn_unused_scope "Ignoring --#{scope} since no value to set was given"
|
47
90
|
|
48
|
-
|
49
|
-
|
50
|
-
|
91
|
+
if options[:parseable]
|
92
|
+
if value = Bundler.settings[name]
|
93
|
+
Bundler.ui.info("#{name}=#{value}")
|
94
|
+
end
|
95
|
+
return
|
96
|
+
end
|
51
97
|
|
52
|
-
|
98
|
+
confirm(name)
|
99
|
+
return
|
100
|
+
end
|
53
101
|
|
54
|
-
|
55
|
-
|
56
|
-
|
102
|
+
Bundler.ui.info(message) if message
|
103
|
+
Bundler.settings.send("set_#{scope}", name, new_value)
|
104
|
+
end
|
105
|
+
|
106
|
+
def confirm_all
|
107
|
+
if @options[:parseable]
|
108
|
+
thor.with_padding do
|
109
|
+
Bundler.settings.all.each do |setting|
|
110
|
+
val = Bundler.settings[setting]
|
111
|
+
Bundler.ui.info "#{setting}=#{val}"
|
112
|
+
end
|
113
|
+
end
|
114
|
+
else
|
115
|
+
Bundler.ui.confirm "Settings are listed in order of priority. The top value will be used.\n"
|
57
116
|
Bundler.settings.all.each do |setting|
|
58
|
-
|
59
|
-
|
117
|
+
Bundler.ui.confirm setting
|
118
|
+
show_pretty_values_for(setting)
|
119
|
+
Bundler.ui.confirm ""
|
60
120
|
end
|
61
121
|
end
|
62
|
-
else
|
63
|
-
Bundler.ui.confirm "Settings are listed in order of priority. The top value will be used.\n"
|
64
|
-
Bundler.settings.all.each do |setting|
|
65
|
-
Bundler.ui.confirm "#{setting}"
|
66
|
-
show_pretty_values_for(setting)
|
67
|
-
Bundler.ui.confirm ""
|
68
|
-
end
|
69
122
|
end
|
70
|
-
end
|
71
123
|
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
124
|
+
def confirm(name)
|
125
|
+
Bundler.ui.confirm "Settings for `#{name}` in order of priority. The top value will be used"
|
126
|
+
show_pretty_values_for(name)
|
127
|
+
end
|
76
128
|
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
129
|
+
def new_value
|
130
|
+
pathname = Pathname.new(value)
|
131
|
+
if name.start_with?("local.") && pathname.directory?
|
132
|
+
pathname.expand_path.to_s
|
133
|
+
else
|
134
|
+
value
|
135
|
+
end
|
83
136
|
end
|
84
|
-
end
|
85
137
|
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
138
|
+
def message
|
139
|
+
locations = Bundler.settings.locations(name)
|
140
|
+
if @options[:parseable]
|
141
|
+
"#{name}=#{new_value}" if new_value
|
142
|
+
elsif scope == "global"
|
143
|
+
if !locations[:local].nil?
|
144
|
+
"Your application has set #{name} to #{locations[:local].inspect}. " \
|
145
|
+
"This will override the global value you are currently setting"
|
146
|
+
elsif locations[:env]
|
147
|
+
"You have a bundler environment variable for #{name} set to " \
|
148
|
+
"#{locations[:env].inspect}. This will take precedence over the global value you are setting"
|
149
|
+
elsif !locations[:global].nil? && locations[:global] != value
|
150
|
+
"You are replacing the current global value of #{name}, which is currently " \
|
151
|
+
"#{locations[:global].inspect}"
|
152
|
+
end
|
153
|
+
elsif scope == "local" && !locations[:local].nil? && locations[:local] != value
|
154
|
+
"You are replacing the current local value of #{name}, which is currently " \
|
155
|
+
"#{locations[:local].inspect}"
|
100
156
|
end
|
101
|
-
elsif scope == "local" && locations[:local] != args.join(" ")
|
102
|
-
"You are replacing the current local value of #{name}, which is currently " \
|
103
|
-
"#{locations[:local].inspect}"
|
104
157
|
end
|
105
|
-
end
|
106
158
|
|
107
|
-
|
108
|
-
|
109
|
-
|
110
|
-
|
159
|
+
def show_pretty_values_for(setting)
|
160
|
+
thor.with_padding do
|
161
|
+
Bundler.settings.pretty_values_for(setting).each do |line|
|
162
|
+
Bundler.ui.info line
|
163
|
+
end
|
111
164
|
end
|
112
165
|
end
|
113
|
-
end
|
114
166
|
|
115
|
-
|
116
|
-
|
167
|
+
def explicit_scope?
|
168
|
+
@explicit_scope
|
169
|
+
end
|
170
|
+
|
171
|
+
def warn_unused_scope(msg)
|
172
|
+
return unless explicit_scope?
|
173
|
+
return if options[:parseable]
|
174
|
+
|
175
|
+
Bundler.ui.warn(msg)
|
176
|
+
end
|
177
|
+
|
178
|
+
def validate_scope!
|
179
|
+
@explicit_scope = true
|
180
|
+
scopes = %w[global local].select {|s| options[s] }
|
181
|
+
case scopes.size
|
182
|
+
when 0
|
183
|
+
@scope = "global"
|
184
|
+
@explicit_scope = false
|
185
|
+
when 1
|
186
|
+
@scope = scopes.first
|
187
|
+
else
|
188
|
+
raise InvalidOption,
|
189
|
+
"The options #{scopes.join " and "} were specified. Please only use one of the switches at a time."
|
190
|
+
end
|
191
|
+
end
|
117
192
|
end
|
118
193
|
end
|
119
194
|
end
|
@@ -12,7 +12,7 @@ module Bundler
|
|
12
12
|
Bundler::SharedHelpers.major_deprecation 2, "bundle console will be replaced " \
|
13
13
|
"by `bin/console` generated by `bundle gem <name>`"
|
14
14
|
|
15
|
-
group ? Bundler.require(:default, *
|
15
|
+
group ? Bundler.require(:default, *group.split.map!(&:to_sym)) : Bundler.require
|
16
16
|
ARGV.clear
|
17
17
|
|
18
18
|
console = get_console(Bundler.settings[:console] || "irb")
|
@@ -4,8 +4,8 @@ require "rbconfig"
|
|
4
4
|
|
5
5
|
module Bundler
|
6
6
|
class CLI::Doctor
|
7
|
-
DARWIN_REGEX = /\s+(.+) \(compatibility
|
8
|
-
LDD_REGEX = /\t\S+ => (\S+) \(\S+\)
|
7
|
+
DARWIN_REGEX = /\s+(.+) \(compatibility /.freeze
|
8
|
+
LDD_REGEX = /\t\S+ => (\S+) \(\S+\)/.freeze
|
9
9
|
|
10
10
|
attr_reader :options
|
11
11
|
|
@@ -56,7 +56,7 @@ module Bundler
|
|
56
56
|
end
|
57
57
|
|
58
58
|
def check!
|
59
|
-
|
59
|
+
require_relative "check"
|
60
60
|
Bundler::CLI::Check.new({}).run
|
61
61
|
end
|
62
62
|
|
@@ -100,7 +100,7 @@ module Bundler
|
|
100
100
|
files_not_readable_or_writable = []
|
101
101
|
files_not_rw_and_owned_by_different_user = []
|
102
102
|
files_not_owned_by_current_user_but_still_rw = []
|
103
|
-
Find.find(Bundler.
|
103
|
+
Find.find(Bundler.bundle_path.to_s).each do |f|
|
104
104
|
if !File.writable?(f) || !File.readable?(f)
|
105
105
|
if File.stat(f).uid != Process.uid
|
106
106
|
files_not_rw_and_owned_by_different_user << f
|
@@ -1,6 +1,6 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
|
3
|
+
require_relative "../current_ruby"
|
4
4
|
|
5
5
|
module Bundler
|
6
6
|
class CLI::Exec
|
@@ -13,7 +13,7 @@ module Bundler
|
|
13
13
|
@cmd = args.shift
|
14
14
|
@args = args
|
15
15
|
|
16
|
-
if
|
16
|
+
if !Bundler.current_ruby.jruby?
|
17
17
|
@args << { :close_others => !options.keep_file_descriptors? }
|
18
18
|
elsif options.keep_file_descriptors?
|
19
19
|
Bundler.ui.warn "Ruby version #{RUBY_VERSION} defaults to keeping non-standard file descriptors on Kernel#exec."
|
@@ -27,12 +27,7 @@ module Bundler
|
|
27
27
|
if !Bundler.settings[:disable_exec_load] && ruby_shebang?(bin_path)
|
28
28
|
return kernel_load(bin_path, *args)
|
29
29
|
end
|
30
|
-
|
31
|
-
if Bundler.current_ruby.jruby_18?
|
32
|
-
kernel_exec(bin_path, *args)
|
33
|
-
else
|
34
|
-
kernel_exec([bin_path, cmd], *args)
|
35
|
-
end
|
30
|
+
kernel_exec(bin_path, *args)
|
36
31
|
else
|
37
32
|
# exec using the given command
|
38
33
|
kernel_exec(cmd, *args)
|
@@ -69,7 +64,7 @@ module Bundler
|
|
69
64
|
Process.setproctitle(process_title(file, args)) if Process.respond_to?(:setproctitle)
|
70
65
|
ui = Bundler.ui
|
71
66
|
Bundler.ui = nil
|
72
|
-
|
67
|
+
require_relative "../setup"
|
73
68
|
TRAPPED_SIGNALS.each {|s| trap(s, "DEFAULT") }
|
74
69
|
Kernel.load(file)
|
75
70
|
rescue SystemExit, SignalException
|