From 0d19abf450d26fa76a23aaae38d392ecdef4e1e0 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Thu, 2 Jun 2016 13:52:19 +0200
Subject: [PATCH] Add minor improvements in create builds service

---
 app/models/ci/commit.rb                            | 2 +-
 app/services/ci/create_builds_service.rb           | 9 ++-------
 lib/ci/gitlab_ci_yaml_processor.rb                 | 5 ++++-
 spec/services/create_commit_builds_service_spec.rb | 2 +-
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/app/models/ci/commit.rb b/app/models/ci/commit.rb
index c682f3e570..ccd26959ad 100644
--- a/app/models/ci/commit.rb
+++ b/app/models/ci/commit.rb
@@ -135,7 +135,7 @@ module Ci
       @config_processor ||= begin
         Ci::GitlabCiYamlProcessor.new(ci_yaml_file, project.path_with_namespace)
       rescue Ci::GitlabCiYamlProcessor::ValidationError, Psych::SyntaxError => e
-        self.yaml_errors = (e.message)
+        self.yaml_errors = e.message
         nil
       rescue
         self.yaml_errors = 'Undefined error'
diff --git a/app/services/ci/create_builds_service.rb b/app/services/ci/create_builds_service.rb
index 18274ce24e..7fb2ad7e06 100644
--- a/app/services/ci/create_builds_service.rb
+++ b/app/services/ci/create_builds_service.rb
@@ -2,10 +2,11 @@ module Ci
   class CreateBuildsService
     def initialize(commit)
       @commit = commit
+      @config = commit.config_processor
     end
 
     def execute(stage, user, status, trigger_request = nil)
-      builds_attrs = config_processor.builds_for_stage_and_ref(stage, @commit.ref, @commit.tag, trigger_request)
+      builds_attrs = @config.builds_for_stage_and_ref(stage, @commit.ref, @commit.tag, trigger_request)
 
       # check when to create next build
       builds_attrs = builds_attrs.select do |build_attrs|
@@ -41,11 +42,5 @@ module Ci
         end
       end
     end
-
-    private
-
-    def config_processor
-      @config_processor ||= @commit.config_processor
-    end
   end
 end
diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb
index 026a5ac97c..fcc8af1648 100644
--- a/lib/ci/gitlab_ci_yaml_processor.rb
+++ b/lib/ci/gitlab_ci_yaml_processor.rb
@@ -27,7 +27,10 @@ module Ci
     end
 
     def builds_for_stage_and_ref(stage, ref, tag = false, trigger_request = nil)
-      builds.select{|build| build[:stage] == stage && process?(build[:only], build[:except], ref, tag, trigger_request)}
+      builds.select do |build|
+        build[:stage] == stage &&
+          process?(build[:only], build[:except], ref, tag, trigger_request)
+      end
     end
 
     def builds
diff --git a/spec/services/create_commit_builds_service_spec.rb b/spec/services/create_commit_builds_service_spec.rb
index 8c6b602ac8..dc915e9dd7 100644
--- a/spec/services/create_commit_builds_service_spec.rb
+++ b/spec/services/create_commit_builds_service_spec.rb
@@ -183,7 +183,7 @@ describe CreateCommitBuildsService, services: true do
                                  ref: 'refs/heads/master',
                                  before: '00000000',
                                  after: '31das312',
-                                 commits: [{ message: 'some msg'}])
+                                 commits: [{ message: 'some msg'} ])
 
         expect(result).to be false
         expect(Ci::Build.all).to be_empty