Improve custom Gitolite hook loading

Author: Nicolas Rodriguez

.gitignore

@@ -5,3 +5,4 @@ settings.yml
 /rdoc
 /coverage
 /junit
+custom_hooks.rb

custom_hooks.rb.example

@@ -0,0 +1,38 @@
+# You can declare here you own hooks to install globally in Gitolite.
+# You must set the source directory of the files with the *source_dir* method and
+# declare your hooks with *gitolite_hook* method.
+#
+# *RedmineGitHosting::GitoliteHooks.register_hooks* can be called multiple times
+# with a different *source_dir*.
+#
+# *name*        : the hook name (just a name to identify the hook)
+# *source*      : the source path concatenated with *source_dir*
+# *destination* : the destination path on Gitolite side.
+#
+# The *destination* must be relative.
+# The final destination will depend on your Gitolite version :
+#
+# Gitolite v2 : <gitolite_home_dir>/.gitolite/hooks/common
+# Gitolite v3 : <gitolite_home_dir>/local/hooks/common/
+#
+# RedmineGitHosting::GitoliteHooks.register_hooks do
+#   source_dir    '/tmp/global-hooks'
+#
+#   gitolite_hook do
+#     name 'global/check-branch'
+#     source 'pre-receive/check_branch.rb'
+#     destination 'pre-receive.d/check_branch.rb'
+#     executable  true
+#   end
+# end
+#
+# RedmineGitHosting::GitoliteHooks.register_hooks do
+#   source_dir    '/tmp/custom-hooks'
+#
+#   gitolite_hook do
+#     name 'custom/notify-users'
+#     source 'post-receive/notify_users.rb'
+#     destination 'post-receive.d/notify_users.rb'
+#     executable  true
+#   end
+# end

lib/load_gitolite_hooks.rb

@@ -64,39 +64,10 @@
   end
 end
 
-
-# You can declare here you own hooks to install globally in Gitolite.
-# You must set the source directory of the files with the *source_dir* method and
-# declare your hooks with *gitolite_hook* method. (see above)
-#
-# *RedmineGitHosting::GitoliteHooks.register_hooks* can be called multiple times
-# with a different *source_dir*.
-#
-# *name*        : the hook name (to identify the hook)
-# *source*      : the source path concatenated with *source_dir*
-# *destination* : the destination path on Gitolite side.
-#
-# The *destination* must be relative.
-# The final destination depends on your Gitolite version :
-#
-# Gitolite v3 : <gitolite_home_dir>/local/hooks/common/
-# Gitolite v2 : <gitolite_home_dir>/.gitolite/hooks/common
-#
-# RedmineGitHosting::GitoliteHooks.register_hooks do
-#   # Set source directory : /tmp/foo
-#   source_dir    File.join('/', 'tmp', 'foo')
-#
-#   gitolite_hook do
-#     # Hook name
-#     name 'bar.rb'
-#
-#     # Will be /tmp/foo/pre-receive/lib/bar.rb
-#     source 'pre-receive/lib/bar.rb'
-#
-#     # Will be <gitolite_home_dir>/local/hooks/common/lib_toto/test.rb (Gitolite v3)
-#     # Will be <gitolite_home_dir>/.gitolite/hooks/common/lib_toto/test.rb (Gitolite v2)
-#     destination 'lib_toto/test.rb'
-#
-#     executable  false
-#   end
-# end
+# Gitolite hooks can be found in Redmine root dir or in plugin root dir
+[
+  Rails.root.join('redmine_git_hosting_hooks.rb').to_s,
+  Rails.root.join('plugins', 'redmine_git_hosting', 'custom_hooks.rb').to_s
+].each do |file|
+  require_dependency file if File.exist?(file)
+end