Refactor and cleanup bundle wrapper (heroku#1602)

* Refactor report to kwarg

* Refactor gemfile_path to kwarg

* Refactor bundler_path to kwarg

* Remove unused options

* Remove unused code

* Remove unused code

Author: schneems

hatchet.json

@@ -23,7 +23,6 @@
   "rails_versions": [
     "sharpstone/rails_lts_23_default_ruby",
     "sharpstone/rails3_default_ruby",
-    "sharpstone/rails4_windows_mri193",
     "sharpstone/rails42_default_ruby",
     "sharpstone/rails61",
     "sharpstone/rails-jsbundling",

hatchet.lock

@@ -21,8 +21,6 @@
   - 984b6d02353519251c2d1e885bf8914a2584f26a
 - - "./repos/rails_versions/rails42_default_ruby"
   - fbdaf031823f09d1514ec1d55dcb04ca2f4264ca
-- - "./repos/rails_versions/rails4_windows_mri193"
-  - f4c7b6209835050468bbb87827acf652b8f4d8ce
 - - "./repos/rails_versions/rails61"
   - 47828a3e8c79b7869ca0d9a3afa4be065fa46e96
 - - "./repos/rails_versions/rails_8_ruby_schema"

lib/language_pack/helpers/bundler_wrapper.rb

@@ -101,11 +101,15 @@ def initialize(version_hash, major_minor)
 
   attr_reader :bundler_path
 
-  def initialize(options = {})
-    @report               = options[:report] || HerokuBuildReport::GLOBAL
+  def initialize(
+      bundler_path: nil,
+      gemfile_path: Pathname.new("./Gemfile"),
+      report: HerokuBuildReport::GLOBAL
+    )
+    @report               = report
     @bundler_tmp          = Pathname.new(Dir.mktmpdir)
-    @fetcher              = options[:fetcher]      || LanguagePack::Fetcher.new(LanguagePack::Base::VENDOR_URL) # coupling
-    @gemfile_path         = options[:gemfile_path] || Pathname.new("./Gemfile")
+    @fetcher              = LanguagePack::Fetcher.new(LanguagePack::Base::VENDOR_URL) # coupling
+    @gemfile_path         = gemfile_path
     @gemfile_lock_path    = Pathname.new("#{@gemfile_path}.lock")
 
     contents = @gemfile_lock_path.read(mode: "rt")
@@ -132,8 +136,8 @@ def initialize(options = {})
     )
     @dir_name = "bundler-#{@version}"
 
-    @bundler_path         = options[:bundler_path] || @bundler_tmp.join(@dir_name)
-    @bundler_tar          = options[:bundler_tar]  || "bundler/#{@dir_name}.tgz"
+    @bundler_path         = bundler_path || @bundler_tmp.join(@dir_name)
+    @bundler_tar          = "bundler/#{@dir_name}.tgz"
     @orig_bundle_gemfile  = ENV['BUNDLE_GEMFILE']
     @path                 = Pathname.new("#{@bundler_path}/gems/#{@dir_name}/lib")
   end
@@ -162,22 +166,10 @@ def gem_version(name)
     end
   end
 
-  # detects whether the Gemfile.lock contains the Windows platform
-  # @return [Boolean] true if the Gemfile.lock was created on Windows
-  def windows_gemfile_lock?
-    platforms.detect do |platform|
-      /mingw|mswin/.match(platform.os) if platform.is_a?(Gem::Platform)
-    end
-  end
-
   def specs
     @specs ||= lockfile_parser.specs.each_with_object({}) {|spec, hash| hash[spec.name] = spec }
   end
 
-  def platforms
-    @platforms ||= lockfile_parser.platforms
-  end
-
   def version
     @version
   end

spec/helpers/bundler_wrapper_spec.rb

@@ -110,15 +110,6 @@ def wrapper.topic(*args); end # Silence output in tests
     end
   end
 
-  it "detects windows gemfiles" do
-    Hatchet::App.new("rails4_windows_mri193").in_directory_fork do |dir|
-      require "bundler"
-      Bundler.with_unbundled_env do
-        expect(@bundler.install.windows_gemfile_lock?).to be_truthy
-      end
-    end
-  end
-
   describe "when executing bundler" do
     it "handles JRuby pre gemfiles" do
       Hatchet::App.new("jruby-minimal").in_directory_fork do |dir|