Install bundler where we want it from the beginning

We know where bundler will live, we can put it in the right place from the start.

Author: schneems

lib/language_pack.rb

@@ -50,7 +50,7 @@ def self.call(app_path:, cache_path:, gemfile_lock:, bundle_default_without:, en
       io: warn_io
     )
 
-    bundler = Helpers::BundlerWrapper.new.install
+    bundler = Helpers::BundlerWrapper.new(bundler_path: ruby_version.bundler_directory).install
     default_config_vars = Ruby.default_config_vars(metadata: metadata, ruby_version: ruby_version, bundler: bundler, environment_name: environment_name)
     Ruby.setup_language_pack_environment(
       app_path: app_path.expand_path,
@@ -59,7 +59,6 @@ def self.call(app_path:, cache_path:, gemfile_lock:, bundle_default_without:, en
       bundle_default_without: bundle_default_without,
       default_config_vars: default_config_vars
     )
-    Ruby.install_bundler_in_app(bundler_src_dir: bundler.bundler_path, app_bundler_dir: ruby_version.bundler_directory)
     Ruby.load_bundler_cache(
       ruby_version: ruby_version,
       new_app: new_app,

lib/language_pack/helpers/bundler_wrapper.rb

@@ -9,7 +9,7 @@
 #
 # Example:
 #
-#   bundler = LanguagePack::Helpers::BundlerWrapper.new
+#   bundler = LanguagePack::Helpers::BundlerWrapper.new(bundler_path: "vendor/bundle/ruby/3.2.0")
 #   bundler.install
 #   bundler.version                 => "1.15.2"
 #   bundler.dir_name                => "bundler-1.15.2"
@@ -22,7 +22,7 @@
 # of an isolated dyno, you must call `BundlerWrapper#clean`. To reset the environment
 # variable:
 #
-#   bundler = LanguagePack::Helpers::BundlerWrapper.new
+#   bundler = LanguagePack::Helpers::BundlerWrapper.new(bundler_path: "vendor/bundle/ruby/3.2.0")
 #   bundler.install
 #   bundler.clean # <========== IMPORTANT =============
 #
@@ -109,12 +109,11 @@ def initialize(version_hash, major_minor)
   attr_reader :bundler_path
 
   def initialize(
-      bundler_path: nil,
+      bundler_path:,
       gemfile_path: Pathname.new("./Gemfile"),
       report: HerokuBuildReport::GLOBAL
     )
     @report               = report
-    @bundler_tmp          = Pathname.new(Dir.mktmpdir)
     @gemfile_path         = gemfile_path
     @gemfile_lock_path    = Pathname.new("#{@gemfile_path}.lock")
 
@@ -142,7 +141,7 @@ def initialize(
     )
     @dir_name = "bundler-#{@version}"
 
-    @bundler_path         = bundler_path || @bundler_tmp.join(@dir_name)
+    @bundler_path         = bundler_path
     @orig_bundle_gemfile  = ENV['BUNDLE_GEMFILE']
   end
 
@@ -154,7 +153,6 @@ def install
 
   def clean
     ENV['BUNDLE_GEMFILE'] = @orig_bundle_gemfile
-    @bundler_tmp.rmtree if @bundler_tmp.directory?
   end
 
   def has_gem?(name)

lib/language_pack/ruby.rb

@@ -539,13 +539,6 @@ def self.install_ruby(app_path: , ruby_version: , stack:, arch: , metadata:, io:
     io.error message
   end
 
-  # installs vendored gems into the slug
-  def self.install_bundler_in_app(bundler_src_dir:, app_bundler_dir:)
-    FileUtils.mkdir_p(app_bundler_dir)
-    Dir.chdir(app_bundler_dir) do |dir|
-      `cp -R #{bundler_src_dir}/. .`
-    end
-  end
 
   # default set of binaries to install
   # @return [Array] resulting list
@@ -931,74 +924,8 @@ def self.load_bundler_cache(cache: , metadata: , stack:, bundler_cache: , bundle
     metadata.write(stack_cache, stack)
   end
 
-  def self.purge_bundler_cache(bundler_cache: , stack:  nil, ruby_version: , bundler:)
-    bundler_cache.clear(stack)
-    # need to reinstall language pack gems
-    install_bundler_in_app(bundler_src_dir: bundler.bundler_path, app_bundler_dir: ruby_version.bundler_directory)
-  end
-
-  # writes ERB based database.yml for Rails. The database.yml uses the DATABASE_URL from the environment during runtime.
-  def create_database_yml
-    return false unless File.directory?("config")
-    return false if  bundler.has_gem?('activerecord') && bundler.gem_version('activerecord') >= Gem::Version.new('4.1.0.beta1')
-
-    topic("Writing config/database.yml to read from DATABASE_URL")
-    File.open("config/database.yml", "w") do |file|
-      file.puts <<~DATABASE_YML
-        <%
-
-        require 'cgi'
-        require 'uri'
-
-        begin
-          uri = URI.parse(ENV["DATABASE_URL"])
-        rescue URI::InvalidURIError
-          raise "Invalid DATABASE_URL"
-        end
-
-        raise "No RACK_ENV or RAILS_ENV found" unless ENV["RAILS_ENV"] || ENV["RACK_ENV"]
-
-        def attribute(name, value, force_string = false)
-          if value
-            value_string =
-              if force_string
-                '"' + value + '"'
-              else
-                value
-              end
-            "\#{name}: \#{value_string}"
-          else
-            ""
-          end
-        end
-
-        adapter = uri.scheme
-        adapter = "postgresql" if adapter == "postgres"
-
-        database = (uri.path || "").split("/")[1]
-
-        username = uri.user
-        password = uri.password
-
-        host = uri.host
-        port = uri.port
-
-        params = CGI.parse(uri.query || "")
-
-        %>
-
-        <%= ENV["RAILS_ENV"] || ENV["RACK_ENV"] %>:
-          <%= attribute "adapter",  adapter %>
-          <%= attribute "database", database %>
-          <%= attribute "username", username %>
-          <%= attribute "password", password, true %>
-          <%= attribute "host",     host %>
-          <%= attribute "port",     port %>
-
-        <% params.each do |key, value| %>
-          <%= key %>: <%= value.first %>
-        <% end %>
-      DATABASE_YML
-    end
+  def purge_bundler_cache(stack = nil)
+    @bundler_cache.clear(stack)
+    bundler.install
   end
 end

spec/hatchet/rails6_spec.rb

@@ -3,7 +3,7 @@
 describe "Rails 6" do
   it "should detect successfully" do
     Hatchet::App.new('rails61').in_directory_fork do
-      bundler = LanguagePack::Helpers::BundlerWrapper.new.install
+      bundler = LanguagePack::Helpers::BundlerWrapper.new(bundler_path: Dir.mktmpdir)
       expect(LanguagePack::Rails5.use?(bundler: bundler)).to eq(false)
       expect(LanguagePack::Rails6.use?(bundler: bundler)).to eq(true)
     end

spec/hatchet/rails7_spec.rb

@@ -3,7 +3,7 @@
 describe "Rails 7" do
   it "should detect successfully" do
     Hatchet::App.new('rails-jsbundling').in_directory_fork do
-      bundler = LanguagePack::Helpers::BundlerWrapper.new.install
+      bundler = LanguagePack::Helpers::BundlerWrapper.new(bundler_path: Dir.mktmpdir)
       expect(LanguagePack::Rails6.use?(bundler: bundler)).to eq(false)
       expect(LanguagePack::Rails7.use?(bundler: bundler)).to eq(true)
     end

spec/helpers/bundler_wrapper_spec.rb

@@ -72,6 +72,7 @@
       report = HerokuBuildReport.dev_null
 
       bundler = LanguagePack::Helpers::BundlerWrapper.new(
+        bundler_path: Dir.mktmpdir,
         gemfile_path: gemfile,
         report: report
       )
@@ -96,7 +97,7 @@
       ENV['RUBYOPT'] = ENV['RUBYOPT'].sub('-rbundler/setup', '')
     end
 
-    @bundler = LanguagePack::Helpers::BundlerWrapper.new
+    @bundler = LanguagePack::Helpers::BundlerWrapper.new(bundler_path: Dir.mktmpdir)
   end
 
   after(:each) do
@@ -117,7 +118,7 @@
 
       expect(tmp_gemfile_lock_path.read).to match("BUNDLED")
 
-      wrapper = LanguagePack::Helpers::BundlerWrapper.new(gemfile_path: tmp_gemfile_path )
+      wrapper = LanguagePack::Helpers::BundlerWrapper.new(bundler_path: Dir.mktmpdir, gemfile_path: tmp_gemfile_path)
 
       expect(wrapper.version).to eq(LanguagePack::Helpers::BundlerWrapper::BLESSED_BUNDLER_VERSIONS["2"])
 

spec/helpers/fetcher_spec.rb

@@ -10,7 +10,7 @@
           lockfile.write("BUNDLED WITH\n   #{version}")
 
           fetcher = LanguagePack::Fetcher.new(LanguagePack::Base::VENDOR_URL)
-          fetcher.fetch_untar("bundler/#{LanguagePack::Helpers::BundlerWrapper.new.dir_name}.tgz")
+          fetcher.fetch_untar("bundler/#{LanguagePack::Helpers::BundlerWrapper.new(bundler_path: Dir.mktmpdir).dir_name}.tgz")
 
           expect(run!("ls bin")).to match("bundle")
         end