Fix #359

Author: root

Diff for: app/helpers/gitolite_plugin_settings_helper.rb

@@ -5,17 +5,29 @@ def render_gitolite_params_status(params)
       content = ''
       params.each do |param, installed|
         content << content_tag(:li, style: 'padding: 2px;') do
-          image_tag(image_for_param(installed), style: 'vertical-align: bottom;') +
-          content_tag(:em, param)
+          image_tag(image_for_param(installed), style: 'vertical-align: bottom; padding-right: 5px;') +
+          content_tag(:em, label_for_param(param, installed))
         end
       end
       content.html_safe
     end
   end
 
 
-  def image_for_param(bool)
-    bool ? 'true.png' : 'exclamation.png'
+  def label_for_param(param, install_status)
+    install_status == 2 ? "#{param} (#{l(:label_gitolite_hook_untouched)})" : param
+  end
+
+
+  def image_for_param(install_status)
+    case install_status
+    when 0, true
+      'true.png'
+    when 1, false
+      'exclamation.png'
+    when 2
+      'warning.png'
+    end
   end
 
 

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

@@ -20,6 +20,20 @@
     %td= l(:label_sudo_redmine_to_gitolite_user)
     %td= image_tag (RedmineGitHosting::Config.can_redmine_sudo_to_gitolite_user? ? 'true.png' : 'exclamation.png')
 
+  - gitolite_checks = RedmineGitHosting::Config.check_hooks_install!
+
+  %tr
+    %td= l(:label_gitolite_hooks_installed)
+    %td= render_gitolite_params_status(gitolite_checks[:hook_files])
+
+  %tr
+    %td= l(:label_gitolite_hooks_params_installed)
+    %td= render_gitolite_params_status(gitolite_checks[:global_params])
+
+  %tr
+    %td= l(:label_gitolite_mailer_params_installed)
+    %td= render_gitolite_params_status(gitolite_checks[:mailer_params])
+
   %tr
     %td= l(:label_mirroring_keys_installed)
     %td= image_tag (RedmineGitHosting::Config.mirroring_keys_installed?(reset: true) ? 'true.png' : 'exclamation.png')

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

@@ -89,6 +89,7 @@ en:
   label_gitolite_hooks_namespace: Hooks Git namespace
   label_default_gitolite_hooks_url: Default URL
   label_install_gitolite_hooks: Install hooks !
+  label_gitolite_hook_untouched: hook let untouched
 
   # Gitolite Cache Config
   label_tab_cache: Cache

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

@@ -89,6 +89,7 @@ fr:
   label_gitolite_hooks_namespace: Espace de nom Git des hooks
   label_default_gitolite_hooks_url: URL par défaut
   label_install_gitolite_hooks: Installer les hooks !
+  label_gitolite_hook_untouched: hook non mis à jour
 
   # Gitolite Cache Config
   label_tab_cache: Cache

Diff for: lib/redmine_git_hosting/config/gitolite_hooks.rb

@@ -59,8 +59,17 @@ def check_hooks_install!
       end
 
 
+      def install_hooks!
+        {
+          hook_files:    RedmineGitHosting::GitoliteHooks.install_hooks!,
+          global_params: RedmineGitHosting::GitoliteParams::GlobalParams.new.install!,
+          mailer_params: RedmineGitHosting::GitoliteParams::MailerParams.new.install!
+        }
+      end
+
+
       def update_hook_params!
-        RedmineGitHosting::GitoliteParams::GlobalParams.new.installed?
+        RedmineGitHosting::GitoliteParams::GlobalParams.new.install!
       end
 
     end

Diff for: lib/redmine_git_hosting/gitolite_hook.rb

@@ -17,12 +17,11 @@ def def_field(*names)
 
     def_field :name, :source, :destination, :executable
 
-    attr_reader :source_dir, :force_update
+    attr_reader :source_dir
 
 
     def initialize(source_dir, &block)
-      @source_dir   = source_dir
-      @force_update = RedmineGitHosting::Config.gitolite_overwrite_existing_hooks?
+      @source_dir = source_dir
       instance_eval(&block)
     end
 
@@ -50,15 +49,30 @@ def filemode
 
 
     def installed?
+      if !file_exists?
+        1
+      elsif hook_file_has_changed?
+        2
+      else
+        0
+      end
+    end
+
+
+    def install!
       if !file_exists?
         logger.info("Hook '#{name}' does not exist, installing it ...")
         install_hook
-      elsif hook_file_has_changed? && force_update
+      elsif hook_file_has_changed?
         logger.warn("Hook '#{name}' is already present but it's not ours!")
-        logger.info("Restoring '#{name}' hook since forceInstallHook == true")
-        install_hook
+        if force_update?
+          logger.info("Restoring '#{name}' hook since forceInstallHook == true")
+          install_hook
+        else
+          logger.info("Leaving '#{name}' hook untouched since forceInstallHook == false")
+        end
       end
-      file_exists?
+      installed?
     end
 
 
@@ -74,6 +88,11 @@ def install_hook
       end
 
 
+      def force_update?
+        RedmineGitHosting::Config.gitolite_overwrite_existing_hooks?
+      end
+
+
       def logger
         RedmineGitHosting.logger
       end

Diff for: lib/redmine_git_hosting/gitolite_hooks.rb

@@ -28,6 +28,15 @@ def hooks_installed?
       end
 
 
+      def install_hooks!
+        installed = {}
+        registered_hooks.each do |hook|
+          installed[hook.name] = hook.install!
+        end
+        installed
+      end
+
+
       def gitolite_hook(&block)
         @gitolite_hooks << RedmineGitHosting::GitoliteHook.new(@source_dir, &block)
       end

Diff for: lib/redmine_git_hosting/gitolite_params/global_params.rb

@@ -30,41 +30,19 @@ def initialize
 
 
       def installed?
-        gitolite_hooks_url_set?
-        debug_mode_set?
-        async_mode_set?
+        @installed['redmineurl'] = (current_params['redmineurl'] == gitolite_hooks_url)
+        @installed['debugmode']  = (current_params['debugmode'] == debug_mode)
+        @installed['asyncmode']  = (current_params['asyncmode'] == async_mode)
         @installed
       end
 
 
-      private
-
-
-        def gitolite_hooks_url_set?
-          if current_params['redmineurl'] != gitolite_hooks_url
-            @installed['redmineurl'] = set_git_config_param(namespace, 'redmineurl', gitolite_hooks_url)
-          else
-            @installed['redmineurl'] = true
-          end
-        end
-
-
-        def debug_mode_set?
-          if current_params['debugmode'] != debug_mode
-            @installed['debugmode'] = set_git_config_param(namespace, 'debugmode', debug_mode)
-          else
-            @installed['debugmode'] = true
-          end
-        end
-
-
-        def async_mode_set?
-          if current_params['asyncmode'] != async_mode
-            @installed['asyncmode'] = set_git_config_param(namespace, 'asyncmode', async_mode)
-          else
-            @installed['asyncmode'] = true
-          end
-        end
+      def install!
+        @installed['redmineurl'] = set_git_config_param(namespace, 'redmineurl', gitolite_hooks_url)
+        @installed['debugmode']  = set_git_config_param(namespace, 'debugmode', debug_mode)
+        @installed['asyncmode']  = set_git_config_param(namespace, 'asyncmode', async_mode)
+        @installed
+      end
 
     end
   end

Diff for: lib/redmine_git_hosting/gitolite_params/mailer_params.rb

@@ -24,11 +24,17 @@ def initialize
 
       def installed?
         mailer_params.each do |param|
-          if current_params[param] != current_mailer_params[param]
-            @installed[param] = set_git_config_param(namespace, param, current_mailer_params[param])
-          else
-            @installed[param] = true
-          end
+          next if current_mailer_params[param].empty?
+          @installed[param] = (current_params[param] == current_mailer_params[param])
+        end
+        @installed
+      end
+
+
+      def install!
+        mailer_params.each do |param|
+          next if current_mailer_params[param].empty?
+          @installed[param] = set_git_config_param(namespace, param, current_mailer_params[param])
         end
         @installed
       end

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

@@ -22,7 +22,7 @@ def install_gitolite_hooks
             render_404
             return
           end
-          @gitolite_checks = RedmineGitHosting::Config.check_hooks_install!
+          @gitolite_checks = RedmineGitHosting::Config.install_hooks!
         end
 
       end

Diff for: lib/tasks/redmine_git_hosting.rake

@@ -61,7 +61,7 @@ namespace :redmine_git_hosting do
     puts "Installing/updating Gitolite hooks"
     puts "----------------------------------"
     puts "Results :"
-    result = RedmineGitHosting::Config.check_hooks_install!
+    result = RedmineGitHosting::Config.install_hooks!
     puts YAML::dump(result)
     puts "Done!"
   end