[rubygems/rubygems] util/rubocop -A --only Style/RescueModifier

https://github.com/rubygems/rubygems/commit/b490379eab

4 files changed, 50 insertions, 10 deletions

diff --git a/test/rubygems/helper.rb b/test/rubygems/helper.rb
index 4e738c3d40..c3a1454012 100644
--- a/test/rubygems/helper.rb
+++ b/test/rubygems/helper.rb
@@ -343,7 +343,11 @@ class Gem::TestCase < Test::Unit::TestCase
 
     @orig_LOAD_PATH = $LOAD_PATH.dup
     $LOAD_PATH.map! do |s|
-      expand_path = File.realpath(s) rescue File.expand_path(s)
+      expand_path = begin
+                      File.realpath(s)
+                    rescue
+                      File.expand_path(s)
+                    end
       if expand_path != s
         expand_path.tap(&Gem::UNTAINT)
         if s.instance_variable_defined?(:@gem_prelude_index)
@@ -1521,7 +1525,11 @@ Also, a list:
   # <tt>test/rubygems/</tt>.
 
   def self.cert_path(cert_name)
-    if (Time.at(2**32) rescue 32) == 32
+    if begin
+         Time.at(2**32)
+       rescue
+         32
+       end == 32
       cert_file = "#{__dir__}/#{cert_name}_cert_32.pem"
 
       return cert_file if File.exist? cert_file
diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb
index e31a20c57e..c86ccc2098 100644
--- a/test/rubygems/test_gem.rb
+++ b/test/rubygems/test_gem.rb
@@ -662,7 +662,11 @@ class TestGem < Gem::TestCase
 
   def test_self_ensure_gem_directories_missing_parents
     gemdir = File.join @tempdir, "a/b/c/gemdir"
-    FileUtils.rm_rf File.join(@tempdir, "a") rescue nil
+    begin
+      FileUtils.rm_rf File.join(@tempdir, "a")
+    rescue
+      nil
+    end
     refute File.exist?(File.join(@tempdir, "a")),
            "manually remove #{File.join @tempdir, "a"}, tests are broken"
     Gem.use_paths gemdir
@@ -675,7 +679,11 @@ class TestGem < Gem::TestCase
   unless win_platform? || Process.uid.zero? # only for FS that support write protection
     def test_self_ensure_gem_directories_write_protected
       gemdir = File.join @tempdir, "egd"
-      FileUtils.rm_r gemdir rescue nil
+      begin
+        FileUtils.rm_r gemdir
+      rescue
+        nil
+      end
       refute File.exist?(gemdir), "manually remove #{gemdir}, tests are broken"
       FileUtils.mkdir_p gemdir
       FileUtils.chmod 0400, gemdir
@@ -692,7 +700,11 @@ class TestGem < Gem::TestCase
       parent = File.join(@tempdir, "egd")
       gemdir = "#{parent}/a/b/c"
 
-      FileUtils.rm_r parent rescue nil
+      begin
+        FileUtils.rm_r parent
+      rescue
+        nil
+      end
       refute File.exist?(parent), "manually remove #{parent}, tests are broken"
       FileUtils.mkdir_p parent
       FileUtils.chmod 0400, parent
@@ -1496,19 +1508,31 @@ class TestGem < Gem::TestCase
 
   def test_load_env_plugins
     with_plugin("load") { Gem.load_env_plugins }
-    assert_equal :loaded, TEST_PLUGIN_LOAD rescue nil
+    begin
+      assert_equal :loaded, TEST_PLUGIN_LOAD
+    rescue
+      nil
+    end
 
     util_remove_interrupt_command
 
     # Should attempt to cause a StandardError
     with_plugin("standarderror") { Gem.load_env_plugins }
-    assert_equal :loaded, TEST_PLUGIN_STANDARDERROR rescue nil
+    begin
+      assert_equal :loaded, TEST_PLUGIN_STANDARDERROR
+    rescue
+      nil
+    end
 
     util_remove_interrupt_command
 
     # Should attempt to cause an Exception
     with_plugin("exception") { Gem.load_env_plugins }
-    assert_equal :loaded, TEST_PLUGIN_EXCEPTION rescue nil
+    begin
+      assert_equal :loaded, TEST_PLUGIN_EXCEPTION
+    rescue
+      nil
+    end
   end
 
   def test_gem_path_ordering
diff --git a/test/rubygems/test_gem_commands_exec_command.rb b/test/rubygems/test_gem_commands_exec_command.rb
index c73b0eae6c..532f8acef0 100644
--- a/test/rubygems/test_gem_commands_exec_command.rb
+++ b/test/rubygems/test_gem_commands_exec_command.rb
@@ -730,7 +730,11 @@ class TestGemCommandsExecCommand < Gem::TestCase
       assert_includes @ui.output, "a (2)\n"
       assert_includes @ui.output, "b (2)\n"
 
-      invoke "gem", "uninstall", "--verbose", "-x", "a" rescue nil
+      begin
+        invoke "gem", "uninstall", "--verbose", "-x", "a"
+      rescue
+        nil
+      end
       refute_includes @ui.output, "running gem exec with"
       assert_includes @ui.output, "Successfully uninstalled a-2\n"
 
diff --git a/test/rubygems/test_gem_remote_fetcher.rb b/test/rubygems/test_gem_remote_fetcher.rb
index dda4d4701e..1faf62957a 100644
--- a/test/rubygems/test_gem_remote_fetcher.rb
+++ b/test/rubygems/test_gem_remote_fetcher.rb
@@ -361,7 +361,11 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
       local_path = File.join @tempdir, @a1.file_name
       inst = nil
       FileUtils.chmod 0555, @a1.cache_dir
-      FileUtils.mkdir_p File.join(Gem.user_dir, "cache") rescue nil
+      begin
+        FileUtils.mkdir_p File.join(Gem.user_dir, "cache")
+      rescue
+        nil
+      end
       FileUtils.chmod 0555, File.join(Gem.user_dir, "cache")
 
       Dir.chdir @tempdir do