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/list.rb
CHANGED
@@ -4,17 +4,25 @@ module Bundler
|
|
4
4
|
class CLI::List
|
5
5
|
def initialize(options)
|
6
6
|
@options = options
|
7
|
+
@without_group = options["without-group"].map(&:to_sym)
|
8
|
+
@only_group = options["only-group"].map(&:to_sym)
|
7
9
|
end
|
8
10
|
|
9
11
|
def run
|
10
|
-
raise InvalidOption, "The `--only-group` and `--without-group` options cannot be used together" if @
|
12
|
+
raise InvalidOption, "The `--only-group` and `--without-group` options cannot be used together" if @only_group.any? && @without_group.any?
|
11
13
|
|
12
14
|
raise InvalidOption, "The `--name-only` and `--paths` options cannot be used together" if @options["name-only"] && @options[:paths]
|
13
15
|
|
14
|
-
specs = if @
|
16
|
+
specs = if @only_group.any? || @without_group.any?
|
15
17
|
filtered_specs_by_groups
|
16
18
|
else
|
17
|
-
|
19
|
+
begin
|
20
|
+
Bundler.load.specs
|
21
|
+
rescue GemNotFound => e
|
22
|
+
Bundler.ui.error e.message
|
23
|
+
Bundler.ui.warn "Install missing gems with `bundle install`."
|
24
|
+
exit 1
|
25
|
+
end
|
18
26
|
end.reject {|s| s.name == "bundler" }.sort_by(&:name)
|
19
27
|
|
20
28
|
return Bundler.ui.info "No gems in the Gemfile" if specs.empty?
|
@@ -29,12 +37,12 @@ module Bundler
|
|
29
37
|
Bundler.ui.info "Use `bundle info` to print more detailed information about a gem"
|
30
38
|
end
|
31
39
|
|
32
|
-
|
40
|
+
private
|
33
41
|
|
34
42
|
def verify_group_exists(groups)
|
35
|
-
|
36
|
-
|
37
|
-
|
43
|
+
(@without_group + @only_group).each do |group|
|
44
|
+
raise InvalidOption, "`#{group}` group could not be found." unless groups.include?(group)
|
45
|
+
end
|
38
46
|
end
|
39
47
|
|
40
48
|
def filtered_specs_by_groups
|
@@ -44,10 +52,10 @@ module Bundler
|
|
44
52
|
verify_group_exists(groups)
|
45
53
|
|
46
54
|
show_groups =
|
47
|
-
if @
|
48
|
-
groups.reject {|g|
|
49
|
-
elsif @
|
50
|
-
groups.select {|g|
|
55
|
+
if @without_group.any?
|
56
|
+
groups.reject {|g| @without_group.include?(g) }
|
57
|
+
elsif @only_group.any?
|
58
|
+
groups.select {|g| @only_group.include?(g) }
|
51
59
|
else
|
52
60
|
groups
|
53
61
|
end.map(&:to_sym)
|
data/lib/bundler/cli/lock.rb
CHANGED
@@ -21,9 +21,13 @@ module Bundler
|
|
21
21
|
Bundler::Fetcher.disable_endpoint = options["full-index"]
|
22
22
|
|
23
23
|
update = options[:update]
|
24
|
+
conservative = options[:conservative]
|
25
|
+
|
24
26
|
if update.is_a?(Array) # unlocking specific gems
|
25
27
|
Bundler::CLI::Common.ensure_all_gems_in_lockfile!(update)
|
26
|
-
update = { :gems => update, :
|
28
|
+
update = { :gems => update, :conservative => conservative }
|
29
|
+
elsif update
|
30
|
+
update = { :conservative => conservative } if conservative
|
27
31
|
end
|
28
32
|
definition = Bundler.definition(update)
|
29
33
|
|
data/lib/bundler/cli/open.rb
CHANGED
@@ -1,7 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require "shellwords"
|
4
|
-
|
5
3
|
module Bundler
|
6
4
|
class CLI::Open
|
7
5
|
attr_reader :options, :name
|
@@ -14,12 +12,17 @@ module Bundler
|
|
14
12
|
editor = [ENV["BUNDLER_EDITOR"], ENV["VISUAL"], ENV["EDITOR"]].find {|e| !e.nil? && !e.empty? }
|
15
13
|
return Bundler.ui.info("To open a bundled gem, set $EDITOR or $BUNDLER_EDITOR") unless editor
|
16
14
|
return unless spec = Bundler::CLI::Common.select_spec(name, :regex_match)
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
15
|
+
if spec.default_gem?
|
16
|
+
Bundler.ui.info "Unable to open #{name} because it's a default gem, so the directory it would normally be installed to does not exist."
|
17
|
+
else
|
18
|
+
path = spec.full_gem_path
|
19
|
+
Dir.chdir(path) do
|
20
|
+
require "shellwords"
|
21
|
+
command = Shellwords.split(editor) + [path]
|
22
|
+
Bundler.with_original_env do
|
23
|
+
system(*command)
|
24
|
+
end || Bundler.ui.info("Could not run '#{command.join(" ")}'")
|
25
|
+
end
|
23
26
|
end
|
24
27
|
end
|
25
28
|
end
|
data/lib/bundler/cli/outdated.rb
CHANGED
@@ -2,17 +2,29 @@
|
|
2
2
|
|
3
3
|
module Bundler
|
4
4
|
class CLI::Outdated
|
5
|
-
attr_reader :options, :gems
|
5
|
+
attr_reader :options, :gems, :options_include_groups, :filter_options_patch, :sources, :strict
|
6
|
+
attr_accessor :outdated_gems
|
6
7
|
|
7
8
|
def initialize(options, gems)
|
8
9
|
@options = options
|
9
10
|
@gems = gems
|
11
|
+
@sources = Array(options[:source])
|
12
|
+
|
13
|
+
@filter_options_patch = options.keys & %w[filter-major filter-minor filter-patch]
|
14
|
+
|
15
|
+
@outdated_gems = []
|
16
|
+
|
17
|
+
@options_include_groups = [:group, :groups].any? do |v|
|
18
|
+
options.keys.include?(v.to_s)
|
19
|
+
end
|
20
|
+
|
21
|
+
# the patch level options imply strict is also true. It wouldn't make
|
22
|
+
# sense otherwise.
|
23
|
+
@strict = options["filter-strict"] || Bundler::CLI::Common.patch_level_options(options).any?
|
10
24
|
end
|
11
25
|
|
12
26
|
def run
|
13
|
-
check_for_deployment_mode
|
14
|
-
|
15
|
-
sources = Array(options[:source])
|
27
|
+
check_for_deployment_mode!
|
16
28
|
|
17
29
|
gems.each do |gem_name|
|
18
30
|
Bundler::CLI::Common.select_spec(gem_name)
|
@@ -20,11 +32,9 @@ module Bundler
|
|
20
32
|
|
21
33
|
Bundler.definition.validate_runtime!
|
22
34
|
current_specs = Bundler.ui.silence { Bundler.definition.resolve }
|
23
|
-
|
24
|
-
Bundler.ui.silence do
|
25
|
-
Bundler.load.dependencies.
|
26
|
-
current_dependencies[dep.name] = dep
|
27
|
-
end
|
35
|
+
|
36
|
+
current_dependencies = Bundler.ui.silence do
|
37
|
+
Bundler.load.dependencies.map {|dep| [dep.name, dep] }.to_h
|
28
38
|
end
|
29
39
|
|
30
40
|
definition = if gems.empty? && sources.empty?
|
@@ -39,14 +49,6 @@ module Bundler
|
|
39
49
|
options
|
40
50
|
)
|
41
51
|
|
42
|
-
# the patch level options imply strict is also true. It wouldn't make
|
43
|
-
# sense otherwise.
|
44
|
-
strict = options[:strict] ||
|
45
|
-
Bundler::CLI::Common.patch_level_options(options).any?
|
46
|
-
|
47
|
-
filter_options_patch = options.keys &
|
48
|
-
%w[filter-major filter-minor filter-patch]
|
49
|
-
|
50
52
|
definition_resolution = proc do
|
51
53
|
options[:local] ? definition.resolve_with_cache! : definition.resolve_remotely!
|
52
54
|
end
|
@@ -58,8 +60,6 @@ module Bundler
|
|
58
60
|
end
|
59
61
|
|
60
62
|
Bundler.ui.info ""
|
61
|
-
outdated_gems_by_groups = {}
|
62
|
-
outdated_gems_list = []
|
63
63
|
|
64
64
|
# Loop through the current specs
|
65
65
|
gemfile_specs, dependency_specs = current_specs.partition do |spec|
|
@@ -72,130 +72,117 @@ module Bundler
|
|
72
72
|
gemfile_specs + dependency_specs
|
73
73
|
end
|
74
74
|
|
75
|
-
specs.sort_by(&:name).each do |current_spec|
|
76
|
-
next
|
75
|
+
specs.sort_by(&:name).uniq(&:name).each do |current_spec|
|
76
|
+
next unless gems.empty? || gems.include?(current_spec.name)
|
77
77
|
|
78
|
-
|
79
|
-
|
78
|
+
active_spec = retrieve_active_spec(definition, current_spec)
|
79
|
+
next unless active_spec
|
80
80
|
|
81
|
-
next
|
82
|
-
if filter_options_patch.any?
|
83
|
-
update_present = update_present_via_semver_portions(current_spec, active_spec, options)
|
84
|
-
next unless update_present
|
85
|
-
end
|
81
|
+
next unless filter_options_patch.empty? || update_present_via_semver_portions(current_spec, active_spec, options)
|
86
82
|
|
87
83
|
gem_outdated = Gem::Version.new(active_spec.version) > Gem::Version.new(current_spec.version)
|
88
84
|
next unless gem_outdated || (current_spec.git_version != active_spec.git_version)
|
89
|
-
|
85
|
+
|
86
|
+
dependency = current_dependencies[current_spec.name]
|
87
|
+
groups = ""
|
90
88
|
if dependency && !options[:parseable]
|
91
89
|
groups = dependency.groups.join(", ")
|
92
90
|
end
|
93
91
|
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
outdated_gems_by_groups[groups] << { :active_spec => active_spec,
|
101
|
-
:current_spec => current_spec,
|
102
|
-
:dependency => dependency,
|
103
|
-
:groups => groups }
|
92
|
+
outdated_gems << {
|
93
|
+
:active_spec => active_spec,
|
94
|
+
:current_spec => current_spec,
|
95
|
+
:dependency => dependency,
|
96
|
+
:groups => groups,
|
97
|
+
}
|
104
98
|
end
|
105
99
|
|
106
|
-
if
|
107
|
-
display_nothing_outdated_message(filter_options_patch)
|
108
|
-
else
|
100
|
+
if outdated_gems.empty?
|
109
101
|
unless options[:parseable]
|
110
|
-
|
111
|
-
Bundler.ui.info "Outdated gems included in the bundle (including " \
|
112
|
-
"pre-releases):"
|
113
|
-
else
|
114
|
-
Bundler.ui.info "Outdated gems included in the bundle:"
|
115
|
-
end
|
116
|
-
end
|
117
|
-
|
118
|
-
options_include_groups = [:group, :groups].select do |v|
|
119
|
-
options.keys.include?(v.to_s)
|
102
|
+
Bundler.ui.info(nothing_outdated_message)
|
120
103
|
end
|
104
|
+
else
|
105
|
+
if options_include_groups
|
106
|
+
relevant_outdated_gems = outdated_gems.group_by {|g| g[:groups] }.sort.flat_map do |groups, gems|
|
107
|
+
contains_group = groups.split(", ").include?(options[:group])
|
108
|
+
next unless options[:groups] || contains_group
|
121
109
|
|
122
|
-
|
123
|
-
|
124
|
-
[nil, ordered_groups].flatten.each do |groups|
|
125
|
-
gems = outdated_gems_by_groups[groups]
|
126
|
-
contains_group = if groups
|
127
|
-
groups.split(",").include?(options[:group])
|
128
|
-
else
|
129
|
-
options[:group] == "group"
|
130
|
-
end
|
131
|
-
|
132
|
-
next if (!options[:groups] && !contains_group) || gems.nil?
|
110
|
+
gems
|
111
|
+
end.compact
|
133
112
|
|
134
|
-
|
135
|
-
|
136
|
-
|
137
|
-
else
|
138
|
-
Bundler.ui.info "===== Without group ====="
|
139
|
-
end
|
140
|
-
end
|
141
|
-
|
142
|
-
gems.each do |gem|
|
143
|
-
print_gem(
|
144
|
-
gem[:current_spec],
|
145
|
-
gem[:active_spec],
|
146
|
-
gem[:dependency],
|
147
|
-
groups,
|
148
|
-
options_include_groups.any?
|
149
|
-
)
|
113
|
+
if options[:parseable]
|
114
|
+
relevant_outdated_gems.each do |gems|
|
115
|
+
print_gems(gems)
|
150
116
|
end
|
117
|
+
else
|
118
|
+
print_gems_table(relevant_outdated_gems)
|
151
119
|
end
|
120
|
+
elsif options[:parseable]
|
121
|
+
print_gems(outdated_gems)
|
152
122
|
else
|
153
|
-
|
154
|
-
print_gem(
|
155
|
-
gem[:current_spec],
|
156
|
-
gem[:active_spec],
|
157
|
-
gem[:dependency],
|
158
|
-
gem[:groups],
|
159
|
-
options_include_groups.any?
|
160
|
-
)
|
161
|
-
end
|
123
|
+
print_gems_table(outdated_gems)
|
162
124
|
end
|
163
125
|
|
164
126
|
exit 1
|
165
127
|
end
|
166
128
|
end
|
167
129
|
|
168
|
-
|
130
|
+
private
|
169
131
|
|
170
|
-
def
|
171
|
-
|
172
|
-
|
132
|
+
def groups_text(group_text, groups)
|
133
|
+
"#{group_text}#{groups.split(",").size > 1 ? "s" : ""} \"#{groups}\""
|
134
|
+
end
|
135
|
+
|
136
|
+
def nothing_outdated_message
|
137
|
+
if filter_options_patch.any?
|
138
|
+
display = filter_options_patch.map do |o|
|
139
|
+
o.sub("filter-", "")
|
140
|
+
end.join(" or ")
|
141
|
+
|
142
|
+
"No #{display} updates to display.\n"
|
173
143
|
else
|
174
|
-
|
175
|
-
if !current_spec.version.prerelease? && !options[:pre] && active_specs.size > 1
|
176
|
-
active_specs.delete_if {|b| b.respond_to?(:version) && b.version.prerelease? }
|
177
|
-
end
|
178
|
-
active_spec = active_specs.last
|
144
|
+
"Bundle up to date!\n"
|
179
145
|
end
|
146
|
+
end
|
147
|
+
|
148
|
+
def retrieve_active_spec(definition, current_spec)
|
149
|
+
active_spec = definition.resolve.find_by_name_and_platform(current_spec.name, current_spec.platform)
|
150
|
+
return unless active_spec
|
180
151
|
|
181
|
-
active_spec
|
152
|
+
return active_spec if strict
|
153
|
+
|
154
|
+
active_specs = active_spec.source.specs.search(current_spec.name).select {|spec| spec.match_platform(current_spec.platform) }.sort_by(&:version)
|
155
|
+
if !current_spec.version.prerelease? && !options[:pre] && active_specs.size > 1
|
156
|
+
active_specs.delete_if {|b| b.respond_to?(:version) && b.version.prerelease? }
|
157
|
+
end
|
158
|
+
active_specs.last
|
182
159
|
end
|
183
160
|
|
184
|
-
def
|
185
|
-
|
186
|
-
|
187
|
-
|
188
|
-
|
189
|
-
|
161
|
+
def print_gems(gems_list)
|
162
|
+
gems_list.each do |gem|
|
163
|
+
print_gem(
|
164
|
+
gem[:current_spec],
|
165
|
+
gem[:active_spec],
|
166
|
+
gem[:dependency],
|
167
|
+
gem[:groups],
|
168
|
+
)
|
169
|
+
end
|
170
|
+
end
|
190
171
|
|
191
|
-
|
192
|
-
|
193
|
-
|
194
|
-
|
172
|
+
def print_gems_table(gems_list)
|
173
|
+
data = gems_list.map do |gem|
|
174
|
+
gem_column_for(
|
175
|
+
gem[:current_spec],
|
176
|
+
gem[:active_spec],
|
177
|
+
gem[:dependency],
|
178
|
+
gem[:groups],
|
179
|
+
)
|
195
180
|
end
|
181
|
+
|
182
|
+
print_indented([table_header] + data)
|
196
183
|
end
|
197
184
|
|
198
|
-
def print_gem(current_spec, active_spec, dependency, groups
|
185
|
+
def print_gem(current_spec, active_spec, dependency, groups)
|
199
186
|
spec_version = "#{active_spec.version}#{active_spec.git_version}"
|
200
187
|
spec_version += " (from #{active_spec.loaded_from})" if Bundler.ui.debug? && active_spec.loaded_from
|
201
188
|
current_version = "#{current_spec.version}#{current_spec.git_version}"
|
@@ -209,23 +196,31 @@ module Bundler
|
|
209
196
|
|
210
197
|
output_message = if options[:parseable]
|
211
198
|
spec_outdated_info.to_s
|
212
|
-
elsif options_include_groups ||
|
199
|
+
elsif options_include_groups || groups.empty?
|
213
200
|
" * #{spec_outdated_info}"
|
214
201
|
else
|
215
|
-
" * #{spec_outdated_info} in
|
202
|
+
" * #{spec_outdated_info} in #{groups_text("group", groups)}"
|
216
203
|
end
|
217
204
|
|
218
205
|
Bundler.ui.info output_message.rstrip
|
219
206
|
end
|
220
207
|
|
221
|
-
def
|
208
|
+
def gem_column_for(current_spec, active_spec, dependency, groups)
|
209
|
+
current_version = "#{current_spec.version}#{current_spec.git_version}"
|
210
|
+
spec_version = "#{active_spec.version}#{active_spec.git_version}"
|
211
|
+
dependency = dependency.requirement if dependency
|
212
|
+
|
213
|
+
ret_val = [active_spec.name, current_version, spec_version, dependency.to_s, groups.to_s]
|
214
|
+
ret_val << active_spec.loaded_from.to_s if Bundler.ui.debug?
|
215
|
+
ret_val
|
216
|
+
end
|
217
|
+
|
218
|
+
def check_for_deployment_mode!
|
222
219
|
return unless Bundler.frozen_bundle?
|
223
|
-
suggested_command = if Bundler.settings.locations("frozen")[:global]
|
224
|
-
"bundle config
|
220
|
+
suggested_command = if Bundler.settings.locations("frozen").keys.&([:global, :local]).any?
|
221
|
+
"bundle config unset frozen"
|
225
222
|
elsif Bundler.settings.locations("deployment").keys.&([:global, :local]).any?
|
226
|
-
"bundle config
|
227
|
-
else
|
228
|
-
"bundle install --no-deployment"
|
223
|
+
"bundle config unset deployment"
|
229
224
|
end
|
230
225
|
raise ProductionError, "You are trying to check outdated gems in " \
|
231
226
|
"deployment mode. Run `bundle outdated` elsewhere.\n" \
|
@@ -260,7 +255,36 @@ module Bundler
|
|
260
255
|
|
261
256
|
def get_version_semver_portion_value(spec, version_portion_index)
|
262
257
|
version_section = spec.version.segments[version_portion_index, 1]
|
263
|
-
version_section.
|
258
|
+
version_section.to_a[0].to_i
|
259
|
+
end
|
260
|
+
|
261
|
+
def print_indented(matrix)
|
262
|
+
header = matrix[0]
|
263
|
+
data = matrix[1..-1]
|
264
|
+
|
265
|
+
column_sizes = Array.new(header.size) do |index|
|
266
|
+
matrix.max_by {|row| row[index].length }[index].length
|
267
|
+
end
|
268
|
+
|
269
|
+
Bundler.ui.info justify(header, column_sizes)
|
270
|
+
|
271
|
+
data.sort_by! {|row| row[0] }
|
272
|
+
|
273
|
+
data.each do |row|
|
274
|
+
Bundler.ui.info justify(row, column_sizes)
|
275
|
+
end
|
276
|
+
end
|
277
|
+
|
278
|
+
def table_header
|
279
|
+
header = ["Gem", "Current", "Latest", "Requested", "Groups"]
|
280
|
+
header << "Path" if Bundler.ui.debug?
|
281
|
+
header
|
282
|
+
end
|
283
|
+
|
284
|
+
def justify(row, sizes)
|
285
|
+
row.each_with_index.map do |element, index|
|
286
|
+
element.ljust(sizes[index])
|
287
|
+
end.join(" ").strip + "\n"
|
264
288
|
end
|
265
289
|
end
|
266
290
|
end
|
data/lib/bundler/cli/plugin.rb
CHANGED
@@ -1,11 +1,11 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
|
3
|
+
require_relative "../vendored_thor"
|
4
4
|
module Bundler
|
5
5
|
class CLI::Plugin < Thor
|
6
6
|
desc "install PLUGINS", "Install the plugin from the source"
|
7
7
|
long_desc <<-D
|
8
|
-
Install plugins either from the rubygems source provided (with --source option) or from a git source provided with
|
8
|
+
Install plugins either from the rubygems source provided (with --source option) or from a git source provided with --git (for remote repos) or --local_git (for local repos). If no sources are provided, it uses Gem.sources
|
9
9
|
D
|
10
10
|
method_option "source", :type => :string, :default => nil, :banner =>
|
11
11
|
"URL of the RubyGems source to fetch the plugin from"
|
@@ -13,6 +13,8 @@ module Bundler
|
|
13
13
|
"The version of the plugin to fetch"
|
14
14
|
method_option "git", :type => :string, :default => nil, :banner =>
|
15
15
|
"URL of the git repo to fetch from"
|
16
|
+
method_option "local_git", :type => :string, :default => nil, :banner =>
|
17
|
+
"Path of the local git repo to fetch from"
|
16
18
|
method_option "branch", :type => :string, :default => nil, :banner =>
|
17
19
|
"The git branch to checkout"
|
18
20
|
method_option "ref", :type => :string, :default => nil, :banner =>
|
@@ -20,5 +22,20 @@ module Bundler
|
|
20
22
|
def install(*plugins)
|
21
23
|
Bundler::Plugin.install(plugins, options)
|
22
24
|
end
|
25
|
+
|
26
|
+
desc "uninstall PLUGINS", "Uninstall the plugins"
|
27
|
+
long_desc <<-D
|
28
|
+
Uninstall given list of plugins. To uninstall all the plugins, use -all option.
|
29
|
+
D
|
30
|
+
method_option "all", :type => :boolean, :default => nil, :banner =>
|
31
|
+
"Uninstall all the installed plugins. If no plugin is installed, then it does nothing."
|
32
|
+
def uninstall(*plugins)
|
33
|
+
Bundler::Plugin.uninstall(plugins, options)
|
34
|
+
end
|
35
|
+
|
36
|
+
desc "list", "List the installed plugins and available commands"
|
37
|
+
def list
|
38
|
+
Bundler::Plugin.list
|
39
|
+
end
|
23
40
|
end
|
24
41
|
end
|
data/lib/bundler/cli/pristine.rb
CHANGED
@@ -29,11 +29,16 @@ module Bundler
|
|
29
29
|
|
30
30
|
FileUtils.rm_rf spec.full_gem_path
|
31
31
|
when Source::Git
|
32
|
+
if source.local?
|
33
|
+
Bundler.ui.warn("Cannot pristine #{gem_name}. Gem is locally overridden.")
|
34
|
+
next
|
35
|
+
end
|
36
|
+
|
32
37
|
source.remote!
|
33
38
|
if extension_cache_path = source.extension_cache_path(spec)
|
34
39
|
FileUtils.rm_rf extension_cache_path
|
35
40
|
end
|
36
|
-
FileUtils.rm_rf spec.extension_dir
|
41
|
+
FileUtils.rm_rf spec.extension_dir
|
37
42
|
FileUtils.rm_rf spec.full_gem_path
|
38
43
|
else
|
39
44
|
Bundler.ui.warn("Cannot pristine #{gem_name}. Gem is sourced from local path.")
|
data/lib/bundler/cli/remove.rb
CHANGED
@@ -11,8 +11,7 @@ module Bundler
|
|
11
11
|
raise InvalidOption, "Please specify gems to remove." if @gems.empty?
|
12
12
|
|
13
13
|
Injector.remove(@gems, {})
|
14
|
-
|
15
|
-
Installer.install(Bundler.root, Bundler.definition) if @options["install"]
|
14
|
+
Installer.install(Bundler.root, Bundler.definition)
|
16
15
|
end
|
17
16
|
end
|
18
17
|
end
|
data/lib/bundler/cli/show.rb
CHANGED
@@ -24,7 +24,7 @@ module Bundler
|
|
24
24
|
return unless spec
|
25
25
|
path = spec.full_gem_path
|
26
26
|
unless File.directory?(path)
|
27
|
-
Bundler.ui.warn "The gem #{gem_name} has been deleted. It was installed at:"
|
27
|
+
return Bundler.ui.warn "The gem #{gem_name} has been deleted. It was installed at: #{path}"
|
28
28
|
end
|
29
29
|
end
|
30
30
|
return Bundler.ui.info(path)
|
@@ -53,7 +53,7 @@ module Bundler
|
|
53
53
|
end
|
54
54
|
end
|
55
55
|
|
56
|
-
|
56
|
+
private
|
57
57
|
|
58
58
|
def fetch_latest_specs
|
59
59
|
definition = Bundler.definition(true)
|
data/lib/bundler/cli/update.rb
CHANGED
@@ -9,7 +9,7 @@ module Bundler
|
|
9
9
|
end
|
10
10
|
|
11
11
|
def run
|
12
|
-
Bundler.ui.level = "
|
12
|
+
Bundler.ui.level = "warn" if options[:quiet]
|
13
13
|
|
14
14
|
Plugin.gemfile_install(Bundler.default_gemfile) if Bundler.feature_flag.plugins?
|
15
15
|
|
@@ -22,14 +22,19 @@ module Bundler
|
|
22
22
|
if Bundler.feature_flag.update_requires_all_flag?
|
23
23
|
raise InvalidOption, "To update everything, pass the `--all` flag."
|
24
24
|
end
|
25
|
-
SharedHelpers.major_deprecation
|
25
|
+
SharedHelpers.major_deprecation 3, "Pass --all to `bundle update` to update everything"
|
26
26
|
elsif !full_update && options[:all]
|
27
27
|
raise InvalidOption, "Cannot specify --all along with specific options."
|
28
28
|
end
|
29
29
|
|
30
|
+
conservative = options[:conservative]
|
31
|
+
|
30
32
|
if full_update
|
31
|
-
|
32
|
-
|
33
|
+
if conservative
|
34
|
+
Bundler.definition(:conservative => conservative)
|
35
|
+
else
|
36
|
+
Bundler.definition(true)
|
37
|
+
end
|
33
38
|
else
|
34
39
|
unless Bundler.default_lockfile.exist?
|
35
40
|
raise GemfileLockNotFound, "This Bundle hasn't been installed yet. " \
|
@@ -43,7 +48,7 @@ module Bundler
|
|
43
48
|
end
|
44
49
|
|
45
50
|
Bundler.definition(:gems => gems, :sources => sources, :ruby => options[:ruby],
|
46
|
-
:
|
51
|
+
:conservative => conservative,
|
47
52
|
:bundler => options[:bundler])
|
48
53
|
end
|
49
54
|
|
@@ -58,24 +63,44 @@ module Bundler
|
|
58
63
|
Bundler.settings.set_command_option_if_given :jobs, opts["jobs"]
|
59
64
|
|
60
65
|
Bundler.definition.validate_runtime!
|
66
|
+
|
67
|
+
if locked_gems = Bundler.definition.locked_gems
|
68
|
+
previous_locked_info = locked_gems.specs.reduce({}) do |h, s|
|
69
|
+
h[s.name] = { :spec => s, :version => s.version, :source => s.source.identifier }
|
70
|
+
h
|
71
|
+
end
|
72
|
+
end
|
73
|
+
|
61
74
|
installer = Installer.install Bundler.root, Bundler.definition, opts
|
62
75
|
Bundler.load.cache if Bundler.app_cache.exist?
|
63
76
|
|
64
77
|
if CLI::Common.clean_after_install?
|
65
|
-
|
78
|
+
require_relative "clean"
|
66
79
|
Bundler::CLI::Clean.new(options).run
|
67
80
|
end
|
68
81
|
|
69
|
-
if locked_gems
|
82
|
+
if locked_gems
|
70
83
|
gems.each do |name|
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
Bundler.
|
78
|
-
|
84
|
+
locked_info = previous_locked_info[name]
|
85
|
+
next unless locked_info
|
86
|
+
|
87
|
+
locked_spec = locked_info[:spec]
|
88
|
+
new_spec = Bundler.definition.specs[name].first
|
89
|
+
unless new_spec
|
90
|
+
unless locked_spec.match_platform(Bundler.local_platform)
|
91
|
+
Bundler.ui.warn "Bundler attempted to update #{name} but it was not considered because it is for a different platform from the current one"
|
92
|
+
end
|
93
|
+
|
94
|
+
next
|
95
|
+
end
|
96
|
+
|
97
|
+
locked_source = locked_info[:source]
|
98
|
+
new_source = new_spec.source.identifier
|
99
|
+
next if locked_source != new_source
|
100
|
+
|
101
|
+
new_version = new_spec.version
|
102
|
+
locked_version = locked_info[:version]
|
103
|
+
if new_version < locked_version
|
79
104
|
Bundler.ui.warn "Note: #{name} version regressed from #{locked_version} to #{new_version}"
|
80
105
|
elsif new_version == locked_version
|
81
106
|
Bundler.ui.warn "Bundler attempted to update #{name} but its version stayed the same"
|
@@ -84,8 +109,10 @@ module Bundler
|
|
84
109
|
end
|
85
110
|
|
86
111
|
Bundler.ui.confirm "Bundle updated!"
|
87
|
-
Bundler::CLI::Common.output_without_groups_message
|
112
|
+
Bundler::CLI::Common.output_without_groups_message(:update)
|
88
113
|
Bundler::CLI::Common.output_post_install_messages installer.post_install_messages
|
114
|
+
|
115
|
+
Bundler::CLI::Common.output_fund_metadata_summary
|
89
116
|
end
|
90
117
|
end
|
91
118
|
end
|