elasticsearch-rails-ha 1.0.9 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e3c1aa3acfaf1fe91c786fc0a6cccab55e1f8b7
-  data.tar.gz: 545dd2a26bdd584c786fec5241f5f5468ceeb9e7
+  metadata.gz: da23a4c8436e4f5f8659fd611b0a0980db37bab1
+  data.tar.gz: 9c3b206a17cb6304a515a05f774ed7353b204f95
 SHA512:
-  metadata.gz: df29576590a3767962cb3e73509a0c1913f163a65bea92bb431d6d824cea278b891b0741126ac39abf8849a2d4d91a7591563d21fe4bbc19372758445b477bf4
-  data.tar.gz: c3ef3d133c76defcc30044e5267258878da1626cbea35138e3fe065c06a6fbed855007b8ddd154f7a27ff6767f7ae3d14cdfadb94fa62fdf45b29063c18c5e90
+  metadata.gz: ec71d34671adb3d7e6416c4a8193c71cda707b55878ac2ea45878c4c0880daadb145e0036abfdc9820156ff34b436f0a4c3046356619183b1b09f71eb6c75075
+  data.tar.gz: 1364788c8bd1436fe6d46ea30fc41d3741c6ff178e2420089c1042468629a8d522e101157c9bde031a4da18a4ea5814e541940a6854e191b2b8319193f7648d9

data/README.md

@@ -1,6 +1,6 @@
 # elasticsearch-rails-ha RubyGem
 
-[![Build Status](https://travis-ci.org/18F/elasticsearch-rails-ha-gem.svg?branch=master)](https://travis-ci.org/18F/elasticsearch-rails-ha-gem)
+[![Build Status](https://travis-ci.org/karpet/elasticsearch-rails-ha-gem.svg?branch=master)](https://travis-ci.org/karpet/elasticsearch-rails-ha-gem)
 
 Elasticsearch for Rails, high availability extensions.
 

data/lib/elasticsearch/rails/ha/parallel_indexer.rb

@@ -1,14 +1,24 @@
 require 'active_record/base'
 require 'ansi'
+require 'term/ansicolor'
 require 'pp'
 
 module Elasticsearch
   module Rails
     module HA
       class ParallelIndexer
+        include Term::ANSIColor
 
         attr_reader :klass, :idx_name, :nprocs, :batch_size, :max, :force, :verbose, :scope
 
+        def blue_log(msg)
+          blue{ msg }
+        end
+
+        def red_log(msg)
+          red{ msg }
+        end
+
         # leverage multiple cores to run indexing in parallel
         def initialize(opts)
           @klass    = opts[:klass] or fail "klass required"
@@ -41,11 +51,11 @@ module Elasticsearch
             offsets.push( chunk.first )
           end
           if @verbose
-            puts ::ANSI.blue{ "Parallel Indexer: index=#{@idx_name} total=#{@total_expected} nprocs=#{@nprocs} pool_size=#{@pool_size} offsets=#{offsets} " }
+            puts blue_log("Parallel Indexer: index=#{@idx_name} total=#{@total_expected} nprocs=#{@nprocs} pool_size=#{@pool_size} offsets=#{offsets} ")
           end
 
           if @force
-            @verbose and puts ::ANSI.blue{ "Force creating new index" }
+            @verbose and puts blue_log("Force creating new index")
             klass.__elasticsearch__.create_index! force: true, index: idx_name
             klass.__elasticsearch__.refresh_index! index: idx_name
           end
@@ -85,25 +95,25 @@ module Elasticsearch
             pstat = pair[1]
             exit_ok = true
             if pstat.exited?
-              @verbose and puts ::ANSI.blue{ "PID #{pid} exited with #{pstat.exitstatus}" }
+              @verbose and puts blue_log("PID #{pid} exited with #{pstat.exitstatus}")
             end
             if pstat.signaled?
-              puts ::ANSI.red{ " >> #{pid} exited with uncaught signal #{pstat.termsig}" }
+              puts red_log(" >> #{pid} exited with uncaught signal #{pstat.termsig}")
               exit_ok = false
             end
 
             if !pstat.success?
-              puts ::ANSI.red{ " >> #{pid} was not successful" }
+              puts red_log(" >> #{pid} was not successful")
               exit_ok = false
             end
 
             if pair[1].exitstatus != 0
-              puts ::ANSI.red{ " >> #{pid} exited with non-zero status" }
+              puts red_log(" >> #{pid} exited with non-zero status")
               exit_ok = false
             end
 
             if !exit_ok
-              raise ::ANSI.red{ "PID #{pair[0]} exited abnormally, so the whole reindex fails" }
+              raise red_log("PID #{pair[0]} exited abnormally, so the whole reindex fails")
             end
           end
         end
@@ -117,7 +127,7 @@ module Elasticsearch
 
           completed = 0
           errors    = []
-          @verbose and puts ::ANSI.blue{ "Start worker #{$$} at offset #{start_at}" }
+          @verbose and puts blue_log("Start worker #{$$} at offset #{start_at}")
           pbar = ::ANSI::Progressbar.new("#{klass} [#{$$}]", @pool_size, STDOUT) rescue nil
           checkpoint = false
           if pbar
@@ -142,7 +152,7 @@ module Elasticsearch
                 pbar.inc resp['items'].size
               end
               if checkpoint && @verbose
-                puts ::ANSI.blue{ "[#{$$}] #{Time.now.utc.iso8601} : #{completed} records completed" }
+                puts blue_log("[#{$$}] #{Time.now.utc.iso8601} : #{completed} records completed")
               end
               STDERR.flush
               STDOUT.flush
@@ -152,7 +162,7 @@ module Elasticsearch
               end
               if completed >= @pool_size || (@max && @max.to_i == completed)
                 pbar.finish if pbar
-                @verbose and puts ::ANSI.blue{ "Worker #{$$} finished #{completed} records" }
+                @verbose and puts blue_log("Worker #{$$} finished #{completed} records")
                 exit!(true) # exit child worker
               end
             end # end do |resp| block

data/lib/elasticsearch/rails/ha/version.rb

@@ -1,7 +1,7 @@
 module Elasticsearch
   module Rails
     module HA
-      VERSION = '1.0.9'
+      VERSION = '1.1.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-rails-ha
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.1.0
 platform: ruby
 authors:
 - Peter Karman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-22 00:00:00.000000000 Z
+date: 2018-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch-model
@@ -42,16 +42,16 @@ dependencies:
   name: elasticsearch-indexstager
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: ansi
   requirement: !ruby/object:Gem::Requirement
@@ -67,13 +67,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: about_yml
+  name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -112,16 +112,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: elasticsearch-extensions
   requirement: !ruby/object:Gem::Requirement
@@ -166,7 +166,7 @@ dependencies:
         version: '3.1'
 description: High Availability extensions to the Elasticsearch::Rails gem
 email:
-- peter.karman@gsa.gov
+- karpet@peknet.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -179,7 +179,7 @@ files:
 - lib/elasticsearch/rails/ha/parallel_indexer.rb
 - lib/elasticsearch/rails/ha/tasks.rb
 - lib/elasticsearch/rails/ha/version.rb
-homepage: https://github.com/18F/elasticsearch-rails-ha-gem
+homepage: https://github.com/karpet/elasticsearch-rails-ha-gem
 licenses:
 - CC0
 metadata: {}
@@ -199,9 +199,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: High Availability extensions to the Elasticsearch::Rails gem
 test_files: []
-has_rdoc: