Modify environment before calling Ruby

.gitignore

@@ -8,3 +8,4 @@ coverage/
 .bundle
 tags
 .bundle/
+hooks/.env

CHANGELOG

@@ -1,3 +1,9 @@
+v2.5.0
+  - Restore PATH before calling hooks v2
+
+v2.4.0
+  - Show error message when git access is rejected
+
 v2.2.0
   - Support for custom hooks (Drew Blessing and Jose Kahan)
 

VERSION

@@ -1 +1 @@
-2.3.1
+2.5.0

hooks/post-receive

@@ -1,18 +1,5 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env bash
 
-# This file was placed here by GitLab. It makes sure that your pushed commits
-# will be processed properly.
-
-refs = ARGF.read
-key_id  = ENV['GL_ID']
-repo_path = Dir.pwd
-
-require_relative '../lib/gitlab_custom_hook'
-require_relative '../lib/gitlab_post_receive'
-
-if GitlabPostReceive.new(repo_path, key_id, refs).exec &&
-    GitlabCustomHook.new.post_receive(refs, repo_path)
-  exit 0
-else
-  exit 1
-end
+# Remove paths Git automatically prepends to PATH on hooks.
+. "$GIT_DIR/hooks/.env"
+ruby "$GIT_DIR/hooks/post-receive-main.rb"

hooks/post-receive-main.rb

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+
+# This file was placed here by GitLab. It makes sure that your pushed commits
+# will be processed properly.
+
+refs = ARGF.read
+key_id  = ENV['GL_ID']
+repo_path = Dir.pwd
+
+require_relative '../lib/gitlab_custom_hook'
+require_relative '../lib/gitlab_post_receive'
+
+if GitlabPostReceive.new(repo_path, key_id, refs).exec &&
+    GitlabCustomHook.new.post_receive(refs, repo_path)
+  exit 0
+else
+  exit 1
+end

hooks/pre-receive

@@ -1,18 +1,5 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env bash
 
-# This file was placed here by GitLab. It makes sure that your pushed commits
-# will be processed properly.
-
-refs = ARGF.read
-key_id  = ENV['GL_ID']
-repo_path = Dir.pwd
-
-require_relative '../lib/gitlab_custom_hook'
-require_relative '../lib/gitlab_access'
-
-if GitlabAccess.new(repo_path, key_id, refs).exec &&
-    GitlabCustomHook.new.pre_receive(refs, repo_path)
-  exit 0
-else
-  exit 1
-end
+# Remove paths Git automatically prepends to PATH on hooks.
+. "$GIT_DIR/hooks/.env"
+ruby "$GIT_DIR/hooks/pre-receive-main.rb"

hooks/pre-receive-main.rb

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+
+# This file was placed here by GitLab. It makes sure that your pushed commits
+# will be processed properly.
+
+refs = ARGF.read
+key_id  = ENV['GL_ID']
+repo_path = Dir.pwd
+
+require_relative '../lib/gitlab_custom_hook'
+require_relative '../lib/gitlab_access'
+
+if GitlabAccess.new(repo_path, key_id, refs).exec &&
+    GitlabCustomHook.new.pre_receive(refs, repo_path)
+  exit 0
+else
+  exit 1
+end

hooks/update

@@ -1,17 +1,5 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env bash
 
-# This file was placed here by GitLab. It makes sure that your pushed commits
-# will be processed properly.
-
-ref_name = ARGV[0]
-old_value = ARGV[1]
-new_value = ARGV[2]
-repo_path = Dir.pwd
-
-require_relative '../lib/gitlab_custom_hook'
-
-if GitlabCustomHook.new.update(ref_name, old_value, new_value, repo_path)
-  exit 0
-else
-  exit 1
-end
+# Remove paths Git automatically prepends to PATH on hooks.
+. "$GIT_DIR/hooks/.env"
+ruby "$GIT_DIR/hooks/update-main.rb"

hooks/update-main.rb

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+# This file was placed here by GitLab. It makes sure that your pushed commits
+# will be processed properly.
+
+ref_name = ARGV[0]
+old_value = ARGV[1]
+new_value = ARGV[2]
+repo_path = Dir.pwd
+
+require_relative '../lib/gitlab_custom_hook'
+
+if GitlabCustomHook.new.update(ref_name, old_value, new_value, repo_path)
+  exit 0
+else
+  exit 1
+end