replace Gitolited mixin with Gitlab::ShellAdapter

Dmitriy Zaporozhets
1 parent d6338a84
Showing 9 changed files with 21 additions and 17 deletions Show diff stats
app/models/project.rb
app/models/protected_branch.rb
app/models/users_project.rb
app/observers/key_observer.rb
app/services/project_transfer_service.rb
app/workers/gitlab_shell_worker.rb
config/initializers/5_backend.rb
lib/gitlab/backend/shell_adapter.rb
lib/gitolited.rb
@@ -23,7 +23,7 @@
 require "grit"
  
 class Project < ActiveRecord::Base
-  include Gitolited
+  include Gitlab::ShellAdapter
   extend Enumerize
  
   class TransferError < StandardError; end
@@ -10,7 +10,7 @@
 #
  
 class ProtectedBranch < ActiveRecord::Base
-  include Gitolited
+  include Gitlab::ShellAdapter
  
   attr_accessible :name
  
@@ -11,7 +11,7 @@
 #
  
 class UsersProject < ActiveRecord::Base
-  include Gitolited
+  include Gitlab::ShellAdapter
  
   GUEST     = 10
   REPORTER  = 20
 class KeyObserver < ActiveRecord::Observer
-  include Gitolited
+  include Gitlab::ShellAdapter
  
   def after_save(key)
     GitlabShellWorker.perform_async(
@@ -3,7 +3,7 @@
 # Used for transfer project to another namespace
 #
 class ProjectTransferService
-  include Gitolited
+  include Gitlab::ShellAdapter
  
   attr_accessor :project
  
 class GitlabShellWorker
   include Sidekiq::Worker
-  include Gitolited
+  include Gitlab::ShellAdapter
  
   sidekiq_options queue: :gitlab_shell
  
@@ -3,3 +3,6 @@ require Rails.root.join(&quot;lib&quot;, &quot;gitlab&quot;, &quot;backend&quot;, &quot;grack_auth&quot;)
  
 # GIT over SSH
 require Rails.root.join("lib", "gitlab", "backend", "shell")
+
+# GitLab shell adapter
+require Rails.root.join("lib", "gitlab", "backend", "shell_adapter")
@@ -0,0 +1,12 @@
+# == GitLab Shell mixin
+#
+# Provide a shortcut to Gitlab::Shell instance by gitlab_shell
+#
+module Gitlab
+  module ShellAdapter
+    def gitlab_shell
+      Gitlab::Shell.new
+    end
+  end
+end
+
@@ -1,11 +0,0 @@
-# == Gitolited mixin
-#
-# Provide a shortcut to Gitlab::Shell instance by gitlab_shell
-#
-# Used by Project, UsersProject, etc
-#
-module Gitolited
-  def gitlab_shell
-    Gitlab::Shell.new
-  end
-end
...	...	@@ -23,7 +23,7 @@
23	23	require "grit"
24	24
25	25	class Project < ActiveRecord::Base
26		- include Gitolited
	26	+ include Gitlab::ShellAdapter
27	27	extend Enumerize
28	28
29	29	class TransferError < StandardError; end
...	...
...	...	@@ -10,7 +10,7 @@
10	10	#
11	11
12	12	class ProtectedBranch < ActiveRecord::Base
13		- include Gitolited
	13	+ include Gitlab::ShellAdapter
14	14
15	15	attr_accessible :name
16	16
...	...
...	...	@@ -11,7 +11,7 @@
11	11	#
12	12
13	13	class UsersProject < ActiveRecord::Base
14		- include Gitolited
	14	+ include Gitlab::ShellAdapter
15	15
16	16	GUEST = 10
17	17	REPORTER = 20
...	...
1	1	class KeyObserver < ActiveRecord::Observer
2		- include Gitolited
	2	+ include Gitlab::ShellAdapter
3	3
4	4	def after_save(key)
5	5	GitlabShellWorker.perform_async(
...	...
...	...	@@ -3,7 +3,7 @@
3	3	# Used for transfer project to another namespace
4	4	#
5	5	class ProjectTransferService
6		- include Gitolited
	6	+ include Gitlab::ShellAdapter
7	7
8	8	attr_accessor :project
9	9
...	...
1	1	class GitlabShellWorker
2	2	include Sidekiq::Worker
3		- include Gitolited
	3	+ include Gitlab::ShellAdapter
4	4
5	5	sidekiq_options queue: :gitlab_shell
6	6
...	...
...	...	@@ -3,3 +3,6 @@ require Rails.root.join("lib", "gitlab", "backend", "grack_auth")
3	3
4	4	# GIT over SSH
5	5	require Rails.root.join("lib", "gitlab", "backend", "shell")
	6	+
	7	+# GitLab shell adapter
	8	+require Rails.root.join("lib", "gitlab", "backend", "shell_adapter")
...	...
...	...	@@ -0,0 +1,12 @@
	1	+# == GitLab Shell mixin
	2	+#
	3	+# Provide a shortcut to Gitlab::Shell instance by gitlab_shell
	4	+#
	5	+module Gitlab
	6	+ module ShellAdapter
	7	+ def gitlab_shell
	8	+ Gitlab::Shell.new
	9	+ end
	10	+ end
	11	+end
	12	+
...	...
...	...	@@ -1,11 +0,0 @@
1		-# == Gitolited mixin
2		-#
3		-# Provide a shortcut to Gitlab::Shell instance by gitlab_shell
4		-#
5		-# Used by Project, UsersProject, etc
6		-#
7		-module Gitolited
8		- def gitlab_shell
9		- Gitlab::Shell.new
10		- end
11		-end