From f067202e9b7a4304ffb8d68408880f7eb7fc8b34 Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Thu, 7 Jul 2016 15:06:05 +0200 Subject: [PATCH] Improve creating CI config entries for jobs config --- lib/gitlab/ci/config/node/jobs.rb | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/gitlab/ci/config/node/jobs.rb b/lib/gitlab/ci/config/node/jobs.rb index d7d61ade36d..cba1fce4a4c 100644 --- a/lib/gitlab/ci/config/node/jobs.rb +++ b/lib/gitlab/ci/config/node/jobs.rb @@ -29,14 +29,18 @@ module Gitlab private - def create_node(key, value) - job_node = key.to_s.start_with?('.') ? Node::HiddenJob : Node::Job + def create_node(name, config) + job_node(name).new(config, job_attributes(name)) + end - job_attributes = { key: key, - parent: self, - description: "#{key} job definition." } + def job_node(name) + name.to_s.start_with?('.') ? Node::HiddenJob : Node::Job + end - job_node.new(value, attributes.merge(job_attributes)) + def job_attributes(name) + @attributes.merge(key: name, + parent: self, + description: "#{name} job definition.") end end end