Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
ecdcf04e
Commit
ecdcf04e
authored
Jul 07, 2016
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add undefined CI node strategies to handle defaults
parent
de8b93bb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
35 additions
and
16 deletions
+35
-16
lib/gitlab/ci/config/node/undefined.rb
lib/gitlab/ci/config/node/undefined.rb
+35
-16
No files found.
lib/gitlab/ci/config/node/undefined.rb
View file @
ecdcf04e
...
@@ -13,38 +13,57 @@ module Gitlab
...
@@ -13,38 +13,57 @@ module Gitlab
class
Undefined
<
Entry
class
Undefined
<
Entry
include
Validatable
include
Validatable
delegate
:valid?
,
:errors
,
:value
,
to: :@strategy
validations
do
validations
do
validates
:config
,
type:
Class
validates
:config
,
type:
Class
end
end
def
initialize
(
node
)
def
initialize
(
node
)
super
super
@strategy
=
create_strategy
(
node
,
node
.
default
)
unless
node
.
default
.
nil?
@default
=
fabricate_default
(
node
)
end
end
end
def
value
def
defined?
@default
.
value
if
@default
false
end
end
def
valid?
private
@default
?
@default
.
valid?
:
true
end
def
create_strategy
(
node
,
default
)
if
default
.
nil?
Undefined
::
NullStrategy
.
new
else
entry
=
Node
::
Factory
.
fabricate
(
node
,
default
,
attributes
)
def
errors
Undefined
::
DefaultStrategy
.
new
(
entry
)
@default
?
@default
.
errors
:
[]
end
end
end
def
defined?
class
DefaultStrategy
false
delegate
:valid?
,
:errors
,
:value
,
to: :@default
def
initialize
(
entry
)
@default
=
entry
end
end
end
private
class
NullStrategy
def
initialize
(
*
)
end
def
fabricate_default
(
node
)
def
value
Node
::
Factory
.
fabricate
(
node
,
node
.
default
,
attributes
)
nil
end
def
valid?
true
end
def
errors
[]
end
end
end
end
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