Move directory with project. Fixed all related path methods to use namespace

Dmitriy Zaporozhets
1 parent e29ccece
Showing 9 changed files with 55 additions and 10 deletions Show diff stats
app/controllers/admin/groups_controller.rb
app/controllers/dashboard_controller.rb
app/controllers/groups_controller.rb
app/observers/issue_observer.rb
app/observers/project_observer.rb
app/roles/repository.rb
spec/factories.rb
spec/models/namespace_spec.rb
spec/models/project_spec.rb
@@ -48,14 +48,18 @@ class Admin::GroupsController &lt; AdminController
   def project_update
     project_ids = params[:project_ids]
-    Project.where(id: project_ids).update_all(group_id: @group.id)
+
+    Project.where(id: project_ids).each do |project|
+      project.namespace_id = @group.id
+      project.save
+    end
     redirect_to :back, notice: 'Group was successfully updated.'
   end
   def remove_project
     @project = Project.find(params[:project_id])
-    @project.group_id = nil
+    @project.namespace_id = nil
     @project.save
     redirect_to :back, notice: 'Group was successfully updated.'
@@ -4,7 +4,7 @@ class DashboardController &lt; ApplicationController
   before_filter :event_filter, only: :index
   def index
-    @groups = Group.where(id: current_user.projects.pluck(:group_id))
+    @groups = Group.where(id: current_user.projects.pluck(:namespace_id))
     @projects = current_user.projects_sorted_by_activity
     @projects = @projects.page(params[:page]).per(30)
@@ -54,7 +54,7 @@ class GroupsController &lt; ApplicationController
   end
   def projects
-    @projects ||= current_user.projects_sorted_by_activity.where(group_id: @group.id)
+    @projects ||= current_user.projects_sorted_by_activity.where(namespace_id: @group.id)
   end
   def project_ids
@@ -3,7 +3,7 @@ class IssueObserver &lt; ActiveRecord::Observer
   def after_create(issue)
     if issue.assignee && issue.assignee != current_user
-      Notify.new_issue_email(issue.id).deliver 
+      Notify.new_issue_email(issue.id).deliver
     end
   end
@@ -14,8 +14,8 @@ class IssueObserver &lt; ActiveRecord::Observer
     status = 'closed' if issue.is_being_closed?
     status = 'reopened' if issue.is_being_reopened?
     if status
-      Note.create_status_change_note(issue, current_user, status) 
-      [issue.author, issue.assignee].compact.each do |recipient| 
+      Note.create_status_change_note(issue, current_user, status)
+      [issue.author, issue.assignee].compact.each do |recipient|
         Notify.issue_status_changed_email(recipient.id, issue.id, status, current_user)
       end
     end
 class ProjectObserver < ActiveRecord::Observer
   def after_save(project)
     project.update_repository
+
+    # Move repository if namespace changed
+    if project.namespace_id_changed?
+      move_project(project)
+    end
   end
   def after_destroy(project)
@@ -18,4 +23,19 @@ class ProjectObserver &lt; ActiveRecord::Observer
   def log_info message
     Gitlab::AppLogger.info message
   end
+
+  def move_project(project)
+    old_dir = Namespace.find_by_id(project.namespace_id_was).try(:code) || ''
+    new_dir = Namespace.find_by_id(project.namespace_id).try(:code) || ''
+
+    # 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")
+
+    binding.pry
+    `mv #{old_path} #{new_path}`
+  end
 end
@@ -79,11 +79,15 @@ module Repository
   end
   def url_to_repo
-    git_host.url_to_repo(path)
+    git_host.url_to_repo(path_with_namespace)
   end
   def path_to_repo
-    File.join(Gitlab.config.git_base_path, "#{path}.git")
+    File.join(Gitlab.config.git_base_path, namespace_dir, "#{path}.git")
+  end
+
+  def namespace_dir
+    namespace.try(:code) || ''
   end
   def update_repository
@@ -29,10 +29,14 @@ FactoryGirl.define do
     owner
   end
-  factory :group do
+  factory :namespace do
     sequence(:name) { |n| "group#{n}" }
     code { name.downcase.gsub(/\s/, '_') }
     owner
+
+    factory :group do
+      type 'Group'
+    end
   end
   factory :users_project do
@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe Namespace do
+  let!(:namespace) { create(:namespace) }
+
+  it { should have_many :projects }
+  it { should validate_presence_of :name }
+  it { should validate_uniqueness_of(:name) }
+  it { should validate_presence_of :code }
+  it { should validate_uniqueness_of(:code) }
+  it { should validate_presence_of :owner }
+end
@@ -24,6 +24,7 @@ require &#39;spec_helper&#39;
 describe Project do
   describe "Associations" do
     it { should belong_to(:group) }
+    it { should belong_to(:namespace) }
     it { should belong_to(:owner).class_name('User') }
     it { should have_many(:users) }
     it { should have_many(:events).dependent(:destroy) }
	@@ -4,7 +4,7 @@ class DashboardController < ApplicationController		@@ -4,7 +4,7 @@ class DashboardController < ApplicationController
4	before_filter :event_filter, only: :index	4	before_filter :event_filter, only: :index
5		5
6	def index	6	def index
7	- @groups = Group.where(id: current_user.projects.pluck(:group_id))	7	+ @groups = Group.where(id: current_user.projects.pluck(:namespace_id))
8	@projects = current_user.projects_sorted_by_activity	8	@projects = current_user.projects_sorted_by_activity
9	@projects = @projects.page(params[:page]).per(30)	9	@projects = @projects.page(params[:page]).per(30)
10		10
	@@ -54,7 +54,7 @@ class GroupsController < ApplicationController		@@ -54,7 +54,7 @@ class GroupsController < ApplicationController
54	end	54	end
55		55
56	def projects	56	def projects
57	- @projects \|\|= current_user.projects_sorted_by_activity.where(group_id: @group.id)	57	+ @projects \|\|= current_user.projects_sorted_by_activity.where(namespace_id: @group.id)
58	end	58	end
59		59
60	def project_ids	60	def project_ids
1	class ProjectObserver < ActiveRecord::Observer	1	class ProjectObserver < ActiveRecord::Observer
2	def after_save(project)	2	def after_save(project)
3	project.update_repository	3	project.update_repository
		4	+
		5	+ # Move repository if namespace changed
		6	+ if project.namespace_id_changed?
		7	+ move_project(project)
		8	+ end
4	end	9	end
5		10
6	def after_destroy(project)	11	def after_destroy(project)
	@@ -18,4 +23,19 @@ class ProjectObserver < ActiveRecord::Observer		@@ -18,4 +23,19 @@ class ProjectObserver < ActiveRecord::Observer
18	def log_info message	23	def log_info message
19	Gitlab::AppLogger.info message	24	Gitlab::AppLogger.info message
20	end	25	end
		26	+
		27	+ def move_project(project)
		28	+ old_dir = Namespace.find_by_id(project.namespace_id_was).try(:code) \|\| ''
		29	+ new_dir = Namespace.find_by_id(project.namespace_id).try(:code) \|\| ''
		30	+
		31	+ # Create new dir if missing
		32	+ new_dir_path = File.join(Gitlab.config.git_base_path, new_dir)
		33	+ Dir.mkdir(new_dir_path) unless File.exists?(new_dir_path)
		34	+
		35	+ old_path = File.join(Gitlab.config.git_base_path, old_dir, "#{project.path}.git")
		36	+ new_path = File.join(new_dir_path, "#{project.path}.git")
		37	+
		38	+ binding.pry
		39	+ `mv #{old_path} #{new_path}`
		40	+ end
21	end	41	end
@@ -0,0 +1,12 @@		@@ -0,0 +1,12 @@
	1	+require 'spec_helper'
	2	+
	3	+describe Namespace do
	4	+ let!(:namespace) { create(:namespace) }
	5	+
	6	+ it { should have_many :projects }
	7	+ it { should validate_presence_of :name }
	8	+ it { should validate_uniqueness_of(:name) }
	9	+ it { should validate_presence_of :code }
	10	+ it { should validate_uniqueness_of(:code) }
	11	+ it { should validate_presence_of :owner }
	12	+end