From 3d9467c6b7d18271ce385a7deb45617fd8d8811e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Fri, 28 Aug 2020 18:04:33 +0200 Subject: [PATCH 1/2] Revert "Restore `cache_all` flag removal" This reverts commit 713d9063c3694350f962ed27ee10663317c2e15b. We should deprecate it rather the remove it abruptly. --- bundler/lib/bundler/cli.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/bundler/lib/bundler/cli.rb b/bundler/lib/bundler/cli.rb index ad873b84e95a..203f0539cb5d 100644 --- a/bundler/lib/bundler/cli.rb +++ b/bundler/lib/bundler/cli.rb @@ -440,10 +440,9 @@ def outdated(*gems) end desc "cache [OPTIONS]", "Locks and then caches all of the gems into vendor/cache" - unless Bundler.feature_flag.cache_all? - method_option "all", :type => :boolean, - :banner => "Include all sources (including path and git)." - end + method_option "all", :type => :boolean, + :default => Bundler.feature_flag.cache_all?, + :banner => "Include all sources (including path and git)." method_option "all-platforms", :type => :boolean, :banner => "Include gems for all platforms present in the lockfile, not only the current one" method_option "cache-path", :type => :string, :banner => "Specify a different cache path than the default (vendor/cache)." From 49f0636e2986f506623e82115dddb96362438622 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Fri, 28 Aug 2020 19:00:48 +0200 Subject: [PATCH 2/2] Note default change in documentation --- bundler/man/bundle-config.1 | 2 +- bundler/man/bundle-config.1.ronn | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bundler/man/bundle-config.1 b/bundler/man/bundle-config.1 index 1c5b54e77f88..762b18f2e0f0 100644 --- a/bundler/man/bundle-config.1 +++ b/bundler/man/bundle-config.1 @@ -154,7 +154,7 @@ The following is a list of all configuration keys and their purpose\. You can le \fBbin\fR (\fBBUNDLE_BIN\fR): Install executables from gems in the bundle to the specified directory\. Defaults to \fBfalse\fR\. . .IP "\(bu" 4 -\fBcache_all\fR (\fBBUNDLE_CACHE_ALL\fR): Cache all gems, including path and git gems\. +\fBcache_all\fR (\fBBUNDLE_CACHE_ALL\fR): Cache all gems, including path and git gems\. This needs to be explicitly configured on bundler 1 and bundler 2, but will be the default on bundler 3\. . .IP "\(bu" 4 \fBcache_all_platforms\fR (\fBBUNDLE_CACHE_ALL_PLATFORMS\fR): Cache gems for all platforms\. diff --git a/bundler/man/bundle-config.1.ronn b/bundler/man/bundle-config.1.ronn index 9b8eb94c1b4e..a0ff30cb1559 100644 --- a/bundler/man/bundle-config.1.ronn +++ b/bundler/man/bundle-config.1.ronn @@ -150,7 +150,8 @@ learn more about their operation in [bundle install(1)](bundle-install.1.html). Install executables from gems in the bundle to the specified directory. Defaults to `false`. * `cache_all` (`BUNDLE_CACHE_ALL`): - Cache all gems, including path and git gems. + Cache all gems, including path and git gems. This needs to be explicitly + configured on bundler 1 and bundler 2, but will be the default on bundler 3. * `cache_all_platforms` (`BUNDLE_CACHE_ALL_PLATFORMS`): Cache gems for all platforms. * `cache_path` (`BUNDLE_CACHE_PATH`):