Refactor a little, add rake task to check repositories identifier uniqueness

Author: root

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

@@ -38,6 +38,19 @@ def repo_ident_unique?
         end
 
 
+        def have_duplicated_identifier?
+          if ((self.all.map(&:identifier).inject(Hash.new(0)) do |h, x|
+              h[x] += 1 unless x.blank?
+              h
+            end.values.max) || 0) > 1
+            # Oops -- have duplication
+            return true
+          else
+            return false
+          end
+        end
+
+
         # Translate repository path into a unique ID for use in caching of git commands.
         #
         # We perform caching here to speed this up, since this function gets called

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

@@ -177,24 +177,18 @@ def save_git_hosting_values
 
             # Check to see if we are trying to claim all repository identifiers are unique
             if valuehash[:unique_repo_identifier] == 'true'
-              if ((Repository.all.map(&:identifier).inject(Hash.new(0)) do |h,x|
-                  h[x]+=1 unless x.blank?
-                  h
-                end.values.max) || 0) > 1
+              if Repository::Git.have_duplicated_identifier?
                 # Oops -- have duplication.  Force to false.
-                RedmineGitolite::GitHosting.logger.error { "Detected non-unique repository identifiers. Setting unique_repo_identifier => 'false'" }
+                RedmineGitolite::GitHosting.logger.error { "Detected non-unique repository identifiers. Cannot switch to unique_repo_identifier, setting unique_repo_identifier => 'false'" }
                 valuehash[:unique_repo_identifier] = 'false'
               end
             end
 
 
             if @@old_valuehash[:hierarchical_organisation] == 'true' && valuehash[:hierarchical_organisation] == 'false'
-              if ((Repository.all.map(&:identifier).inject(Hash.new(0)) do |h,x|
-                  h[x]+=1 unless x.blank?
-                  h
-                end.values.max) || 0) > 1
-                # Oops -- have duplication.  Force to false.
-                RedmineGitolite::GitHosting.logger.error { "Detected non-unique repository identifiers. Setting hierarchical_organisation => 'false'" }
+              if Repository::Git.have_duplicated_identifier?
+                # Oops -- have duplication.  Force to true.
+                RedmineGitolite::GitHosting.logger.error { "Detected non-unique repository identifiers. Cannot switch to flat mode, setting hierarchical_organisation => 'true'" }
                 valuehash[:hierarchical_organisation] = 'true'
               end
             end

Diff for: lib/tasks/redmine_git_hosting.rake

@@ -66,6 +66,7 @@ namespace :redmine_git_hosting do
     puts "Done!"
   end
 
+
   desc "Update/repair Gitolite configuration"
   task :update_repositories => [:environment] do
     puts "Performing manual update_repositories operation..."
@@ -80,6 +81,7 @@ namespace :redmine_git_hosting do
     puts "Done!"
   end
 
+
   desc "Fetch commits from gitolite repositories/update gitolite configuration"
   task :fetch_changesets => [:environment] do
     puts "Performing manual fetch_changesets operation..."
@@ -88,6 +90,21 @@ namespace :redmine_git_hosting do
     puts "Done!"
   end
 
+
+  desc "Check repositories identifier uniqueness"
+  task :check_repository_uniqueness => [:environment] do
+    puts "Checking repositories identifier uniqueness..."
+    if Repository::Git.have_duplicated_identifier?
+      # Oops -- have duplication.
+      RedmineGitolite::GitHosting.logger.error { "Detected non-unique repository identifiers!" }
+      puts "Detected non-unique repository identifiers!"
+    else
+      puts "pass!"
+    end
+    puts "Done!"
+  end
+
+
   desc "Install redmine_git_hosting scripts"
   task :install_scripts do |t,args|
     if !ENV["READ_ONLY"]
@@ -96,6 +113,7 @@ namespace :redmine_git_hosting do
     Rake::Task["selinux:redmine_git_hosting:install_scripts"].invoke
   end
 
+
   desc "Remove redmine_git_hosting scripts"
   task :remove_scripts do
     Rake::Task["selinux:redmine_git_hosting:remove_scripts"].invoke