Refactoring (heroku#1608)

* Format kwargs on multiple lines

* Don't rely on CWD, prefer injected path

* Remove redundant chdir (this is done outside already)

* Do not rely on CWD prefer the injected path

* Do not rely on CWD prefer the injected path

* Prefer kwarg

* Remove legacy CI code

Author: schneems

lib/language_pack/base.rb

@@ -31,8 +31,6 @@ def initialize(app_path: , cache_path: , gemfile_lock: )
     @fetchers      = {:buildpack => LanguagePack::Fetcher.new(VENDOR_URL) }
     @arch = get_arch
     @report = HerokuBuildReport::GLOBAL
-
-    Dir.chdir app_path
   end
 
   def get_arch

lib/language_pack/ruby.rb

@@ -78,7 +78,7 @@ def compile
     remove_vendor_bundle
     warn_bundler_upgrade
     warn_bad_binstubs
-    install_ruby(slug_vendor_ruby)
+    install_ruby(install_path: slug_vendor_ruby)
     setup_language_pack_environment(
       ruby_layer_path: File.expand_path("."),
       gem_layer_path: File.expand_path("."),
@@ -127,7 +127,10 @@ def config_detect
   # Since `ruby2.5` is not a valid binary name
   #
   def warn_bad_binstubs
-    check = LanguagePack::Helpers::BinstubCheck.new(app_root_dir: Dir.pwd, warn_object: self)
+    check = LanguagePack::Helpers::BinstubCheck.new(
+      warn_object: self,
+      app_root_dir: self.app_path,
+    )
     check.call
   end
 
@@ -467,7 +470,7 @@ def warn_outdated_minor
 
   # install the vendored ruby
   # @return [Boolean] true if it installs the vendored ruby and false otherwise
-  def install_ruby(install_path)
+  def install_ruby(install_path: )
     # Could do a compare operation to avoid re-downloading ruby
     return false unless ruby_version
 
@@ -552,7 +555,7 @@ def install_ruby(install_path)
   end
 
   def new_app?
-    @new_app ||= !File.exist?("vendor/heroku")
+    @new_app ||= !app_path.join("vendor").join("heroku").exist?
   end
 
   # find the ruby install path for its binstubs during build
@@ -631,14 +634,15 @@ def uninstall_binary(path)
   # users should be using `bundle pack` instead.
   # https://github.com/heroku/heroku-buildpack-ruby/issues/21
   def remove_vendor_bundle
-    if File.exist?("vendor/bundle")
+    vendor_bundle = self.app_path.join("vendor").join("bundle")
+    if vendor_bundle.exist?
       warn(<<~WARNING)
         Removing `vendor/bundle`.
         Checking in `vendor/bundle` is not supported. Please remove this directory
         and add it to your .gitignore. To vendor your gems with Bundler, use
         `bundle pack` instead.
       WARNING
-      FileUtils.rm_rf("vendor/bundle")
+      vendor_bundle.rmtree
     end
   end
 

lib/language_pack/test/ruby.rb

@@ -8,7 +8,7 @@ def compile
     new_app?
     remove_vendor_bundle
     warn_bad_binstubs
-    install_ruby(slug_vendor_ruby)
+    install_ruby(install_path: slug_vendor_ruby)
     setup_language_pack_environment(
       ruby_layer_path: File.expand_path("."),
       gem_layer_path: File.expand_path("."),

spec/spec_helper.rb

@@ -44,11 +44,6 @@ def create_file_with_size_in(size, dir)
   Pathname.new name
 end
 
-if ENV['TRAVIS']
-  # Don't execute tests against "merge" commits
-  exit 0 if ENV['TRAVIS_PULL_REQUEST'] != 'false' && ENV['TRAVIS_BRANCH'] == 'master'
-end
-
 def buildpack_path
   File.expand_path(File.join("../.."), __FILE__)
 end