Kill `spec:travis`

It overcomplicates things.

2 files changed, 6 insertions, 43 deletions

diff --git a/.travis.yml b/.travis.yml
index a428231133..92ba48d1b5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,11 @@
 language: ruby
 dist: bionic
-script: bin/rake spec:travis
+script:
+  - bin/rake spec
+  - sudo -E rake spec:sudo
+  - sudo chown -R $(whoami) tmp
+  - BUNDLER_SPEC_PRE_RECORDED=1 bin/rake spec:realworld
+
 before_script:
   - travis_retry gem install rake:"~> 12.0"
   - travis_retry bin/rake override_version
diff --git a/Rakefile b/Rakefile
index 88304aafd4..5ee4a40111 100644
--- a/Rakefile
+++ b/Rakefile
@@ -24,13 +24,6 @@ task :spec do
 end
 
 namespace :spec do
-  def safe_task(&block)
-    yield
-    true
-  rescue StandardError
-    false
-  end
-
   desc "Ensure spec dependencies are installed"
   task :deps do
     Spec::Rubygems.dev_setup
@@ -71,41 +64,6 @@ namespace :spec do
   task :set_sudo do
     ENV["BUNDLER_SUDO_TESTS"] = "1"
   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!")
-
-    # disallow making network requests on CI
-    ENV["BUNDLER_SPEC_PRE_RECORDED"] = "1"
-
-    puts "\n\e[1;33m[Travis CI] Running bundler specs against RubyGems #{rg}\e[m\n\n"
-    specs = safe_task { Rake::Task["spec"].invoke }
-
-    Rake::Task["spec"].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: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"].reenable
-
-    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:realworld"].invoke }
-
-    { "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
 end
 
 desc "Run RuboCop"