Merge branch 'devel' into feat_protected_branches

Author: root

Diff for: app/models/repository_mirror.rb

@@ -50,8 +50,8 @@ def to_s
 
   def push
     begin
-      push_message = RedmineGitolite::GitoliteWrapper.sudo_pipe("bash") do
-        [ 'cd', repository.gitolite_repository_path, '&&', 'env', 'GIT_SSH=~/.ssh/run_gitolite_admin_ssh', 'git', 'push', *push_args, '2>&1' ].join(' ')
+      push_message = RedmineGitolite::GitoliteWrapper.sudo_pipe("sh") do
+        [ 'cd', repository.gitolite_repository_path, '&&', 'env', 'GIT_SSH=$HOME/.ssh/run_gitolite_admin_ssh', 'git', 'push', *push_args, '2>&1' ].join(' ')
       end
       push_failed = false
     rescue RedmineGitolite::GitHosting::GitHostingException => e

Diff for: app/services/git_notifier.rb

@@ -0,0 +1,133 @@
+class GitNotifier
+  unloadable
+
+
+  attr_reader :email_prefix
+  attr_reader :sender_address
+  attr_reader :default_list
+  attr_reader :mail_mapping
+
+  attr_reader :mailer
+  attr_reader :smtp_auth
+  attr_reader :smtp_server
+  attr_reader :smtp_port
+  attr_reader :smtp_user
+  attr_reader :smtp_pass
+
+
+  def initialize(repository)
+    @repository     = repository
+    @project        = repository.project
+    @email_prefix   = ''
+    @sender_address = ''
+    @default_list   = []
+    @mail_mapping   = {}
+
+    if ActionMailer::Base.delivery_method == :smtp
+      @mailer = 'smtp'
+    else
+      @mailer = 'sendmail'
+    end
+
+    @smtp_auth =
+    if ActionMailer::Base.smtp_settings.has_key?(:authentication) &&
+      ActionMailer::Base.smtp_settings[:authentication] != :none
+      true
+    else
+      false
+    end
+
+    @smtp_server = ActionMailer::Base.smtp_settings[:address]
+    @smtp_port   = ActionMailer::Base.smtp_settings[:port]
+    @smtp_user   = ActionMailer::Base.smtp_settings[:user_name]
+    @smtp_pass   = ActionMailer::Base.smtp_settings[:password]
+
+    build_notifier
+  end
+
+
+  def mailing_list
+    @mail_mapping.keys
+  end
+
+
+  private
+
+
+  def build_notifier
+    set_email_prefix
+    set_sender_address
+    set_default_list
+    set_mail_mapping
+  end
+
+
+  def set_email_prefix
+    if !@repository.git_notification.nil? && !@repository.git_notification.prefix.empty?
+      @email_prefix = @repository.git_notification.prefix
+    else
+      @email_prefix = RedmineGitolite::Config.get_setting(:gitolite_notify_global_prefix)
+    end
+  end
+
+
+  def set_sender_address
+    if !@repository.git_notification.nil? && !@repository.git_notification.sender_address.empty?
+      @sender_address = @repository.git_notification.sender_address
+    else
+      @sender_address = RedmineGitolite::Config.get_setting(:gitolite_notify_global_sender_address)
+    end
+  end
+
+
+  def set_default_list
+    @default_list = @project.member_principals.map(&:user).compact.uniq
+                                                          .select{|user| user.allowed_to?(:receive_git_notifications, @project)}
+                                                          .map(&:mail).uniq.sort
+  end
+
+
+  def set_mail_mapping
+    mail_mapping = {}
+
+    # First collect all project users
+    default_users = @default_list.map{ |mail| mail_mapping[mail] = :project }
+
+    # Then add global include list
+    RedmineGitolite::Config.get_setting(:gitolite_notify_global_include).sort.map{ |mail| mail_mapping[mail] = :global }
+
+    # Then filter
+    mail_mapping = filter_list(mail_mapping)
+
+    # Then add local include list
+    if !@repository.git_notification.nil? && !@repository.git_notification.include_list.empty?
+      @repository.git_notification.include_list.sort.map{ |mail| mail_mapping[mail] = :local }
+    end
+
+    @mail_mapping = mail_mapping
+  end
+
+
+  def filter_list(merged_map)
+    mail_mapping = {}
+    exclude_list = []
+
+    # Build exclusion list
+    if !RedmineGitolite::Config.get_setting(:gitolite_notify_global_exclude).empty?
+      exclude_list = RedmineGitolite::Config.get_setting(:gitolite_notify_global_exclude)
+    end
+
+    if !@repository.git_notification.nil? && !@repository.git_notification.exclude_list.empty?
+      exclude_list = exclude_list + @repository.git_notification.exclude_list
+    end
+
+    exclude_list = exclude_list.uniq.sort
+
+    merged_map.each do |mail, from|
+      mail_mapping[mail] = from unless exclude_list.include?(mail)
+    end
+
+    return mail_mapping
+  end
+
+end

Diff for: app/views/repositories/_form.html.erb

@@ -166,7 +166,7 @@
 
       <p>
         <%= label_tag  "", l(:label_mirroring_keys_installed) %>
-        <%= image_tag (RedmineGitolite::Mirrors.mirroring_keys_installed? ? 'true.png' : 'exclamation.png') %>
+        <%= image_tag (RedmineGitolite::GitoliteWrapper.mirroring_keys_installed? ? 'true.png' : 'exclamation.png') %>
       </p>
 
     <% else %>

Diff for: app/views/repository_git_notifications/_form.html.erb

@@ -29,7 +29,7 @@
 </div>
 
 <%= javascript_tag do %>
-  var mailing_list_default_users = <%= raw @repository.mailing_list_default_users.to_json %>;
+  var mailing_list_default_users = <%= raw @repository.default_list.to_json %>;
 
   function loadTagIt(target, autocomplete){
     if (autocomplete == true){

Diff for: app/views/repository_git_notifications/index.html.erb

@@ -32,7 +32,7 @@
 
   <h3 class="git"><%= l(:label_git_notifications) %></h3>
 
-  <% if @repository.mailing_list_default_users.any? ||
+  <% if @repository.default_list.any? ||
         (!@git_notification.nil? && @git_notification.include_list.any?) ||
         (!@git_notification.nil? && @git_notification.exclude_list.any?) %>
 
@@ -60,9 +60,9 @@
         </tr>
         <tr>
           <td>
-            <% if @repository.mailing_list_default_users.any? %>
+            <% if @repository.default_list.any? %>
               <ul>
-                <% @repository.mailing_list_default_users.each do |item| %>
+                <% @repository.default_list.each do |item| %>
                   <li><%= item %></li>
                 <% end %>
               </ul>
@@ -90,9 +90,9 @@
           </td>
 
           <td>
-            <% if @repository.mailing_list_effective.any? %>
+            <% if @repository.mail_mapping.any? %>
               <ul>
-                <% @repository.mailing_list_effective.each do |item, from| %>
+                <% @repository.mail_mapping.each do |item, from| %>
                   <li><%= item %> (<%= from %>)</li>
                 <% end %>
               </ul>

Diff for: app/views/repository_mirrors/index.html.erb

@@ -62,7 +62,7 @@
 
   <div class="spacer"></div>
 
-  <% mirror_pubkey = RedmineGitolite::Mirrors.mirroring_public_key %>
+  <% mirror_pubkey = RedmineGitolite::GitoliteWrapper.mirroring_public_key %>
 
   <div style="margin: 2px 3px; width: 99%;">
 

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

@@ -3,7 +3,6 @@
   gitolite_recycle_bin_expiration_time = RedmineGitolite::Config.get_setting(:gitolite_recycle_bin_expiration_time)
 
   gitolite_temp_dir    = RedmineGitolite::Config.get_setting(:gitolite_temp_dir)
-  gitolite_timeout     = RedmineGitolite::Config.get_setting(:gitolite_timeout)
   gitolite_log_level   = RedmineGitolite::Config.get_setting(:gitolite_log_level)
   gitolite_log_split   = RedmineGitolite::Config.get_setting(:gitolite_log_split)
 
@@ -20,13 +19,6 @@
   <em><%= l(:label_gitolite_temp_dir_desc) %></em>
 </p>
 
-<p>
-  <label><%= l(:label_gitolite_timeout) %></label>
-  <%= text_field_tag("settings[gitolite_timeout]", "#{gitolite_timeout}", :size => 10) %>
-  <br />
-  <em><%= l(:label_gitolite_timeout_desc) %></em>
-</p>
-
 <p>
   <label><%= l(:label_gitolite_recycle_bin_expiration_time) %></label>
   <%= text_field_tag("settings[gitolite_recycle_bin_expiration_time]", gitolite_recycle_bin_expiration_time, :size => 10) %>

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

@@ -5,29 +5,29 @@
   <tr>
     <td><%= l(:label_temp_dir_writeable) %></td>
     <td>
-      <% state = RedmineGitolite::Scripts.temp_dir_writeable?(:reset => true) %>
-      <span class="label label-<%= state ? 'success' : 'important' %>"><%= RedmineGitolite::Scripts.get_temp_dir_path %></span>
+      <% state = RedmineGitolite::GitoliteWrapper.temp_dir_writeable?(:reset => true) %>
+      <span class="label label-<%= state ? 'success' : 'important' %>"><%= RedmineGitolite::GitoliteWrapper.gitolite_admin_dir %></span>
     </td>
   </tr>
 
   <tr>
     <td><%= l(:label_redmine_user) %></td>
-    <td><span class="label label-success"><%= RedmineGitolite::Scripts.redmine_user %></span></td>
+    <td><span class="label label-success"><%= RedmineGitolite::GitoliteWrapper.redmine_user %></span></td>
   </tr>
 
   <tr>
     <td><%= l(:label_gitolite_user) %></td>
-    <td><span class="label label-success"><%= RedmineGitolite::Scripts.gitolite_user %></span></td>
+    <td><span class="label label-success"><%= RedmineGitolite::GitoliteWrapper.gitolite_user %></span></td>
   </tr>
 
   <tr>
     <td><%= l(:label_sudo_gitolite_to_redmine_user) %></td>
-    <td><%= image_tag (RedmineGitolite::Scripts.can_gitolite_sudo_to_redmine_user? ? 'true.png' : 'exclamation.png') %></td>
+    <td><%= image_tag (RedmineGitolite::GitoliteWrapper.can_gitolite_sudo_to_redmine_user? ? 'true.png' : 'exclamation.png') %></td>
   </tr>
 
   <tr>
     <td><%= l(:label_sudo_redmine_to_gitolite_user) %></td>
-    <td><%= image_tag (RedmineGitolite::Scripts.can_redmine_sudo_to_gitolite_user? ? 'true.png' : 'exclamation.png') %></td>
+    <td><%= image_tag (RedmineGitolite::GitoliteWrapper.can_redmine_sudo_to_gitolite_user? ? 'true.png' : 'exclamation.png') %></td>
   </tr>
 
   <% hooks_manager = RedmineGitolite::Hooks.new %>
@@ -62,7 +62,7 @@
 
   <tr>
     <td><%= l(:label_mirroring_keys_installed) %></td>
-    <td><%= image_tag (RedmineGitolite::Mirrors.mirroring_keys_installed?(:reset => true) ? 'true.png' : 'exclamation.png') %></td>
+    <td><%= image_tag (RedmineGitolite::GitoliteWrapper.mirroring_keys_installed?(:reset => true) ? 'true.png' : 'exclamation.png') %></td>
   </tr>
 
   <tr>

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

@@ -43,10 +43,6 @@ en:
 
   label_gitolite_temp_dir: Temporary dir for lock file and data
   label_gitolite_temp_dir_desc: (Must be absolute)
-  label_gitolite_scripts_dir: Scripts dir
-  label_gitolite_scripts_dir_desc: (Can be absolute or relative to Redmine root)
-  label_gitolite_timeout: Git timeout
-  label_gitolite_timeout_desc: (In seconds)
 
   label_gitolite_recycle_bin_expiration_time: Expiration time for repositories in recycle bin
   label_gitolite_recycle_bin_expiration_time_desc: (In hours)
@@ -150,19 +146,14 @@ en:
   label_sudo_redmine_to_gitolite_user: Redmine user is able to sudo to Git user?
   label_sudo_gitolite_to_redmine_user: Git user is able to sudo to Redmine user?
   label_unknown_gitolite_version: Unknown version
-  label_scripts_dir_writeable: Scripts directory writeable?
   label_temp_dir_writeable: Temp directory writeable?
-  label_gitolite_admin_ssh_script_installed: Script for Gitolite Admin command installed?
-  label_git_cmd_script_installed: Script for Git command installed?
-  label_shell_cmd_script_installed: Script for Shell command installed?
   label_mirroring_keys_installed: Mirrors keys installed?
   label_gitolite_version: Gitolite version
   label_gitolite_banner: Gitolite banner
   label_path_directories: PATH directories
   label_gitolite_hooks_params_installed: Hooks parameters installed?
   label_gitolite_hooks_installed: Hooks installed?
   label_redmine_user: Redmine username
-  label_sudo_version: Sudo version
   label_git_version: Git version
 
   # Recycle Bin

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

@@ -43,10 +43,6 @@ fr:
 
   label_gitolite_temp_dir: Répertoire temporaire pour les fichiers de verrouillage et les données
   label_gitolite_temp_dir_desc: (Doit être absolu)
-  label_gitolite_scripts_dir: Répertoire des scripts
-  label_gitolite_scripts_dir_desc: (Peut être absolu ou relatif à la racine de Redmine)
-  label_gitolite_timeout: Délai d'expiration Git
-  label_gitolite_timeout_desc: (En secondes)
 
   label_gitolite_recycle_bin_expiration_time: Temps d'expiration pour les dépôts dans la corbeille
   label_gitolite_recycle_bin_expiration_time_desc: (En heures)
@@ -150,19 +146,14 @@ fr:
   label_sudo_redmine_to_gitolite_user: L'utilisateur Redmine peut sudo vers l'utilisateur Git?
   label_sudo_gitolite_to_redmine_user: L'utilisateur Git peut sudo vers l'utilisateur Redmine?
   label_unknown_gitolite_version: Version inconnue
-  label_scripts_dir_writeable: Le répertoire des scripts est accessible en écriture?
   label_temp_dir_writeable: Le répertoire temporaire est accessible en écriture?
-  label_gitolite_admin_ssh_script_installed: Script pour les commandes Gitolite Admin installé?
-  label_git_cmd_script_installed: Script pour les commandes Git installé?
-  label_shell_cmd_script_installed: Script pour les commandes Shell installé?
   label_mirroring_keys_installed: Clés de miroir installées?
   label_gitolite_version: Version de Gitolite
   label_gitolite_banner: Gitolite banner
   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_redmine_user: Nom d'utilisateur Redmine
-  label_sudo_version: Version de Sudo
   label_git_version: Version de Git
 
   # Recycle Bin