[rubygems/rubygems] Prefer FileUtils.rm_r to FileUtils.rm_rf for specs

Because it does not swallow errors if it fails to remove the given
folders, making issues easier to debug.

ruby/rubygems@0db12d7afc

Author: deivid-rodriguez

spec/bundler/cache/gems_spec.rb

@@ -312,7 +312,7 @@
         path: cached_myrack.parent,
         rubygems_version: "1.3.2"
 
-      FileUtils.rm_rf default_bundle_path
+      FileUtils.rm_r default_bundle_path
       system_gems :bundler
 
       FileUtils.rm bundled_app_lock
@@ -345,7 +345,7 @@
         c.checksum gem_repo1, "myrack", "1.0.0"
       end
 
-      FileUtils.rm_rf default_bundle_path
+      FileUtils.rm_r default_bundle_path
       system_gems :bundler
 
       lockfile <<-L

spec/bundler/cache/git_spec.rb

@@ -28,7 +28,7 @@
     expect(bundled_app("vendor/cache/foo-1.0-#{ref}/.git")).not_to exist
     expect(bundled_app("vendor/cache/foo-1.0-#{ref}/.bundlecache")).to be_file
 
-    FileUtils.rm_rf lib_path("foo-1.0")
+    FileUtils.rm_r lib_path("foo-1.0")
     expect(the_bundle).to include_gems "foo 1.0"
   end
 
@@ -49,7 +49,7 @@
     expect(bundled_app("vendor/cache/foo-1.0-#{ref}")).to exist
     expect(bundled_app("vendor/cache/foo-1.0-#{ref}/.git")).not_to exist
 
-    FileUtils.rm_rf lib_path("foo-1.0")
+    FileUtils.rm_r lib_path("foo-1.0")
     expect(the_bundle).to include_gems "foo 1.0"
   end
 
@@ -66,7 +66,7 @@
     bundle :cache
 
     expect(out).to include "Updating files in vendor/cache"
-    FileUtils.rm_rf lib_path("foo-1.0")
+    FileUtils.rm_r lib_path("foo-1.0")
     expect(the_bundle).to include_gems "foo 1.0"
   end
 
@@ -95,7 +95,7 @@
     expect(bundled_app("vendor/cache/foo-1.0-#{ref}")).to exist
     expect(bundled_app("vendor/cache/foo-1.0-#{old_ref}")).not_to exist
 
-    FileUtils.rm_rf lib_path("foo-1.0")
+    FileUtils.rm_r lib_path("foo-1.0")
     run "require 'foo'"
     expect(out).to eq("CACHE")
   end
@@ -124,7 +124,7 @@
     expect(bundled_app("vendor/cache/foo-1.0-#{ref}")).to exist
     expect(bundled_app("vendor/cache/foo-1.0-#{old_ref}")).not_to exist
 
-    FileUtils.rm_rf lib_path("foo-1.0")
+    FileUtils.rm_r lib_path("foo-1.0")
     run "require 'foo'"
     expect(out).to eq("CACHE")
   end
@@ -249,7 +249,7 @@
     # Simulate old cache by copying the real cache folder to vendor/cache
     FileUtils.mkdir_p bundled_app("vendor/cache")
     FileUtils.cp_r "#{Dir.glob(vendored_gems("cache/bundler/git/foo-1.0-*")).first}/.", cache_dir
-    FileUtils.rm_rf bundled_app("vendor/bundle")
+    FileUtils.rm_r bundled_app("vendor/bundle")
 
     bundle "install --local --verbose"
     expect(err).to include("Installing from cache in old \"bare repository\" format for compatibility")
@@ -281,7 +281,7 @@
     # Simulate old cache by copying the real cache folder to vendor/cache
     FileUtils.mkdir_p bundled_app("vendor/cache")
     FileUtils.cp_r "#{Dir.glob(vendored_gems("cache/bundler/git/foo-1.0-*")).first}/.", cache_dir
-    FileUtils.rm_rf bundled_app("vendor/bundle")
+    FileUtils.rm_r bundled_app("vendor/bundle")
 
     bundle "install --verbose"
     expect(out).to include("Fetching")
@@ -423,7 +423,7 @@
     # Simulate an old incorrect situation where vendor/cache would be the install location of git gems
     FileUtils.mkdir_p bundled_app("vendor/cache")
     FileUtils.cp_r git_path, bundled_app("vendor/cache/foo-1.0-#{path_revision}")
-    FileUtils.rm_rf bundled_app("vendor/cache/foo-1.0-#{path_revision}/.git")
+    FileUtils.rm_r bundled_app("vendor/cache/foo-1.0-#{path_revision}/.git")
 
     bundle :install, env: { "BUNDLE_DEPLOYMENT" => "true", "BUNDLE_CACHE_ALL" => "true" }
   end

spec/bundler/commands/cache_spec.rb

@@ -357,7 +357,7 @@
 
       bundle :cache
       pristine_system_gems :bundler
-      FileUtils.rm_rf gem_repo2
+      FileUtils.rm_r gem_repo2
 
       bundle "install --local"
       expect(the_bundle).to include_gems "myrack 1.0.0"
@@ -372,7 +372,7 @@
 
       bundle :cache
       pristine_system_gems :bundler
-      FileUtils.rm_rf gem_repo2
+      FileUtils.rm_r gem_repo2
 
       bundle "config set --local deployment true"
       bundle "config set --local path vendor/bundle"
@@ -389,7 +389,7 @@
 
       bundle :cache
       pristine_system_gems :bundler
-      FileUtils.rm_rf gem_repo2
+      FileUtils.rm_r gem_repo2
 
       bundle "config set --local cache_all_platforms true"
       bundle "config set --local path vendor/bundle"
@@ -449,7 +449,7 @@
         empty_repo4
 
         # delete compact index cache
-        FileUtils.rm_rf home(".bundle/cache/compact_index")
+        FileUtils.rm_r home(".bundle/cache/compact_index")
 
         bundle "install", artifice: "compact_index", env: { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }
 

spec/bundler/commands/check_spec.rb

@@ -95,7 +95,7 @@
       gem "foo", git: "#{lib_path("foo")}"
     G
 
-    FileUtils.rm_rf bundled_app("vendor/bundle")
+    FileUtils.rm_r bundled_app("vendor/bundle")
     bundle :check, raise_on_error: false
     expect(exitstatus).to eq 1
     expect(err).to include("Bundler can't satisfy your Gemfile's dependencies.")
@@ -281,7 +281,7 @@
         G
         bundle "install --path vendor/bundle"
 
-        FileUtils.rm_rf(bundled_app(".bundle"))
+        FileUtils.rm_r(bundled_app(".bundle"))
       end
 
       it "returns success" do
@@ -328,7 +328,7 @@
     end
 
     it "shows what is missing with the current Gemfile if it is not satisfied" do
-      FileUtils.rm_rf default_bundle_path
+      FileUtils.rm_r default_bundle_path
       system_gems :bundler
       bundle :check, raise_on_error: false
       expect(err).to match(/The following gems are missing/)

spec/bundler/commands/clean_spec.rb

@@ -352,8 +352,8 @@ def should_not_have_gems(*gems)
     bundle "install"
 
     FileUtils.rm(vendored_gems("bin/myrackup"))
-    FileUtils.rm_rf(vendored_gems("gems/thin-1.0"))
-    FileUtils.rm_rf(vendored_gems("gems/myrack-1.0.0"))
+    FileUtils.rm_r(vendored_gems("gems/thin-1.0"))
+    FileUtils.rm_r(vendored_gems("gems/myrack-1.0.0"))
 
     bundle :clean
 

spec/bundler/commands/exec_spec.rb

@@ -1264,7 +1264,7 @@ def require(path)
       end
 
       it "allows calling bundle install after removing gem.build_complete" do
-        FileUtils.rm_rf Dir[bundled_app(".bundle/**/gem.build_complete")]
+        FileUtils.rm_r Dir[bundled_app(".bundle/**/gem.build_complete")]
         bundle "exec #{Gem.ruby} -S bundle install"
       end
     end

spec/bundler/commands/info_spec.rb

@@ -70,7 +70,7 @@
     end
 
     it "warns if path does not exist on disk, but specification is there" do
-      FileUtils.rm_rf(default_bundle_path("gems", "rails-2.3.2"))
+      FileUtils.rm_r(default_bundle_path("gems", "rails-2.3.2"))
 
       bundle "info rails --path"
 

spec/bundler/commands/install_spec.rb

@@ -100,7 +100,7 @@
         gem 'myrack'
       G
 
-      FileUtils.rm_rf(default_bundle_path("gems/myrack-1.0.0"))
+      FileUtils.rm_r(default_bundle_path("gems/myrack-1.0.0"))
 
       bundle "install --verbose"
 
@@ -337,13 +337,13 @@
       it "allows running bundle install --system without deleting foo", bundler: "< 3" do
         bundle "install --path vendor"
         bundle "install --system"
-        FileUtils.rm_rf(bundled_app("vendor"))
+        FileUtils.rm_r(bundled_app("vendor"))
         expect(the_bundle).to include_gems "myrack 1.0"
       end
 
       it "allows running bundle install --system after deleting foo", bundler: "< 3" do
         bundle "install --path vendor"
-        FileUtils.rm_rf(bundled_app("vendor"))
+        FileUtils.rm_r(bundled_app("vendor"))
         bundle "install --system"
         expect(the_bundle).to include_gems "myrack 1.0"
       end

spec/bundler/commands/outdated_spec.rb

@@ -417,7 +417,7 @@ def test_group_option(group)
     end
 
     it "doesn't hit repo2" do
-      FileUtils.rm_rf(gem_repo2)
+      FileUtils.rm_r(gem_repo2)
 
       bundle "outdated --local"
       expect(out).not_to match(/Fetching (gem|version|dependency) metadata from/)

spec/bundler/commands/show_spec.rb

@@ -36,7 +36,7 @@
     end
 
     it "warns if specification is installed, but path does not exist on disk" do
-      FileUtils.rm_rf(default_bundle_path("gems", "rails-2.3.2"))
+      FileUtils.rm_r(default_bundle_path("gems", "rails-2.3.2"))
 
       bundle "show rails"