ej 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c59e2d9ef69659e78965bdf47966eb4dbc290d1b
-  data.tar.gz: 5c38f14f40b51b17b2aadb74764a4e5b385a9d97
+  metadata.gz: 0c287ef1568268d6329315195b6f2255a6cca268
+  data.tar.gz: d700cae1c877b2009112ec5125ba615f66444bb1
 SHA512:
-  metadata.gz: a574e5a65c979ab40fabe18b5c3ec74f37d00a7982e1987e916379319b8b87b4901e01c2d2b34875e5a8782a7bda475091b7b4cc9d8a759c5bb3627582a14fc8
-  data.tar.gz: 773b7994f96c5f98ae1782d6189b1816be4f3148317d6ded743bfb77822e5e81044f0186e1c54b32cb78c479687be6690fbc4bd3636aff4510b6499e352d1851
+  metadata.gz: 9bfeb51bc5202b6185a168e1c38b4a705248f01357191ef8bc2198b1b8f3d6b715762d8ac367b8d72ba397cf2e894c3a51183f37b8ebdbc06dda77b9ecce646d
+  data.tar.gz: 41009a197052df5f4b0030e14f970a2964d70c79e8157f0d62b5e6fb760009d35dc2ebdbe1123bfdc0b05e0079f6d4b27c80ea27cf3c6b21cb6e3bbbca297a63

data/lib/ej/commands.rb

@@ -16,7 +16,7 @@ module Ej
     map '-s' => :search
     map '-f' => :facet
     map '-c' => :count
-    map '-I' => :bulk
+    map '-b' => :bulk
     map '-l' => :indices
     map '-a' => :aliases
     map '-m' => :mapping
@@ -34,14 +34,24 @@ module Ej
     option :type, type: :string, aliases: '-t', default: nil, desc: 'type'
     option :size, type: :numeric, aliases: '-n', default: nil, desc: 'size'
     option :from, type: :numeric, aliases: '--from', default: 0, desc: 'from'
+    option :fields, type: :array, aliases: '--fields', default: nil, desc: 'fields'
     option :source_only, type: :boolean, aliases: '--so', default: true, desc: 'from'
-    def search(query = nil)
-      puts_json(@core.search(options['type'], query, options['size'], options['from'], options['source_only']))
+    option :query, type: :string, aliases: '-q', default: nil, desc: 'query'
+    def search(query = options['query'])
+      puts_json(@core.search(options['type'],
+                             query,
+                             options['size'],
+                             options['from'],
+                             options['source_only'],
+                             query,
+                             options['fields']
+                             ))
     end
 
     desc 'total [lucene query]', 'total'
     option :type, type: :string, aliases: '-t', default: nil, desc: 'type'
-    def count(query = nil)
+    option :query, type: :string, aliases: '-q', default: nil, desc: 'query'
+    def count(query = options['query'])
       puts_json(@core.search(options['type'], query, 0, 0, false))
     end
 
@@ -52,15 +62,15 @@ module Ej
       puts_json(@core.distinct(term, options['type'], options['query']))
     end
 
-    desc 'move', 'move index'
+    desc 'copy', 'copy index'
     option :source, type: :string, aliases: '--source', required: true, desc: 'source host'
     option :dest, type: :string, aliases: '--dest', required: true, desc: 'dest host'
     option :query, type: :string, aliases: '-q', default: nil, desc: 'query'
-    def move
-      @core.move(options['source'], options['dest'], options['query'])
+    def copy
+      @core.copy(options['source'], options['dest'], options['query'])
     end
 
-    desc 'dump', 'move index'
+    desc 'dump', 'dump index'
     option :query, type: :string, aliases: '-q', default: nil, desc: 'query'
     def dump
       @core.dump(options['query'])
@@ -92,7 +102,7 @@ module Ej
       puts_json(@core.max(options['term']))
     end
 
-    desc '-I', 'bulk import STDIN JSON'
+    desc '-b', 'bulk import STDIN JSON'
     option :index, aliases: '-i', type: :string, default: "logstash-#{Time.now.strftime('%Y.%m.%d')}", required: true, desc: 'index'
     option :type, type: :string, aliases: '-t', default: nil, required: true, desc: 'type'
     option :timestamp_key, aliases: '--timestamp_key', type: :string, desc: 'timestamp key', default: nil
@@ -200,6 +210,16 @@ module Ej
       puts_json(@core.refresh)
     end
 
+    desc 'info', 'view nodes info'
+    def nodes_info
+      puts_json @core.nodes_info
+    end
+
+    desc 'stats', 'view nodes stats'
+    def nodes_stats
+      puts_json @core.nodes_stats
+    end
+
     desc '--j2h', 'json to hash'
     def json_to_hash
       pp Yajl::Parser.parse(STDIN.read)

data/lib/ej/core.rb

@@ -15,12 +15,13 @@ module Ej
       @client = Elasticsearch::Client.new hosts: host, logger: @logger, index: @index
     end
 
-    def search(type, query, size, from, source_only, routing = nil)
+    def search(type, query, size, from, source_only, routing = nil, fields = nil)
       body = { from: from }
       body[:size] = size unless size.nil?
       body[:query] = { query_string: { query: query } } unless query.nil?
       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))
       source_only ? get_sources(results) : results
     end
@@ -31,7 +32,7 @@ module Ej
       @client.search index: @index, type: type, body: body
     end
 
-    def move(source, dest, query)
+    def copy(source, dest, query)
       per = DEFAULT_PER
       num = 0
       logger = Logger.new($stdout)
@@ -53,7 +54,7 @@ module Ej
           bulk_message << source
         end
         dest_client.bulk body: bulk_message unless bulk_message.empty?
-        logger.info("move complete #{from + docs.size}/#{total}")
+        logger.info("copy complete #{from + docs.size}/#{total}")
         num += 1
       end
     end
@@ -206,6 +207,14 @@ module Ej
       @client.indices.refresh index: @index
     end
 
+    def nodes_info
+      @client.nodes.info
+    end
+
+    def nodes_stats
+      @client.nodes.stats
+    end
+
     def bulk(timestamp_key, type, add_timestamp, id_keys, index)
       data = parse_json(STDIN.read)
       template = id_keys.map { |key| '%s' }.join('_') unless id_keys.nil?

data/lib/ej/version.rb

@@ -1,3 +1,3 @@
 module Ej
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ej
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - toyama0919
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-23 00:00:00.000000000 Z
+date: 2014-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler