Fixed and improved enable_naamespace migration task
This commit is contained in:
parent
d991ce636b
commit
d03964d6ec
|
@ -51,8 +51,12 @@ class Namespace < 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 < 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
|
||||
|
||||
User.transaction do
|
||||
username = user.email.match(/^[^@]*/)[0]
|
||||
if user.update_attributes!(username: username)
|
||||
print '.'.green
|
||||
else
|
||||
print 'F'.red
|
||||
end
|
||||
if user.namespace
|
||||
print '-'.cyan
|
||||
next
|
||||
end
|
||||
end
|
||||
|
||||
puts ""
|
||||
print "Create directories for groups: "
|
||||
username = if user.username.present?
|
||||
# if user already has username filled
|
||||
user.username
|
||||
else
|
||||
build_username(user)
|
||||
end
|
||||
|
||||
Group.find_each(batch_size: 500) do |group|
|
||||
if group.ensure_dir_exist
|
||||
print '.'.green
|
||||
else
|
||||
begin
|
||||
User.transaction do
|
||||
user.update_attributes!(username: username)
|
||||
print '.'.green
|
||||
end
|
||||
rescue
|
||||
print 'F'.red
|
||||
end
|
||||
end
|
||||
puts ""
|
||||
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
|
||||
|
||||
def migrate_groups
|
||||
puts "\nCreate directories for groups: ".blue
|
||||
|
||||
Group.find_each(batch_size: 500) do |group|
|
||||
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 "\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
|
||||
|
|
Loading…
Reference in New Issue