bundler 1.17.2 → 2.2.33
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +2095 -1251
- data/LICENSE.md +18 -19
- data/README.md +10 -11
- data/bundler.gemspec +10 -28
- data/exe/bundle +22 -3
- data/lib/bundler/build_metadata.rb +4 -12
- data/lib/bundler/capistrano.rb +4 -4
- data/lib/bundler/cli/add.rb +28 -16
- data/lib/bundler/cli/binstubs.rb +6 -2
- data/lib/bundler/cli/cache.rb +24 -17
- data/lib/bundler/cli/check.rb +4 -2
- data/lib/bundler/cli/clean.rb +1 -1
- data/lib/bundler/cli/common.rb +39 -13
- data/lib/bundler/cli/config.rb +161 -86
- data/lib/bundler/cli/console.rb +1 -1
- data/lib/bundler/cli/doctor.rb +20 -9
- data/lib/bundler/cli/exec.rb +8 -25
- data/lib/bundler/cli/fund.rb +36 -0
- data/lib/bundler/cli/gem.rb +213 -32
- data/lib/bundler/cli/info.rb +42 -7
- data/lib/bundler/cli/init.rb +2 -2
- data/lib/bundler/cli/inject.rb +1 -1
- data/lib/bundler/cli/install.rb +34 -44
- data/lib/bundler/cli/issue.rb +8 -7
- data/lib/bundler/cli/list.rb +19 -11
- data/lib/bundler/cli/lock.rb +5 -1
- data/lib/bundler/cli/open.rb +11 -8
- data/lib/bundler/cli/outdated.rb +142 -118
- data/lib/bundler/cli/plugin.rb +19 -2
- data/lib/bundler/cli/pristine.rb +6 -1
- data/lib/bundler/cli/remove.rb +1 -2
- data/lib/bundler/cli/show.rb +2 -2
- data/lib/bundler/cli/update.rb +43 -16
- data/lib/bundler/cli.rb +211 -150
- data/lib/bundler/compact_index_client/cache.rb +6 -14
- data/lib/bundler/compact_index_client/gem_parser.rb +28 -0
- data/lib/bundler/compact_index_client/updater.rb +15 -28
- data/lib/bundler/compact_index_client.rb +28 -12
- data/lib/bundler/current_ruby.rb +14 -11
- data/lib/bundler/definition.rb +207 -368
- data/lib/bundler/dep_proxy.rb +16 -9
- data/lib/bundler/dependency.rb +19 -14
- data/lib/bundler/deployment.rb +1 -1
- data/lib/bundler/digest.rb +71 -0
- data/lib/bundler/dsl.rb +81 -81
- data/lib/bundler/endpoint_specification.rb +1 -1
- data/lib/bundler/env.rb +9 -14
- data/lib/bundler/environment_preserver.rb +29 -3
- data/lib/bundler/errors.rb +20 -3
- data/lib/bundler/feature_flag.rb +14 -33
- data/lib/bundler/fetcher/base.rb +1 -1
- data/lib/bundler/fetcher/compact_index.rb +28 -14
- data/lib/bundler/fetcher/dependency.rb +1 -1
- data/lib/bundler/fetcher/downloader.rb +14 -8
- data/lib/bundler/fetcher/index.rb +8 -8
- data/lib/bundler/fetcher.rb +22 -17
- data/lib/bundler/friendly_errors.rb +29 -48
- data/lib/bundler/gem_helper.rb +79 -43
- data/lib/bundler/gem_helpers.rb +38 -29
- data/lib/bundler/gem_tasks.rb +1 -1
- data/lib/bundler/gem_version_promoter.rb +5 -5
- data/lib/bundler/graph.rb +3 -3
- data/lib/bundler/index.rb +9 -9
- data/lib/bundler/injector.rb +33 -13
- data/lib/bundler/inline.rb +41 -30
- data/lib/bundler/installer/gem_installer.rb +9 -18
- data/lib/bundler/installer/parallel_installer.rb +50 -33
- data/lib/bundler/installer/standalone.rb +30 -11
- data/lib/bundler/installer.rb +39 -66
- data/lib/bundler/lazy_specification.rb +63 -28
- data/lib/bundler/lockfile_generator.rb +1 -1
- data/lib/bundler/lockfile_parser.rb +19 -52
- data/lib/bundler/{ssl_certs → man}/.document +0 -0
- data/{man → lib/bundler/man}/bundle-add.1 +10 -2
- data/{man/bundle-add.ronn → lib/bundler/man/bundle-add.1.ronn} +7 -1
- data/{man → lib/bundler/man}/bundle-binstubs.1 +6 -4
- data/{man/bundle-binstubs.ronn → lib/bundler/man/bundle-binstubs.1.ronn} +3 -5
- data/lib/bundler/man/bundle-cache.1 +55 -0
- data/{man/bundle-package.ronn → lib/bundler/man/bundle-cache.1.ronn} +15 -15
- data/{man → lib/bundler/man}/bundle-check.1 +1 -1
- data/{man/bundle-check.ronn → lib/bundler/man/bundle-check.1.ronn} +0 -0
- data/{man → lib/bundler/man}/bundle-clean.1 +1 -1
- data/{man/bundle-clean.ronn → lib/bundler/man/bundle-clean.1.ronn} +0 -0
- data/{man → lib/bundler/man}/bundle-config.1 +59 -60
- data/{man/bundle-config.ronn → lib/bundler/man/bundle-config.1.ronn} +77 -78
- data/{man → lib/bundler/man}/bundle-doctor.1 +1 -1
- data/{man/bundle-doctor.ronn → lib/bundler/man/bundle-doctor.1.ronn} +0 -0
- data/{man → lib/bundler/man}/bundle-exec.1 +2 -2
- data/{man/bundle-exec.ronn → lib/bundler/man/bundle-exec.1.ronn} +1 -1
- data/{man → lib/bundler/man}/bundle-gem.1 +38 -3
- data/{man/bundle-gem.ronn → lib/bundler/man/bundle-gem.1.ronn} +46 -7
- data/{man → lib/bundler/man}/bundle-info.1 +1 -1
- data/{man/bundle-info.ronn → lib/bundler/man/bundle-info.1.ronn} +0 -0
- data/{man → lib/bundler/man}/bundle-init.1 +2 -2
- data/{man/bundle-init.ronn → lib/bundler/man/bundle-init.1.ronn} +1 -1
- data/{man → lib/bundler/man}/bundle-inject.1 +1 -1
- data/{man/bundle-inject.ronn → lib/bundler/man/bundle-inject.1.ronn} +0 -0
- data/{man → lib/bundler/man}/bundle-install.1 +37 -7
- data/{man/bundle-install.ronn → lib/bundler/man/bundle-install.1.ronn} +34 -7
- data/{man → lib/bundler/man}/bundle-list.1 +7 -7
- data/{man/bundle-list.ronn → lib/bundler/man/bundle-list.1.ronn} +6 -6
- data/{man → lib/bundler/man}/bundle-lock.1 +1 -1
- data/{man/bundle-lock.ronn → lib/bundler/man/bundle-lock.1.ronn} +0 -0
- data/{man → lib/bundler/man}/bundle-open.1 +1 -1
- data/{man/bundle-open.ronn → lib/bundler/man/bundle-open.1.ronn} +0 -0
- data/{man → lib/bundler/man}/bundle-outdated.1 +1 -1
- data/{man/bundle-outdated.ronn → lib/bundler/man/bundle-outdated.1.ronn} +0 -0
- data/{man → lib/bundler/man}/bundle-platform.1 +1 -1
- data/{man/bundle-platform.ronn → lib/bundler/man/bundle-platform.1.ronn} +0 -0
- data/{man → lib/bundler/man}/bundle-pristine.1 +1 -1
- data/{man/bundle-pristine.ronn → lib/bundler/man/bundle-pristine.1.ronn} +0 -0
- data/{man → lib/bundler/man}/bundle-remove.1 +1 -1
- data/{man/bundle-remove.ronn → lib/bundler/man/bundle-remove.1.ronn} +0 -0
- data/{man → lib/bundler/man}/bundle-show.1 +1 -1
- data/{man/bundle-show.ronn → lib/bundler/man/bundle-show.1.ronn} +0 -0
- data/{man → lib/bundler/man}/bundle-update.1 +7 -7
- data/{man/bundle-update.ronn → lib/bundler/man/bundle-update.1.ronn} +6 -6
- data/{man → lib/bundler/man}/bundle-viz.1 +1 -1
- data/{man/bundle-viz.ronn → lib/bundler/man/bundle-viz.1.ronn} +0 -0
- data/{man → lib/bundler/man}/bundle.1 +7 -3
- data/{man/bundle.ronn → lib/bundler/man/bundle.1.ronn} +5 -2
- data/{man → lib/bundler/man}/gemfile.5 +44 -21
- data/{man → lib/bundler/man}/gemfile.5.ronn +24 -20
- data/{man → lib/bundler/man}/index.txt +1 -1
- data/lib/bundler/match_platform.rb +1 -1
- data/lib/bundler/mirror.rb +5 -5
- data/lib/bundler/plugin/api/source.rb +27 -7
- data/lib/bundler/plugin/api.rb +1 -1
- data/lib/bundler/plugin/dsl.rb +1 -1
- data/lib/bundler/plugin/index.rb +27 -4
- data/lib/bundler/plugin/installer/rubygems.rb +1 -1
- data/lib/bundler/plugin/installer.rb +35 -22
- data/lib/bundler/plugin/source_list.rb +5 -1
- data/lib/bundler/plugin.rb +100 -42
- data/lib/bundler/psyched_yaml.rb +0 -15
- data/lib/bundler/remote_specification.rb +5 -4
- data/lib/bundler/resolver/spec_group.rb +57 -53
- data/lib/bundler/resolver.rb +127 -113
- data/lib/bundler/retry.rb +4 -4
- data/lib/bundler/ruby_version.rb +5 -20
- data/lib/bundler/rubygems_ext.rb +103 -79
- data/lib/bundler/rubygems_gem_installer.rb +69 -8
- data/lib/bundler/rubygems_integration.rb +181 -446
- data/lib/bundler/runtime.rb +24 -34
- data/lib/bundler/settings.rb +159 -110
- data/lib/bundler/setup.rb +11 -12
- data/lib/bundler/shared_helpers.rb +56 -90
- data/lib/bundler/similarity_detector.rb +3 -3
- data/lib/bundler/source/git/git_proxy.rb +106 -105
- data/lib/bundler/source/git.rb +66 -39
- data/lib/bundler/source/metadata.rb +9 -9
- data/lib/bundler/source/path/installer.rb +10 -10
- data/lib/bundler/source/path.rb +23 -12
- data/lib/bundler/source/rubygems/remote.rb +3 -4
- data/lib/bundler/source/rubygems.rb +136 -120
- data/lib/bundler/source/rubygems_aggregate.rb +68 -0
- data/lib/bundler/source.rb +27 -6
- data/lib/bundler/source_list.rb +101 -66
- data/lib/bundler/source_map.rb +58 -0
- data/lib/bundler/spec_set.rb +49 -53
- data/lib/bundler/stub_specification.rb +40 -34
- data/lib/bundler/templates/Executable.bundler +24 -15
- data/lib/bundler/templates/Gemfile +1 -1
- data/lib/bundler/templates/gems.rb +1 -1
- data/lib/bundler/templates/newgem/CHANGELOG.md.tt +5 -0
- data/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt +57 -47
- data/lib/bundler/templates/newgem/Gemfile.tt +19 -2
- data/lib/bundler/templates/newgem/README.md.tt +7 -5
- data/lib/bundler/templates/newgem/Rakefile.tt +23 -5
- data/lib/bundler/templates/newgem/bin/console.tt +1 -0
- data/lib/bundler/templates/newgem/circleci/config.yml.tt +13 -0
- data/lib/bundler/templates/newgem/ext/newgem/extconf.rb.tt +2 -0
- data/lib/bundler/templates/newgem/github/workflows/main.yml.tt +27 -0
- data/lib/bundler/templates/newgem/gitlab-ci.yml.tt +9 -0
- data/lib/bundler/templates/newgem/lib/newgem/version.rb.tt +2 -0
- data/lib/bundler/templates/newgem/lib/newgem.rb.tt +4 -2
- data/lib/bundler/templates/newgem/newgem.gemspec.tt +29 -40
- data/lib/bundler/templates/newgem/rubocop.yml.tt +13 -0
- data/lib/bundler/templates/newgem/sig/newgem.rbs.tt +8 -0
- data/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt +2 -0
- data/lib/bundler/templates/newgem/spec/spec_helper.rb.tt +2 -1
- data/lib/bundler/templates/newgem/standard.yml.tt +2 -0
- data/lib/bundler/templates/newgem/test/{newgem_test.rb.tt → minitest/newgem_test.rb.tt} +2 -0
- data/lib/bundler/templates/newgem/test/minitest/test_helper.rb.tt +6 -0
- data/lib/bundler/templates/newgem/test/test-unit/newgem_test.rb.tt +15 -0
- data/lib/bundler/templates/newgem/test/test-unit/test_helper.rb.tt +6 -0
- data/lib/bundler/templates/newgem/travis.yml.tt +0 -1
- data/lib/bundler/ui/rg_proxy.rb +1 -1
- data/lib/bundler/ui/shell.rb +7 -11
- data/lib/bundler/ui.rb +3 -3
- data/lib/bundler/uri_credentials_filter.rb +10 -4
- data/lib/bundler/vendor/.document +1 -0
- data/lib/bundler/vendor/connection_pool/LICENSE +20 -0
- data/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb +174 -0
- data/lib/bundler/vendor/connection_pool/lib/connection_pool/version.rb +3 -0
- data/lib/bundler/vendor/connection_pool/lib/connection_pool/wrapper.rb +57 -0
- data/lib/bundler/vendor/connection_pool/lib/connection_pool.rb +126 -0
- data/lib/bundler/vendor/fileutils/LICENSE.txt +22 -0
- data/lib/bundler/vendor/fileutils/lib/fileutils.rb +273 -147
- data/lib/bundler/vendor/molinillo/LICENSE +9 -0
- data/lib/bundler/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb +7 -0
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb +1 -1
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb +1 -1
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb +1 -1
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb +1 -1
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/log.rb +6 -6
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb +1 -1
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb +3 -3
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb +39 -11
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb +38 -6
- data/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb +4 -4
- data/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb +1 -1
- data/lib/bundler/vendor/molinillo/lib/molinillo/modules/specification_provider.rb +12 -1
- data/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +53 -51
- data/lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb +2 -2
- data/lib/bundler/vendor/molinillo/lib/molinillo.rb +5 -6
- data/lib/bundler/vendor/net-http-persistent/README.rdoc +82 -0
- data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/connection.rb +40 -0
- data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/pool.rb +53 -0
- data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/timed_stack_multi.rb +79 -0
- data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +302 -462
- data/lib/bundler/vendor/thor/LICENSE.md +20 -0
- data/lib/bundler/vendor/thor/lib/thor/actions/create_file.rb +1 -1
- data/lib/bundler/vendor/thor/lib/thor/actions/create_link.rb +3 -2
- data/lib/bundler/vendor/thor/lib/thor/actions/directory.rb +7 -17
- data/lib/bundler/vendor/thor/lib/thor/actions/file_manipulation.rb +20 -9
- data/lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb +19 -8
- data/lib/bundler/vendor/thor/lib/thor/actions.rb +28 -13
- data/lib/bundler/vendor/thor/lib/thor/base.rb +63 -43
- data/lib/bundler/vendor/thor/lib/thor/command.rb +21 -14
- data/lib/bundler/vendor/thor/lib/thor/error.rb +78 -0
- data/lib/bundler/vendor/thor/lib/thor/group.rb +3 -3
- data/lib/bundler/vendor/thor/lib/thor/invocation.rb +1 -0
- data/lib/bundler/vendor/thor/lib/thor/line_editor/basic.rb +1 -1
- data/lib/bundler/vendor/thor/lib/thor/line_editor/readline.rb +6 -6
- data/lib/bundler/vendor/thor/lib/thor/line_editor.rb +2 -2
- data/lib/bundler/vendor/thor/lib/thor/nested_context.rb +29 -0
- data/lib/bundler/vendor/thor/lib/thor/parser/arguments.rb +7 -3
- data/lib/bundler/vendor/thor/lib/thor/parser/option.rb +20 -7
- data/lib/bundler/vendor/thor/lib/thor/parser/options.rb +21 -5
- data/lib/bundler/vendor/thor/lib/thor/parser.rb +4 -4
- data/lib/bundler/vendor/thor/lib/thor/rake_compat.rb +1 -0
- data/lib/bundler/vendor/thor/lib/thor/runner.rb +15 -14
- data/lib/bundler/vendor/thor/lib/thor/shell/basic.rb +65 -8
- data/lib/bundler/vendor/thor/lib/thor/shell/color.rb +10 -2
- data/lib/bundler/vendor/thor/lib/thor/shell/html.rb +3 -3
- data/lib/bundler/vendor/thor/lib/thor/shell.rb +4 -4
- data/lib/bundler/vendor/thor/lib/thor/util.rb +18 -2
- data/lib/bundler/vendor/thor/lib/thor/version.rb +1 -1
- data/lib/bundler/vendor/thor/lib/thor.rb +16 -9
- data/lib/bundler/vendor/tmpdir/lib/tmpdir.rb +154 -0
- data/lib/bundler/vendor/tsort/LICENSE.txt +22 -0
- data/lib/bundler/vendor/tsort/lib/tsort.rb +453 -0
- data/lib/bundler/vendor/uri/LICENSE.txt +22 -0
- data/lib/bundler/vendor/uri/lib/uri/common.rb +744 -0
- data/lib/bundler/vendor/uri/lib/uri/file.rb +94 -0
- data/lib/bundler/vendor/uri/lib/uri/ftp.rb +267 -0
- data/lib/bundler/vendor/uri/lib/uri/generic.rb +1568 -0
- data/lib/bundler/vendor/uri/lib/uri/http.rb +88 -0
- data/lib/bundler/vendor/uri/lib/uri/https.rb +23 -0
- data/lib/bundler/vendor/uri/lib/uri/ldap.rb +261 -0
- data/lib/bundler/vendor/uri/lib/uri/ldaps.rb +21 -0
- data/lib/bundler/vendor/uri/lib/uri/mailto.rb +294 -0
- data/lib/bundler/vendor/uri/lib/uri/rfc2396_parser.rb +546 -0
- data/lib/bundler/vendor/uri/lib/uri/rfc3986_parser.rb +125 -0
- data/lib/bundler/vendor/uri/lib/uri/version.rb +6 -0
- data/lib/bundler/vendor/uri/lib/uri.rb +104 -0
- data/lib/bundler/vendored_fileutils.rb +1 -6
- data/lib/bundler/vendored_molinillo.rb +1 -1
- data/lib/bundler/vendored_persistent.rb +7 -12
- data/lib/bundler/vendored_thor.rb +2 -2
- data/lib/bundler/vendored_tmpdir.rb +4 -0
- data/lib/bundler/vendored_tsort.rb +4 -0
- data/lib/bundler/vendored_uri.rb +4 -0
- data/lib/bundler/version.rb +1 -20
- data/lib/bundler/version_ranges.rb +51 -5
- data/lib/bundler/vlad.rb +2 -2
- data/lib/bundler/worker.rb +21 -8
- data/lib/bundler/yaml_serializer.rb +3 -4
- data/lib/bundler.rb +248 -118
- metadata +115 -190
- data/exe/bundle_ruby +0 -60
- data/lib/bundler/cli/package.rb +0 -49
- data/lib/bundler/compatibility_guard.rb +0 -14
- data/lib/bundler/gem_remote_fetcher.rb +0 -43
- data/lib/bundler/ssl_certs/certificate_manager.rb +0 -66
- data/lib/bundler/ssl_certs/index.rubygems.org/GlobalSignRootCA.pem +0 -21
- data/lib/bundler/ssl_certs/rubygems.global.ssl.fastly.net/DigiCertHighAssuranceEVRootCA.pem +0 -23
- data/lib/bundler/ssl_certs/rubygems.org/AddTrustExternalCARoot.pem +0 -25
- data/lib/bundler/templates/newgem/test/test_helper.rb.tt +0 -4
- data/lib/bundler/vendor/molinillo/lib/molinillo/compatibility.rb +0 -26
- data/lib/bundler/vendor/net-http-persistent/lib/net/http/faster.rb +0 -27
- data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/ssl_reuse.rb +0 -129
- data/lib/bundler/vendor/thor/lib/thor/core_ext/io_binary_read.rb +0 -12
- data/lib/bundler/vendor/thor/lib/thor/core_ext/ordered_hash.rb +0 -129
- data/man/bundle-add.1.txt +0 -52
- data/man/bundle-binstubs.1.txt +0 -48
- data/man/bundle-check.1.txt +0 -33
- data/man/bundle-clean.1.txt +0 -26
- data/man/bundle-config.1.txt +0 -529
- data/man/bundle-doctor.1.txt +0 -44
- data/man/bundle-exec.1.txt +0 -178
- data/man/bundle-gem.1.txt +0 -91
- data/man/bundle-info.1.txt +0 -21
- data/man/bundle-init.1.txt +0 -34
- data/man/bundle-inject.1.txt +0 -32
- data/man/bundle-install.1.txt +0 -396
- data/man/bundle-list.1.txt +0 -43
- data/man/bundle-lock.1.txt +0 -93
- data/man/bundle-open.1.txt +0 -29
- data/man/bundle-outdated.1.txt +0 -131
- data/man/bundle-package.1 +0 -55
- data/man/bundle-package.1.txt +0 -79
- data/man/bundle-platform.1.txt +0 -57
- data/man/bundle-pristine.1.txt +0 -44
- data/man/bundle-remove.1.txt +0 -34
- data/man/bundle-show.1.txt +0 -27
- data/man/bundle-update.1.txt +0 -391
- data/man/bundle-viz.1.txt +0 -39
- data/man/bundle.1.txt +0 -113
- data/man/gemfile.5.txt +0 -653
data/lib/bundler/cli/config.rb
CHANGED
@@ -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 3,
|
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
|
data/lib/bundler/cli/console.rb
CHANGED
@@ -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")
|
data/lib/bundler/cli/doctor.rb
CHANGED
@@ -1,11 +1,12 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
3
|
require "rbconfig"
|
4
|
+
require "shellwords"
|
4
5
|
|
5
6
|
module Bundler
|
6
7
|
class CLI::Doctor
|
7
|
-
DARWIN_REGEX = /\s+(.+) \(compatibility
|
8
|
-
LDD_REGEX = /\t\S+ => (\S+) \(\S+\)
|
8
|
+
DARWIN_REGEX = /\s+(.+) \(compatibility /.freeze
|
9
|
+
LDD_REGEX = /\t\S+ => (\S+) \(\S+\)/.freeze
|
9
10
|
|
10
11
|
attr_reader :options
|
11
12
|
|
@@ -22,14 +23,14 @@ module Bundler
|
|
22
23
|
end
|
23
24
|
|
24
25
|
def dylibs_darwin(path)
|
25
|
-
output = `/usr/bin/otool -L
|
26
|
+
output = `/usr/bin/otool -L #{path.shellescape}`.chomp
|
26
27
|
dylibs = output.split("\n")[1..-1].map {|l| l.match(DARWIN_REGEX).captures[0] }.uniq
|
27
28
|
# ignore @rpath and friends
|
28
29
|
dylibs.reject {|dylib| dylib.start_with? "@" }
|
29
30
|
end
|
30
31
|
|
31
32
|
def dylibs_ldd(path)
|
32
|
-
output = `/usr/bin/ldd
|
33
|
+
output = `/usr/bin/ldd #{path.shellescape}`.chomp
|
33
34
|
output.split("\n").map do |l|
|
34
35
|
match = l.match(LDD_REGEX)
|
35
36
|
next if match.nil?
|
@@ -56,12 +57,12 @@ module Bundler
|
|
56
57
|
end
|
57
58
|
|
58
59
|
def check!
|
59
|
-
|
60
|
+
require_relative "check"
|
60
61
|
Bundler::CLI::Check.new({}).run
|
61
62
|
end
|
62
63
|
|
63
64
|
def run
|
64
|
-
Bundler.ui.level = "
|
65
|
+
Bundler.ui.level = "warn" if options[:quiet]
|
65
66
|
Bundler.settings.validate!
|
66
67
|
check!
|
67
68
|
|
@@ -93,15 +94,18 @@ module Bundler
|
|
93
94
|
end
|
94
95
|
end
|
95
96
|
|
96
|
-
|
97
|
+
private
|
97
98
|
|
98
99
|
def check_home_permissions
|
99
100
|
require "find"
|
100
101
|
files_not_readable_or_writable = []
|
101
102
|
files_not_rw_and_owned_by_different_user = []
|
102
103
|
files_not_owned_by_current_user_but_still_rw = []
|
103
|
-
|
104
|
-
|
104
|
+
broken_symlinks = []
|
105
|
+
Find.find(Bundler.bundle_path.to_s).each do |f|
|
106
|
+
if !File.exist?(f)
|
107
|
+
broken_symlinks << f
|
108
|
+
elsif !File.writable?(f) || !File.readable?(f)
|
105
109
|
if File.stat(f).uid != Process.uid
|
106
110
|
files_not_rw_and_owned_by_different_user << f
|
107
111
|
else
|
@@ -113,6 +117,13 @@ module Bundler
|
|
113
117
|
end
|
114
118
|
|
115
119
|
ok = true
|
120
|
+
|
121
|
+
if broken_symlinks.any?
|
122
|
+
Bundler.ui.warn "Broken links exist in the Bundler home. Please report them to the offending gem's upstream repo. These files are:\n - #{broken_symlinks.join("\n - ")}"
|
123
|
+
|
124
|
+
ok = false
|
125
|
+
end
|
126
|
+
|
116
127
|
if files_not_owned_by_current_user_but_still_rw.any?
|
117
128
|
Bundler.ui.warn "Files exist in the Bundler home that are owned by another " \
|
118
129
|
"user, but are still readable/writable. These files are:\n - #{files_not_owned_by_current_user_but_still_rw.join("\n - ")}"
|
data/lib/bundler/cli/exec.rb
CHANGED
@@ -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
|
@@ -12,12 +12,7 @@ module Bundler
|
|
12
12
|
@options = options
|
13
13
|
@cmd = args.shift
|
14
14
|
@args = args
|
15
|
-
|
16
|
-
if Bundler.current_ruby.ruby_2? && !Bundler.current_ruby.jruby?
|
17
|
-
@args << { :close_others => !options.keep_file_descriptors? }
|
18
|
-
elsif options.keep_file_descriptors?
|
19
|
-
Bundler.ui.warn "Ruby version #{RUBY_VERSION} defaults to keeping non-standard file descriptors on Kernel#exec."
|
20
|
-
end
|
15
|
+
@args << { :close_others => !options.keep_file_descriptors? } unless Bundler.current_ruby.jruby?
|
21
16
|
end
|
22
17
|
|
23
18
|
def run
|
@@ -27,19 +22,14 @@ module Bundler
|
|
27
22
|
if !Bundler.settings[:disable_exec_load] && ruby_shebang?(bin_path)
|
28
23
|
return kernel_load(bin_path, *args)
|
29
24
|
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
|
25
|
+
kernel_exec(bin_path, *args)
|
36
26
|
else
|
37
27
|
# exec using the given command
|
38
28
|
kernel_exec(cmd, *args)
|
39
29
|
end
|
40
30
|
end
|
41
31
|
|
42
|
-
|
32
|
+
private
|
43
33
|
|
44
34
|
def validate_cmd!
|
45
35
|
return unless cmd.nil?
|
@@ -48,15 +38,11 @@ module Bundler
|
|
48
38
|
end
|
49
39
|
|
50
40
|
def kernel_exec(*args)
|
51
|
-
ui = Bundler.ui
|
52
|
-
Bundler.ui = nil
|
53
41
|
Kernel.exec(*args)
|
54
42
|
rescue Errno::EACCES, Errno::ENOEXEC
|
55
|
-
Bundler.ui = ui
|
56
43
|
Bundler.ui.error "bundler: not executable: #{cmd}"
|
57
44
|
exit 126
|
58
45
|
rescue Errno::ENOENT
|
59
|
-
Bundler.ui = ui
|
60
46
|
Bundler.ui.error "bundler: command not found: #{cmd}"
|
61
47
|
Bundler.ui.warn "Install missing gem executables with `bundle install`"
|
62
48
|
exit 127
|
@@ -67,18 +53,15 @@ module Bundler
|
|
67
53
|
ARGV.replace(args)
|
68
54
|
$0 = file
|
69
55
|
Process.setproctitle(process_title(file, args)) if Process.respond_to?(:setproctitle)
|
70
|
-
|
71
|
-
Bundler.ui = nil
|
72
|
-
require "bundler/setup"
|
56
|
+
require_relative "../setup"
|
73
57
|
TRAPPED_SIGNALS.each {|s| trap(s, "DEFAULT") }
|
74
58
|
Kernel.load(file)
|
75
59
|
rescue SystemExit, SignalException
|
76
60
|
raise
|
77
|
-
rescue Exception
|
78
|
-
Bundler.ui = ui
|
61
|
+
rescue Exception # rubocop:disable Lint/RescueException
|
79
62
|
Bundler.ui.error "bundler: failed to load command: #{cmd} (#{file})"
|
80
|
-
|
81
|
-
|
63
|
+
Bundler::FriendlyErrors.disable!
|
64
|
+
raise
|
82
65
|
end
|
83
66
|
|
84
67
|
def process_title(file, args)
|
@@ -0,0 +1,36 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Bundler
|
4
|
+
class CLI::Fund
|
5
|
+
attr_reader :options
|
6
|
+
|
7
|
+
def initialize(options)
|
8
|
+
@options = options
|
9
|
+
end
|
10
|
+
|
11
|
+
def run
|
12
|
+
Bundler.definition.validate_runtime!
|
13
|
+
|
14
|
+
groups = Array(options[:group]).map(&:to_sym)
|
15
|
+
|
16
|
+
deps = if groups.any?
|
17
|
+
Bundler.definition.dependencies_for(groups)
|
18
|
+
else
|
19
|
+
Bundler.definition.current_dependencies
|
20
|
+
end
|
21
|
+
|
22
|
+
fund_info = deps.each_with_object([]) do |dep, arr|
|
23
|
+
spec = Bundler.definition.specs[dep.name].first
|
24
|
+
if spec.metadata.key?("funding_uri")
|
25
|
+
arr << "* #{spec.name} (#{spec.version})\n Funding: #{spec.metadata["funding_uri"]}"
|
26
|
+
end
|
27
|
+
end
|
28
|
+
|
29
|
+
if fund_info.empty?
|
30
|
+
Bundler.ui.info "None of the installed gems you directly depend on are looking for funding."
|
31
|
+
else
|
32
|
+
Bundler.ui.info fund_info.join("\n")
|
33
|
+
end
|
34
|
+
end
|
35
|
+
end
|
36
|
+
end
|