Remove clone rubygems task

Delegate everything to `bin/with_rubygems` instead.

3 files changed, 5 insertions, 23 deletions

diff --git a/.travis.yml b/.travis.yml
index c87c1305c9..673a6ad7b5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,6 @@ before_script:
   - travis_retry rake -E 'module ::Bundler; VERSION = "0.0.0"; end' override_version
   - travis_retry rake spec:travis:deps
   - travis_retry rake man:build
-  - travis_retry rake spec:rubygems:clone_rubygems_$RGV
 
 branches:
   only:
diff --git a/Rakefile b/Rakefile
index a20c2d6cd1..870b1bf41f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -135,31 +135,11 @@ namespace :spec do
         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
-          end
-        elsif rg != "master"
-          raise "need to be running against master with bundler as a submodule"
-        end
-
-        puts "Checked out rubygems '#{rg}' at #{hash}"
+      task "set_rubygems_#{rg}" do
         ENV["RGV"] = rg
       end
 
-      task rg => ["clone_rubygems_#{rg}"]
+      task rg => ["set_rubygems_#{rg}"]
       task "rubygems:all" => rg
     end
 
diff --git a/bin/with_rubygems b/bin/with_rubygems
index d16c289822..f12422f6b7 100755
--- a/bin/with_rubygems
+++ b/bin/with_rubygems
@@ -15,8 +15,11 @@ unless rubygems_path.directory?
   run("git", "clone", "https://github.com/rubygems/rubygems.git", rubygems_path.to_s)
 end
 Dir.chdir(rubygems_path) do
+  run("git remote update")
   version = "v#{version}" if version =~ /\A\d/
   run("git", "checkout", version, "--quiet")
+  hash = `git rev-parse HEAD`.chomp
+  puts "Checked out rubygems '#{version}' at #{hash}"
 end if version
 
 rubygems_lib = rubygems_path + "lib"