ej 0.0.10 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e13c00ed9f42cd2d40691d5f1acfa125fffcf284
-  data.tar.gz: 1aef0c43f773b32ac03d1f45773f52f94787a079
+  metadata.gz: 3b1ec1d5f0c2e1630c9dcf7aee4e101cc3f53215
+  data.tar.gz: 5a4e7a17581781b171bbcba5f336442ce124bf78
 SHA512:
-  metadata.gz: 21fdb6d389963d441e71fa521a68e125bd2756076b455b19244219d6b30f0848e729fbf333db3504c3c34336a0eaf9c102fd9be8ae616a02158882769ae892c4
-  data.tar.gz: 508a1b1389ea5b0b642b79a5710ce5f09176033aff2530333a539aebf4149aa039244a1ed3c2e2d8604d280704d9eebbe19e0ba9957ea217d8910435c1c56400
+  metadata.gz: 40aa492344a215acdfac37730b50ae3f57a8212903352bf84b80b6ac9bcfebc2617ad7887cb402556c4b113ae2c60caae424ebc4f94a11bce3336039b63e96ac
+  data.tar.gz: 9a281585c27d17bfb97855a869a7736e014aeff119452e48754104c31553f356ec202e37fe1b6b6cc233f6dd37551fc6fe4b53a90ee8dd34bc9ff28feeaf59a0

data/lib/ej/commands.rb

@@ -13,6 +13,8 @@ module Ej
     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 :format, type: :string, default: 'json', enum: ['json', 'yaml'], desc: 'format'
+
     map '-s' => :search
     map '-f' => :facet
     map '-c' => :count
@@ -37,14 +39,16 @@ module Ej
     option :fields, type: :array, aliases: '--fields', default: nil, desc: 'fields'
     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_json(@core.search(options['type'],
+      puts_with_format(@core.search(options['type'],
                              query,
                              options['size'],
                              options['from'],
                              options['source_only'],
-                             query,
-                             options['fields']
+                             nil,
+                             options['fields'],
+                             options['sort']
                              ))
     end
 
@@ -52,54 +56,56 @@ module Ej
     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_json(@core.search(options['type'], query, 0, 0, false))
+      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_json(@core.distinct(term, options['type'], options['query']))
+      puts_with_format(@core.distinct(term, options['type'], options['query']))
     end
 
     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'
+    option :per, type: :numeric, default: nil, desc: 'per'
     def copy
-      @core.copy(options['source'], options['dest'], options['query'])
+      @core.copy(options['source'], options['dest'], options['query'], options['per'])
     end
 
     desc 'dump', 'dump index'
     option :query, type: :string, aliases: '-q', default: nil, desc: 'query'
+    option :per, type: :numeric, default: nil, desc: 'per'
     def dump
-      @core.dump(options['query'])
+      @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_json(@core.facet(term, options['size'], options['query']))
+      puts_with_format(@core.facet(term, options['size'], options['query']))
     end
 
     desc 'aggs', 'aggs'
     option :query, type: :string, aliases: '-q', default: '*', desc: 'query'
     option :size, type: :numeric, aliases: '-n', default: 10, desc: 'size'
     def aggs(term)
-      puts_json(@core.aggs(term, options['size'], options['query']))
+      puts_with_format(@core.aggs(term, options['size'], options['query']))
     end
 
     desc 'min', 'term'
     option :term, type: :string, aliases: '-k', desc: 'terms'
     def min
-      puts_json(@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_json(@core.max(options['term']))
+      puts_with_format(@core.max(options['term']))
     end
 
     desc '-b', 'bulk import STDIN JSON'
@@ -114,39 +120,39 @@ module Ej
 
     desc 'health', 'health'
     def health
-      puts_json(@core.health)
+      puts_with_format(@core.health)
     end
 
     desc '-a', 'list aliases'
     def aliases
-      puts_json(@core.aliases)
+      puts_with_format(@core.aliases)
     end
 
     desc 'state', 'state'
     def state
-      puts_json(@core.state)
+      puts_with_format(@core.state)
     end
 
     desc 'indices', 'show indices summary'
     def indices
-      puts_json(@core.indices)
+      puts_with_format(@core.indices)
     end
 
     desc 'stats', 'index stats'
     def stats
-      puts_json(@core.stats)
+      puts_with_format(@core.stats)
     end
 
     desc 'mapping', 'show mapping'
     def mapping
-      puts_json(@core.mapping)
+      puts_with_format(@core.mapping)
     end
 
     desc 'not_analyzed', 'not analyzed'
     def not_analyzed
       json = File.read(File.expand_path('../../../template/not_analyze_template.json', __FILE__))
       hash = Yajl::Parser.parse(json)
-      puts_json(@core.put_template('ej_init', hash))
+      puts_with_format(@core.put_template('ej_init', hash))
     end
 
     desc 'put_routing', "put routing.\nexsample. ej put_routing -i someindex -t sometype --path somecolumn"
@@ -155,13 +161,13 @@ module Ej
     option :path, type: :string, default: nil, required: true, desc: 'path'
     def put_routing
       body = { options['type'] => {"_routing"=>{"required"=>true, "path"=>options['path']}}}
-      puts_json(@core.put_mapping(options['index'], options['type'], body))
+      puts_with_format(@core.put_mapping(options['index'], options['type'], body))
     end
 
     desc 'put_template', 'put template'
     def put_template(name)
       hash = Yajl::Parser.parse(STDIN.read)
-      puts_json(@core.put_template(name, hash))
+      puts_with_format(@core.put_template(name, hash))
     end
 
     desc 'create_aliases', 'create aliases'
@@ -192,32 +198,32 @@ module Ej
 
     desc 'template', 'show template'
     def template
-      puts_json(@core.template)
+      puts_with_format(@core.template)
     end
 
     desc 'settings', 'show template'
     def settings
-      puts_json(@core.settings)
+      puts_with_format(@core.settings)
     end
 
     desc 'warmer', 'warmer'
     def warmer
-      puts_json(@core.warmer)
+      puts_with_format(@core.warmer)
     end
 
     desc 'refresh', 'refresh'
     def refresh
-      puts_json(@core.refresh)
+      puts_with_format(@core.refresh)
     end
 
     desc 'nodes_info', 'view nodes info'
     def nodes_info
-      puts_json @core.nodes_info
+      puts_with_format @core.nodes_info
     end
 
     desc 'nodes_stats', 'view nodes stats'
     def nodes_stats
-      puts_json @core.nodes_stats
+      puts_with_format @core.nodes_stats
     end
 
     desc '--j2h', 'json to hash'
@@ -227,9 +233,21 @@ module Ej
 
     private
 
+    def puts_with_format(object)
+      if options['format'] == 'json'
+        puts_json(object)
+      elsif options['format'] == 'yaml'
+        puts_yaml(object)
+      end
+    end
+
     def puts_json(object)
       puts Yajl::Encoder.encode(object, pretty: true)
     end
 
+    def puts_yaml(object)
+      puts YAML.dump(object)
+    end
+
   end
 end

data/lib/ej/core.rb

@@ -8,16 +8,23 @@ require 'pp'
 
 module Ej
   class Core
-    DEFAULT_PER = 30000
+    DEFAULT_PER = 1000
     def initialize(host, index, debug)
       @logger =  debug ? Logger.new($stderr) : nil
       @index = index
       @client = Elasticsearch::Client.new hosts: host, logger: @logger, index: @index
     end
 
-    def search(type, query, size, from, source_only, routing = nil, fields = nil)
+    def search(type, query, size, from, source_only, routing = nil, fields = nil, sort = nil)
       body = { from: from }
       body[:size] = size unless size.nil?
+      if sort
+        sorts = []
+        sort.each do |k, v|
+          sorts << { k => v }
+        end
+        body[:sort] = sorts
+      end
       body[:query] = { query_string: { query: query } } unless query.nil?
       search_option = { index: @index, type: type, body: body }
       search_option[:routing] = routing unless routing.nil?
@@ -32,8 +39,8 @@ module Ej
       @client.search index: @index, type: type, body: body
     end
 
-    def copy(source, dest, query)
-      per = DEFAULT_PER
+    def copy(source, dest, query, per_size)
+      per = per_size || DEFAULT_PER
       num = 0
       logger = Logger.new($stdout)
       source_client = Elasticsearch::Client.new hosts: source, index: @index
@@ -59,11 +66,11 @@ module Ej
       end
     end
 
-    def dump(query)
-      per = DEFAULT_PER
+    def dump(query, per_size)
+      per = per_size || DEFAULT_PER
       num = 0
-      bulk_message = []
       while true
+        bulk_message = []
         from = num * per
         body = { size: per, from: from }
         body[:query] = { query_string: { query: query } } unless query.nil?
@@ -77,8 +84,8 @@ module Ej
           bulk_message << Yajl::Encoder.encode(source)
         end
         num += 1
+        puts bulk_message.join("\n")
       end
-      puts bulk_message.join("\n")
     end
 
     def facet(term, size, query)
@@ -106,7 +113,8 @@ module Ej
                "aggs"=>
                 {"agg_" + term =>
                   {"terms"=>{"field"=>term, "size"=>size, "order"=>{"_count"=>"desc"}}}}}
-      @client.search index: @index, body: body
+      results = @client.search index: @index, body: body
+      results['aggregations']["agg_" + term]['buckets']
     end
 
     def min(term)

data/lib/ej/version.rb

@@ -1,3 +1,3 @@
 module Ej
-  VERSION = '0.0.10'
+  VERSION = '0.0.12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ej
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.12
 platform: ruby
 authors:
 - toyama0919
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-10 00:00:00.000000000 Z
+date: 2016-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -196,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: elasticsearch command line utility.