Get Gitolite LOCAL_CODE dir with gitolite query-rc command

Author: root

Diff for: app/forms/plugin_settings_validation/storage_config.rb

@@ -2,28 +2,23 @@ module PluginSettingsValidation
   module StorageConfig
     extend ActiveSupport::Concern
 
-    PATHS_TO_VALIDATE = [:gitolite_global_storage_dir, :gitolite_redmine_storage_dir, :gitolite_recycle_bin_dir, :gitolite_local_code_dir]
+    PATHS_TO_VALIDATE = [:gitolite_global_storage_dir, :gitolite_redmine_storage_dir, :gitolite_recycle_bin_dir]
 
     included do
       # Gitolite Storage Config
       add_accessor :gitolite_global_storage_dir,
                    :gitolite_redmine_storage_dir,
-                   :gitolite_recycle_bin_dir,
-                   :gitolite_local_code_dir
+                   :gitolite_recycle_bin_dir
 
       before_validation do
         self.gitolite_global_storage_dir  = strip_value(gitolite_global_storage_dir)
         self.gitolite_redmine_storage_dir = strip_value(gitolite_redmine_storage_dir)
         self.gitolite_recycle_bin_dir     = strip_value(gitolite_recycle_bin_dir)
-        self.gitolite_local_code_dir      = strip_value(gitolite_local_code_dir)
       end
 
       validates_presence_of :gitolite_global_storage_dir, :gitolite_recycle_bin_dir
-      validates_presence_of :gitolite_local_code_dir, if: Proc.new { RedmineGitHosting::Config.gitolite_version == 3 }
 
       validates_each PATHS_TO_VALIDATE do |record, attr, value|
-        # *gitolite_local_code_dir* is only available with Gitolite 3
-        next if attr == :gitolite_local_code_dir && RedmineGitHosting::Config.gitolite_version != 3
         record.errors.add(attr, 'must be relative') if value.starts_with?('/')
       end
     end

Diff for: app/views/settings/redmine_git_hosting/_gitolite_config_storage.html.haml

@@ -2,7 +2,6 @@
 - gitolite_global_storage_dir  = RedmineGitHosting::Config.get_setting(:gitolite_global_storage_dir)
 - gitolite_redmine_storage_dir = RedmineGitHosting::Config.get_setting(:gitolite_redmine_storage_dir)
 - gitolite_recycle_bin_dir     = RedmineGitHosting::Config.get_setting(:gitolite_recycle_bin_dir)
-- gitolite_local_code_dir      = RedmineGitHosting::Config.get_setting(:gitolite_local_code_dir)
 
 %h3= l(:label_gitolite_storage_config)
 
@@ -29,13 +28,3 @@
   %em
     = surround '(', ')' do
       = l(:label_gitolite_redmine_storage_dir_desc)
-
-- if RedmineGitHosting::Config.gitolite_version == 3
-  %p
-    %label= l(:label_gitolite_local_code_dir)
-    = text_field_tag 'settings[gitolite_local_code_dir]', gitolite_local_code_dir, size: 60
-    %br
-    %em
-      = surround '(', ')' do
-        = l(:label_gitolite_local_code_dir_desc) + ','
-        = link_to 'Gitolite non-core programs', 'http://gitolite.com/gitolite/non-core.html#localcode', target: 'blank'

Diff for: app/views/settings/redmine_git_hosting/_gitolite_config_test.html.haml

@@ -36,6 +36,14 @@
       - else
         = image_tag('exclamation.png')
 
+  %tr
+    %td= l(:label_gitolite_local_code_dir)
+    %td
+      - if RedmineGitHosting::Config.gitolite_local_code_dir
+        %span{ class: 'label label-success' }= RedmineGitHosting::Config.gitolite_local_code_dir
+      - else
+        = image_tag('exclamation.png')
+
   - gitolite_checks = RedmineGitHosting::Config.check_hooks_install!
 
   %tr

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

@@ -26,8 +26,6 @@ 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
@@ -170,6 +168,7 @@ en:
   label_gitolite_libgit2_version: libgit2 version
   label_gitolite_bin_dir: Gitolite binaries directory
   label_gitolite_lib_dir: Gitolite librairies directory
+  label_gitolite_local_code_dir: Gitolite non-core hooks directory
 
   # Recycle Bin
   label_tab_gitolite_recycle_bin: Recycle Bin

Diff for: config/locales/settings/es.yml

@@ -26,8 +26,6 @@ es:
   label_gitolite_recycle_bin_dir_desc: Relativa al directorio del usuario de Gitolite
   label_gitolite_redmine_storage_dir: Subcarpeta para los repositorios gestionados por Redmine-managed
   label_gitolite_redmine_storage_dir_desc: Relativa al directorio de repositorios de Gitolite
-  label_gitolite_local_code_dir: Carpeta de hooks non-core de Gitolite
-  label_gitolite_local_code_dir_desc: Relativa al directorio del usuario de Gitolite
 
   # Gitolite Config File
   label_tab_config_file: Fichero de configuración
@@ -169,6 +167,7 @@ es:
   label_gitolite_libgit2_version: Versión de libgit2
   label_gitolite_bin_dir: Carpeta de binarios de Gitolite
   label_gitolite_lib_dir: Carpeta de bibliotecas de Gitolite
+  label_gitolite_local_code_dir: Carpeta de hooks non-core de Gitolite
 
   # Recycle Bin
   label_tab_gitolite_recycle_bin: Papelera de reciclaje

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

@@ -26,8 +26,6 @@ fr:
   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_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
@@ -170,6 +168,7 @@ fr:
   label_gitolite_libgit2_version: Version de libgit2
   label_gitolite_bin_dir: Répertoire des binaires Gitolite
   label_gitolite_lib_dir: Répertoire des librairies Gitolite
+  label_gitolite_local_code_dir: Répertoire de stockage des hooks non-core
 
   # Recycle Bin
   label_tab_gitolite_recycle_bin: Corbeille

Diff for: config/locales/settings/ru.yml

@@ -26,8 +26,6 @@ ru:
   label_gitolite_recycle_bin_dir_desc: Относительно домашнего каталога пользователя Gitolite
   label_gitolite_redmine_storage_dir: Подкаталог управляемых через Redmine репозиториев
   label_gitolite_redmine_storage_dir_desc: Относительно каталога репозиториев Gitolite
-  label_gitolite_local_code_dir: Каталог внешних хуков Gitolite
-  label_gitolite_local_code_dir_desc: Относительно домашнего каталога пользователя Gitolite
 
   # Gitolite Config File
   label_tab_config_file: Конфиг. файл
@@ -169,6 +167,7 @@ ru:
   label_gitolite_libgit2_version: Версия libgit2
   label_gitolite_bin_dir: Каталог с двоичный Gitolite
   label_gitolite_lib_dir: Каталог с библиотеками Gitolite
+  label_gitolite_local_code_dir: Каталог внешних хуков Gitolite
 
   # Recycle Bin
   label_tab_gitolite_recycle_bin: Корзина

Diff for: lib/default_settings.yml

@@ -10,7 +10,6 @@ gitolite_ssh_public_key:        <%= Rails.root.join('plugins', 'redmine_git_host
 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/config/gitolite_hooks.rb

@@ -29,13 +29,13 @@ def gitolite_overwrite_existing_hooks?
 
 
       def gitolite_local_code_dir
-        get_setting(:gitolite_local_code_dir)
+        @gitolite_local_code_dir ||= RedmineGitHosting::Commands.sudo_gitolite_query_rc('LOCAL_CODE')
       end
 
 
       def gitolite_hooks_dir
         if gitolite_version == 3
-          File.join(gitolite_home_dir, gitolite_local_code_dir, 'hooks', 'common')
+          File.join(gitolite_local_code_dir, 'hooks', 'common')
         else
           File.join(gitolite_home_dir, '.gitolite', 'hooks', 'common')
         end