rake: Extract Gitaly checkout into separate task

The way Gitaly is built in source installations, local test, and CI are
slightly different. In a future commit gitlab:gitaly:install will no
longer be used, but we still need to clone and checkout the correct
revision. To do so, this change extracts the cloning and checking out
into a separate Rake task. The install task will depend on that new task
so that functionality remains the same.

lib/tasks/gitlab/gitaly.rake

@@ -37,8 +37,8 @@ namespace :gitlab do
       raise
     end
 
-    desc 'GitLab | Gitaly | Install or upgrade gitaly'
-    task :install, [:dir, :storage_path, :repo] => :gitlab_environment do |t, args|
+    desc 'GitLab | Gitaly | Clone and checkout gitaly'
+    task :clone, [:dir, :storage_path, :repo] => :gitlab_environment do |t, args|
       warn_user_is_not_gitlab
 
       unless args.dir.present? && args.storage_path.present?
@@ -51,6 +51,11 @@ Usage: rake "gitlab:gitaly:install[/installation/dir,/storage/path]")
       version = Gitlab::GitalyClient.expected_server_version
 
       checkout_or_clone_version(version: version, repo: args.repo, target_dir: args.dir, clone_opts: %w[--depth 1])
+    end
+
+    desc 'GitLab | Gitaly | Install or upgrade gitaly'
+    task :install, [:dir, :storage_path, :repo] => [:gitlab_environment, 'gitlab:gitaly:clone'] do |t, args|
+      warn_user_is_not_gitlab
 
       storage_paths = { 'default' => args.storage_path }
       Gitlab::SetupHelper::Gitaly.create_configuration(args.dir, storage_paths)

spec/tasks/gitlab/gitaly_rake_spec.rb

@@ -7,26 +7,26 @@ RSpec.describe 'gitlab:gitaly namespace rake task', :silence_stdout do
     Rake.application.rake_require 'tasks/gitlab/gitaly'
   end
 
-  describe 'install' do
-    let(:repo) { 'https://gitlab.com/gitlab-org/gitaly.git' }
-    let(:clone_path) { Rails.root.join('tmp/tests/gitaly').to_s }
-    let(:storage_path) { Rails.root.join('tmp/tests/repositories').to_s }
-    let(:version) { File.read(Rails.root.join(Gitlab::GitalyClient::SERVER_VERSION_FILE)).chomp }
+  let(:repo) { 'https://gitlab.com/gitlab-org/gitaly.git' }
+  let(:clone_path) { Rails.root.join('tmp/tests/gitaly').to_s }
+  let(:storage_path) { Rails.root.join('tmp/tests/repositories').to_s }
+  let(:version) { File.read(Rails.root.join(Gitlab::GitalyClient::SERVER_VERSION_FILE)).chomp }
 
-    subject { run_rake_task('gitlab:gitaly:install', clone_path, storage_path) }
+  describe 'clone' do
+    subject { run_rake_task('gitlab:gitaly:clone', clone_path, storage_path) }
 
     context 'no dir given' do
       it 'aborts and display a help message' do
         # avoid writing task output to spec progress
         allow($stderr).to receive :write
-        expect { run_rake_task('gitlab:gitaly:install') }.to raise_error /Please specify the directory where you want to install gitaly and the path for the default storage/
+        expect { run_rake_task('gitlab:gitaly:clone') }.to raise_error /Please specify the directory where you want to install gitaly and the path for the default storage/
       end
     end
 
     context 'no storage path given' do
       it 'aborts and display a help message' do
         allow($stderr).to receive :write
-        expect { run_rake_task('gitlab:gitaly:install', clone_path) }.to raise_error /Please specify the directory where you want to install gitaly and the path for the default storage/
+        expect { run_rake_task('gitlab:gitaly:clone', clone_path) }.to raise_error /Please specify the directory where you want to install gitaly and the path for the default storage/
       end
     end
 
@@ -40,11 +40,6 @@ RSpec.describe 'gitlab:gitaly namespace rake task', :silence_stdout do
     end
 
     describe 'checkout or clone' do
-      before do
-        stub_env('CI', false)
-        expect(Dir).to receive(:chdir).with(clone_path)
-      end
-
       it 'calls checkout_or_clone_version with the right arguments' do
         expect(main_object)
           .to receive(:checkout_or_clone_version).with(version: version, repo: repo, target_dir: clone_path, clone_opts: %w[--depth 1])
@@ -52,6 +47,10 @@ RSpec.describe 'gitlab:gitaly namespace rake task', :silence_stdout do
         subject
       end
     end
+  end
+
+  describe 'install' do
+    subject { run_rake_task('gitlab:gitaly:install', clone_path, storage_path) }
 
     describe 'gmake/make' do
       before do
@@ -62,10 +61,6 @@ RSpec.describe 'gitlab:gitaly namespace rake task', :silence_stdout do
       end
 
       context 'gmake is available' do
-        before do
-          expect(main_object).to receive(:checkout_or_clone_version)
-        end
-
         it 'calls gmake in the gitaly directory' do
           expect(Gitlab::Popen).to receive(:popen)
             .with(%w[which gmake])
@@ -93,7 +88,6 @@ RSpec.describe 'gitlab:gitaly namespace rake task', :silence_stdout do
 
       context 'gmake is not available' do
         before do
-          expect(main_object).to receive(:checkout_or_clone_version)
           expect(Gitlab::Popen).to receive(:popen)
             .with(%w[which gmake])
             .and_return(['', 42])