BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
640440c9
Commit
640440c9
authored
May 16, 2017
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Autolink package names in Godeps.json
parent
e780259a
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
119 additions
and
0 deletions
+119
-0
dependency_linker.rb
lib/gitlab/dependency_linker.rb
+1
-0
godeps_json_linker.rb
lib/gitlab/dependency_linker/godeps_json_linker.rb
+26
-0
godeps_json_linker_spec.rb
spec/lib/gitlab/dependency_linker/godeps_json_linker_spec.rb
+84
-0
dependency_linker_spec.rb
spec/lib/gitlab/dependency_linker_spec.rb
+8
-0
No files found.
lib/gitlab/dependency_linker.rb
View file @
640440c9
...
...
@@ -9,6 +9,7 @@ module Gitlab
PodspecLinker
,
PodspecJsonLinker
,
CartfileLinker
,
GodepsJsonLinker
,
].
freeze
def
self
.
linker
(
blob_name
)
...
...
lib/gitlab/dependency_linker/godeps_json_linker.rb
0 → 100644
View file @
640440c9
module
Gitlab
module
DependencyLinker
class
GodepsJsonLinker
<
JsonLinker
NESTED_REPO_REGEX
=
%r{([^/]+/)+[^/]+?}
.
freeze
self
.
file_type
=
:godeps_json
private
def
link_dependencies
link_json
(
'ImportPath'
)
do
|
path
|
case
path
when
%r{
\A
(?<repo>gitlab
\.
com/
#{
NESTED_REPO_REGEX
}
)
\.
git/(?<path>.+)
\z
}
,
%r{
\A
(?<repo>git(lab|hub)
\.
com/
#{
REPO_REGEX
}
)/(?<path>.+)
\z
}
"https://
#{
$~
[
:repo
]
}
/tree/master/
#{
$~
[
:path
]
}
"
when
/\Agolang\.org/
"https://godoc.org/
#{
path
}
"
else
"https://
#{
path
}
"
end
end
end
end
end
end
spec/lib/gitlab/dependency_linker/godeps_json_linker_spec.rb
0 → 100644
View file @
640440c9
require
'rails_helper'
describe
Gitlab
::
DependencyLinker
::
GodepsJsonLinker
,
lib:
true
do
describe
'.support?'
do
it
'supports Godeps.json'
do
expect
(
described_class
.
support?
(
'Godeps.json'
)).
to
be_truthy
end
it
'does not support other files'
do
expect
(
described_class
.
support?
(
'Godeps.json.example'
)).
to
be_falsey
end
end
describe
'#link'
do
let
(
:file_name
)
{
"Godeps.json"
}
let
(
:file_content
)
do
<<-
CONTENT
.
strip_heredoc
{
"ImportPath": "gitlab.com/gitlab-org/gitlab-pages",
"GoVersion": "go1.5",
"Packages": [
"./..."
],
"Deps": [
{
"ImportPath": "github.com/kardianos/osext",
"Rev": "efacde03154693404c65e7aa7d461ac9014acd0c"
},
{
"ImportPath": "github.com/stretchr/testify/assert",
"Rev": "1297dc01ed0a819ff634c89707081a4df43baf6b"
},
{
"ImportPath": "github.com/stretchr/testify/require",
"Rev": "1297dc01ed0a819ff634c89707081a4df43baf6b"
},
{
"ImportPath": "gitlab.com/group/project/path",
"Rev": "1297dc01ed0a819ff634c89707081a4df43baf6b"
},
{
"ImportPath": "gitlab.com/group/subgroup/project.git/path",
"Rev": "1297dc01ed0a819ff634c89707081a4df43baf6b"
},
{
"ImportPath": "golang.org/x/crypto/ssh/terminal",
"Rev": "1351f936d976c60a0a48d728281922cf63eafb8d"
},
{
"ImportPath": "golang.org/x/net/http2",
"Rev": "b4e17d61b15679caf2335da776c614169a1b4643"
}
]
}
CONTENT
end
subject
{
Gitlab
::
Highlight
.
highlight
(
file_name
,
file_content
)
}
def
link
(
name
,
url
)
%{<a href="#{url}" rel="nofollow noreferrer noopener" target="_blank">#{name}</a>}
end
it
'links the package name'
do
expect
(
subject
).
to
include
(
link
(
'gitlab.com/gitlab-org/gitlab-pages'
,
'https://gitlab.com/gitlab-org/gitlab-pages'
))
end
it
'links GitHub repos'
do
expect
(
subject
).
to
include
(
link
(
'github.com/kardianos/osext'
,
'https://github.com/kardianos/osext'
))
expect
(
subject
).
to
include
(
link
(
'github.com/stretchr/testify/assert'
,
'https://github.com/stretchr/testify/tree/master/assert'
))
expect
(
subject
).
to
include
(
link
(
'github.com/stretchr/testify/require'
,
'https://github.com/stretchr/testify/tree/master/require'
))
end
it
'links GitLab projects'
do
expect
(
subject
).
to
include
(
link
(
'gitlab.com/group/project/path'
,
'https://gitlab.com/group/project/tree/master/path'
))
expect
(
subject
).
to
include
(
link
(
'gitlab.com/group/subgroup/project.git/path'
,
'https://gitlab.com/group/subgroup/project/tree/master/path'
))
end
it
'links Golang packages'
do
expect
(
subject
).
to
include
(
link
(
'golang.org/x/net/http2'
,
'https://godoc.org/golang.org/x/net/http2'
))
end
end
end
spec/lib/gitlab/dependency_linker_spec.rb
View file @
640440c9
...
...
@@ -65,5 +65,13 @@ describe Gitlab::DependencyLinker, lib: true do
described_class
.
link
(
blob_name
,
nil
,
nil
)
end
it
'links using GodepsJsonLinker'
do
blob_name
=
'Godeps.json'
expect
(
described_class
::
GodepsJsonLinker
).
to
receive
(
:link
)
described_class
.
link
(
blob_name
,
nil
,
nil
)
end
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment