Ensure tapioca gem command executes in a clean env

Shopify · Jan 22, 2025 · af07bac · af07bac
1 parent 3540c7c
commit af07bac
Showing 1 changed file with 16 additions and 14 deletions.
diff --git a/lib/ruby_lsp/tapioca/run_gem_rbi_check.rb b/lib/ruby_lsp/tapioca/run_gem_rbi_check.rb
@@ -81,20 +81,22 @@ def generate_gem_rbis
 
       sig { params(gems: T::Array[String]).void }
       def execute_tapioca_gem_command(gems)
-        # Resetting BUNDLE_GEMFILE to root folder to use the project's Gemfile instead of Ruby LSP's composed Gemfile
-        stdout, stderr, status = T.unsafe(Open3).capture3(
-          { "BUNDLE_GEMFILE" => "Gemfile" },
-          "bundle",
-          "exec",
-          "tapioca",
-          "gem",
-          "--lsp_addon",
-          *gems,
-        )
-
-        log_message(stdout) unless stdout.empty?
-        log_message(stderr) unless stderr.empty?
-        @result.status = status
+        Bundler.with_unbundled_env do
+          # Resetting BUNDLE_GEMFILE to root folder to use the project's Gemfile instead of Ruby LSP's composed Gemfile
+          stdout, stderr, status = T.unsafe(Open3).capture3(
+            { "BUNDLE_GEMFILE" => "Gemfile" },
+            "bundle",
+            "exec",
+            "tapioca",
+            "gem",
+            "--lsp_addon",
+            *gems,
+          )
+
+          log_message(stdout) unless stdout.empty?
+          log_message(stderr) unless stderr.empty?
+          @result.status = status
+        end
       end
 
       sig { params(gems: T::Array[String]).void }