Small refactoring

Author: root

Diff for: lib/redmine_git_hosting/gitolite_wrappers/global/common.rb

@@ -32,6 +32,23 @@ def rw_access_perms
           [permissions]
         end
 
+
+        def repo_conf
+          all_repository_config
+        end
+
+
+        def perms
+          repo_conf.permissions.select { |p| p.has_key? 'RW+' }
+        end
+
+
+        # RedmineGitHosting key can act on any refspec ('') so it should be in that 'subgroup'
+        #
+        def users
+          perms[0]['RW+']['']
+        end
+
       end
     end
   end

Diff for: lib/redmine_git_hosting/gitolite_wrappers/global/disable_rw_access.rb

@@ -19,17 +19,11 @@ def call
 
 
         def remove_redmine_key
-          repo_conf = all_repository_config
-
-          # RedmineGitHosting key must be in RW+ group
-          perms = repo_conf.permissions.select{ |p| p.has_key? 'RW+' }
-
           # RedmineGitHosting key must be in [RW+][''] group
           # Return if those groups are absent : it means that our key is not here
           return if perms.empty? || !perms[0]['RW+'].include?('')
 
           # Check for key presence
-          users = perms[0]['RW+']['']
           return if !users.include?(redmine_gitolite_key)
 
           # Delete the key

Diff for: lib/redmine_git_hosting/gitolite_wrappers/global/enable_rw_access.rb

@@ -22,30 +22,17 @@ def call
 
 
         def add_redmine_key
-          repo_conf = all_repository_config
-
           # RedmineGitHosting key must be in RW+ group
-          perms = repo_conf.permissions.select{ |p| p.has_key? 'RW+' }
-
           # If not create the RW+ group and add the key
           if perms.empty?
             logger.info("#{context} : No permissions set for '@all' repository, add RedmineGitHosting key")
             repo_conf.permissions = rw_access_perms
-            return
-          end
-
-          # RedmineGitHosting key can act on any refspec ('') so it should be it that 'subgroup'
-          users = perms[0]['RW+']['']
-
-          # If not create it
-          if users.nil?
+          elsif users.nil?
             logger.info("#{context} : RedmineGitHosting key is not present, add it !")
             repo_conf.permissions[0]['RW+'][''] = [redmine_gitolite_key]
-          # Check that the 'subgroup' contains our key
           elsif !users.include?(redmine_gitolite_key)
             logger.info("#{context} : RedmineGitHosting key is not present, add it !")
             repo_conf.permissions[0]['RW+'][''].push(redmine_gitolite_key)
-          # Our key already here, nothing to do
           else
             logger.info("#{context} : RedmineGitHosting key is present, nothing to do.")
           end