ej 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 719a4ba9e1eb1f6fc382cce5f1d1b51571478294
-  data.tar.gz: a602858b43d554d18d5c588dad77caee78bf5bef
+  metadata.gz: e76e6b6fc5c6bebf55f97553afc843cbb9d9b730
+  data.tar.gz: '07830f36bd93af33e7686d264ef25dcf5b34d10b'
 SHA512:
-  metadata.gz: 7f00eb51f37d65e89791a15b1a327742db9889c8b6e059ded000f9c3e8f940bb72fef98ed074fa0f0b337c1f2966ad85b36697419b5b8fac26c690d1140961e9
-  data.tar.gz: e45cde9cc3abe2dcb3e063eba243bc6ef01053f34479e2da656fd877539e2e74d51450313f17f82267d28e10b5f3b84b07ed6192c7c5a5fa68fc8129ee2522bf
+  metadata.gz: 96e69fe5ee1ba6ae3ecb8c53030b6710379bd312f8bef4ffcc5cea5d5e0281bfc3f11478b743d37122fcf01c5d06fe5476f4103805d18105a77f5a30c1926458
+  data.tar.gz: 9788d2673c94ac4f30084fc7951f660484268e440934a45495bfbe12ff1aeaa503708ff1af36c3b96d74b0539e75ed0df15816668d2602a9c36fde4b81aac3b5

data/lib/ej/commands.rb

@@ -6,6 +6,8 @@ module Ej
   class Commands < Thor
     class_option :index, aliases: '-i', type: :string, default: '_all', desc: 'index'
     class_option :host, aliases: '-h', type: :string, default: DEFAULT_HOST, desc: 'host'
+    class_option :user, aliases: '-u', type: :string, default: nil, desc: 'user'
+    class_option :password, aliases: '--pass', type: :string, default: nil, desc: 'password'
     class_option :debug, aliases: '-d', type: :boolean, default: false, desc: 'debug mode'
 
     map '-s' => :search
@@ -68,13 +70,15 @@ module Ej
     option :query, type: :string, aliases: '-q', default: nil, desc: 'query'
     option :per, type: :numeric, default: nil, desc: 'per'
     option :scroll, type: :string, default: "1m", desc: 'scroll'
+    option :dest_index, type: :string, desc: 'dest index'
     def copy
       @core.copy(
         options[:source],
         options[:dest],
         options[:query],
         options[:per],
-        options[:scroll]
+        options[:scroll],
+        options[:dest_index]
       )
     end
 

data/lib/ej/core.rb

@@ -147,7 +147,7 @@ module Ej
       connect_with_retry { @client.bulk body: bulk_message unless bulk_message.empty? }
     end
 
-    def copy(source, dest, query, per_size, scroll)
+    def copy(source, dest, query, per_size, scroll, dest_index)
       source_client = Elasticsearch::Client.new hosts: source
       dest_client = Elasticsearch::Client.new hosts: dest
 
@@ -155,18 +155,18 @@ module Ej
       r = connect_with_retry { source_client.search(scroll_option) }
       total = r['hits']['total']
       i = 0
-      i += bulk_results(r, dest_client, i, total)
+      i += bulk_results(r, dest_client, i, total, dest_index)
 
       while r = connect_with_retry { source_client.scroll(scroll_id: r['_scroll_id'], scroll: scroll) } and
         (not r['hits']['hits'].empty?) do
-        i += bulk_results(r, dest_client, i, total)
+        i += bulk_results(r, dest_client, i, total, dest_index)
       end
     end
 
     private
 
-    def bulk_results(results, dest_client, before_size, total)
-      bulk_message = convert_results(results)
+    def bulk_results(results, dest_client, before_size, total, dest_index)
+      bulk_message = convert_results(results, dest_index)
       connect_with_retry do
         dest_client.bulk body: bulk_message unless bulk_message.empty?
         to_size = before_size + (bulk_message.size/2)
@@ -182,7 +182,7 @@ module Ej
       search_option
     end
 
-    def convert_results(search_results)
+    def convert_results(search_results, dest_index)
       data = HashWrapper.new(search_results)
       docs = data.hits.hits
       bulk_message = []
@@ -192,6 +192,7 @@ module Ej
         ['_id', '_type', '_index'].each do |meta_field|
           source.delete(meta_field)
         end
+        doc._index = dest_index if dest_index 
         bulk_message << { index: doc.to_h }
         bulk_message << source
       end

data/lib/ej/values.rb

@@ -7,17 +7,17 @@ module Ej
     def initialize(global_options)
       @logger =  Logger.new($stderr)
       @logger.level = global_options[:debug] ? Logger::DEBUG : Logger::INFO
-      @client = get_client(global_options[:host], global_options[:index])
+      @client = get_client(global_options[:host], global_options[:index], global_options[:user], global_options[:password])
       @index = global_options[:index]
     end
 
-    def get_client(host_string, index)
+    def get_client(host_string, index, user, password)
       host, port = (host_string || DEFAULT_HOST), DEFAULT_PORT
       if !host_string.nil? && host_string.include?(":")
         host, port = host_string.split(':')
       end
 
-      hosts = [{ host: host, port: port }]
+      hosts = [{ host: host, port: port, user: user, password: password }]
       transport = ::Elasticsearch::Transport::Transport::HTTP::Faraday.new(
         {
           hosts: hosts,

data/lib/ej/version.rb

@@ -1,3 +1,3 @@
 module Ej
-  VERSION = '0.1.10'
+  VERSION = '0.1.11'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ej
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - toyama0919
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-23 00:00:00.000000000 Z
+date: 2017-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -204,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: elasticsearch command line utility.