Merge branch '5836-move-lib-ci-into-gitlab-namespace' into 'master'

app/controllers/ci/lints_controller.rb

@@ -7,11 +7,11 @@ module Ci
 
     def create
       @content = params[:content]
-      @error = Ci::GitlabCiYamlProcessor.validation_message(@content)
+      @error = Gitlab::Ci::YamlProcessor.validation_message(@content)
       @status = @error.blank?
 
       if @error.blank?
-        @config_processor = Ci::GitlabCiYamlProcessor.new(@content)
+        @config_processor = Gitlab::Ci::YamlProcessor.new(@content)
         @stages = @config_processor.stages
         @builds = @config_processor.builds
         @jobs = @config_processor.jobs

app/controllers/projects/pipelines_controller.rb

@@ -132,10 +132,10 @@ class Projects::PipelinesController < Projects::ApplicationController
 
   def charts
     @charts = {}
-    @charts[:week] = Ci::Charts::WeekChart.new(project)
-    @charts[:month] = Ci::Charts::MonthChart.new(project)
-    @charts[:year] = Ci::Charts::YearChart.new(project)
-    @charts[:pipeline_times] = Ci::Charts::PipelineTime.new(project)
+    @charts[:week] = Gitlab::Ci::Charts::WeekChart.new(project)
+    @charts[:month] = Gitlab::Ci::Charts::MonthChart.new(project)
+    @charts[:year] = Gitlab::Ci::Charts::YearChart.new(project)
+    @charts[:pipeline_times] = Gitlab::Ci::Charts::PipelineTime.new(project)
 
     @counts = {}
     @counts[:total] = @project.pipelines.count(:all)

app/models/blob_viewer/gitlab_ci_yml.rb

@@ -13,7 +13,7 @@ module BlobViewer
 
       prepare!
 
-      @validation_message = Ci::GitlabCiYamlProcessor.validation_message(blob.data)
+      @validation_message = Gitlab::Ci::YamlProcessor.validation_message(blob.data)
     end
 
     def valid?

app/models/ci/build.rb

@@ -446,8 +446,8 @@ module Ci
       return unless trace
 
       trace = trace.dup
-      Ci::MaskSecret.mask!(trace, project.runners_token) if project
-      Ci::MaskSecret.mask!(trace, token)
+      Gitlab::Ci::MaskSecret.mask!(trace, project.runners_token) if project
+      Gitlab::Ci::MaskSecret.mask!(trace, token)
       trace
     end
 

app/models/ci/group_variable.rb

 module Ci
   class GroupVariable < ActiveRecord::Base
-    extend Ci::Model
+    extend Gitlab::Ci::Model
     include HasVariable
     include Presentable
 

app/models/ci/pipeline.rb

 module Ci
   class Pipeline < ActiveRecord::Base
-    extend Ci::Model
+    extend Gitlab::Ci::Model
     include HasStatus
     include Importable
     include AfterCommitQueue
@@ -336,8 +336,8 @@ module Ci
       return @config_processor if defined?(@config_processor)
 
       @config_processor ||= begin
-        Ci::GitlabCiYamlProcessor.new(ci_yaml_file, project.full_path)
-      rescue Ci::GitlabCiYamlProcessor::ValidationError, Psych::SyntaxError => e
+        Gitlab::Ci::YamlProcessor.new(ci_yaml_file, project.full_path)
+      rescue Gitlab::Ci::YamlProcessor::ValidationError, Psych::SyntaxError => e
         self.yaml_errors = e.message
         nil
       rescue

app/models/ci/pipeline_schedule.rb

 module Ci
   class PipelineSchedule < ActiveRecord::Base
-    extend Ci::Model
+    extend Gitlab::Ci::Model
     include Importable
 
     acts_as_paranoid

app/models/ci/pipeline_schedule_variable.rb

 module Ci
   class PipelineScheduleVariable < ActiveRecord::Base
-    extend Ci::Model
+    extend Gitlab::Ci::Model
     include HasVariable
 
     belongs_to :pipeline_schedule

app/models/ci/pipeline_variable.rb

 module Ci
   class PipelineVariable < ActiveRecord::Base
-    extend Ci::Model
+    extend Gitlab::Ci::Model
     include HasVariable
 
     belongs_to :pipeline

app/models/ci/runner.rb

 module Ci
   class Runner < ActiveRecord::Base
-    extend Ci::Model
+    extend Gitlab::Ci::Model
 
     RUNNER_QUEUE_EXPIRY_TIME = 60.minutes
     ONLINE_CONTACT_TIMEOUT = 1.hour

app/models/ci/runner_project.rb

 module Ci
   class RunnerProject < ActiveRecord::Base
-    extend Ci::Model
+    extend Gitlab::Ci::Model
 
     belongs_to :runner
     belongs_to :project

app/models/ci/stage.rb

 module Ci
   class Stage < ActiveRecord::Base
-    extend Ci::Model
+    extend Gitlab::Ci::Model
     include Importable
     include HasStatus
     include Gitlab::OptimisticLocking

app/models/ci/trigger.rb

 module Ci
   class Trigger < ActiveRecord::Base
-    extend Ci::Model
+    extend Gitlab::Ci::Model
 
     acts_as_paranoid
 

app/models/ci/trigger_request.rb

 module Ci
   class TriggerRequest < ActiveRecord::Base
-    extend Ci::Model
+    extend Gitlab::Ci::Model
 
     belongs_to :trigger
     belongs_to :pipeline, foreign_key: :commit_id

app/models/ci/variable.rb

 module Ci
   class Variable < ActiveRecord::Base
-    extend Ci::Model
+    extend Gitlab::Ci::Model
     include HasVariable
     include Presentable
 

changelogs/unreleased/5836-move-lib-ci-into-gitlab-namespace.yml

+---
+title: Move `lib/ci` to `lib/gitlab/ci`
+merge_request: 14078
+author: Maxim Rydkin
+type: other

lib/api/lint.rb

@@ -6,7 +6,7 @@ module API
         requires :content, type: String, desc: 'Content of .gitlab-ci.yml'
       end
       post '/lint' do
-        error = Ci::GitlabCiYamlProcessor.validation_message(params[:content])
+        error = Gitlab::Ci::YamlProcessor.validation_message(params[:content])
 
         status 200
 

lib/ci/charts.rb → lib/gitlab/ci/charts.rb

-module Ci
-  module Charts
-    module DailyInterval
-      def grouped_count(query)
-        query
-          .group("DATE(#{Ci::Pipeline.table_name}.created_at)")
-          .count(:created_at)
-          .transform_keys { |date| date.strftime(@format) }
-      end
-
-      def interval_step
-        @interval_step ||= 1.day
-      end
-    end
-
-    module MonthlyInterval
-      def grouped_count(query)
-        if Gitlab::Database.postgresql?
+module Gitlab
+  module Ci
+    module Charts
+      module DailyInterval
+        def grouped_count(query)
           query
-            .group("to_char(#{Ci::Pipeline.table_name}.created_at, '01 Month YYYY')")
-            .count(:created_at)
-            .transform_keys(&:squish)
-        else
-          query
-            .group("DATE_FORMAT(#{Ci::Pipeline.table_name}.created_at, '01 %M %Y')")
+            .group("DATE(#{::Ci::Pipeline.table_name}.created_at)")
             .count(:created_at)
+            .transform_keys { |date| date.strftime(@format) }
+        end
+
+        def interval_step
+          @interval_step ||= 1.day
         end
       end
 
-      def interval_step
-        @interval_step ||= 1.month
+      module MonthlyInterval
+        def grouped_count(query)
+          if Gitlab::Database.postgresql?
+            query
+              .group("to_char(#{::Ci::Pipeline.table_name}.created_at, '01 Month YYYY')")
+              .count(:created_at)
+              .transform_keys(&:squish)
+          else
+            query
+              .group("DATE_FORMAT(#{::Ci::Pipeline.table_name}.created_at, '01 %M %Y')")
+              .count(:created_at)
+          end
+        end
+
+        def interval_step
+          @interval_step ||= 1.month
+        end
       end
-    end
 
-    class Chart
-      attr_reader :labels, :total, :success, :project, :pipeline_times
+      class Chart
+        attr_reader :labels, :total, :success, :project, :pipeline_times
 
-      def initialize(project)
-        @labels = []
-        @total = []
-        @success = []
-        @pipeline_times = []
-        @project = project
+        def initialize(project)
+          @labels = []
+          @total = []
+          @success = []
+          @pipeline_times = []
+          @project = project
 
-        collect
-      end
+          collect
+        end
 
-      def collect
-        query = project.pipelines
-          .where("? > #{Ci::Pipeline.table_name}.created_at AND #{Ci::Pipeline.table_name}.created_at > ?", @to, @from) # rubocop:disable GitlabSecurity/SqlInjection
+        def collect
+          query = project.pipelines
+            .where("? > #{::Ci::Pipeline.table_name}.created_at AND #{::Ci::Pipeline.table_name}.created_at > ?", @to, @from) # rubocop:disable GitlabSecurity/SqlInjection
 
-        totals_count  = grouped_count(query)
-        success_count = grouped_count(query.success)
+          totals_count  = grouped_count(query)
+          success_count = grouped_count(query.success)
 
-        current = @from
-        while current < @to
-          label = current.strftime(@format)
+          current = @from
+          while current < @to
+            label = current.strftime(@format)
 
-          @labels  << label
-          @total   << (totals_count[label] || 0)
-          @success << (success_count[label] || 0)
+            @labels  << label
+            @total   << (totals_count[label] || 0)
+            @success << (success_count[label] || 0)
 
-          current += interval_step
+            current += interval_step
+          end
         end
       end
-    end
 
-    class YearChart < Chart
-      include MonthlyInterval
+      class YearChart < Chart
+        include MonthlyInterval
 
-      def initialize(*)
-        @to     = Date.today.end_of_month
-        @from   = @to.years_ago(1).beginning_of_month
-        @format = '%d %B %Y'
+        def initialize(*)
+          @to     = Date.today.end_of_month
+          @from   = @to.years_ago(1).beginning_of_month
+          @format = '%d %B %Y'
 
-        super
+          super
+        end
       end
-    end
 
-    class MonthChart < Chart
-      include DailyInterval
+      class MonthChart < Chart
+        include DailyInterval
 
-      def initialize(*)
-        @to     = Date.today
-        @from   = @to - 30.days
-        @format = '%d %B'
+        def initialize(*)
+          @to     = Date.today
+          @from   = @to - 30.days
+          @format = '%d %B'
 
-        super
+          super
+        end
       end
-    end
 
-    class WeekChart < Chart
-      include DailyInterval
+      class WeekChart < Chart
+        include DailyInterval
 
-      def initialize(*)
-        @to     = Date.today
-        @from   = @to - 7.days
-        @format = '%d %B'
+        def initialize(*)
+          @to     = Date.today
+          @from   = @to - 7.days
+          @format = '%d %B'
 
-        super
+          super
+        end
       end
-    end
 
-    class PipelineTime < Chart
-      def collect
-        commits = project.pipelines.last(30)
+      class PipelineTime < Chart
+        def collect
+          commits = project.pipelines.last(30)
 
-        commits.each do |commit|
-          @labels << commit.short_sha
-          duration = commit.duration || 0
-          @pipeline_times << (duration / 60)
+          commits.each do |commit|
+            @labels << commit.short_sha
+            duration = commit.duration || 0
+            @pipeline_times << (duration / 60)
+          end
         end
       end
     end

lib/ci/mask_secret.rb → lib/gitlab/ci/mask_secret.rb

-module Ci::MaskSecret
-  class << self
-    def mask!(value, token)
-      return value unless value.present? && token.present?
+module Gitlab
+  module Ci::MaskSecret
+    class << self
+      def mask!(value, token)
+        return value unless value.present? && token.present?
 
-      value.gsub!(token, 'x' * token.length)
-      value
+        value.gsub!(token, 'x' * token.length)
+        value
+      end
     end
   end
 end

lib/ci/model.rb → lib/gitlab/ci/model.rb

-module Ci
-  module Model
-    def table_name_prefix
-      "ci_"
-    end
+module Gitlab
+  module Ci
+    module Model
+      def table_name_prefix
+        "ci_"
+      end
 
-    def model_name
-      @model_name ||= ActiveModel::Name.new(self, nil, self.name.split("::").last)
+      def model_name
+        @model_name ||= ActiveModel::Name.new(self, nil, self.name.split("::").last)
+      end
     end
   end
 end

lib/gitlab/ci/trace/stream.rb

@@ -56,13 +56,13 @@ module Gitlab
         end
 
         def html_with_state(state = nil)
-          ::Ci::Ansi2html.convert(stream, state)
+          ::Gitlab::Ci::Ansi2html.convert(stream, state)
         end
 
         def html(last_lines: nil)
           text = raw(last_lines: last_lines)
           buffer = StringIO.new(text)
-          ::Ci::Ansi2html.convert(buffer).html
+          ::Gitlab::Ci::Ansi2html.convert(buffer).html
         end
 
         def extract_coverage(regex)

spec/lib/ci/ansi2html_spec.rb → spec/lib/gitlab/ci/ansi2html_spec.rb

 require 'spec_helper'
 
-describe Ci::Ansi2html do
+describe Gitlab::Ci::Ansi2html do
   subject { described_class }
 
   it "prints non-ansi as-is" do

spec/lib/ci/charts_spec.rb → spec/lib/gitlab/ci/charts_spec.rb

 require 'spec_helper'
 
-describe Ci::Charts do
+describe Gitlab::Ci::Charts do
   context "pipeline_times" do
     let(:project) { create(:project) }
-    let(:chart) { Ci::Charts::PipelineTime.new(project) }
+    let(:chart) { Gitlab::Ci::Charts::PipelineTime.new(project) }
 
     subject { chart.pipeline_times }
 

spec/lib/ci/mask_secret_spec.rb → spec/lib/gitlab/ci/mask_secret_spec.rb

 require 'spec_helper'
 
-describe Ci::MaskSecret do
+describe Gitlab::Ci::MaskSecret do
   subject { described_class }
 
   describe '#mask' do

spec/lib/gitlab/import_export/project_tree_saver_spec.rb

@@ -119,7 +119,7 @@ describe Gitlab::ImportExport::ProjectTreeSaver do
 
       it 'has no when YML attributes but only the DB column' do
         allow_any_instance_of(Ci::Pipeline).to receive(:ci_yaml_file).and_return(File.read(Rails.root.join('spec/support/gitlab_stubs/gitlab_ci.yml')))
-        expect_any_instance_of(Ci::GitlabCiYamlProcessor).not_to receive(:build_attributes)
+        expect_any_instance_of(Gitlab::Ci::YamlProcessor).not_to receive(:build_attributes)
 
         saved_project_json
       end

spec/views/ci/lints/show.html.haml_spec.rb

@@ -4,7 +4,7 @@ describe 'ci/lints/show' do
   include Devise::Test::ControllerHelpers
 
   describe 'XSS protection' do
-    let(:config_processor) { Ci::GitlabCiYamlProcessor.new(YAML.dump(content)) }
+    let(:config_processor) { Gitlab::Ci::YamlProcessor.new(YAML.dump(content)) }
     before do
       assign(:status, true)
       assign(:builds, config_processor.builds)
@@ -59,7 +59,7 @@ describe 'ci/lints/show' do
     }
   end
 
-  let(:config_processor) { Ci::GitlabCiYamlProcessor.new(YAML.dump(content)) }
+  let(:config_processor) { Gitlab::Ci::YamlProcessor.new(YAML.dump(content)) }
 
   context 'when the content is valid' do
     before do