Remove now dummy being-rescue-end block

1 files changed, 97 insertions, 101 deletions

diff --git a/Rakefile b/Rakefile
index 3427f06bae..f8f13a3f09 100644
--- a/Rakefile
+++ b/Rakefile
@@ -100,139 +100,135 @@ task :rubocop do
   sh("bin/rubocop --parallel")
 end
 
-begin
-  namespace :spec do
-    task :clean do
-      rm_rf "tmp"
-    end
+namespace :spec do
+  task :clean do
+    rm_rf "tmp"
+  end
 
-    desc "Run the real-world spec suite"
-    task :realworld => %w[set_realworld spec]
+  desc "Run the real-world spec suite"
+  task :realworld => %w[set_realworld spec]
 
-    namespace :realworld do
-      desc "Re-record cassettes for the realworld specs"
-      task :record => %w[set_record realworld]
+  namespace :realworld do
+    desc "Re-record cassettes for the realworld specs"
+    task :record => %w[set_record realworld]
 
-      task :set_record do
-        ENV["BUNDLER_SPEC_FORCE_RECORD"] = "TRUE"
-      end
+    task :set_record do
+      ENV["BUNDLER_SPEC_FORCE_RECORD"] = "TRUE"
     end
+  end
 
-    task :set_realworld do
-      ENV["BUNDLER_REALWORLD_TESTS"] = "1"
-    end
+  task :set_realworld do
+    ENV["BUNDLER_REALWORLD_TESTS"] = "1"
+  end
 
-    desc "Run the spec suite with the sudo tests"
-    task :sudo => %w[set_sudo spec clean_sudo]
+  desc "Run the spec suite with the sudo tests"
+  task :sudo => %w[set_sudo spec clean_sudo]
 
-    task :set_sudo do
-      ENV["BUNDLER_SUDO_TESTS"] = "1"
-    end
+  task :set_sudo do
+    ENV["BUNDLER_SUDO_TESTS"] = "1"
+  end
 
-    task :clean_sudo do
-      puts "Cleaning up sudo test files..."
-      system "sudo rm -rf #{File.expand_path("../tmp/sudo_gem_home", __FILE__)}"
-    end
+  task :clean_sudo do
+    puts "Cleaning up sudo test files..."
+    system "sudo rm -rf #{File.expand_path("../tmp/sudo_gem_home", __FILE__)}"
+  end
 
-    # RubyGems specs by version
-    namespace :rubygems do
-      rubyopt = ENV["RUBYOPT"]
-      # When editing this list, also edit .travis.yml!
-      branches = %w[master]
-      releases = %w[v2.5.2 v2.6.14 v2.7.9 v3.0.3]
-      (branches + releases).each do |rg|
-        desc "Run specs with RubyGems #{rg}"
-        task rg do
-          sh("bin/rspec")
-        end
+  # RubyGems specs by version
+  namespace :rubygems do
+    rubyopt = ENV["RUBYOPT"]
+    # When editing this list, also edit .travis.yml!
+    branches = %w[master]
+    releases = %w[v2.5.2 v2.6.14 v2.7.9 v3.0.3]
+    (branches + releases).each do |rg|
+      desc "Run specs with RubyGems #{rg}"
+      task rg do
+        sh("bin/rspec")
+      end
 
-        # Create tasks like spec:rubygems:v1.8.3:sudo to run the sudo specs
-        namespace rg do
-          task :sudo => ["set_sudo", rg, "clean_sudo"]
-          task :realworld => ["set_realworld", rg]
-        end
+      # Create tasks like spec:rubygems:v1.8.3:sudo to run the sudo specs
+      namespace rg do
+        task :sudo => ["set_sudo", rg, "clean_sudo"]
+        task :realworld => ["set_realworld", rg]
+      end
 
-        task "clone_rubygems_#{rg}" do
-          unless File.directory?(RUBYGEMS_REPO)
-            system("git clone https://github.com/rubygems/rubygems.git tmp/rubygems")
-          end
-          hash = nil
-
-          if RUBYGEMS_REPO.start_with?(Dir.pwd)
-            Dir.chdir(RUBYGEMS_REPO) do
-              system("git remote update")
-              if rg == "master"
-                system("git checkout origin/master")
-              else
-                system("git checkout #{rg}") || raise("Unknown RubyGems ref #{rg}")
-              end
-              hash = `git rev-parse HEAD`.chomp
+      task "clone_rubygems_#{rg}" do
+        unless File.directory?(RUBYGEMS_REPO)
+          system("git clone https://github.com/rubygems/rubygems.git tmp/rubygems")
+        end
+        hash = nil
+
+        if RUBYGEMS_REPO.start_with?(Dir.pwd)
+          Dir.chdir(RUBYGEMS_REPO) do
+            system("git remote update")
+            if rg == "master"
+              system("git checkout origin/master")
+            else
+              system("git checkout #{rg}") || raise("Unknown RubyGems ref #{rg}")
             end
-          elsif rg != "master"
-            raise "need to be running against master with bundler as a submodule"
+            hash = `git rev-parse HEAD`.chomp
           end
-
-          puts "Checked out rubygems '#{rg}' at #{hash}"
-          ENV["RUBYOPT"] = "-I#{File.join(RUBYGEMS_REPO, "lib")} #{rubyopt}"
-          puts "RUBYOPT=#{ENV["RUBYOPT"]}"
+        elsif rg != "master"
+          raise "need to be running against master with bundler as a submodule"
         end
 
-        task rg => ["clone_rubygems_#{rg}"]
-        task "rubygems:all" => rg
+        puts "Checked out rubygems '#{rg}' at #{hash}"
+        ENV["RUBYOPT"] = "-I#{File.join(RUBYGEMS_REPO, "lib")} #{rubyopt}"
+        puts "RUBYOPT=#{ENV["RUBYOPT"]}"
       end
 
-      desc "Run specs under a RubyGems checkout (set RG=path)"
-      task "co" do
-        sh("bin/rspec")
-      end
+      task rg => ["clone_rubygems_#{rg}"]
+      task "rubygems:all" => rg
+    end
 
-      task "setup_co" do
-        rg = File.expand_path ENV["RG"]
-        puts "Running specs against RubyGems in #{rg}..."
-        ENV["RUBYOPT"] = "-I#{rg} #{rubyopt}"
-      end
+    desc "Run specs under a RubyGems checkout (set RG=path)"
+    task "co" do
+      sh("bin/rspec")
+    end
 
-      task "co" => "setup_co"
-      task "rubygems:all" => "co"
+    task "setup_co" do
+      rg = File.expand_path ENV["RG"]
+      puts "Running specs against RubyGems in #{rg}..."
+      ENV["RUBYOPT"] = "-I#{rg} #{rubyopt}"
     end
 
-    desc "Run the tests on Travis CI against a RubyGem version (using ENV['RGV'])"
-    task :travis do
-      rg = ENV["RGV"] || raise("RubyGems version is required on Travis!")
+    task "co" => "setup_co"
+    task "rubygems:all" => "co"
+  end
 
-      # disallow making network requests on CI
-      ENV["BUNDLER_SPEC_PRE_RECORDED"] = "TRUE"
+  desc "Run the tests on Travis CI against a RubyGem version (using ENV['RGV'])"
+  task :travis do
+    rg = ENV["RGV"] || raise("RubyGems version is required on Travis!")
 
-      puts "\n\e[1;33m[Travis CI] Running bundler specs against RubyGems #{rg}\e[m\n\n"
-      specs = safe_task { Rake::Task["spec:rubygems:#{rg}"].invoke }
+    # disallow making network requests on CI
+    ENV["BUNDLER_SPEC_PRE_RECORDED"] = "TRUE"
 
-      Rake::Task["spec:rubygems:#{rg}"].reenable
+    puts "\n\e[1;33m[Travis CI] Running bundler specs against RubyGems #{rg}\e[m\n\n"
+    specs = safe_task { Rake::Task["spec:rubygems:#{rg}"].invoke }
 
-      puts "\n\e[1;33m[Travis CI] Running bundler sudo specs against RubyGems #{rg}\e[m\n\n"
-      sudos = system("sudo -E rake spec:rubygems:#{rg}:sudo")
-      # clean up by chowning the newly root-owned tmp directory back to the travis user
-      system("sudo chown -R #{ENV["USER"]} #{File.join(File.dirname(__FILE__), "tmp")}")
+    Rake::Task["spec:rubygems:#{rg}"].reenable
 
-      Rake::Task["spec:rubygems:#{rg}"].reenable
+    puts "\n\e[1;33m[Travis CI] Running bundler sudo specs against RubyGems #{rg}\e[m\n\n"
+    sudos = system("sudo -E rake spec:rubygems:#{rg}:sudo")
+    # clean up by chowning the newly root-owned tmp directory back to the travis user
+    system("sudo chown -R #{ENV["USER"]} #{File.join(File.dirname(__FILE__), "tmp")}")
 
-      puts "\n\e[1;33m[Travis CI] Running bundler real world specs against RubyGems #{rg}\e[m\n\n"
-      realworld = safe_task { Rake::Task["spec:rubygems:#{rg}:realworld"].invoke }
+    Rake::Task["spec:rubygems:#{rg}"].reenable
 
-      { "specs" => specs, "sudo" => sudos, "realworld" => realworld }.each do |name, passed|
-        if passed
-          puts "\e[0;32m[Travis CI] #{name} passed\e[m"
-        else
-          puts "\e[0;31m[Travis CI] #{name} failed\e[m"
-        end
-      end
+    puts "\n\e[1;33m[Travis CI] Running bundler real world specs against RubyGems #{rg}\e[m\n\n"
+    realworld = safe_task { Rake::Task["spec:rubygems:#{rg}:realworld"].invoke }
 
-      unless specs && sudos && realworld
-        raise "Spec run failed, please review the log for more information"
+    { "specs" => specs, "sudo" => sudos, "realworld" => realworld }.each do |name, passed|
+      if passed
+        puts "\e[0;32m[Travis CI] #{name} passed\e[m"
+      else
+        puts "\e[0;31m[Travis CI] #{name} failed\e[m"
       end
     end
+
+    unless specs && sudos && realworld
+      raise "Spec run failed, please review the log for more information"
+    end
   end
-rescue LoadError
-  nil
 end
 
 begin