Fix #258

Author: root

Diff for: app/views/settings/_gitolite_config_hooks.html.erb

@@ -31,14 +31,12 @@
   </span>
 </p>
 
-<% hooks_manager = RedmineGitolite::Hooks.new %>
-
 <p>
   <label><%= l(:label_gitolite_hooks_url) %></label>
-  <span class="label label-info"><%= hooks_manager.gitolite_hooks_url %></span>
+  <span class="label label-info"><%= RedmineGitolite::HookManager.gitolite_hooks_url %></span>
 </p>
 
 <p>
   <label><%= l(:label_gitolite_hooks_namespace) %></label>
-  <span class="label label-info"><%= hooks_manager.gitolite_hooks_namespace %></span>
+  <span class="label label-info"><%= RedmineGitolite::HookManager.gitolite_hooks_namespace %></span>
 </p>

Diff for: app/views/settings/_gitolite_config_storage.html.erb

@@ -3,6 +3,7 @@
   gitolite_global_storage_dir  = RedmineGitolite::ConfigRedmine.get_setting(:gitolite_global_storage_dir)
   gitolite_redmine_storage_dir = RedmineGitolite::ConfigRedmine.get_setting(:gitolite_redmine_storage_dir)
   gitolite_recycle_bin_dir     = RedmineGitolite::ConfigRedmine.get_setting(:gitolite_recycle_bin_dir)
+  gitolite_local_code_dir      = RedmineGitolite::ConfigRedmine.get_setting(:gitolite_local_code_dir)
 %>
 
 <h3><%= l(:label_gitolite_storage_config) %></h3>
@@ -27,3 +28,12 @@
   <br />
   <em><%= l(:label_gitolite_redmine_storage_dir_desc) %></em>
 </p>
+
+<% if RedmineGitolite::Config.gitolite_version == 3 %>
+<p>
+  <label><%= l(:label_gitolite_local_code_dir) %></label>
+  <%= text_field_tag("settings[gitolite_local_code_dir]", "./#{gitolite_local_code_dir}", :size => 60) %>
+  <br />
+  <em>(<%= l(:label_gitolite_local_code_dir_desc) %>, <%= link_to 'Gitolite non-core programs', 'http://gitolite.com/gitolite/non-core.html#localcode', :target => 'blank' %>)</em>
+</p>
+<% end %>

Diff for: app/views/settings/_gitolite_config_test.html.erb

@@ -67,12 +67,13 @@
     <td><%= image_tag (RedmineGitolite::Config.can_redmine_sudo_to_gitolite_user? ? 'true.png' : 'exclamation.png') %></td>
   </tr>
 
-  <% hooks_manager = RedmineGitolite::Hooks.new %>
+
+  <% gitolite_checks = RedmineGitolite::HookManager.check_install! %>
 
   <tr>
     <td><%= l(:label_gitolite_hooks_params_installed) %></td>
     <td>
-      <% params_installed = hooks_manager.hook_params_installed? %>
+      <% params_installed = gitolite_checks[:hook_params] %>
       <% params_installed.each do |param, installed| %>
         <%= image_tag((installed ? 'true.png' : 'exclamation.png'), :style => "vertical-align: bottom;") %>
         <em><%= param %></em>
@@ -81,10 +82,22 @@
     </td>
   </tr>
 
+  <tr>
+    <td><%= l(:label_gitolite_hook_dirs_installed) %></td>
+    <td>
+      <% hook_dirs_installed  = gitolite_checks[:hook_dirs] %>
+      <% hook_dirs_installed.each do |hook, installed| %>
+        <%= image_tag((installed ? 'true.png' : 'exclamation.png'), :style => "vertical-align: bottom;") %>
+        <em><%= hook %></em>
+        <br />
+      <% end %>
+    </td>
+  </tr>
+
   <tr>
     <td><%= l(:label_gitolite_hooks_installed) %></td>
     <td>
-      <% hooks_installed  = hooks_manager.hooks_installed? %>
+      <% hooks_installed  = gitolite_checks[:hook_files] %>
       <% hooks_installed.each do |hook, installed| %>
         <%= image_tag((installed ? 'true.png' : 'exclamation.png'), :style => "vertical-align: bottom;") %>
         <em><%= hook %></em>

Diff for: config/locales/plugin_settings/en.yml

@@ -27,6 +27,8 @@ en:
   label_gitolite_recycle_bin_dir_desc: (Relative to Gitolite user home)
   label_gitolite_redmine_storage_dir: Subdirectory for Redmine-managed repositories
   label_gitolite_redmine_storage_dir_desc: (Relative to Gitolite repositories base path)
+  label_gitolite_local_code_dir: Gitolite non-core hooks directory
+  label_gitolite_local_code_dir_desc: Relative to Gitolite user home
 
   # Gitolite Config File
   label_tab_config_file: Configuration file
@@ -163,6 +165,7 @@ en:
   label_path_directories: PATH directories
   label_gitolite_hooks_params_installed: Hooks parameters installed?
   label_gitolite_hooks_installed: Hooks installed?
+  label_gitolite_hook_dirs_installed: Hook dirs installed?
   label_redmine_user: Redmine username
   label_sudo_version: Sudo version
   label_git_version: Git version

Diff for: config/locales/plugin_settings/fr.yml

@@ -26,7 +26,9 @@ fr:
   label_gitolite_recycle_bin_dir: Chemin de la corbeille Gitolite
   label_gitolite_recycle_bin_dir_desc: (Relatif au répertoire personnel de l'utilisateur Gitolite)
   label_gitolite_redmine_storage_dir: Sous-répertoire pour les dépôts gérés par Redmine
-  label_gitolite_redmine_storage_dir_desc: (Relatif au répertoire personnel de l'utilisateur Gitolite)
+  label_gitolite_redmine_storage_dir_desc: (Relatif au chemin de base des dépôts Gitolite)
+  label_gitolite_local_code_dir: Répertoire de stockage des hooks non-core
+  label_gitolite_local_code_dir_desc: Relatif au répertoire personnel de l'utilisateur Gitolite
 
   # Gitolite Config File
   label_tab_config_file: Fichier de configuration
@@ -163,6 +165,7 @@ fr:
   label_path_directories: Répertoires du PATH
   label_gitolite_hooks_params_installed: Paramètres des hooks installés?
   label_gitolite_hooks_installed: Hooks installés?
+  label_gitolite_hook_dirs_installed: Répertoires des hooks installés?
   label_redmine_user: Nom d'utilisateur Redmine
   label_sudo_version: Version de Sudo
   label_git_version: Version de Git

Diff for: init.rb

@@ -25,6 +25,7 @@
       :gitolite_global_storage_dir    => 'repositories/',
       :gitolite_redmine_storage_dir   => '',
       :gitolite_recycle_bin_dir       => 'recycle_bin/',
+      :gitolite_local_code_dir        => 'local',
 
       # Gitolite Config File
       :gitolite_config_file           => 'gitolite.conf',

Diff for: lib/redmine_git_hosting.rb

@@ -40,7 +40,10 @@ def apply_patch(&block)
   require_dependency 'redmine_gitolite/config'
   require_dependency 'redmine_gitolite/config_redmine'
   require_dependency 'redmine_gitolite/cache'
-  require_dependency 'redmine_gitolite/hooks'
+  require_dependency 'redmine_gitolite/hook_manager'
+  require_dependency 'redmine_gitolite/hook_file'
+  require_dependency 'redmine_gitolite/hook_dir'
+  require_dependency 'redmine_gitolite/hook_param'
   require_dependency 'redmine_gitolite/recycle'
   require_dependency 'redmine_gitolite/log'
   require_dependency 'redmine_gitolite/shell'

Diff for: lib/redmine_git_hosting/patches/setting_patch.rb

@@ -150,7 +150,7 @@ def save_git_hosting_values
 
 
             # Normalize paths, should be relative and end in '/'
-            [ :gitolite_global_storage_dir, :gitolite_recycle_bin_dir ].each do |setting|
+            [ :gitolite_global_storage_dir, :gitolite_recycle_bin_dir, :gitolite_local_code_dir ].each do |setting|
               if valuehash[setting]
                 normalizedFile  = File.expand_path(valuehash[setting].lstrip.rstrip, "/")
                 if (normalizedFile != "/")
@@ -359,8 +359,7 @@ def restore_git_hosting_values
 
             ## Gitolite user has changed, check if this new one has our hooks!
             if @@old_valuehash[:gitolite_user] != valuehash[:gitolite_user]
-              hooks = RedmineGitolite::Hooks.new
-              hooks.check_install
+              RedmineGitolite::HookManager.check_install!
             end
 
 
@@ -397,8 +396,7 @@ def restore_git_hosting_values
                @@old_valuehash[:gitolite_force_hooks_update] != valuehash[:gitolite_force_hooks_update] ||
                @@old_valuehash[:gitolite_hooks_are_asynchronous] != valuehash[:gitolite_hooks_are_asynchronous]
                 # Need to update our .gitconfig
-                hooks = RedmineGitolite::Hooks.new
-                hooks.hook_params_installed?
+                RedmineGitolite::HookManager.update_hook_params!
             end
 
 

Diff for: lib/redmine_gitolite/hook_dir.rb

@@ -0,0 +1,58 @@
+module RedmineGitolite
+
+  class HookDir
+
+    attr_reader :name
+    attr_reader :destination_path
+
+
+    def initialize(name, destination_path)
+      @name             = name
+      @destination_path = destination_path
+    end
+
+
+    def installed?
+      if !exists?
+        logger.info { "Global hook directory '#{name}' not created yet, installing it..." }
+
+        if install_hooks_dir
+          logger.info { "Global hook directory '#{name}' installed" }
+        end
+      end
+      return exists?
+    end
+
+
+    private
+
+
+      def logger
+        RedmineGitolite::Log.get_logger(:global)
+      end
+
+
+      def exists?
+        begin
+          RedmineGitolite::GitHosting.execute_command(:shell_cmd, "test -r '#{destination_path}' && echo 'yes' || echo 'no'").match(/yes/) ? true : false
+        rescue RedmineGitolite::GitHosting::GitHostingException => e
+          return false
+        end
+      end
+
+
+      def install_hooks_dir
+        logger.info { "Installing hook directory '#{destination_path}'" }
+
+        begin
+          RedmineGitolite::GitHosting.execute_command(:shell_cmd, "mkdir -p '#{destination_path}'")
+          RedmineGitolite::GitHosting.execute_command(:shell_cmd, "chmod 755 '#{destination_path}'")
+          return true
+        rescue => e
+          logger.error { "Problems installing hook directory '#{destination_path}'" }
+          return false
+        end
+      end
+
+  end
+end

Diff for: lib/redmine_gitolite/hook_file.rb

@@ -0,0 +1,107 @@
+module RedmineGitolite
+
+  class HookFile
+
+    attr_reader :name
+    attr_reader :source_path
+    attr_reader :destination_path
+    attr_reader :filemode
+
+
+    def initialize(name, source_path, destination_path, executable)
+      @name             = name
+      @source_path      = source_path
+      @destination_path = destination_path
+      @filemode         = executable ? 755 : 644
+      @force_update     = RedmineGitolite::ConfigRedmine.get_setting(:gitolite_force_hooks_update, true)
+    end
+
+
+    def installed?
+      if !exists?
+        logger.info { "Hook '#{name}' does not exist, installing it ..." }
+        do_install_file
+      elsif hook_are_different?
+        logger.warn { "Hook '#{name}' is already present but it's not ours!" }
+
+        if @force_update
+          logger.info { "Restoring '#{name}' hook since forceInstallHook == true" }
+          do_install_file
+        end
+      end
+      return exists?
+    end
+
+
+    private
+
+
+      def do_install_file
+        if install_hook_file
+          logger.info { "Hook '#{name}' installed" }
+          logger.info { "Running '#{gitolite_command}' on the Gitolite install ..." }
+          update_gitolite
+        end
+      end
+
+
+      def logger
+        RedmineGitolite::Log.get_logger(:global)
+      end
+
+
+      def hook_are_different?
+        local_md5 != distant_md5
+      end
+
+
+      def local_md5
+        Digest::MD5.hexdigest(File.read(source_path))
+      end
+
+
+      def distant_md5
+        content = RedmineGitolite::GitHosting.execute_command(:shell_cmd, "cat '#{destination_path}'") rescue ''
+        Digest::MD5.hexdigest(content)
+      end
+
+
+      def gitolite_command
+        RedmineGitolite::Config.gitolite_command
+      end
+
+
+      def exists?
+        begin
+          RedmineGitolite::GitHosting.execute_command(:shell_cmd, "test -s '#{destination_path}' && echo 'yes' || echo 'no'").match(/yes/) ? true : false
+        rescue RedmineGitolite::GitHosting::GitHostingException => e
+          return false
+        end
+      end
+
+
+      def install_hook_file
+        logger.info { "Installing hook '#{source_path}' in '#{destination_path}'" }
+
+        begin
+          RedmineGitolite::GitHosting.execute_command(:shell_cmd, "'cat - > #{destination_path}'", :pipe_data => "'#{source_path}'", :pipe_command => 'cat')
+          RedmineGitolite::GitHosting.execute_command(:shell_cmd, "chmod #{filemode} '#{destination_path}'")
+          return true
+        rescue => e
+          logger.error { "Problems installing hook from '#{source_path}' in '#{destination_path}'" }
+          return false
+        end
+      end
+
+
+      def update_gitolite
+        begin
+          RedmineGitolite::GitHosting.execute_command(:shell_cmd, gitolite_command)
+          return true
+        rescue RedmineGitolite::GitHosting::GitHostingException => e
+          return false
+        end
+      end
+
+  end
+end