zelastic 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04e31f09152172933b5800dfd711a673e6d22c6c
-  data.tar.gz: d943d84ef9ee7770c4597b4853f75cfd83ec9ab1
+  metadata.gz: 7688ccc666c5845c29e20e163691a19f35ee368d
+  data.tar.gz: 6de7dbb95705106006706f62d03425345d7509c1
 SHA512:
-  metadata.gz: c81a965e8b108be4ff1b4cacdee26fceb6a2164af583e93b06bd9d1919aa9bffb5d29a39220d01c26d0b41f6f0f60da6dffefa6e23b47d4a54edc748344b861e
-  data.tar.gz: f5ce82aac1b74cbac4526c36bdecf4694b39fc7ac2b1f234298fc635aa883e51f22552954963383b785f15558f27c2e1307d34359c2e5c620ecb34ea300a46ea
+  metadata.gz: 113fedb974cb28813e3b8084dbec4dd154b2821afcd0127cbef7b6874b0438b5986fa336bdcc2159502f0869d9f2455ce836907821026393e0814a6e36350456
+  data.tar.gz: 8af284f5e38267416325426ea8a72ad62a485698ee51e2e66790bac8590e9e3e6a61c1b85671e31bf0ec35c3d63a9dbbc8c3017abb28ef6d655021b666140975

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+v0.5.1 - Aug 8th, 2018
+---
+
+- Fix re-indexing log output upon initial index creation (#7)
+
 v0.5.0 - Aug 3rd, 2018
 ---
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zelastic (0.5.0)
+    zelastic (0.5.1)
       activesupport
 
 GEM

data/lib/zelastic/index_manager.rb

@@ -12,11 +12,7 @@ module Zelastic
     def create_index(unique_name)
       index_name = index_name_from_unique(unique_name)
 
-      client.indices.create(
-        index: index_name,
-        body: config.index_definition
-      )
-
+      client.indices.create(index: index_name, body: config.index_definition)
       client.indices.put_alias(index: index_name, name: config.write_alias)
     end
 
@@ -24,9 +20,7 @@ module Zelastic
       index_name = index_name_from_unique(unique_name)
 
       config.data_source.find_in_batches(batch_size: batch_size).with_index do |batch, i|
-        logger.info(
-          "ES: (ESTIMATED: #{indexed_percent(batch_size, i + 1)}%) Indexing #{config.type} records"
-        )
+        logger.info(populate_index_log(batch_size: batch_size, batch_number: i + 1))
         indexer.index_batch(batch, client: client, index_name: index_name)
       end
     end
@@ -114,6 +108,15 @@ module Zelastic
       end
     end
 
+    def populate_index_log(batch_size:, batch_number:)
+      progress = if current_index_exists?
+                   "ESTIMATED: #{indexed_percent(batch_size, batch_number)}%"
+                 else
+                   'First index'
+                 end
+      "ES: (#{progress}) Indexing #{config.type} records"
+    end
+
     def current_index_size
       @current_index_size ||= client.count(index: config.read_alias, type: config.type)['count']
     end
@@ -121,5 +124,9 @@ module Zelastic
     def indexed_percent(batch_size, batch_number)
       (batch_size * batch_number.to_f / current_index_size * 100).round(2)
     end
+
+    def current_index_exists?
+      client.indices.exists?(index: config.read_alias)
+    end
   end
 end

data/lib/zelastic/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Zelastic
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zelastic
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - carwow Developers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-03 00:00:00.000000000 Z
+date: 2018-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport