Factor lib backend gitlab shell path

1 files changed, 20 insertions, 12 deletions

diff --git a/lib/gitlab/backend/shell.rb b/lib/gitlab/backend/shell.rb
index f95bbde5b39..ddb1ac61bf5 100644
--- a/lib/gitlab/backend/shell.rb
+++ b/lib/gitlab/backend/shell.rb
@@ -16,7 +16,7 @@ module Gitlab
     #   add_repository("gitlab/gitlab-ci")
     #
     def add_repository(name)
-      system "#{gitlab_shell_path}/bin/gitlab-projects", "add-project", "#{name}.git"
+      system gitlab_shell_projects_path, 'add-project', "#{name}.git"
     end
 
     # Import repository
@@ -27,7 +27,7 @@ module Gitlab
     #   import_repository("gitlab/gitlab-ci", "https://github.com/randx/six.git")
     #
     def import_repository(name, url)
-      system "#{gitlab_shell_path}/bin/gitlab-projects", "import-project", "#{name}.git", url, '240'
+      system gitlab_shell_projects_path, 'import-project', "#{name}.git", url, '240'
     end
 
     # Move repository
@@ -39,7 +39,7 @@ module Gitlab
     #   mv_repository("gitlab/gitlab-ci", "randx/gitlab-ci-new.git")
     #
     def mv_repository(path, new_path)
-      system "#{gitlab_shell_path}/bin/gitlab-projects", "mv-project", "#{path}.git", "#{new_path}.git"
+      system gitlab_shell_projects_path, 'mv-project', "#{path}.git", "#{new_path}.git"
     end
 
     # Update HEAD for repository
@@ -51,7 +51,7 @@ module Gitlab
     #  update_repository_head("gitlab/gitlab-ci", "3-1-stable")
     #
     def update_repository_head(path, branch)
-      system "#{gitlab_shell_path}/bin/gitlab-projects", "update-head", "#{path}.git", branch
+      system gitlab_shell_projects_path, 'update-head', "#{path}.git", branch
     end
 
     # Fork repository to new namespace
@@ -63,7 +63,7 @@ module Gitlab
     #  fork_repository("gitlab/gitlab-ci", "randx")
     #
     def fork_repository(path, fork_namespace)
-      system "#{gitlab_shell_path}/bin/gitlab-projects", "fork-project", "#{path}.git", fork_namespace
+      system gitlab_shell_projects_path, 'fork-project', "#{path}.git", fork_namespace
     end
 
     # Remove repository from file system
@@ -74,7 +74,7 @@ module Gitlab
     #   remove_repository("gitlab/gitlab-ci")
     #
     def remove_repository(name)
-      system "#{gitlab_shell_path}/bin/gitlab-projects", "rm-project", "#{name}.git"
+      system gitlab_shell_projects_path, 'rm-project', "#{name}.git"
     end
 
     # Add repository branch from passed ref
@@ -87,7 +87,7 @@ module Gitlab
     #   add_branch("gitlab/gitlab-ci", "4-0-stable", "master")
     #
     def add_branch(path, branch_name, ref)
-      system "#{gitlab_shell_path}/bin/gitlab-projects", "create-branch", "#{path}.git", branch_name, ref
+      system gitlab_shell_projects_path, 'create-branch', "#{path}.git", branch_name, ref
     end
 
     # Remove repository branch
@@ -99,7 +99,7 @@ module Gitlab
     #   rm_branch("gitlab/gitlab-ci", "4-0-stable")
     #
     def rm_branch(path, branch_name)
-      system "#{gitlab_shell_path}/bin/gitlab-projects", "rm-branch", "#{path}.git", branch_name
+      system gitlab_shell_projects_path, 'rm-branch', "#{path}.git", branch_name
     end
 
     # Add repository tag from passed ref
@@ -129,7 +129,7 @@ module Gitlab
     #   rm_tag("gitlab/gitlab-ci", "v4.0")
     #
     def rm_tag(path, tag_name)
-      system "#{gitlab_shell_path}/bin/gitlab-projects", "rm-tag", "#{path}.git", tag_name
+      system gitlab_shell_projects_path, 'rm-tag', "#{path}.git", tag_name
     end
 
     # Add new key to gitlab-shell
@@ -138,7 +138,7 @@ module Gitlab
     #   add_key("key-42", "sha-rsa ...")
     #
     def add_key(key_id, key_content)
-      system "#{gitlab_shell_path}/bin/gitlab-keys", "add-key", key_id, key_content
+      system gitlab_shell_keys_path, 'add-key', key_id, key_content
     end
 
     # Batch-add keys to authorized_keys
@@ -157,7 +157,7 @@ module Gitlab
     #   remove_key("key-342", "sha-rsa ...")
     #
     def remove_key(key_id, key_content)
-      system "#{gitlab_shell_path}/bin/gitlab-keys", "rm-key", key_id, key_content
+      system gitlab_shell_keys_path, 'rm-key', key_id, key_content
     end
 
     # Remove all ssh keys from gitlab shell
@@ -166,7 +166,7 @@ module Gitlab
     #   remove_all_keys
     #
     def remove_all_keys
-      system "#{gitlab_shell_path}/bin/gitlab-keys", "clear"
+      system gitlab_shell_keys_path, 'clear'
     end
 
     # Add empty directory for storing repositories
@@ -249,5 +249,13 @@ module Gitlab
     def exists?(dir_name)
       File.exists?(full_path(dir_name))
     end
+
+    def gitlab_shell_projects_path
+      File.join(gitlab_shell_path, 'bin', 'gitlab-projects')
+    end
+
+    def gitlab_shell_keys_path
+      File.join(gitlab_shell_path, 'bin', 'gitlab-keys')
+    end
   end
 end