# Move repository if namespace changed
if project.namespace_id_changed? and not project.new_record?
- move_project(project)
+ old_dir = Namespace.find_by_id(project.namespace_id_was).try(:path) || ''
+ new_dir = Namespace.find_by_id(project.namespace_id).try(:path) || ''
+
+ Gitlab::ProjectMover.new(project, old_dir, new_dir).execute
end
end
def log_info message
Gitlab::AppLogger.info message
end
-
- def move_project(project)
- old_dir = Namespace.find_by_id(project.namespace_id_was).try(:path) || ''
- new_dir = Namespace.find_by_id(project.namespace_id).try(:path) || ''
-
- # Create new dir if missing
- new_dir_path = File.join(Gitlab.config.git_base_path, new_dir)
- Dir.mkdir(new_dir_path) unless File.exists?(new_dir_path)
-
- old_path = File.join(Gitlab.config.git_base_path, old_dir, "#{project.path}.git")
- new_path = File.join(new_dir_path, "#{project.path}.git")
-
- `mv #{old_path} #{new_path}`
-
- log_info "Project #{project.name} was moved from #{old_path} to #{new_path}"
- end
end
require 'database_cleaner'
require 'spinach/capybara'
-%w(gitolite_stub stubbed_repository valid_commit).each do |f|
+%w(namespaces_stub gitolite_stub stubbed_repository valid_commit).each do |f|
require Rails.root.join('spec', 'support', f)
end
--- /dev/null
+# ProjectMover class
+#
+# Used for moving project repositories from one subdir to another
+module Gitlab
+ class ProjectMover
+ attr_reader :project, :old_dir, :new_dir
+
+ def initialize(project, old_dir, new_dir)
+ @project = project
+ @old_dir = old_dir
+ @new_dir = new_dir
+ end
+
+ def execute
+ # Create new dir if missing
+ new_dir_path = File.join(Gitlab.config.git_base_path, new_dir)
+ Dir.mkdir(new_dir_path) unless File.exists?(new_dir_path)
+
+ old_path = File.join(Gitlab.config.git_base_path, old_dir, "#{project.path}.git")
+ new_path = File.join(new_dir_path, "#{project.path}.git")
+
+ if system("mv #{old_path} #{new_path}")
+ log_info "Project #{project.name} was moved from #{old_path} to #{new_path}"
+ true
+ else
+ log_info "Error! Project #{project.name} cannot be moved from #{old_path} to #{new_path}"
+ false
+ end
+ end
+
+ protected
+
+ def log_info message
+ Gitlab::AppLogger.info message
+ end
+ end
+end
--- /dev/null
+require 'namespace'
+require 'gitlab/project_mover'
+
+class Namespace
+ def ensure_dir_exist
+ true
+ end
+end
+
+class Gitlab::ProjectMover
+ def execute
+ true
+ end
+end
end
end
-class Namespace
- def ensure_dir_exist
- true
- end
-end
-
Project.send(:include, StubbedRepository)