ej 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 643e3d4fc75c7f83f484f89845d0fcf4b75433a1
-  data.tar.gz: d65079cd2e20a88ba694ad20d8ee8db48d50df24
+  metadata.gz: 551d0015a2a0b74774c85195fdf145f1b531e8c6
+  data.tar.gz: 791210a77c5f2051d745969fc77612e39675f416
 SHA512:
-  metadata.gz: aeb5afcd34843b5caef5d53a408d05a42f2a4a5db6367198bf6ff6ce17c6c14fe224dbd460c123e7a2fd885506929835044056f450d61b632e008378f09083b9
-  data.tar.gz: a47937f3958993b8809c537c2b381da730de01a82b96918ff6cf8677ce46661ee64bfc84d49a927113d6f9d9cc10f382f3f0907f2bd3152395eade6d3595a82c
+  metadata.gz: cdcca2d81f858557e71ca906f790421ac837cbf54c652b542b6aabe6e7492d5cd3ebf8246163842595fa00b080300b47c9dd3b0010e94e8ca4e99d584e8d78f6
+  data.tar.gz: 85d6ca97247aa458b11305393447a9f766ebfa2747b4e626aee4abc554a58ba747af7050e76dfa3ae51b9ae14b771fdab60658a7a9e52b7e068794a8ba722010

data/lib/ej/commands.rb

@@ -1,16 +1,14 @@
 #!/usr/bin/env ruby
 # coding: utf-8
+require 'ej/core'
 require 'thor'
 require 'yajl'
-require 'elasticsearch'
-require 'ej/core'
-require 'logger'
 
 module Ej
   class Commands < Thor
     class_option :index, aliases: '-i', type: :string, default: '_all', desc: 'index'
     class_option :host, aliases: '-h', type: :string, default: 'localhost', desc: 'host'
-    class_option :debug, aliases: '-d', type: :string, default: false, desc: 'debug mode'
+    class_option :debug, aliases: '-d', type: :boolean, default: false, desc: 'debug mode'
 
     map '-s' => :search
     map '-f' => :facet
@@ -25,7 +23,7 @@ module Ej
     def initialize(args = [], options = {}, config = {})
       super(args, options, config)
       @global_options = config[:shell].base.options
-      @core = Ej::Core.new(@global_options['host'], @global_options['index'], @global_options['debug'])
+      @core = Ej::Core.new(@global_options[:host], @global_options[:index], @global_options[:debug])
     end
 
     desc '-s [lucene query]', 'search'
@@ -36,30 +34,30 @@ module Ej
     option :source_only, type: :boolean, aliases: '--so', default: true, desc: 'from'
     option :query, type: :string, aliases: '-q', default: nil, desc: 'query'
     option :sort, type: :hash, aliases: '--sort', default: nil, desc: 'ex. --sort @timestamp:desc'
-    def search(query = options['query'])
-      puts_with_format(@core.search(options['type'],
+    def search(query = options[:query])
+      puts_with_format(@core.search(options[:type],
                              query,
-                             options['size'],
-                             options['from'],
-                             options['source_only'],
+                             options[:size],
+                             options[:from],
+                             options[:source_only],
                              nil,
-                             options['fields'],
-                             options['sort']
+                             options[:fields],
+                             options[:sort]
                              ))
     end
 
     desc 'total [lucene query]', 'total'
     option :type, type: :string, aliases: '-t', default: nil, desc: 'type'
     option :query, type: :string, aliases: '-q', default: nil, desc: 'query'
-    def count(query = options['query'])
-      puts_with_format(@core.search(options['type'], query, 0, 0, false))
+    def count(query = options[:query])
+      puts_with_format(@core.search(options[:type], query, 0, 0, false))
     end
 
     desc 'distinct [lucene query]', 'distinct'
     option :type, type: :string, aliases: '-t', default: nil, desc: 'type'
     option :query, type: :string, aliases: '-q', default: nil, desc: 'query'
     def distinct(term)
-      puts_with_format(@core.distinct(term, options['type'], options['query']))
+      puts_with_format(@core.distinct(term, options[:type], options[:query]))
     end
 
     desc 'copy', 'copy index'
@@ -71,12 +69,12 @@ module Ej
     option :from, type: :numeric, default: 0, desc: 'from'
     def copy
       @core.copy(
-        options['source'],
-        options['dest'],
-        options['query'],
-        options['per'],
-        options['proc_num'],
-        options['from']
+        options[:source],
+        options[:dest],
+        options[:query],
+        options[:per],
+        options[:proc_num],
+        options[:from]
       )
     end
 
@@ -84,14 +82,14 @@ module Ej
     option :query, type: :string, aliases: '-q', default: nil, desc: 'query'
     option :per, type: :numeric, default: nil, desc: 'per'
     def dump
-      @core.dump(options['query'], options['per'])
+      @core.dump(options[:query], options[:per])
     end
 
     desc '-f', 'facet'
     option :query, type: :string, aliases: '-q', default: '*', desc: 'query'
     option :size, type: :numeric, aliases: '-n', default: 10, desc: 'size'
     def facet(term)
-      puts_with_format(@core.facet(term, options['size'], options['query']))
+      puts_with_format(@core.facet(term, options[:size], options[:query]))
     end
 
     desc 'aggs', 'aggs'
@@ -99,19 +97,19 @@ module Ej
     option :size, type: :numeric, aliases: '-n', default: 10, desc: 'size'
     option :terms, type: :array, aliases: '-t', required: true, desc: 'size'
     def aggs
-      puts_with_format(@core.aggs(options['terms'], options['size'], options['query']))
+      puts_with_format(@core.aggs(options[:terms], options[:size], options[:query]))
     end
 
     desc 'min', 'term'
     option :term, type: :string, aliases: '-k', desc: 'terms'
     def min
-      puts_with_format(@core.min(options['term']))
+      puts_with_format(@core.min(options[:term]))
     end
 
     desc 'max', 'count record, group by keys'
     option :term, type: :string, aliases: '-k', desc: 'terms'
     def max
-      puts_with_format(@core.max(options['term']))
+      puts_with_format(@core.max(options[:term]))
     end
 
     desc '-b', 'bulk import STDIN JSON'
@@ -121,7 +119,7 @@ module Ej
     option :add_timestamp, type: :boolean, default: true, desc: 'add_timestamp'
     option :id_keys, type: :array, aliases: '--id', default: nil, desc: 'id'
     def bulk
-      @core.bulk(options['timestamp_key'], options['type'], options['add_timestamp'], options['id_keys'], options['index'])
+      @core.bulk(options[:timestamp_key], options[:type], options[:add_timestamp], options[:id_keys], options[:index])
     end
 
     desc 'health', 'health'
@@ -166,8 +164,8 @@ module Ej
     option :type, aliases: '-t', type: :string, default: nil, required: true, desc: 'type'
     option :path, type: :string, default: nil, required: true, desc: 'path'
     def put_routing
-      body = { options['type'] => {"_routing"=>{"required"=>true, "path"=>options['path']}}}
-      puts_with_format(@core.put_mapping(options['index'], options['type'], body))
+      body = { options[:type] => {"_routing"=>{"required"=>true, "path"=>options[:path]}}}
+      puts_with_format(@core.put_mapping(options[:index], options[:type], body))
     end
 
     desc 'put_template', 'put template'
@@ -180,7 +178,7 @@ module Ej
     option :alias, type: :string, aliases: '-a', default: nil, required: true, desc: 'alias name'
     option :indices, type: :array, aliases: '-x', default: nil, required: true, desc: 'index array'
     def create_aliases
-      @core.create_aliases(options['alias'], options['indices'])
+      @core.create_aliases(options[:alias], options[:indices])
     end
 
     desc 'recovery', 'recovery'
@@ -193,13 +191,13 @@ module Ej
     option :type, type: :string, aliases: '-t', default: nil, desc: 'type'
     option :query, type: :string, aliases: '-q', default: nil, desc: 'query'
     def delete
-      @core.delete(options['index'], options['type'], options['query'])
+      @core.delete(options[:index], options[:type], options[:query])
     end
 
     desc 'delete_template --name [name]', 'delete_template'
     option :name, type: :string, default: nil, required: true, desc: 'template name'
     def delete_template
-      @core.delete_template(options['name'])
+      @core.delete_template(options[:name])
     end
 
     desc 'template', 'show template'

data/lib/ej/core.rb

@@ -1,11 +1,14 @@
 #!/usr/bin/env ruby
 # coding: utf-8
-require 'yaml'
 require 'yajl'
 require 'elasticsearch'
 require 'hashie'
-require 'pp'
 require 'parallel'
+require 'logger'
+
+class HashWrapper < ::Hashie::Mash
+  disable_warnings if respond_to?(:disable_warnings)
+end
 
 module Ej
   class Core
@@ -32,7 +35,7 @@ module Ej
       search_option = { index: @index, type: type, body: body }
       search_option[:routing] = routing unless routing.nil?
       search_option[:_source] = fields.nil? ? nil : fields.join(',')
-      results = Hashie::Mash.new(@client.search(search_option))
+      results = HashWrapper.new(@client.search(search_option))
       source_only ? get_sources(results) : results
     end
 
@@ -49,7 +52,7 @@ module Ej
       dest_client = Elasticsearch::Client.new hosts: dest
       calculate_body = { size: 0 }
       calculate_body[:query] = { query_string: { query: query } } unless query.nil?
-      calculate_data = Hashie::Mash.new(source_client.search index: @index, body: calculate_body)
+      calculate_data = HashWrapper.new(source_client.search index: @index, body: calculate_body)
       total = calculate_data.hits.total
       payloads = ((total/per) + 1).times.to_a
       Parallel.map(payloads, in_processes: proc_num) do |num|
@@ -60,7 +63,7 @@ module Ej
         end
         body = { size: per, from: from }
         body[:query] = { query_string: { query: query } } unless query.nil?
-        data = Hashie::Mash.new(source_client.search index: @index, body: body)
+        data = HashWrapper.new(source_client.search index: @index, body: body)
         docs = data.hits.hits
         bulk_message = []
         docs.each do |doc|
@@ -86,7 +89,7 @@ module Ej
         from = num * per
         body = { size: per, from: from }
         body[:query] = { query_string: { query: query } } unless query.nil?
-        data = Hashie::Mash.new(@client.search index: @index, body: body)
+        data = HashWrapper.new(@client.search index: @index, body: body)
         docs = data.hits.hits
         break if docs.empty?
         docs.each do |doc|

data/lib/ej/version.rb

@@ -1,3 +1,3 @@
 module Ej
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ej
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - toyama0919