Merge branch 'es_refactor' into 'master'

ES: Refactoring

Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/516

See merge request !365

app/services/git_push_service.rb

@@ -94,7 +94,7 @@ class GitPushService < BaseService
   end
 
   def index_commits_blobs
-    indexer = Elastic::Indexer.new
+    indexer = Gitlab::Elastic::Indexer.new
     indexer.run(
       @project.id,
       project.repository.path_to_repo,

lib/elastic/indexer.rb

-module Elastic
-  class Indexer
-    Error = Class.new(StandardError)
-
-    def initialize
-      connection_info = {
-        host: Gitlab.config.elasticsearch.host,
-        port: Gitlab.config.elasticsearch.port
-      }.to_json
-
-      # We accept any form of settings, including string and array
-      # This is why JSON is needed
-      @vars = {
-        'ELASTIC_CONNECTION_INFO' => connection_info,
-        'RAILS_ENV'               => Rails.env
-      }
-    end
-
-    def run(project_id, repo_path, from_sha = nil, to_sha = nil)
-      to_sha = nil if to_sha == Gitlab::Git::BLANK_SHA
-
-      vars = @vars.merge({ 'FROM_SHA' => from_sha, 'TO_SHA' => to_sha })
-
-      path_to_indexer = File.join(Rails.root, 'bin/elastic_repo_indexer')
-
-      command = [path_to_indexer, project_id.to_s, repo_path]
-
-      output, status = Gitlab::Popen.popen(command, nil, vars)
-
-      raise Error, output unless status.zero?
-
-      true
-    end
-  end
-end

lib/gitlab/elastic/indexer.rb

+module Gitlab
+  module Elastic
+    class Indexer
+      Error = Class.new(StandardError)
+
+      def initialize
+        connection_info = {
+          host: Gitlab.config.elasticsearch.host,
+          port: Gitlab.config.elasticsearch.port
+        }.to_json
+
+        # We accept any form of settings, including string and array
+        # This is why JSON is needed
+        @vars = {
+          'ELASTIC_CONNECTION_INFO' => connection_info,
+          'RAILS_ENV'               => Rails.env
+        }
+      end
+
+      def run(project_id, repo_path, from_sha = nil, to_sha = nil)
+        to_sha = nil if to_sha == Gitlab::Git::BLANK_SHA
+
+        vars = @vars.merge({ 'FROM_SHA' => from_sha, 'TO_SHA' => to_sha })
+
+        path_to_indexer = File.join(Rails.root, 'bin/elastic_repo_indexer')
+
+        command = [path_to_indexer, project_id.to_s, repo_path]
+
+        output, status = Gitlab::Popen.popen(command, nil, vars)
+
+        raise Error, output unless status.zero?
+
+        true
+      end
+    end
+  end
+end

lib/tasks/gitlab/elastic.rake

@@ -21,7 +21,7 @@ namespace :gitlab do
 
       projects = apply_project_filters(projects)
 
-      indexer = Elastic::Indexer.new
+      indexer = Gitlab::Elastic::Indexer.new
 
       projects.find_each do |project|
         repository = project.repository

spec/lib/elastic/indexer_spec.rb → spec/lib/gitlab/elastic/indexer_spec.rb

@@ -16,6 +16,6 @@ describe "Indexer" do
       )
     ).and_return([[''], 0])
 
-    Elastic::Indexer.new.run(1, 'full_repo_path', '000000', '1d1f2d')
+    Gitlab::Elastic::Indexer.new.run(1, 'full_repo_path', '000000', '1d1f2d')
   end
 end

spec/services/git_push_service_spec.rb

@@ -147,7 +147,7 @@ describe GitPushService, services: true do
     end
 
     it "triggers indexer" do
-      expect_any_instance_of(Elastic::Indexer).to receive(:run)
+      expect_any_instance_of(Gitlab::Elastic::Indexer).to receive(:run)
 
       execute_service(project, user, @oldrev, @newrev, @ref )
     end