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
63bd1f92
Commit
63bd1f92
authored
Apr 18, 2016
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix rubocop complains
parent
c764b57f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
35 additions
and
29 deletions
+35
-29
gitlab_ci_yaml_processor.rb
lib/ci/gitlab_ci_yaml_processor.rb
+33
-27
gitlab_ci_yaml_processor_spec.rb
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
+2
-2
No files found.
lib/ci/gitlab_ci_yaml_processor.rb
View file @
63bd1f92
...
@@ -100,6 +100,29 @@ module Ci
...
@@ -100,6 +100,29 @@ module Ci
end
end
def
validate!
def
validate!
validate_global!
@jobs
.
each
do
|
name
,
job
|
validate_job!
(
name
,
job
)
end
true
end
def
validate_job!
(
name
,
job
)
validate_job_name!
(
name
)
validate_job_keys!
(
name
,
job
)
validate_job_types!
(
name
,
job
)
validate_job_stage!
(
name
,
job
)
if
job
[
:stage
]
validate_job_cache!
(
name
,
job
)
if
job
[
:cache
]
validate_job_artifacts!
(
name
,
job
)
if
job
[
:artifacts
]
validate_job_dependencies!
(
name
,
job
)
if
job
[
:dependencies
]
end
private
def
validate_global!
unless
validate_array_of_strings
(
@before_script
)
unless
validate_array_of_strings
(
@before_script
)
raise
ValidationError
,
"before_script should be an array of strings"
raise
ValidationError
,
"before_script should be an array of strings"
end
end
...
@@ -124,40 +147,23 @@ module Ci
...
@@ -124,40 +147,23 @@ module Ci
raise
ValidationError
,
"variables should be a map of key-valued strings"
raise
ValidationError
,
"variables should be a map of key-valued strings"
end
end
if
@cache
validate_global_cache!
if
@cache
if
@cache
[
:key
]
&&
!
validate_string
(
@cache
[
:key
])
end
raise
ValidationError
,
"cache:key parameter should be a string"
end
if
@cache
[
:untracked
]
&&
!
validate_boolean
(
@cache
[
:untracked
])
raise
ValidationError
,
"cache:untracked parameter should be an boolean"
end
if
@cache
[
:paths
]
&&
!
validate_array_of_strings
(
@cache
[
:paths
])
def
validate_global_cache!
raise
ValidationError
,
"cache:paths parameter should be an array of strings"
if
@cache
[
:key
]
&&
!
validate_string
(
@cache
[
:key
])
end
raise
ValidationError
,
"cache:key parameter should be a string"
end
end
@jobs
.
each
do
|
name
,
job
|
if
@cache
[
:untracked
]
&&
!
validate_boolean
(
@cache
[
:untracked
])
validate_job!
(
name
,
job
)
raise
ValidationError
,
"cache:untracked parameter should be an boolean"
end
end
true
if
@cache
[
:paths
]
&&
!
validate_array_of_strings
(
@cache
[
:paths
])
end
raise
ValidationError
,
"cache:paths parameter should be an array of strings"
end
def
validate_job!
(
name
,
job
)
validate_job_name!
(
name
)
validate_job_keys!
(
name
,
job
)
validate_job_types!
(
name
,
job
)
validate_job_stage!
(
name
,
job
)
if
job
[
:stage
]
validate_job_cache!
(
name
,
job
)
if
job
[
:cache
]
validate_job_artifacts!
(
name
,
job
)
if
job
[
:artifacts
]
validate_job_dependencies!
(
name
,
job
)
if
job
[
:dependencies
]
end
end
private
def
validate_job_name!
(
name
)
def
validate_job_name!
(
name
)
if
name
.
blank?
||
!
validate_string
(
name
)
if
name
.
blank?
||
!
validate_string
(
name
)
raise
ValidationError
,
"job name should be non-empty string"
raise
ValidationError
,
"job name should be non-empty string"
...
...
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
View file @
63bd1f92
...
@@ -295,12 +295,12 @@ module Ci
...
@@ -295,12 +295,12 @@ module Ci
describe
"after_script"
do
describe
"after_script"
do
context
"in global context"
do
context
"in global context"
do
let
(
:config
)
{
let
(
:config
)
do
{
{
after_script:
[
"after_script"
],
after_script:
[
"after_script"
],
test:
{
script:
[
"script"
]
}
test:
{
script:
[
"script"
]
}
}
}
}
end
it
"return after_script in options"
do
it
"return after_script in options"
do
expect
(
subject
[
:options
][
:after_script
]).
to
eq
([
"after_script"
])
expect
(
subject
[
:options
][
:after_script
]).
to
eq
([
"after_script"
])
...
...
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