From 5623cb9a6eb0075306b1cecfd336c2b5ce997f19 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Thu, 31 Aug 2017 13:50:52 +0200
Subject: Make some methods in CI/CD YAML processor private

---
 lib/ci/gitlab_ci_yaml_processor.rb | 56 ++++++++++++++++++++------------------
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb
index 8dff879018f..5676618f7fd 100644
--- a/lib/ci/gitlab_ci_yaml_processor.rb
+++ b/lib/ci/gitlab_ci_yaml_processor.rb
@@ -20,17 +20,6 @@ module Ci
       raise ValidationError, e.message
     end
 
-    def jobs_for_ref(ref, tag = false, source = nil)
-      @jobs.select do |_, job|
-        process?(job.dig(:only, :refs), job.dig(:except, :refs), ref, tag, source)
-      end
-    end
-
-    def jobs_for_stage_and_ref(stage, ref, tag = false, source = nil)
-      jobs_for_ref(ref, tag, source).select do |_, job|
-        job[:stage] == stage
-      end
-    end
 
     def builds_for_stage_and_ref(stage, ref, tag = false, source = nil)
       jobs_for_stage_and_ref(stage, ref, tag, source).map do |name, _|
@@ -38,22 +27,6 @@ module Ci
       end
     end
 
-    def pipeline_stage_builds(stage, pipeline)
-      builds = builds_for_stage_and_ref(
-        stage, pipeline.ref, pipeline.tag?, pipeline.source)
-
-      builds.select do |build|
-        job = @jobs[build.fetch(:name).to_sym]
-        has_kubernetes = pipeline.has_kubernetes_available?
-        only_kubernetes = job.dig(:only, :kubernetes)
-        except_kubernetes = job.dig(:except, :kubernetes)
-
-        [!only_kubernetes && !except_kubernetes,
-          only_kubernetes && has_kubernetes,
-          except_kubernetes && !has_kubernetes].any?
-      end
-    end
-
     def builds
       @jobs.map do |name, _|
         build_attributes(name)
@@ -110,6 +83,35 @@ module Ci
 
     private
 
+    def pipeline_stage_builds(stage, pipeline)
+      builds = builds_for_stage_and_ref(
+        stage, pipeline.ref, pipeline.tag?, pipeline.source)
+
+      builds.select do |build|
+        job = @jobs[build.fetch(:name).to_sym]
+        has_kubernetes = pipeline.has_kubernetes_available?
+        only_kubernetes = job.dig(:only, :kubernetes)
+        except_kubernetes = job.dig(:except, :kubernetes)
+
+        [!only_kubernetes && !except_kubernetes,
+          only_kubernetes && has_kubernetes,
+          except_kubernetes && !has_kubernetes].any?
+      end
+    end
+
+
+    def jobs_for_ref(ref, tag = false, source = nil)
+      @jobs.select do |_, job|
+        process?(job.dig(:only, :refs), job.dig(:except, :refs), ref, tag, source)
+      end
+    end
+
+    def jobs_for_stage_and_ref(stage, ref, tag = false, source = nil)
+      jobs_for_ref(ref, tag, source).select do |_, job|
+        job[:stage] == stage
+      end
+    end
+
     def initial_parsing
       ##
       # Global config
-- 
cgit v1.2.1