Merge pull request #8975 from rubygems/deivid-rodriguez/cache-all-by-default

Switch `cache_all` to be `true` by default

Author: deivid-rodriguez

bundler/lib/bundler/feature_flag.rb

@@ -27,7 +27,6 @@ def self.settings_method(name, key, &default)
 
     (1..10).each {|v| define_method("bundler_#{v}_mode?") { @major_version >= v } }
 
-    settings_flag(:cache_all) { bundler_4_mode? }
     settings_flag(:global_gem_cache) { bundler_5_mode? }
     settings_flag(:plugins) { @bundler_version >= Gem::Version.new("1.14") }
     settings_flag(:update_requires_all_flag) { bundler_5_mode? }

bundler/lib/bundler/settings.rb

@@ -82,6 +82,7 @@ class Settings
       "BUNDLE_TIMEOUT" => 10,
       "BUNDLE_VERSION" => "lockfile",
       "BUNDLE_LOCKFILE_CHECKSUMS" => true,
+      "BUNDLE_CACHE_ALL" => true,
     }.freeze
 
     def initialize(root = nil)

bundler/lib/bundler/source/git.rb

@@ -268,7 +268,7 @@ def local?
       private
 
       def cache_to(custom_path, try_migrate: false)
-        return unless Bundler.feature_flag.cache_all?
+        return unless Bundler.settings[:cache_all]
 
         app_cache_path = app_cache_path(custom_path)
 

bundler/lib/bundler/source/path.rb

@@ -83,7 +83,7 @@ def install(spec, options = {})
 
       def cache(spec, custom_path = nil)
         app_cache_path = app_cache_path(custom_path)
-        return unless Bundler.feature_flag.cache_all?
+        return unless Bundler.settings[:cache_all]
         return if expand(@original_path).to_s.index(root_path.to_s + "/") == 0
 
         unless @original_path.exist?

bundler/spec/cache/git_spec.rb

@@ -13,6 +13,22 @@
 end
 
 RSpec.describe "bundle cache with git" do
+  it "does not copy repository to vendor cache when cache_all set to false" do
+    git = build_git "foo"
+    ref = git.ref_for("main", 11)
+
+    install_gemfile <<-G
+      source "https://gem.repo1"
+      gem "foo", :git => '#{lib_path("foo-1.0")}'
+    G
+
+    bundle "config cache_all false"
+    bundle :cache
+    expect(bundled_app("vendor/cache/foo-1.0-#{ref}")).not_to exist
+
+    expect(the_bundle).to include_gems "foo 1.0"
+  end
+
   it "copies repository to vendor cache and uses it" do
     git = build_git "foo"
     ref = git.ref_for("main", 11)
@@ -22,7 +38,6 @@
       gem "foo", :git => '#{lib_path("foo-1.0")}'
     G
 
-    bundle "config set cache_all true"
     bundle :cache
     expect(bundled_app("vendor/cache/foo-1.0-#{ref}")).to exist
     expect(bundled_app("vendor/cache/foo-1.0-#{ref}/.git")).not_to exist
@@ -43,7 +58,6 @@
 
     bundle "config set --local path vendor/bundle"
     bundle "install"
-    bundle "config set cache_all true"
     bundle :cache
 
     expect(bundled_app("vendor/cache/foo-1.0-#{ref}")).to exist
@@ -61,7 +75,6 @@
       gem "foo", :git => '#{lib_path("foo-1.0")}'
     G
 
-    bundle "config set cache_all true"
     bundle :cache
     bundle :cache
 
@@ -79,7 +92,6 @@
       gem "foo", :git => '#{lib_path("foo-1.0")}'
     G
 
-    bundle "config set cache_all true"
     bundle :cache
 
     update_git "foo" do |s|
@@ -109,7 +121,6 @@
       gem "foo", :git => '#{lib_path("foo-1.0")}'
     G
 
-    bundle "config set cache_all true"
     bundle :cache
 
     update_git "foo" do |s|
@@ -140,7 +151,6 @@
 
     bundle %(config set local.foo #{lib_path("foo-1.0")})
     bundle "install"
-    bundle "config set cache_all true"
     bundle :cache
 
     expect(bundled_app("vendor/cache/foo-invalid-#{ref}")).to exist
@@ -179,7 +189,6 @@
       source "https://gem.repo1"
       gem "foo", :git => '#{lib_path("foo-1.0")}'
     G
-    bundle "config set cache_all true"
     bundle :cache, "all-platforms" => true
 
     pristine_system_gems
@@ -196,7 +205,6 @@
       source "https://gem.repo1"
       gem "foo", :git => '#{lib_path("foo-1.0")}'
     G
-    bundle "config set cache_all true"
     bundle :cache, "all-platforms" => true
 
     pristine_system_gems
@@ -213,7 +221,6 @@
       source "https://gem.repo1"
       gem "foo", :git => '#{lib_path("foo-1.0")}'
     G
-    bundle "config set cache_all true"
     bundle :cache, "all-platforms" => true
 
     pristine_system_gems
@@ -242,7 +249,6 @@
       gem "foo", :git => '#{lib_path("foo-1.0")}'
     G
     bundle "config set global_gem_cache false"
-    bundle "config set cache_all true"
     bundle "config path vendor/bundle"
     bundle :install
 
@@ -274,7 +280,6 @@
       gem "foo", :git => '#{lib_path("foo-1.0")}'
     G
     bundle "config set global_gem_cache false"
-    bundle "config set cache_all true"
     bundle "config path vendor/bundle"
     bundle :install
 
@@ -304,7 +309,6 @@
       gem "foo", :git => '#{lib_path("foo-1.0")}'
     G
     bundle "config set global_gem_cache false"
-    bundle "config set cache_all true"
     bundle "config path vendor/bundle"
     bundle :install
 
@@ -342,7 +346,6 @@
     G
 
     ref = git.ref_for("main", 11)
-    bundle "config set cache_all true"
     bundle :cache
 
     expect(bundled_app("vendor/cache/has_submodule-1.0-#{ref}")).to exist
@@ -362,7 +365,6 @@
       source "https://gem.repo1"
       gem "foo", :git => '#{lib_path("foo-1.0")}'
     G
-    bundle "config set cache_all true"
     bundle :cache
 
     ref = git.ref_for("main", 11)
@@ -377,7 +379,6 @@
       source "https://gem.repo1"
       gem "foo", :git => '#{lib_path("foo-1.0")}'
     G
-    bundle "config set cache_all true"
     bundle :cache, "all-platforms" => true, :install => false
 
     pristine_system_gems
@@ -436,7 +437,6 @@
       source "https://gem.repo1"
       gem "foo", :git => '#{lib_path("foo-1.0")}'
     G
-    bundle "config set cache_all true"
 
     # The algorithm for the cache location for a git checkout is
     # in Bundle::Source::Git#cache_path
@@ -498,7 +498,6 @@
     end
 
     FileUtils.mkdir_p(bundled_app("vendor/cache"))
-    bundle "config set cache_all all"
 
     install_gemfile <<-G
       source "https://gem.repo1"

bundler/spec/cache/path_spec.rb

@@ -9,7 +9,6 @@
       gem "foo", :path => '#{bundled_app("lib/foo")}'
     G
 
-    bundle "config set cache_all true"
     bundle :cache
     expect(bundled_app("vendor/cache/foo-1.0")).not_to exist
     expect(the_bundle).to include_gems "foo 1.0"
@@ -23,7 +22,6 @@
       gem "foo", :path => '#{lib_path("foo-1.0")}'
     G
 
-    bundle "config set cache_all true"
     bundle :cache
     expect(bundled_app("vendor/cache/foo-1.0")).to exist
     expect(bundled_app("vendor/cache/foo-1.0/.bundlecache")).to be_file
@@ -42,7 +40,6 @@
       gem "#{libname}", :path => '#{libpath}'
     G
 
-    bundle "config set cache_all true"
     bundle :cache
     expect(bundled_app("vendor/cache/#{libname}")).to exist
     expect(bundled_app("vendor/cache/#{libname}/.bundlecache")).to be_file
@@ -58,7 +55,6 @@
       gem "foo", :path => '#{lib_path("foo-1.0")}'
     G
 
-    bundle "config set cache_all true"
     bundle :cache
 
     build_lib "foo" do |s|
@@ -81,7 +77,6 @@
       gem "foo", :path => '#{lib_path("foo-1.0")}'
     G
 
-    bundle "config set cache_all true"
     bundle :cache
 
     expect(bundled_app("vendor/cache/foo-1.0")).to exist
@@ -97,20 +92,21 @@
     expect(bundled_app("vendor/cache/foo-1.0")).not_to exist
   end
 
-  it "does not cache path gems by default" do
+  it "does not cache path gems if cache_all is set to false" do
     build_lib "foo"
 
     install_gemfile <<-G
       source "https://gem.repo1"
       gem "foo", :path => '#{lib_path("foo-1.0")}'
     G
+    bundle "config cache_all false"
 
     bundle :cache
     expect(err).to be_empty
     expect(bundled_app("vendor/cache/foo-1.0")).not_to exist
   end
 
-  it "caches path gems by default", bundler: "4" do
+  it "caches path gems by default" do
     build_lib "foo"
 
     install_gemfile <<-G

bundler/spec/install/deploy_spec.rb

@@ -474,7 +474,6 @@
       bundle :install
       expect(the_bundle).to include_gems "foo 1.0"
 
-      bundle "config set cache_all true"
       bundle :cache
       expect(bundled_app("vendor/cache/foo")).to be_directory
 

bundler/spec/install/gemfile/specific_platform_spec.rb

@@ -336,7 +336,6 @@
          #{Bundler::VERSION}
     L
 
-    bundle "config set --local cache_all true"
     bundle "cache --all-platforms"
 
     expect(err).to be_empty

bundler/spec/lock/lockfile_spec.rb

@@ -786,7 +786,6 @@
       c.no_checksum "foo", "1.0"
     end
 
-    bundle "config set cache_all true"
     bundle :cache
     bundle :install, local: true
 

bundler/spec/plugins/source/example_spec.rb

@@ -124,7 +124,6 @@ def install(spec, opts)
       let(:uri_hash) { Digest(:SHA1).hexdigest(lib_path("a-path-gem-1.0").to_s) }
       it "copies repository to vendor cache and uses it" do
         bundle "install"
-        bundle "config set cache_all true"
         bundle :cache
 
         expect(bundled_app("vendor/cache/a-path-gem-1.0-#{uri_hash}")).to exist
@@ -138,7 +137,6 @@ def install(spec, opts)
       it "copies repository to vendor cache and uses it even when installed with `path` configured" do
         bundle "config set --local path vendor/bundle"
         bundle :install
-        bundle "config set cache_all true"
         bundle :cache
 
         expect(bundled_app("vendor/cache/a-path-gem-1.0-#{uri_hash}")).to exist
@@ -150,7 +148,6 @@ def install(spec, opts)
       it "bundler package copies repository to vendor cache" do
         bundle "config set --local path vendor/bundle"
         bundle :install
-        bundle "config set cache_all true"
         bundle :cache
 
         expect(bundled_app("vendor/cache/a-path-gem-1.0-#{uri_hash}")).to exist
@@ -446,7 +443,6 @@ def installed?
           end
         G
 
-        bundle "config set cache_all true"
         bundle :cache
         expect(bundled_app("vendor/cache/foo-1.0-#{ref}")).to exist
         expect(bundled_app("vendor/cache/foo-1.0-#{ref}/.git")).not_to exist