Elan Ruusamäe · @glensc · Rémy Coutable · Elan Ruusamäe · Sean McGivern · Elan Ruusamäe
--- a/lib/gitlab_custom_hook.rb
+++ b/lib/gitlab_custom_hook.rb
+    end
+
+    hook_files
+  end
+
+  # match files from path:
+  # 1. file must be executable
+  # 2. file must not match backup file
+  #
+  # the resulting list is sorted
+  def match_hook_files(path)
+    Dir["#{path}/*"].select do |f|
+      File.executable?(f)
+    end.reject do |f|
+      # exclude backup files: *~
+      f[/~$/]
--- a/CHANGELOG
+++ b/CHANGELOG
+v4.0.0
--- a/CHANGELOG
+++ b/CHANGELOG
+v4.0.0
+  - Use full repository path for API calls
--- a/hooks/post-receive
+++ b/hooks/post-receive
 key_id  = ENV.delete('GL_ID')
 repo_path = Dir.pwd

+require_relative '../lib/gitlab_init'
--- a/lib/gitlab_custom_hook.rb
+++ b/lib/gitlab_custom_hook.rb
+    # <repository>.git/custom_hooks/<hook_name>.d/*
+    hook_path = File.join(@repo_path, 'custom_hooks', "#{hook_name}.d")
+    if Dir.exist?(hook_path)
+      hook_files += match_hook_files(hook_path)
+    end
+
+    hook_files
+  end
+
+  # match files from path:
+  # 1. file must be executable
+  # 2. file must not match backup file
+  #
+  # the resulting list is sorted
+  def match_hook_files(path)
+    Dir["#{path}/*"].select do |f|
--- a/lib/gitlab_custom_hook.rb
+++ b/lib/gitlab_custom_hook.rb
-    hook_file = "#{hook_path}/#{hook_type}"
-    hook_file if File.exist?(hook_file)
+  # lookup hook files in this order:
+  #
+  # 1. <repository>.git/hooks/<hook_name>.d/* - global hooks
+  # 2. <repository>.git/custom_hooks/<hook_name> - per project hook
+  # 3. <repository>.git/custom_hooks/<hook_name>.d/* - per project hooks
+  #
+  def find_hooks(hook_name)
+    hook_files = []
+
+    # <repository>.git/hooks/<hook_name>.d/*
+    hook_path = File.join(@repo_path, 'hooks', "#{hook_name}.d")
+    if Dir.exist?(hook_path)
+      hook_files += match_hook_files(hook_path)
+    end
--- a/spec/gitlab_custom_hook_spec.rb
+++ b/spec/gitlab_custom_hook_spec.rb
+      gitlab_custom_hook.update(ref_name, old_value, new_value)
+      gitlab_custom_hook.post_receive(changes)
    end
  end
+
+  def hook_path(repo_path, path)
+    File.join(repo_path, path.split('/'))
+  end
+
+  def create_hook(repo_path, path, which)
+    FileUtils.ln_sf(which, hook_path(repo_path, path))
+  end
+
+  def create_global_hooks(path, which)
+    # should not be tested, as the "global hooks" is gitlab-shell itself (gitlab-shell/hooks/<hook_name>)
+    raise "no method, this is gitlab-shell itself"
--- a/spec/gitlab_custom_hook_spec.rb
+++ b/spec/gitlab_custom_hook_spec.rb
+        allow(gitlab_custom_hook).to receive(:hook_file).and_return(hook_path)
+
+        expect(gitlab_custom_hook.update(ref_name, old_value, new_value)).to be_true
+      end
+    end
+  end
+
+  context "having no hooks" do
+    it "returns true" do
+      expect(gitlab_custom_hook.pre_receive(changes)).to eq(true)
+      expect(gitlab_custom_hook.update(ref_name, old_value, new_value)).to eq(true)
+      expect(gitlab_custom_hook.post_receive(changes)).to eq(true)
+    end
+  end
+
+  context "having only ok repo hooks" do
--- a/spec/gitlab_custom_hook_spec.rb
+++ b/spec/gitlab_custom_hook_spec.rb
+        .with(hook_path(tmp_repo_path, "hooks/post-receive.d/hook"), changes)
+        .and_call_original

-      expect(gitlab_custom_hook.update('master', '', '', 'repo_path')).to be_true
+      gitlab_custom_hook.pre_receive(changes)
+      gitlab_custom_hook.update(ref_name, old_value, new_value)
+      gitlab_custom_hook.post_receive(changes)
    end
  end
+
+  def hook_path(repo_path, path)
+    File.join(repo_path, path.split('/'))
+  end
+
+  def create_hook(repo_path, path, which)
+    FileUtils.ln_sf(which, hook_path(repo_path, path))
--- a/spec/gitlab_custom_hook_spec.rb
+++ b/spec/gitlab_custom_hook_spec.rb
+        .and_call_original
+      expect(gitlab_custom_hook).to receive(:system)
+        .with(vars, hook_path(tmp_repo_path, "hooks/update.d/hook"), ref_name, old_value, new_value)
+        .and_call_original
+      expect(gitlab_custom_hook).to receive(:call_receive_hook)
+        .with(hook_path(tmp_repo_path, "hooks/post-receive.d/hook"), changes)
+        .and_call_original

-      expect(gitlab_custom_hook.update('master', '', '', 'repo_path')).to be_true
+      gitlab_custom_hook.pre_receive(changes)
+      gitlab_custom_hook.update(ref_name, old_value, new_value)
+      gitlab_custom_hook.post_receive(changes)
    end
  end
+
+  def hook_path(repo_path, path)
--- a/spec/gitlab_custom_hook_spec.rb
+++ b/spec/gitlab_custom_hook_spec.rb
+  context "having failing repo and ok global hooks" do
+    before do
+      create_repo_hooks_d(tmp_repo_path, hook_fail)
+      create_global_hooks_d(tmp_repo_path, hook_ok)
+    end
+
+    it "returns false" do
+      expect(gitlab_custom_hook.pre_receive(changes)).to eq(false)
+      expect(gitlab_custom_hook.update(ref_name, old_value, new_value)).to eq(false)
+      expect(gitlab_custom_hook.post_receive(changes)).to eq(false)
+    end
+
+    it "executes the relevant hooks" do
+      expect(gitlab_custom_hook).to receive(:call_receive_hook)
+        .with(hook_path(tmp_repo_path, "hooks/pre-receive.d/hook"), changes)
+        .and_call_original
--- a/spec/gitlab_custom_hook_spec.rb
+++ b/spec/gitlab_custom_hook_spec.rb
+  # as global scripts are ran first, failing global skips repo hooks
+
+  before do
+    FileUtils.mkdir_p(File.join(tmp_root_path, 'hooks'))
+    FileUtils.mkdir_p(File.join(tmp_root_path, 'hooks', 'update.d'))
+    FileUtils.mkdir_p(File.join(tmp_root_path, 'hooks', 'pre-receive.d'))
+    FileUtils.mkdir_p(File.join(tmp_root_path, 'hooks', 'post-receive.d'))
+
+    FileUtils.symlink(File.join(tmp_root_path, 'hooks'), File.join(tmp_repo_path, 'hooks'))
+    FileUtils.mkdir_p(File.join(tmp_repo_path, 'custom_hooks'))
+    FileUtils.mkdir_p(File.join(tmp_repo_path, 'custom_hooks', 'update.d'))
+    FileUtils.mkdir_p(File.join(tmp_repo_path, 'custom_hooks', 'pre-receive.d'))
+    FileUtils.mkdir_p(File.join(tmp_repo_path, 'custom_hooks', 'post-receive.d'))
+  end
+
+  after do
--- a/spec/gitlab_custom_hook_spec.rb
+++ b/spec/gitlab_custom_hook_spec.rb
+    FileUtils.symlink(File.join(tmp_root_path, 'hooks'), File.join(tmp_repo_path, 'hooks'))
+    FileUtils.mkdir_p(File.join(tmp_repo_path, 'custom_hooks'))
+    FileUtils.mkdir_p(File.join(tmp_repo_path, 'custom_hooks', 'update.d'))
+    FileUtils.mkdir_p(File.join(tmp_repo_path, 'custom_hooks', 'pre-receive.d'))
+    FileUtils.mkdir_p(File.join(tmp_repo_path, 'custom_hooks', 'post-receive.d'))
+  end
+
+  after do
+    cleanup_hook_setup
+  end
+
+  context 'with gl_id_test_hook' do
+    let(:hook_path) { File.join(ROOT_PATH, 'spec/support/gl_id_test_hook') }
+
+    context 'pre_receive hook' do
+      it 'passes GL_ID variable to hook' do