Fix cache logic

The prior directory check only looked at `vendor/bundle/#{engine}/#{major}.#{minor}.0` (which does not include the bundler version). This prevented installing/updating bundler versions. The logic now checks the specific bundler version before skipping installation.

Author: schneems

lib/language_pack/helpers/bundler_wrapper.rb

@@ -141,7 +141,7 @@ def initialize(
     )
     @dir_name = "bundler-#{@version}"
 
-    @bundler_path         = bundler_path
+    @bundler_path = Pathname(bundler_path)
     @orig_bundle_gemfile  = ENV['BUNDLE_GEMFILE']
   end
 
@@ -193,7 +193,7 @@ def bundler_version_escape_valve!
 
   private
   def fetch_bundler
-    return true if Dir.exist?(bundler_path)
+    return true if Dir.exist?(bundler_path.join("gems", dir_name))
 
     topic("Installing bundler #{@version}")
     bundler_version_escape_valve!

spec/hatchet/getting_started_spec.rb

@@ -8,8 +8,10 @@
 
       secret_key_base = app.run("echo $SECRET_KEY_BASE")
 
+      set_bundler_version(version: "2.6.9")
+
       # Re-deploy with cache
-      run!("git commit --allow-empty -m empty")
+      run!("git add .; git commit -m 'Change bundler version'")
       app.push!
 
       # Assert used cached gems

spec/spec_helper.rb

@@ -76,7 +76,7 @@ def set_bundler_version(version: )
   else
     version = "BUNDLED WITH\n   #{version}"
   end
-  gemfile_lock.gsub!(/^BUNDLED WITH$(\r?\n)   (?<major>\d+)\.(?<minor>\d+)\.\d+/m, version)
+  gemfile_lock.gsub!(/^BUNDLED WITH$(\r?\n) {2,3}(?<major>\d+)\.(?<minor>\d+)\.\d+/m, version)
   gemfile_lock << "\n#{version}" unless gemfile_lock.match?(/^BUNDLED WITH/)
 
   Pathname("Gemfile.lock").write(gemfile_lock)