Merge pull request #95 from Shopify/at-bump-bundler

Bump Bundler

Author: Morriar

Gemfile.lock

@@ -49,14 +49,21 @@ GEM
       sorbet-static (= 0.5.6398)
     sorbet-runtime (0.5.6398)
     sorbet-static (0.5.6398-universal-darwin-14)
+    sorbet-static (0.5.6398-universal-darwin-15)
+    sorbet-static (0.5.6398-universal-darwin-16)
+    sorbet-static (0.5.6398-universal-darwin-17)
+    sorbet-static (0.5.6398-universal-darwin-18)
+    sorbet-static (0.5.6398-universal-darwin-19)
+    sorbet-static (0.5.6398-universal-darwin-20)
+    sorbet-static (0.5.6398-x86_64-linux)
     thor (1.1.0)
     unicode-display_width (1.7.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.17)
+  bundler (>= 2.2.10)
   minitest (~> 5.0)
   pry-byebug
   rake (~> 13.0.1)
@@ -65,4 +72,4 @@ DEPENDENCIES
   spoom!
 
 BUNDLED WITH
-   1.17.3
+   2.2.24

lib/spoom/cli/coverage.rb

@@ -91,7 +91,7 @@ def timeline
 
           snapshot = T.let(nil, T.nilable(Spoom::Coverage::Snapshot))
           if options[:bundle_install]
-            Bundler.with_clean_env do
+            Bundler.with_unbundled_env do
               next unless bundle_install(path, sha)
               snapshot = Spoom::Coverage.snapshot(path: path, sorbet_bin: sorbet)
             end

spoom.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
 
   spec.metadata['allowed_push_host'] = "https://rubygems.org"
 
-  spec.add_development_dependency("bundler", "~> 1.17")
+  spec.add_development_dependency("bundler", ">= 2.2.10")
   spec.add_development_dependency("rake", "~> 13.0.1")
   spec.add_development_dependency("minitest", "~> 5.0")
 

test/spoom/sorbet/run_test.rb

@@ -23,7 +23,7 @@ def test_run_srb_from_bundler
           source 'https://rubygems.org'
           gem 'sorbet'
         GEM
-        Bundler.with_clean_env do
+        Bundler.with_unbundled_env do
           _, _, status = @project.bundle_install
           assert(status)
 
@@ -37,7 +37,7 @@ def test_run_srb_from_bundler
 
       def test_run_srb_from_bundler_not_found
         @project.gemfile("source 'https://rubygems.org'")
-        Bundler.with_clean_env do
+        Bundler.with_unbundled_env do
           _, _, status = @project.bundle_install
           assert(status)
 
@@ -47,7 +47,7 @@ def test_run_srb_from_bundler_not_found
       end
 
       def test_run_sorbet_from_path
-        Bundler.with_clean_env do
+        Bundler.with_unbundled_env do
           out, status = Spoom::Sorbet.srb(
             "-h",
             path: @project.path,
@@ -72,7 +72,7 @@ def test_run_sorbet_from_path
       end
 
       def test_run_sorbet_tc_from_path
-        Bundler.with_clean_env do
+        Bundler.with_unbundled_env do
           out, status = Spoom::Sorbet.srb_tc(
             path: @project.path,
             capture_err: true,

test/spoom/sorbet/version_test.rb

@@ -18,7 +18,7 @@ def teardown
 
       def test_srb_version_return_nil_if_srb_not_installed
         @project.gemfile("")
-        Bundler.with_clean_env do
+        Bundler.with_unbundled_env do
           version = Spoom::Sorbet.srb_version(path: @project.path, capture_err: true)
           assert_nil(version)
         end