summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2015-08-12 14:59:13 +0200
committerJacob Vosmaer <contact@jacobvosmaer.nl>2015-08-12 14:59:13 +0200
commita10d47232778e093f7810d8011f887e5453f9007 (patch)
tree86785917cd97bbe295a171975793c2c8fd9a8dbf
parentc31e6165016e4f12483b4c328a62493adac1bcac (diff)
downloadgitlab-shell-create-hooks-broken-symlink.tar.gz
Handle broken symlinks in create-hookscreate-hooks-broken-symlink
If a repository contained a broken symlink named 'hooks', this would raise ENOENT in lib/gitlab_projects.rb, which got ignored in bin/create-hooks. This commit fixes that by making sure we handle broken symlinks in lib/gitlab_projects.rb.
-rw-r--r--lib/gitlab_projects.rb16
-rw-r--r--spec/gitlab_projects_spec.rb45
2 files changed, 57 insertions, 4 deletions
diff --git a/lib/gitlab_projects.rb b/lib/gitlab_projects.rb
index 11f3820..8bf000d 100644
--- a/lib/gitlab_projects.rb
+++ b/lib/gitlab_projects.rb
@@ -21,11 +21,19 @@ class GitlabProjects
def self.create_hooks(path)
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 File.realpath(local_hooks_directory) != File.realpath(GLOBAL_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}")
- FileUtils.ln_s(GLOBAL_HOOKS_DIRECTORY, local_hooks_directory)
+ 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
diff --git a/spec/gitlab_projects_spec.rb b/spec/gitlab_projects_spec.rb
index e8875b6..50af42f 100644
--- a/spec/gitlab_projects_spec.rb
+++ b/spec/gitlab_projects_spec.rb
@@ -12,6 +12,51 @@ describe GitlabProjects do
FileUtils.rm_rf(tmp_repos_path)
end
+ describe :create_hooks do
+ let(:repo_path) { File.join(tmp_repos_path, 'hook-test.git') }
+ let(:hooks_dir) { File.join(repo_path, 'hooks') }
+ let(:target_hooks_dir) { File.join(ROOT_PATH, 'hooks') }
+ let(:existing_target) { File.join(repo_path, 'foobar') }
+
+ before do
+ FileUtils.rm_rf(repo_path)
+ FileUtils.mkdir_p(repo_path)
+ end
+
+ context 'hooks is a directory' do
+ let(:existing_file) { File.join(hooks_dir, 'my-file') }
+
+ before do
+ FileUtils.mkdir_p(hooks_dir)
+ FileUtils.touch(existing_file)
+ GitlabProjects.create_hooks(repo_path)
+ end
+
+ it { File.readlink(hooks_dir).should == target_hooks_dir }
+ it { Dir[File.join(repo_path, "hooks.old.*/my-file")].count.should == 1 }
+ end
+
+ context 'hooks is a valid symlink' do
+ before do
+ FileUtils.mkdir_p existing_target
+ File.symlink(existing_target, hooks_dir)
+ GitlabProjects.create_hooks(repo_path)
+ end
+
+ it { File.readlink(hooks_dir).should == target_hooks_dir }
+ end
+
+ context 'hooks is a broken symlink' do
+ before do
+ FileUtils.rm_f(existing_target)
+ File.symlink(existing_target, hooks_dir)
+ GitlabProjects.create_hooks(repo_path)
+ end
+
+ it { File.readlink(hooks_dir).should == target_hooks_dir }
+ end
+ end
+
describe :initialize do
before do
argv('add-project', repo_name)