elastics-client 1.0.6 → 1.0.7

data/VERSION

@@ -1 +1 @@
-1.0.6
+1.0.7

data/elastics-client.gemspec

@@ -27,7 +27,7 @@ Upgrading Tutorial: http://elastics.github.io/elastics/doc/7-Tutorials/2-Migrate
 
 ________________________________________________________________________________
 EOM
-  s.add_runtime_dependency     'multi_json',  '>= 1.3.4'
-  s.add_runtime_dependency     'progressbar', '>= 0.11.0', '~> 0.12.0'
-  s.add_runtime_dependency     'dye',         '~> 0.1.4'
+  s.add_runtime_dependency     'multi_json',       '>= 1.3.4'
+  s.add_runtime_dependency     'ruby-progressbar', '>= 1.2.0'
+  s.add_runtime_dependency     'dye',              '~> 0.1.4'
 end

data/lib/elastics/prog_bar.rb

@@ -7,30 +7,32 @@ module Elastics
       @total_count      = total_count
       @successful_count = 0
       @failed_count     = 0
-      @pbar             = ::ProgressBar.new('processing...', total_count)
+      @pbar             = ::ProgressBar.create(:total         => total_count,
+                                               :progress_mark => '|',
+                                               :format        => 'processing... |%b%i| %p%% %E',
+                                               :length        => 80)
       @pbar.clear
-      @pbar.bar_mark = '|'
-      puts '_' * @pbar.send(:get_term_width)
+      puts '_' * @pbar.send(:length)
       message = "#{prefix_message}Processing #{total_count} documents"
       message << " in batches of #{batch_size}:" unless batch_size.nil?
       puts message
-      @pbar.send(:show)
+      @pbar.start
     end
 
     def process_result(result, inc)
       unless result.nil? || result.empty?
         unless result.failed.size == 0
           Conf.logger.error "Failed load:\n#{result.failed.to_yaml}"
-          @pbar.bar_mark = 'F'
+          @pbar.progress_mark = 'F'
         end
         @failed_count     += result.failed.size
         @successful_count += result.successful.size
       end
-      @pbar.inc(inc)
+      @pbar.progress += inc
     end
 
     def finish
-      @pbar.finish
+      @pbar.finish unless @pbar.finished?
       puts "Processed #@total_count. Successful #@successful_count. Skipped #{@total_count - @successful_count - @failed_count}. Failed #@failed_count."
       puts 'See the log for the details about the failures.' unless @failed_count == 0
     end

data/lib/elastics-client.rb

@@ -42,7 +42,7 @@ require 'elastics/http_clients/loader'
 require 'elastics/configuration'
 require 'elastics/utility_methods'
 
-require 'progressbar'
+require 'ruby-progressbar'
 require 'elastics/prog_bar'
 require 'elastics/client_live_reindex'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastics-client
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -28,16 +28,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.3.4
 - !ruby/object:Gem::Dependency
-  name: progressbar
+  name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.11.0
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -45,10 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.11.0
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: dye
   requirement: !ruby/object:Gem::Requirement
@@ -145,3 +139,4 @@ signing_key:
 specification_version: 3
 summary: Client gem for elasticsearch
 test_files: []
+has_rdoc: