Merge branch '113-remove-gitlab-projects' into 'master'

Resolve "Remove bin/gitlab_projects and lib/gitlab_projects.rb"

Closes #113

See merge request gitlab-org/gitlab-shell!180

README.md

@@ -77,41 +77,6 @@ To install gitlab-shell you also need a Go compiler version 1.8 or newer. https:
 
     ./bin/check
 
-## Repos
-
-Add repo:
-
-    ./bin/gitlab-projects add-project gitlab/gitlab-ci.git
-
-Remove repo:
-
-    ./bin/gitlab-projects rm-project gitlab/gitlab-ci.git
-
-List repos:
-
-    ./bin/gitlab-projects list-projects
-
-Import repo:
-
-    # Default timeout is 2 minutes
-    ./bin/gitlab-projects import-project randx/six.git https://github.com/randx/six.git
-
-    # Override timeout in seconds
-    ./bin/gitlab-projects import-project randx/six.git https://github.com/randx/six.git 90
-
-Fork repo:
-
-    ./bin/gitlab-projects fork-project gitlab/gitlab-ci.git randx
-
-Create tag (lightweight & annotated):
-
-    ./bin/gitlab-projects create-tag gitlab/gitlab-ci.git v3.0.0 3-0-stable
-    ./bin/gitlab-projects create-tag gitlab/gitlab-ci.git v3.0.0 3-0-stable 'annotated message goes here'
-
-Gc repo:
-
-    ./bin/gitlab-projects gc gitlab/gitlab-ci.git
-
 ## Keys
 
 Add key:

bin/create-hooks

@@ -5,16 +5,38 @@
 # This script is used when restoring a GitLab backup.
 
 require_relative '../lib/gitlab_init'
-require File.join(ROOT_PATH, 'lib', 'gitlab_projects')
 require File.join(ROOT_PATH, 'lib', 'gitlab_metrics')
 
+def create_hooks(path)
+  global_hooks_directory = File.join(ROOT_PATH, 'hooks')
+  local_hooks_directory = File.join(path, 'hooks')
+  real_local_hooks_directory = :not_found
+
+  begin
+    real_local_hooks_directory = File.realpath(local_hooks_directory)
+  rescue Errno::ENOENT
+    # real_local_hooks_directory == :not_found
+  end
+
+  if real_local_hooks_directory != File.realpath(global_hooks_directory)
+    if File.exist?(local_hooks_directory)
+      $logger.info "Moving existing hooks directory and symlinking global hooks directory for #{path}."
+      FileUtils.mv(local_hooks_directory, "#{local_hooks_directory}.old.#{Time.now.to_i}")
+    end
+    FileUtils.ln_sf(global_hooks_directory, local_hooks_directory)
+  else
+    $logger.info "Hooks already exist for #{path}."
+    true
+  end
+end
+
 repository_storage_paths = ARGV
 
 repository_storage_paths.each do |repo_path|
   Dir["#{repo_path.chomp('/')}/**/*.git"].each do |repo|
     begin
       GitlabMetrics.measure('command-create-hooks') do
-        GitlabProjects.create_hooks(repo)
+        create_hooks(repo)
       end
     rescue Errno::ENOENT
       # The user must have deleted their repository. Ignore.

bin/gitlab-projects

-#!/usr/bin/env ruby
-
-
-require_relative '../lib/gitlab_init'
-
-#
-# GitLab Projects shell. Add/remove projects from /home/git/repositories
-#
-# Ex.
-#   /bin/gitlab-projects add-project gitlab/gitlab-ci.git
-#
-#   /bin/gitlab-projects rm-project gitlab/gitlab-ci.git
-#
-#   /bin/gitlab-projects list-projects
-#
-#   /bin/gitlab-projects mv-project gitlab/gitlab-ci.git randx/fork.git
-#
-#   /bin/gitlab-projects fork-project gitlab/gitlab-ci.git randx
-#
-#   /bin/gitlab-projects import-project randx/six.git https://github.com/randx/six.git
-#
-require File.join(ROOT_PATH, 'lib', 'gitlab_projects')
-
-# Return non-zero if command execution was not successful
-if GitlabProjects.new.exec
-  exit 0
-else
-  exit 1
-end