gitlab-elasticsearch-git 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2f2e02dd07d4a8be46948d3bce7bb400fc85b01
-  data.tar.gz: 7351959ff7c27ac48360f9bca26ab7e2727763ca
+  metadata.gz: 69245382e85329466c42b0f9747ac527a01e2473
+  data.tar.gz: fdb37b7cb8f67913253cb8d45f790974eea961cc
 SHA512:
-  metadata.gz: 492e50d3b67c8b2a3adb03c4cd5a62ece0bda3a9d6199cef64b02e678e22414b3943f80581bb7141f002a7230db1c767c039025e61bc056f018f54a78b3027cf
-  data.tar.gz: 17086678943cdb815521fa196cb59a1f3d0926ae40b1e209ade66d8f19b75c1ccb4f12f7638a7da5c143b34ab6bb44fb76dd5183bc33d7c7964b826c6ca809f9
+  metadata.gz: 86f3d459d93084c0293cebbf200484ef4d292753843a321869fd886d9748e57ce218ed9e12d42a1144e9e523244f08c6c41056176a030f8200b2c880904f451f
+  data.tar.gz: 8c304bef1477625c30e1d1abf95dc3c309b798ebfe6fab90ecae13029f85dfde8e5c6d75fc899be5fc09bfb676972c9af7dfd5bff9a6d1ba87cb0df0cc2b9b44

data/CHANGELOG

@@ -1,3 +1,6 @@
+1.0.1
+ - Yield current batch and total count when indexing
+
 1.0.0
  - Blobs and Commits have a parent project
 

data/lib/elasticsearch/git/repository.rb

@@ -91,8 +91,9 @@ module Elasticsearch
           from, to = parse_revs(from_rev, to_rev)
 
           diff = repository_for_indexing.diff(from, to)
+          deltas = diff.deltas
 
-          diff.deltas.reverse.each_slice(BLOBS_BATCH) do |slice|
+          deltas.reverse.each_slice(BLOBS_BATCH) do |slice|
             bulk_operations = slice.map do |delta|
               if delta.status == :deleted
                 next if delta.old_file[:mode].to_s(8) == "160000"
@@ -106,6 +107,8 @@ module Elasticsearch
             end
 
             perform_bulk bulk_operations
+
+            yield slice, deltas.length if block_given?
           end
 
           ObjectSpace.garbage_collect
@@ -205,6 +208,8 @@ module Elasticsearch
               end
 
               perform_bulk bulk_operations
+
+              yield batch, commit_oids.length if block_given?
             end
 
             ObjectSpace.garbage_collect

data/lib/elasticsearch/git/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Git
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
   end
 end

data/spec/main_spec.rb

@@ -106,4 +106,31 @@ describe TestRepository do
     expect(TestRepository.__elasticsearch__.search('test').results.count).to eq(6)
     expect(repo.search('test')[:commits][:total_count]).to eq(3)
   end
+
+  it "yields current batch and total length when indexing commits" do
+    count = 0
+    total = 0
+
+    repo.index_commits do |batch, total_count|
+      count += batch.length
+      total  = total_count
+    end
+
+    expect(count).to be > 0
+    expect(count).to eq(total)
+  end
+
+  it "yields current batch and total length when indexing blobs" do
+    count = 0
+    total = 0
+
+
+    repo.index_blobs do |batch, total_count|
+      count += batch.length
+      total  = total_count
+    end
+
+    expect(count).to be > 0
+    expect(count).to eq(total)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-elasticsearch-git
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Andrey Kumanyaev
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-08 00:00:00.000000000 Z
+date: 2016-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch-model