Hardcode Gemfile.next for test deploy branch

README.md

@@ -49,15 +49,15 @@ For more information about using Ruby and buildpacks on Heroku, see these Dev Ce
 To use this buildpack, fork it on Github.  Push up changes to your fork, then create a test app with `--buildpack <your-github-url>` and push to it.
 
 
-## Next Rails
+## Deployment
 
-This buildpack supports Next Rails version, to configure it follow the steps below:
+This buildpack deploys the Rails version defined in Gemfile.next.lock.
+Here are the deployment steps for this buildpack
 
-1. Make sure your app can boot with the next Rails version locally.
-2. Go to the Settings tab of your Heroku app, and add the `BUNDLE_GEMFILE` config var with `Gemfile.next` as a value.
-3. Go to the Buildpacks section and remove the `heroku/ruby` buildpack from your app and add `https://github.com/fastruby/heroku-buildpack-ruby#add_gemfile_next_support`
-4. Deploy your app to Heroku.
-5. The Next Rails version should be installed and your app should boot.
+1. Make sure your app can boot with the Gemfile.next.lock file locally.
+2. Go to the Buildpacks section and remove the `heroku/ruby` buildpack from your app and add `https://github.com/fastruby/heroku-buildpack-ruby#use_gemfile_next`
+3. Deploy your app to Heroku.
+4. The build and release logs should confirm that the correct Rails version is deployed.
 
 ### Testing
 

lib/language_pack/disable_deploys.rb

@@ -3,7 +3,7 @@
 
 class LanguagePack::DisableDeploys < LanguagePack::Base
   def self.use?
-    File.exist?("Gemfile")
+    File.exist?("Gemfile.next")
   end
 
   def name

lib/language_pack/helpers/bundler_wrapper.rb

@@ -101,7 +101,7 @@ def initialize(version_hash, major_minor)
   def initialize(options = {})
     @bundler_tmp          = Pathname.new(Dir.mktmpdir)
     @fetcher              = options[:fetcher]      || LanguagePack::Fetcher.new(LanguagePack::Base::VENDOR_URL) # coupling
-    @gemfile_path         = options[:gemfile_path] || Pathname.new(env("BUNDLE_GEMFILE") || "./Gemfile")
+    @gemfile_path         = options[:gemfile_path] || Pathname.new("./Gemfile.next")
     @gemfile_lock_path    = Pathname.new("#{@gemfile_path}.lock")
 
     @version = self.class.detect_bundler_version(contents: @gemfile_lock_path.read(mode: "rt"))
@@ -223,7 +223,7 @@ def needs_ruby_global_append_path?
   end
 
   def bundler_version_escape_valve!
-    topic("Removing BUNDLED WITH version in the #{@gemfile_lock_path}")
+    topic("Removing BUNDLED WITH version in the Gemfile.next.lock")
     contents = File.read(@gemfile_lock_path, mode: "rt")
     File.open(@gemfile_lock_path, "w") do |f|
       f.write contents.sub(/^BUNDLED WITH$(\r?\n)   (?<major>\d+)\.\d+\.\d+/m, '')

lib/language_pack/no_lockfile.rb

@@ -3,7 +3,7 @@
 
 class LanguagePack::NoLockfile < LanguagePack::Ruby
   def self.use?
-    !File.exists?("Gemfile.lock")
+    !File.exists?("Gemfile.next.lock")
   end
 
   def name

lib/language_pack/ruby.rb

@@ -24,7 +24,7 @@ class LanguagePack::Ruby < LanguagePack::Base
   # detects if this is a valid Ruby app
   # @return [Boolean] true if it's a Ruby app
   def self.use?
-    File.exist?("Gemfile")
+    File.exist?("Gemfile.next")
   end
 
   def self.bundler
@@ -138,20 +138,32 @@ def build
         valid_bundler_cache?(gem_layer.path, gem_layer.metadata)
       end
       install_bundler_in_app("#{gem_layer.path}/#{slug_vendor_base}")
+      puts "1. BUNDLE_GEMFILE: #{ENV["BUNDLE_GEMFILE"]}"
       build_bundler
+      puts "2. BUNDLE_GEMFILE: #{ENV["BUNDLE_GEMFILE"]}"
       # TODO post_bundler might need to be done in a new layer
       bundler.clean
-      gem_layer.metadata[:gems] = Digest::SHA2.hexdigest(File.read(gemfile_lock_path))
+      puts "3. BUNDLE_GEMFILE: #{ENV["BUNDLE_GEMFILE"]}"
+      gem_layer.metadata[:gems] = Digest::SHA2.hexdigest(File.read("Gemfile.next.lock"))
+      puts "4. BUNDLE_GEMFILE: #{ENV["BUNDLE_GEMFILE"]}"
       gem_layer.metadata[:stack] = @stack
+      puts "5. BUNDLE_GEMFILE: #{ENV["BUNDLE_GEMFILE"]}"
       gem_layer.metadata[:ruby_version] = run_stdout(%q(ruby -v)).strip
+      puts "6. BUNDLE_GEMFILE: #{ENV["BUNDLE_GEMFILE"]}"
       gem_layer.metadata[:rubygems_version] = run_stdout(%q(gem -v)).strip
+      puts "7. BUNDLE_GEMFILE: #{ENV["BUNDLE_GEMFILE"]}"
       gem_layer.metadata[:buildpack_version] = BUILDPACK_VERSION
+      puts "8. BUNDLE_GEMFILE: #{ENV["BUNDLE_GEMFILE"]}"
       gem_layer.write
+      puts "9. BUNDLE_GEMFILE: #{ENV["BUNDLE_GEMFILE"]}"
 
       create_database_yml
+      puts "10. BUNDLE_GEMFILE: #{ENV["BUNDLE_GEMFILE"]}"
       # TODO replace this with multibuildpack stuff? put binaries in their own layer?
       install_binaries
+      puts "11. BUNDLE_GEMFILE: #{ENV["BUNDLE_GEMFILE"]}"
       run_assets_precompile_rake_task
+      puts "12. BUNDLE_GEMFILE: #{ENV["BUNDLE_GEMFILE"]}"
     end
     setup_profiled(ruby_layer_path: ruby_layer.path, gem_layer_path: gem_layer.path)
     setup_export(gem_layer)
@@ -340,6 +352,7 @@ def setup_language_pack_environment(ruby_layer_path:, gem_layer_path:, bundle_pa
     ENV["BUNDLE_BIN"] = bundler_binstubs_path
     ENV["BUNDLE_DEPLOYMENT"] = "1"
     ENV["BUNDLE_GLOBAL_PATH_APPENDS_RUBY_SCOPE"] = "1" if bundler.needs_ruby_global_append_path?
+    ENV["BUNDLE_GEMFILE"] = "Gemfile.next"
   end
 
   # Sets up the environment variables for subsequent processes run by
@@ -373,7 +386,8 @@ def setup_export(layer = nil)
     set_export_default "BUNDLE_WITHOUT", ENV["BUNDLE_WITHOUT"], layer
     set_export_default "BUNDLE_BIN", ENV["BUNDLE_BIN"], layer
     set_export_default "BUNDLE_GLOBAL_PATH_APPENDS_RUBY_SCOPE", ENV["BUNDLE_GLOBAL_PATH_APPENDS_RUBY_SCOPE"], layer if bundler.needs_ruby_global_append_path?
-    set_export_default "BUNDLE_DEPLOYMENT", ENV["BUNDLE_DEPLOYMENT"], layer if ENV["BUNDLE_DEPLOYMENT"] # Unset on windows since we delete the Gemfile.lock
+    set_export_default "BUNDLE_DEPLOYMENT", ENV["BUNDLE_DEPLOYMENT"], layer if ENV["BUNDLE_DEPLOYMENT"] # Unset on windows since we delete the Gemfile.next.lock
+    set_export_default "BUNDLE_GEMFILE", "Gemfile.next", layer
   end
 
   # sets up the profile.d script for this buildpack
@@ -411,7 +425,8 @@ def setup_profiled(ruby_layer_path: , gem_layer_path: )
     set_env_default "BUNDLE_WITHOUT", ENV["BUNDLE_WITHOUT"]
     set_env_default "BUNDLE_BIN", ENV["BUNDLE_BIN"]
     set_env_default "BUNDLE_GLOBAL_PATH_APPENDS_RUBY_SCOPE", ENV["BUNDLE_GLOBAL_PATH_APPENDS_RUBY_SCOPE"] if bundler.needs_ruby_global_append_path?
-    set_env_default "BUNDLE_DEPLOYMENT", ENV["BUNDLE_DEPLOYMENT"] if ENV["BUNDLE_DEPLOYMENT"] # Unset on windows since we delete the Gemfile.lock
+    set_env_default "BUNDLE_DEPLOYMENT", ENV["BUNDLE_DEPLOYMENT"] if ENV["BUNDLE_DEPLOYMENT"] # Unset on windows since we delete the Gemfile.next.lock
+    set_env_override "BUNDLE_GEMFILE", "Gemfile.next"
   end
 
   def warn_outdated_ruby
@@ -759,11 +774,11 @@ def build_bundler
       if bundler.windows_gemfile_lock?
         log("bundle", "has_windows_gemfile_lock")
 
-        File.unlink(gemfile_lock_path)
+        File.unlink("Gemfile.next.lock")
         ENV.delete("BUNDLE_DEPLOYMENT")
 
         warn(<<~WARNING, inline: true)
-          Removing `Gemfile.lock` because it was generated on Windows.
+          Removing `Gemfile.next.lock` because it was generated on Windows.
           Bundler will do a full resolve so native gems are handled properly.
           This may result in unexpected gem versions being used in your app.
           In rare occasions Bundler may not be able to resolve your dependencies at all.
@@ -776,7 +791,7 @@ def build_bundler
       bundle_command << "BUNDLE_WITHOUT='#{ENV["BUNDLE_WITHOUT"]}' "
       bundle_command << "BUNDLE_PATH=#{ENV["BUNDLE_PATH"]} "
       bundle_command << "BUNDLE_BIN=#{ENV["BUNDLE_BIN"]} "
-      bundle_command << "BUNDLE_DEPLOYMENT=#{ENV["BUNDLE_DEPLOYMENT"]} " if ENV["BUNDLE_DEPLOYMENT"] # Unset on windows since we delete the Gemfile.lock
+      bundle_command << "BUNDLE_DEPLOYMENT=#{ENV["BUNDLE_DEPLOYMENT"]} " if ENV["BUNDLE_DEPLOYMENT"] # Unset on windows since we delete the Gemfile.next.lock
       bundle_command << "BUNDLE_GLOBAL_PATH_APPENDS_RUBY_SCOPE=#{ENV["BUNDLE_GLOBAL_PATH_APPENDS_RUBY_SCOPE"]} " if bundler.needs_ruby_global_append_path?
       bundle_command << "bundle install -j4"
 
@@ -796,7 +811,7 @@ def build_bundler
 
         # we need to set BUNDLE_CONFIG and BUNDLE_GEMFILE for
         # codon since it uses bundler.
-        env_vars["BUNDLE_GEMFILE"] = "#{pwd}/#{gemfile_path}"
+        env_vars["BUNDLE_GEMFILE"] = "#{pwd}/Gemfile.next"
         env_vars["BUNDLE_CONFIG"] = "#{pwd}/.bundle/config"
         env_vars["CPATH"] = noshellescape("#{yaml_include}:$CPATH")
         env_vars["CPPATH"] = noshellescape("#{yaml_include}:$CPPATH")
@@ -845,7 +860,7 @@ def build_bundler
             correct this by running:
 
                 $ bundle update --ruby
-                $ git add Gemfile.lock
+                $ git add Gemfile.next.lock
                 $ git commit -m "update ruby version"
 
             If this does not solve the issue please see this documentation:
@@ -1325,16 +1340,4 @@ def purge_bundler_cache(stack = nil)
     # need to reinstall language pack gems
     install_bundler_in_app(slug_vendor_base)
   end
-
-  def current_gemfile
-    env("BUNDLE_GEMFILE") || "Gemfile"
-  end
-
-  def gemfile_path
-    Pathname.new(current_gemfile)
-  end
-
-  def gemfile_lock_path
-    Pathname.new("#{current_gemfile}.lock")
-  end
 end