elastics-client 1.0.7 → 1.0.8

data/VERSION

@@ -1 +1 @@
-1.0.7
+1.0.8

data/elastics-client.gemspec

@@ -4,7 +4,8 @@ version = File.read(File.expand_path('../VERSION', __FILE__)).strip
 Gem::Specification.new do |s|
   s.name                      = 'elastics-client'
   s.summary                   = 'Client gem for elasticsearch'
-  s.description               = 'Core gem used by all the elastics gems.'
+  s.description               = 'Core gem used by all the elastics gems. Provides the core resources: HTTP clients,
+Elasticsearch API Methods, Templating System, Cascading Variables Management, Result Extenders, Logging & Debugging, Self-documenting Tool, Rake Tasks, ...'
   s.homepage                  = 'http://elastics.github.io/elastics'
   s.authors                   = ['Domizio Demichelis']
   s.email                     = 'dd.nexus@gmail.com'
@@ -30,4 +31,5 @@ EOM
   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'
+  s.add_runtime_dependency     'prompter',         '~> 0.1.6'
 end

data/lib/elastics-client.rb

@@ -1,4 +1,6 @@
 require 'dye'
+require 'prompter'
+require 'ruby-progressbar'
 require 'yaml'
 require 'ostruct'
 require 'erb'
@@ -42,7 +44,6 @@ require 'elastics/http_clients/loader'
 require 'elastics/configuration'
 require 'elastics/utility_methods'
 
-require 'ruby-progressbar'
 require 'elastics/prog_bar'
 require 'elastics/client_live_reindex'
 

data/lib/elastics/class_proxy/templates/doc.rb

@@ -38,12 +38,12 @@ end
 
 meth
           end
-          puts doc
+          Prompter.say_log doc
         end
 
         def usage(name)
           meth_call = [context, name].join('.')
-          puts build_usage(meth_call, templates[name])
+          Prompter.say_log build_usage(meth_call, templates[name])
         end
 
       private

data/lib/elastics/configuration.rb

@@ -10,7 +10,7 @@ module Elastics
                                                                 :params     => {},
                                                                 :no_pruning => [] ),
                                  :config_file      => './config/elastics.yml',
-                                 :elastics_dir         => './elastics',
+                                 :elastics_dir     => './elastics',
                                  :http_client      => HttpClients::Loader.new_http_client
 
   # shorter alias
@@ -20,6 +20,14 @@ module Elastics
     def configure
       yield self
     end
+    # force color in console (used with jruby)
+    def ansi=(bool)
+      Dye.color = bool
+    end
+
+    def ansi
+      Dye.color?
+    end
   end
 
 end

data/lib/elastics/logger.rb

@@ -24,14 +24,5 @@ module Elastics
       msg.split("\n").map{|l| prefix + l}.join("\n") + "\n"
     end
 
-    # force color in console (used with jruby)
-    def color=(bool)
-      Dye.color = bool
-    end
-
-    def color
-      Dye.color?
-    end
-
   end
 end

data/lib/elastics/prog_bar.rb

@@ -1,21 +1,52 @@
+class ProgressBar
+  module Format
+    class Base
+      # see https://github.com/jfelchner/ruby-progressbar/pull/50
+      def process(environment)
+        processed_string = @format_string.dup
+
+        non_bar_molecules.each do |molecule|
+          processed_string.gsub!("%#{molecule.key}", environment.send(molecule.method_name).to_s)
+        end
+
+        remaining_molecules = bar_molecules.size
+        placeholder_length  = remaining_molecules * 2
+
+        processed_string.gsub! '%%', '%'
+        processed_string_length = processed_string.gsub(/\e\[[\d;]+m/, '').length
+        leftover_bar_length = environment.send(:length) - processed_string_length + placeholder_length
+        leftover_bar_length = leftover_bar_length < 0 ? 0 : leftover_bar_length
+
+        bar_molecules.each do |molecule|
+          processed_string.gsub!("%#{molecule.key}", environment.send(molecule.method_name, leftover_bar_length).to_s)
+        end
+
+        processed_string
+      end
+    end
+  end
+end
+
 module Elastics
   class ProgBar
 
     attr_reader :pbar, :total_count
 
     def initialize(total_count, batch_size=nil, prefix_message=nil)
-      @total_count      = total_count
+      bar_style = [:green, :reversed, :bold]
       @successful_count = 0
       @failed_count     = 0
+      format            = Dye.dye(' processing... ', 'processing... ', bar_style) +
+                          Dye.dye('%b%i',            '|%b%i|',         bar_style) +
+                          Dye.dye(' %p%% %E ',       ' %p%% %E',       bar_style)
       @pbar             = ::ProgressBar.create(:total         => total_count,
-                                               :progress_mark => '|',
-                                               :format        => 'processing... |%b%i| %p%% %E',
-                                               :length        => 80)
+                                               :progress_mark => Dye.dye(' ', '|', bar_style),
+                                               :format        => format )
       @pbar.clear
-      puts '_' * @pbar.send(:length)
+      Prompter.say_log '_' * @pbar.send(:length)
       message = "#{prefix_message}Processing #{total_count} documents"
       message << " in batches of #{batch_size}:" unless batch_size.nil?
-      puts message
+      Prompter.say_log message
       @pbar.start
     end
 
@@ -23,18 +54,24 @@ module Elastics
       unless result.nil? || result.empty?
         unless result.failed.size == 0
           Conf.logger.error "Failed load:\n#{result.failed.to_yaml}"
-          @pbar.progress_mark = 'F'
+          @pbar.progress_mark = Dye.dye(' ', 'F', :reed, :reversed, :bold)
         end
         @failed_count     += result.failed.size
         @successful_count += result.successful.size
       end
-      @pbar.progress += inc
+      new_progress   = @pbar.progress + inc
+      # avoids an error in case progress > total (may happen in import)
+      @pbar.total    = (new_progress + 1) if new_progress > @pbar.total
+      @pbar.progress = new_progress
     end
 
     def 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
+      Prompter.say_log     "Processed #{@pbar.total}. "
+      Prompter.say_ok      "Successful #{@successful_count}. "
+      Prompter.say_notice  "Skipped #{@pbar.total - @successful_count - @failed_count}. "
+      Prompter.say_warning "Failed #{@failed_count}.", :mute => true
+      Prompter.say_warning "See the log for the details about the #{@failed_count} failures." unless @failed_count == 0
     end
 
   end

data/lib/elastics/utility_methods.rb

@@ -116,7 +116,7 @@ module Elastics
 
     def to_bulk_string(meta, source, options)
       action = options[:action] || 'index'
-      return '' if source.nil? || source.empty? &&! (action == 'delete')
+      return '' if (source.nil? || source.empty?) && (action != 'delete')
       meta['_index'] = LiveReindex.prefix_index(meta['_index']) if LiveReindex.should_prefix_index?
       bulk_string = MultiJson.encode(action => meta) + "\n"
       unless action == 'delete'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastics-client
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -59,7 +59,27 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.4
-description: Core gem used by all the elastics gems.
+- !ruby/object:Gem::Dependency
+  name: prompter
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.6
+description: ! 'Core gem used by all the elastics gems. Provides the core resources:
+  HTTP clients,
+
+  Elasticsearch API Methods, Templating System, Cascading Variables Management, Result
+  Extenders, Logging & Debugging, Self-documenting Tool, Rake Tasks, ...'
 email: dd.nexus@gmail.com
 executables: []
 extensions: []