From 580e093fddc2c10ff4e6cd33bfa0a7bfab76395c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
Date: Thu, 15 Aug 2019 18:46:42 +0200
Subject: [PATCH] [bundler/bundler] Make sure gem has been built before
 deleteng it

https://github.com/bundler/bundler/commit/32520c7020
---
 spec/bundler/quality_spec.rb | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/spec/bundler/quality_spec.rb b/spec/bundler/quality_spec.rb
index c3f2fe23b7..bcb9412d4d 100644
--- a/spec/bundler/quality_spec.rb
+++ b/spec/bundler/quality_spec.rb
@@ -226,20 +226,22 @@ RSpec.describe "The library itself" do
 
   it "can still be built" do
     Dir.chdir(root) do
-      begin
-        if ruby_core?
-          spec = Gem::Specification.load(gemspec.to_s)
-          spec.bindir = "libexec"
-          File.open(root.join("bundler.gemspec").to_s, "w") {|f| f.write spec.to_ruby }
-          gem_command! :build, root.join("bundler.gemspec")
-          FileUtils.rm(root.join("bundler.gemspec"))
-        else
-          gem_command! :build, gemspec
-        end
+      if ruby_core?
+        spec = Gem::Specification.load(gemspec.to_s)
+        spec.bindir = "libexec"
+        File.open(root.join("bundler.gemspec").to_s, "w") {|f| f.write spec.to_ruby }
+        gem_command! :build, root.join("bundler.gemspec")
+        FileUtils.rm(root.join("bundler.gemspec"))
+      else
+        gem_command! :build, gemspec
+      end
 
+      bundler_path = root.join("bundler-#{Bundler::VERSION}.gem")
+
+      begin
         expect(err).to be_empty, "bundler should build as a gem without warnings, but\n#{err}"
       ensure
-        root.join("bundler-#{Bundler::VERSION}.gem").rmtree
+        bundler_path.rmtree
       end
     end
   end