Handle Gitolite 'option' directive.

This will permit users to add "option deny-rules = 1" and "option mirror.master" to Gitolite config.

Author: root

Diff for: app/controllers/repository_git_config_keys_controller.rb

@@ -9,17 +9,18 @@ class RepositoryGitConfigKeysController < RedmineGitHostingController
 
   def index
     @repository_git_config_keys = @repository.git_config_keys.all
+    @repository_git_option_keys = @repository.git_option_keys.all
     render_with_api
   end
 
 
   def new
-    @git_config_key = @repository.git_config_keys.new
+    @git_config_key = @repository.git_keys.new
   end
 
 
   def create
-    @git_config_key = @repository.git_config_keys.new(params[:repository_git_config_key])
+    @git_config_key = @repository.send(key_type).new(params[:repository_git_config_key])
     if @git_config_key.save
       flash[:notice] = l(:notice_git_config_key_created)
       call_use_case_and_redirect
@@ -48,13 +49,25 @@ def destroy
   private
 
 
+    def key_type
+      case params[:repository_git_config_key][:type]
+      when 'RepositoryGitConfigKey::Config'
+        :git_config_keys
+      when 'RepositoryGitConfigKey::Option'
+        :git_option_keys
+      else
+        :git_keys
+      end
+    end
+
+
     def set_current_tab
       @tab = 'repository_git_config_keys'
     end
 
 
     def find_repository_git_config_key
-      @git_config_key = @repository.git_config_keys.find(params[:id])
+      @git_config_key = @repository.git_keys.find(params[:id])
     rescue ActiveRecord::RecordNotFound => e
       render_404
     end

Diff for: app/helpers/repository_git_config_keys_helper.rb

@@ -0,0 +1,10 @@
+module RepositoryGitConfigKeysHelper
+
+  def git_config_key_options
+    [
+      [l(:label_git_key_type_config), 'RepositoryGitConfigKey::Config'],
+      [l(:label_git_key_type_option), 'RepositoryGitConfigKey::Option']
+    ]
+  end
+
+end

Diff for: app/models/concerns/gitolitable/config.rb

@@ -2,7 +2,7 @@ module Gitolitable
   module Config
     extend ActiveSupport::Concern
 
-    def gitolite_config
+    def git_config
       repo_conf = {}
 
       # This is needed for all Redmine repositories
@@ -38,5 +38,16 @@ def gitolite_config
       repo_conf
     end
 
+
+    def gitolite_options
+      repo_conf = {}
+
+      git_option_keys.each do |option|
+        repo_conf[option.key] = option.value
+      end if git_option_keys.any?
+
+      repo_conf
+    end
+
   end
 end

Diff for: app/models/repository/xitolite.rb

@@ -19,7 +19,9 @@ class Repository::Xitolite < Repository::Git
   has_many :mirrors,                dependent: :destroy, foreign_key: 'repository_id', class_name: 'RepositoryMirror'
   has_many :post_receive_urls,      dependent: :destroy, foreign_key: 'repository_id', class_name: 'RepositoryPostReceiveUrl'
   has_many :deployment_credentials, dependent: :destroy, foreign_key: 'repository_id', class_name: 'RepositoryDeploymentCredential'
-  has_many :git_config_keys,        dependent: :destroy, foreign_key: 'repository_id', class_name: 'RepositoryGitConfigKey'
+  has_many :git_keys,               dependent: :destroy, foreign_key: 'repository_id', class_name: 'RepositoryGitConfigKey'
+  has_many :git_config_keys,        dependent: :destroy, foreign_key: 'repository_id', class_name: 'RepositoryGitConfigKey::Config'
+  has_many :git_option_keys,        dependent: :destroy, foreign_key: 'repository_id', class_name: 'RepositoryGitConfigKey::Option'
   has_many :protected_branches,     dependent: :destroy, foreign_key: 'repository_id', class_name: 'RepositoryProtectedBranche'
 
   # Additionnal validations

Diff for: app/models/repository_git_config_key.rb

@@ -1,22 +1,16 @@
 class RepositoryGitConfigKey < ActiveRecord::Base
   unloadable
 
-  VALID_CONFIG_KEY_REGEX = /\A[a-zA-Z0-9]+\.[a-zA-Z0-9.]+\z/
-
   ## Attributes
-  attr_accessible :key, :value
+  attr_accessible :type, :key, :value
 
   ## Relations
   belongs_to :repository
 
   ## Validations
   validates :repository_id, presence: true
-
-  validates :key, presence: true,
-                  uniqueness: { case_sensitive: false, scope: :repository_id },
-                  format:     { with: VALID_CONFIG_KEY_REGEX }
-
-  validates :value, presence: true
+  validates :type,          presence: true, inclusion: { in: ['RepositoryGitConfigKey::Config', 'RepositoryGitConfigKey::Option'] }
+  validates :value,         presence: true
 
   ## Callbacks
   after_save :check_if_key_changed

Diff for: app/models/repository_git_config_key/config.rb

@@ -0,0 +1,10 @@
+class RepositoryGitConfigKey::Config < RepositoryGitConfigKey
+  unloadable
+
+  VALID_CONFIG_KEY_REGEX = /\A[a-zA-Z0-9]+\.[a-zA-Z0-9.]+\z/
+
+  validates :key, presence: true,
+                  uniqueness: { case_sensitive: false, scope: [:type, :repository_id] },
+                  format:     { with: VALID_CONFIG_KEY_REGEX }
+
+end

Diff for: app/models/repository_git_config_key/option.rb

@@ -0,0 +1,7 @@
+class RepositoryGitConfigKey::Option < RepositoryGitConfigKey
+  unloadable
+
+  validates :key, presence: true,
+                  uniqueness: { case_sensitive: false, scope: [:type, :repository_id] }
+
+end

Diff for: app/views/repository_git_config_keys/_config_keys.html.haml

@@ -0,0 +1,25 @@
+- if git_config_keys.any?
+
+  %table{ class: 'table table-hover' }
+    %thead
+      %tr
+        %th= l(:label_key)
+        %th= l(:label_value)
+        %th
+
+    %tbody
+      - git_config_keys.each do |git_config_key|
+        %tr
+          %td
+            %span{ class: 'label label-info' }= git_config_key.key
+
+          %td
+            %span{ class: 'label label-success' }= git_config_key.value
+
+          %td{ class: 'buttons' }
+            - if User.current.git_allowed_to?(:edit_repository_git_config_keys, @repository)
+              = link_to l(:button_edit), edit_repository_git_config_key_path(@repository, git_config_key), class: 'icon icon-edit modal-box'
+              = link_to l(:button_delete), repository_git_config_key_path(@repository, git_config_key), remote: true, method: :delete, confirm: l(:text_are_you_sure), class: 'icon icon-del'
+
+- else
+  %p{ class: 'nodata' }= l(:label_no_data)

Diff for: app/views/repository_git_config_keys/_form.html.haml

@@ -1,5 +1,6 @@
 .flash-messages= error_messages_for 'git_config_key'
 
 .box
+  %p= f.select :type, options_for_select(git_config_key_options, @git_config_key.type), { required: @git_config_key.new_record?, prompt: 'Select a key type' }, { disabled: !@git_config_key.new_record? }
   %p= f.text_field :key,   required: true, size: 65, label: :label_key
   %p= f.text_field :value, required: true, size: 65

Diff for: app/views/repository_git_config_keys/index.html.haml

@@ -3,33 +3,19 @@
   - if User.current.git_allowed_to?(:create_repository_git_config_keys, @repository)
     .contextual= link_to l(:label_git_config_key_add), new_repository_git_config_key_path(@repository), class: 'icon icon-add modal-box'
 
-  %h3= l(:label_git_config_keys)
+  %h3
+    = l(:label_git_config_keys)
+    = link_to "(#{l(:label_gitolite_documentation)})", 'http://gitolite.com/gitolite/git-config.html', target: '_blank'
 
-  - if @repository_git_config_keys.any?
+  = render 'config_keys', git_config_keys: @repository_git_config_keys
 
-    %table{ class: 'table table-hover' }
-      %thead
-        %tr
-          %th= l(:label_key)
-          %th= l(:label_value)
-          %th
-
-      %tbody
-        - @repository_git_config_keys.each do |git_config_key|
-          %tr
-            %td
-              %span{ class: 'label label-info' }= git_config_key.key
-
-            %td
-              %span{ class: 'label label-success' }= git_config_key.value
-
-            %td{ class: 'buttons' }
-              - if User.current.git_allowed_to?(:edit_repository_git_config_keys, @repository)
-                = link_to l(:button_edit), edit_repository_git_config_key_path(@repository, git_config_key), class: 'icon icon-edit modal-box'
-                = link_to l(:button_delete), repository_git_config_key_path(@repository, git_config_key), remote: true, method: :delete, confirm: l(:text_are_you_sure), class: 'icon icon-del'
+  - if User.current.git_allowed_to?(:create_repository_git_config_keys, @repository)
+    .contextual= link_to l(:label_git_option_key_add), new_repository_git_config_key_path(@repository), class: 'icon icon-add modal-box'
 
-  - else
-    %p{ class: 'nodata' }= l(:label_no_data)
+  %h3
+    = l(:label_git_option_keys)
+    = link_to "(#{l(:label_gitolite_documentation)})", 'http://gitolite.com/gitolite/options.html', target: '_blank'
+  = render 'config_keys', git_config_keys: @repository_git_option_keys
 
 :javascript
   $(document).ready(function() { initModalBoxes(modals); });

Diff for: config/locales/models/repository_git_config_key/en.yml

@@ -3,7 +3,10 @@ en:
   ########### GIT CONFIG KEYS ###########
   # Basics labels
   label_git_config_keys: Git Config Keys
+  label_git_option_keys: Gitolite configuration options
   label_git_config_key_add: Add Git Config Key
+  label_git_option_key_add: Add Gitolite option
+
   label_git_config_key_create: Create New Git Config Key
   label_git_config_key_edit: Edit Git Config Key
   label_git_config_key_delete: Delete Git Config Key
@@ -15,6 +18,9 @@ en:
   notice_git_config_key_create_failed: Failed to create Git config key
   notice_git_config_key_update_failed: Failed to update Git config key
 
+  label_gitolite_documentation: Gitolite Documentation
+  label_git_key_type_config: Git Config Key
+  label_git_key_type_option: Gitolite Option
   label_key: Key
   label_value: Value
 

Diff for: config/locales/models/repository_git_config_key/fr.yml

@@ -3,7 +3,10 @@ fr:
   ########### GIT CONFIG KEYS ###########
   # Basics labels
   label_git_config_keys: Clés de configuration Git
+  label_git_option_keys: Options de configuration Gitolite
   label_git_config_key_add: Ajouter une clé de configuration Git
+  label_git_option_key_add: Ajouter une option de configuration Gitolite
+
   label_git_config_key_create: Créer une clé de configuration Git
   label_git_config_key_edit: Modifier une clé de configuration Git
   label_git_config_key_delete: Supprimer la clé de configuration Git
@@ -15,6 +18,9 @@ fr:
   notice_git_config_key_create_failed: Échec de création de la clé de configuration Git
   notice_git_config_key_update_failed: Échec de modification de la clé de configuration Git
 
+  label_gitolite_documentation: Documentation Gitolite
+  label_git_key_type_config: Clé de configuration Git
+  label_git_key_type_option: Option de configuration Gitolite
   label_key: Clé
   label_value: Valeur
 

Diff for: db/migrate/20150703050000_add_type_field_to_git_config_keys.rb

@@ -0,0 +1,11 @@
+class AddTypeFieldToGitConfigKeys < ActiveRecord::Migration
+
+  def self.up
+    add_column :repository_git_config_keys, :type, :string
+  end
+
+  def self.down
+    remove_column :repository_git_config_keys, :type
+  end
+
+end

Diff for: db/migrate/20150705180400_rename_git_config_keys_index.rb

@@ -0,0 +1,13 @@
+class RenameGitConfigKeysIndex < ActiveRecord::Migration
+
+  def self.up
+    remove_index :repository_git_config_keys, [:key, :repository_id]
+    add_index :repository_git_config_keys, [:key, :type, :repository_id], unique: true, name: :unique_key_name
+  end
+
+  def self.down
+    remove_index :repository_git_config_keys, name: :unique_key_name
+    add_index :repository_git_config_keys, [:key, :repository_id], unique: true
+  end
+
+end

Diff for: lib/redmine_git_hosting/gitolite_handlers/repositories/base.rb

@@ -40,7 +40,7 @@ def logger
 
 
           def backup_old_perms
-            @old_perms ||= repository.backup_gitolite_permissions(gitolite_repo_conf)
+            @old_perms = repository.backup_gitolite_permissions(gitolite_repo_conf)
           end
 
 
@@ -93,9 +93,15 @@ def recreate_repository_config
 
           def build_repository_config
             repo_conf = ::Gitolite::Config::Repo.new(repository.gitolite_repository_name)
-            repository.gitolite_config.each do |key, value|
+
+            repository.git_config.each do |key, value|
               repo_conf.set_git_config(key, value)
             end
+
+            repository.gitolite_options.each do |key, value|
+              repo_conf.set_gitolite_option(key, value)
+            end
+
             repo_conf
           end