move `lib/ci/charts.rb` into `lib/gitlab/ci/charts.rb`

4 files changed, 124 insertions, 122 deletions

diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb
index a3bfbf0694e..7ad7b3003af 100644
--- a/app/controllers/projects/pipelines_controller.rb
+++ b/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)
diff --git a/lib/ci/charts.rb b/lib/ci/charts.rb
deleted file mode 100644
index 76a69bf8a83..00000000000
--- a/lib/ci/charts.rb
+++ /dev/null
@@ -1,116 +0,0 @@
-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?
-          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
-
-    class Chart
-      attr_reader :labels, :total, :success, :project, :pipeline_times
-
-      def initialize(project)
-        @labels = []
-        @total = []
-        @success = []
-        @pipeline_times = []
-        @project = project
-
-        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
-
-        totals_count  = grouped_count(query)
-        success_count = grouped_count(query.success)
-
-        current = @from
-        while current < @to
-          label = current.strftime(@format)
-
-          @labels  << label
-          @total   << (totals_count[label] || 0)
-          @success << (success_count[label] || 0)
-
-          current += interval_step
-        end
-      end
-    end
-
-    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'
-
-        super
-      end
-    end
-
-    class MonthChart < Chart
-      include DailyInterval
-
-      def initialize(*)
-        @to     = Date.today
-        @from   = @to - 30.days
-        @format = '%d %B'
-
-        super
-      end
-    end
-
-    class WeekChart < Chart
-      include DailyInterval
-
-      def initialize(*)
-        @to     = Date.today
-        @from   = @to - 7.days
-        @format = '%d %B'
-
-        super
-      end
-    end
-
-    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)
-        end
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/ci/charts.rb b/lib/gitlab/ci/charts.rb
new file mode 100644
index 00000000000..ac4bd5d6684
--- /dev/null
+++ b/lib/gitlab/ci/charts.rb
@@ -0,0 +1,118 @@
+module Gitlab
+  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?
+            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
+
+      class Chart
+        attr_reader :labels, :total, :success, :project, :pipeline_times
+
+        def initialize(project)
+          @labels = []
+          @total = []
+          @success = []
+          @pipeline_times = []
+          @project = project
+
+          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
+
+          totals_count  = grouped_count(query)
+          success_count = grouped_count(query.success)
+
+          current = @from
+          while current < @to
+            label = current.strftime(@format)
+
+            @labels  << label
+            @total   << (totals_count[label] || 0)
+            @success << (success_count[label] || 0)
+
+            current += interval_step
+          end
+        end
+      end
+
+      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'
+
+          super
+        end
+      end
+
+      class MonthChart < Chart
+        include DailyInterval
+
+        def initialize(*)
+          @to     = Date.today
+          @from   = @to - 30.days
+          @format = '%d %B'
+
+          super
+        end
+      end
+
+      class WeekChart < Chart
+        include DailyInterval
+
+        def initialize(*)
+          @to     = Date.today
+          @from   = @to - 7.days
+          @format = '%d %B'
+
+          super
+        end
+      end
+
+      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)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/spec/lib/ci/charts_spec.rb b/spec/lib/gitlab/ci/charts_spec.rb
index f0769deef21..f8188675013 100644
--- a/spec/lib/ci/charts_spec.rb
+++ b/spec/lib/gitlab/ci/charts_spec.rb
@@ -1,9 +1,9 @@
 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 }