Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
932d3251
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
932d3251
编写于
8月 24, 2017
作者:
L
Lin Jen-Shin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Move to Projects::HousecleaningService
上级
5c31c720
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
47 addition
and
49 deletion
+47
-49
app/models/project.rb
app/models/project.rb
+1
-1
app/services/projects/housecleaning_service.rb
app/services/projects/housecleaning_service.rb
+40
-0
app/services/projects/import_export/cleanup_service.rb
app/services/projects/import_export/cleanup_service.rb
+0
-42
spec/models/project_spec.rb
spec/models/project_spec.rb
+5
-5
spec/services/projects/housecleaning_service_spec.rb
spec/services/projects/housecleaning_service_spec.rb
+1
-1
未找到文件。
app/models/project.rb
浏览文件 @
932d3251
...
...
@@ -372,7 +372,7 @@ class Project < ActiveRecord::Base
if
Gitlab
::
ImportSources
.
importer_names
.
include?
(
project
.
import_type
)
&&
project
.
repo_exists?
project
.
run_after_commit
do
begin
Projects
::
ImportExport
::
Cleanup
Service
.
new
(
project
).
execute
Projects
::
Housecleaning
Service
.
new
(
project
).
execute
rescue
Projects
::
HousekeepingService
::
LeaseTaken
=>
e
Rails
.
logger
.
info
(
"Could not perform housekeeping for project
#{
project
.
full_path
}
(
#{
project
.
id
}
):
#{
e
}
"
)
end
...
...
app/services/projects/housecleaning_service.rb
0 → 100644
浏览文件 @
932d3251
module
Projects
class
HousecleaningService
def
self
.
reserved_refs_names
%w[heads tags merge-requests keep-around environments]
end
def
self
.
reserved_refs_regexp
names
=
reserved_refs_names
.
map
(
&
Regexp
.
method
(
:escape
)).
join
(
'|'
)
%r{
\A
refs/(?:
#{
names
}
)/}
end
def
initialize
(
project
)
@project
=
project
end
# This could raise Projects::HousekeepingService::LeaseTaken
def
execute
Projects
::
HousekeepingService
.
new
(
@project
).
execute
do
garbage_refs
.
each
(
&
rugged
.
references
.
method
(
:delete
))
end
end
private
def
garbage_refs
@garbage_refs
||=
begin
reserved_refs_regexp
=
self
.
class
.
reserved_refs_regexp
rugged
.
references
.
reject
do
|
ref
|
ref
.
name
=~
reserved_refs_regexp
end
end
end
def
rugged
@rugged
||=
@project
.
repository
.
rugged
end
end
end
app/services/projects/import_export/cleanup_service.rb
已删除
100644 → 0
浏览文件 @
5c31c720
module
Projects
module
ImportExport
class
CleanupService
def
self
.
reserved_refs_names
%w[heads tags merge-requests keep-around environments]
end
def
self
.
reserved_refs_regexp
names
=
reserved_refs_names
.
map
(
&
Regexp
.
method
(
:escape
)).
join
(
'|'
)
%r{
\A
refs/(?:
#{
names
}
)/}
end
def
initialize
(
project
)
@project
=
project
end
# This could raise Projects::HousekeepingService::LeaseTaken
def
execute
Projects
::
HousekeepingService
.
new
(
@project
).
execute
do
garbage_refs
.
each
(
&
rugged
.
references
.
method
(
:delete
))
end
end
private
def
garbage_refs
@garbage_refs
||=
begin
reserved_refs_regexp
=
self
.
class
.
reserved_refs_regexp
rugged
.
references
.
reject
do
|
ref
|
ref
.
name
=~
reserved_refs_regexp
end
end
end
def
rugged
@rugged
||=
@project
.
repository
.
rugged
end
end
end
end
spec/models/project_spec.rb
浏览文件 @
932d3251
...
...
@@ -1563,14 +1563,14 @@ describe Project do
describe
'project import state transitions'
do
context
'state transition: [:started] => [:finished]'
do
let
(
:
cleanup_service
)
{
spy
(
:cleanup
_service
)
}
let
(
:
housecleaning_service
)
{
spy
(
:housecleaning
_service
)
}
let
(
:housekeeping_service
)
{
spy
(
:housekeeping_service
)
}
before
do
allow
(
Projects
::
ImportExport
::
Cleanup
Service
)
.
to
receive
(
:new
)
{
cleanup
_service
}
allow
(
Projects
::
Housecleaning
Service
)
.
to
receive
(
:new
)
{
housecleaning
_service
}
allow
(
cleanup
_service
)
allow
(
housecleaning
_service
)
.
to
receive
(
:execute
)
{
housekeeping_service
.
execute
}
allow
(
Projects
::
HousekeepingService
)
...
...
@@ -1589,7 +1589,7 @@ describe Project do
project
.
import_finish
expect
(
cleanup
_service
).
to
have_received
(
:execute
)
expect
(
housecleaning
_service
).
to
have_received
(
:execute
)
expect
(
housekeeping_service
).
to
have_received
(
:execute
)
end
...
...
spec/services/projects/
import_export/cleanup
_service_spec.rb
→
spec/services/projects/
housecleaning
_service_spec.rb
浏览文件 @
932d3251
require
'spec_helper'
describe
Projects
::
ImportExport
::
Cleanup
Service
do
describe
Projects
::
Housecleaning
Service
do
subject
{
described_class
.
new
(
project
)
}
let
(
:project
)
{
create
(
:project
,
:repository
)
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录