Fixed and improved enable_naamespace migration task

Dmitriy Zaporozhets
1 parent d991ce63
Showing 3 changed files with 71 additions and 22 deletions Show diff stats
app/models/namespace.rb
app/observers/user_observer.rb
lib/tasks/gitlab/enable_namespaces.rake
@@ -51,8 +51,12 @@ class Namespace &lt; ActiveRecord::Base
   end
  
   def ensure_dir_exist
+    dir_exists? || system("mkdir -m 770 #{namespace_dir_path}")
+  end
+
+  def dir_exists?
     namespace_dir_path = File.join(Gitlab.config.gitolite.repos_path, path)
-    system("mkdir -m 770 #{namespace_dir_path}") unless File.exists?(namespace_dir_path)
+    File.exists?(namespace_dir_path)
   end
  
   def move_dir
@@ -14,7 +14,7 @@ class UserObserver &lt; ActiveRecord::Observer
       if user.namespace
         user.namespace.update_attributes(path: user.username)
       else
-        user.create_namespace!(path: user.username, name: user.name)
+        user.create_namespace!(path: user.username, name: user.username)
       end
     end
   end
@@ -3,36 +3,85 @@ namespace :gitlab do
   task enable_namespaces: :environment do
     warn_user_is_not_gitlab
  
-    print "Generate usernames for users without one: "
+    migrate_user_namespaces
+    migrate_groups
+    migrate_projects
  
+    puts "Rebuild Gitolite ... "
+    gitolite = Gitlab::Gitolite.new
+    gitolite.update_repositories(Project.where('namespace_id IS NOT NULL'))
+    puts "... #{"done".green}"
+  end
+
+  def migrate_user_namespaces
+    puts "\nGenerate usernames for users without one: ".blue
     User.find_each(batch_size: 500) do |user|
-      next if user.namespace
+      if user.namespace
+        print '-'.cyan
+        next
+      end
  
-      User.transaction do
-        username = user.email.match(/^[^@]*/)[0]
-        if user.update_attributes!(username: username)
+      username = if user.username.present?
+                   # if user already has username filled
+                   user.username
+                 else
+                   build_username(user)
+                 end
+
+      begin
+        User.transaction do
+          user.update_attributes!(username: username)
           print '.'.green
-        else
-          print 'F'.red
         end
+      rescue
+        print 'F'.red
       end
     end
+    puts "\nDone"
+  end
+
+  def build_username(user)
+    username = nil
+
+    # generate username
+    username = user.email.match(/^[^@]*/)[0]
+    username.gsub!("+", ".")
+
+    # return username if no mathes
+    return username unless User.find_by_username(username)
+
+    # look for same username
+    (1..10).each do |i|
+      suffixed_username = "#{username}#{i}"
+
+      return suffixed_username unless User.find_by_username(suffixed_username)
+    end
+  end
  
-    puts ""
-    print "Create directories for groups: "
+  def migrate_groups
+    puts "\nCreate directories for groups: ".blue
  
     Group.find_each(batch_size: 500) do |group|
-      if group.ensure_dir_exist
-        print '.'.green
-      else
+      begin
+        if group.dir_exists?
+          print '-'.cyan
+        else
+          if group.ensure_dir_exist
+            print '.'.green
+          else
+            print 'F'.red
+          end
+        end
+      rescue
         print 'F'.red
       end
     end
-    puts ""
+    puts "\nDone"
+  end
  
+  def migrate_projects
     git_path = Gitlab.config.gitolite.repos_path
-    puts ""
-    puts "Move projects in groups into respective directories ... "
+    puts "\nMove projects in groups into respective directories ... ".blue
     Project.where('namespace_id IS NOT NULL').find_each(batch_size: 500) do |project|
       next unless project.group
  
@@ -62,10 +111,6 @@ namespace :gitlab do
       end
     end
  
-    puts ""
-    puts "Rebuild Gitolite ... "
-    gitolite = Gitlab::Gitolite.new
-    gitolite.update_repositories(Project.where('namespace_id IS NOT NULL'))
-    puts "... #{"done".green}"
+    puts "\nDone"
   end
 end
...	...	@@ -51,8 +51,12 @@ class Namespace < ActiveRecord::Base
51	51	end
52	52
53	53	def ensure_dir_exist
	54	+ dir_exists? \|\| system("mkdir -m 770 #{namespace_dir_path}")
	55	+ end
	56	+
	57	+ def dir_exists?
54	58	namespace_dir_path = File.join(Gitlab.config.gitolite.repos_path, path)
55		- system("mkdir -m 770 #{namespace_dir_path}") unless File.exists?(namespace_dir_path)
	59	+ File.exists?(namespace_dir_path)
56	60	end
57	61
58	62	def move_dir
...	...
...	...	@@ -14,7 +14,7 @@ class UserObserver < ActiveRecord::Observer
14	14	if user.namespace
15	15	user.namespace.update_attributes(path: user.username)
16	16	else
17		- user.create_namespace!(path: user.username, name: user.name)
	17	+ user.create_namespace!(path: user.username, name: user.username)
18	18	end
19	19	end
20	20	end
...	...
...	...	@@ -3,36 +3,85 @@ namespace :gitlab do
3	3	task enable_namespaces: :environment do
4	4	warn_user_is_not_gitlab
5	5
6		- print "Generate usernames for users without one: "
	6	+ migrate_user_namespaces
	7	+ migrate_groups
	8	+ migrate_projects
7	9
	10	+ puts "Rebuild Gitolite ... "
	11	+ gitolite = Gitlab::Gitolite.new
	12	+ gitolite.update_repositories(Project.where('namespace_id IS NOT NULL'))
	13	+ puts "... #{"done".green}"
	14	+ end
	15	+
	16	+ def migrate_user_namespaces
	17	+ puts "\nGenerate usernames for users without one: ".blue
8	18	User.find_each(batch_size: 500) do \|user\|
9		- next if user.namespace
	19	+ if user.namespace
	20	+ print '-'.cyan
	21	+ next
	22	+ end
10	23
11		- User.transaction do
12		- username = user.email.match(/^[^@]*/)[0]
13		- if user.update_attributes!(username: username)
	24	+ username = if user.username.present?
	25	+ # if user already has username filled
	26	+ user.username
	27	+ else
	28	+ build_username(user)
	29	+ end
	30	+
	31	+ begin
	32	+ User.transaction do
	33	+ user.update_attributes!(username: username)
14	34	print '.'.green
15		- else
16		- print 'F'.red
17	35	end
	36	+ rescue
	37	+ print 'F'.red
18	38	end
19	39	end
	40	+ puts "\nDone"
	41	+ end
	42	+
	43	+ def build_username(user)
	44	+ username = nil
	45	+
	46	+ # generate username
	47	+ username = user.email.match(/^[^@]*/)[0]
	48	+ username.gsub!("+", ".")
	49	+
	50	+ # return username if no mathes
	51	+ return username unless User.find_by_username(username)
	52	+
	53	+ # look for same username
	54	+ (1..10).each do \|i\|
	55	+ suffixed_username = "#{username}#{i}"
	56	+
	57	+ return suffixed_username unless User.find_by_username(suffixed_username)
	58	+ end
	59	+ end
20	60
21		- puts ""
22		- print "Create directories for groups: "
	61	+ def migrate_groups
	62	+ puts "\nCreate directories for groups: ".blue
23	63
24	64	Group.find_each(batch_size: 500) do \|group\|
25		- if group.ensure_dir_exist
26		- print '.'.green
27		- else
	65	+ begin
	66	+ if group.dir_exists?
	67	+ print '-'.cyan
	68	+ else
	69	+ if group.ensure_dir_exist
	70	+ print '.'.green
	71	+ else
	72	+ print 'F'.red
	73	+ end
	74	+ end
	75	+ rescue
28	76	print 'F'.red
29	77	end
30	78	end
31		- puts ""
	79	+ puts "\nDone"
	80	+ end
32	81
	82	+ def migrate_projects
33	83	git_path = Gitlab.config.gitolite.repos_path
34		- puts ""
35		- puts "Move projects in groups into respective directories ... "
	84	+ puts "\nMove projects in groups into respective directories ... ".blue
36	85	Project.where('namespace_id IS NOT NULL').find_each(batch_size: 500) do \|project\|
37	86	next unless project.group
38	87
...	...	@@ -62,10 +111,6 @@ namespace :gitlab do
62	111	end
63	112	end
64	113
65		- puts ""
66		- puts "Rebuild Gitolite ... "
67		- gitolite = Gitlab::Gitolite.new
68		- gitolite.update_repositories(Project.where('namespace_id IS NOT NULL'))
69		- puts "... #{"done".green}"
	114	+ puts "\nDone"
70	115	end
71	116	end
...	...