ej 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 551d0015a2a0b74774c85195fdf145f1b531e8c6
-  data.tar.gz: 791210a77c5f2051d745969fc77612e39675f416
+  metadata.gz: b0e265c64a78dc3bbee03d836b6014ff02230cf5
+  data.tar.gz: 99a5bc9767afe77467139e167c6e29f9ba15f295
 SHA512:
-  metadata.gz: cdcca2d81f858557e71ca906f790421ac837cbf54c652b542b6aabe6e7492d5cd3ebf8246163842595fa00b080300b47c9dd3b0010e94e8ca4e99d584e8d78f6
-  data.tar.gz: 85d6ca97247aa458b11305393447a9f766ebfa2747b4e626aee4abc554a58ba747af7050e76dfa3ae51b9ae14b771fdab60658a7a9e52b7e068794a8ba722010
+  metadata.gz: fa8937a41e19a3ef15ffc673a90625be86a59907005de7398e75e7d3f3fd80c4aa71c16ea3b6673250e697cf3b26e618e1f0bb70ae39e4ebaec50eae4fb4cf04
+  data.tar.gz: fa7f6f3316420ff29b4a064c23968b389cbb1b49f0b5e30ac34df9c9cd81dd0f0aac08157c3354353082769ee5e3618424dbe7d6d4f35b81ccc01eb7fd8904c6

data/.travis.yml

@@ -0,0 +1,17 @@
+language: ruby
+
+rvm:
+  - 2.1.*
+  - 2.2.*
+  - 2.3.3
+  - 2.4.0
+
+gemfile:
+  - Gemfile
+
+os:
+  - linux
+
+before_install: gem update bundler
+
+script: 'bundle exec rake spec'

data/README.md

@@ -1,8 +1,11 @@
-# Ej
+# Ej 
+
+[![Build Status](https://secure.travis-ci.org/toyama0919/ej.png?branch=master)](http://travis-ci.org/toyama0919/ej)
+[![Gem Version](https://badge.fury.io/rb/ej.svg)](http://badge.fury.io/rb/ej)
 
 elasticsearch command line utility
 
-required ruby version >= 2.0
+support ruby version >= 2.1
 
 ![ej4.gif](https://qiita-image-store.s3.amazonaws.com/0/26670/116a381c-98f6-aa72-fbd9-ddc4b179b744.gif)
 
@@ -35,7 +38,7 @@ ej -s -h other_host:9201
 
 ### query search and index
 ```bash
-ej -s "ip_address: 127.0.0.1" -i logstash-2014.07.01
+ej -s "ip_address: 127.0.0.1" -i logstash-2014.07.01 -h other_host
 ```
 
 ### index list
@@ -45,17 +48,12 @@ ej -l -h other_host
 
 ### count
 ```bash
-ej -c "log_date: 2014-01-15"
-```
-
-### facet
-```bash
-ej -f session_id -q "log_date: 2014-01-15"
+ej -c "log_date: 2014-01-15" -h other_host
 ```
 
 ### mapping
 ```bash
-ej -m
+ej -m -h other_host
 ```
 
 ### delete index
@@ -63,6 +61,22 @@ ej -m
 ej delete -i logstash-2014.07.01 -h other_host
 ```
 
+### copy index from remote to remote
+```bash
+ej copy --source remote_host1:9200 --dest remote_host2:9200 -i logstash-2017.01.27 -q 'size: 631'
+```
+
+## monitor
+
+### node stats
+```bash
+ej nodes_stats -h remote_host1
+```
+
+### settings
+```bash
+ej settings -h remote_host1
+```
 
 ## Contributing
 

data/ej.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.5"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake", '< 11.0'
   spec.add_development_dependency "pry"
   spec.add_development_dependency "pry-doc"
   spec.add_development_dependency 'rspec', '~> 2.4'

data/lib/ej.rb

@@ -2,5 +2,11 @@
 # !/usr/bin/env ruby
 # coding: utf-8
 require 'ej/version'
+require 'ej/constants'
+require 'ej/values'
+require 'ej/util'
 require 'ej/core'
+require 'ej/indices'
+require 'ej/nodes'
+require 'ej/cluster'
 require 'ej/commands'

data/lib/ej/cluster.rb

@@ -0,0 +1,17 @@
+module Ej
+  class Cluster
+    def initialize(values)
+      @logger =  values.logger
+      @index = values.index
+      @client = values.client
+    end
+
+    def health
+      @client.cluster.health
+    end
+
+    def state
+      @client.cluster.state
+    end
+  end
+end

data/lib/ej/commands.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-# coding: utf-8
 require 'ej/core'
 require 'thor'
 require 'yajl'
@@ -17,13 +15,16 @@ module Ej
     map '-l' => :indices
     map '-a' => :aliases
     map '-m' => :mapping
-    map '-e' => :debug_eval
     map '--health' => :health
 
     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])
+      values = Values.new(@global_options)
+      @core = Ej::Core.new(values)
+      @indices = Ej::Indices.new(values)
+      @cluster = Ej::Cluster.new(values)
+      @nodes = Ej::Nodes.new(values)
     end
 
     desc '-s [lucene query]', 'search'
@@ -31,7 +32,7 @@ module Ej
     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'
+    option :meta, type: :boolean, default: false, desc: 'meta'
     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])
@@ -39,7 +40,7 @@ module Ej
                              query,
                              options[:size],
                              options[:from],
-                             options[:source_only],
+                             options[:meta],
                              nil,
                              options[:fields],
                              options[:sort]
@@ -65,16 +66,14 @@ module Ej
     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'
-    option :proc_num, type: :numeric, default: 1, desc: 'proc num for multi thread'
-    option :from, type: :numeric, default: 0, desc: 'from'
+    option :scroll, type: :string, default: "1m", desc: 'scroll'
     def copy
       @core.copy(
         options[:source],
         options[:dest],
         options[:query],
         options[:per],
-        options[:proc_num],
-        options[:from]
+        options[:scroll]
       )
     end
 
@@ -112,51 +111,63 @@ module Ej
       puts_with_format(@core.max(options[:term]))
     end
 
-    desc '-b', 'bulk import STDIN JSON'
+    desc '-b', 'bulk import 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
     option :add_timestamp, type: :boolean, default: true, desc: 'add_timestamp'
     option :id_keys, type: :array, aliases: '--id', default: nil, desc: 'id'
+    option :inputs, type: :array, aliases: '--inputs', default: [], desc: 'input files path.'
     def bulk
-      @core.bulk(options[:timestamp_key], options[:type], options[:add_timestamp], options[:id_keys], options[:index])
+      inputs = options[:inputs].empty? ? [STDIN] : options[:inputs]
+      inputs.each do |key|
+        buffer = (key.class == STDIN.class) ? STDIN.read : File.read(key)
+        @core.bulk(
+          options[:timestamp_key],
+          options[:type],
+          options[:add_timestamp],
+          options[:id_keys],
+          options[:index],
+          Util.parse_json(buffer)
+        )
+      end
     end
 
     desc 'health', 'health'
     def health
-      puts_with_format(@core.health)
+      puts_with_format(@cluster.health)
     end
 
     desc '-a', 'list aliases'
     def aliases
-      puts_with_format(@core.aliases)
+      puts_with_format(@indices.aliases)
     end
 
     desc 'state', 'state'
     def state
-      puts_with_format(@core.state)
+      puts_with_format(@cluster.state)
     end
 
     desc 'indices', 'show indices summary'
     def indices
-      puts_with_format(@core.indices)
+      puts_with_format(@indices.indices)
     end
 
     desc 'stats', 'index stats'
     def stats
-      puts_with_format(@core.stats)
+      puts_with_format(@indices.stats)
     end
 
     desc 'mapping', 'show mapping'
     def mapping
-      puts_with_format(@core.mapping)
+      puts_with_format(@indices.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_with_format(@core.put_template('ej_init', hash))
+      puts_with_format(@indices.put_template('ej_init', hash))
     end
 
     desc 'put_routing', "put routing.\nexsample. ej put_routing -i someindex -t sometype --path somecolumn"
@@ -165,69 +176,69 @@ 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_with_format(@core.put_mapping(options[:index], options[:type], body))
+      puts_with_format(@indices.put_mapping(options[:index], options[:type], body))
     end
 
     desc 'put_template', 'put template'
     def put_template(name)
       hash = Yajl::Parser.parse(STDIN.read)
-      puts_with_format(@core.put_template(name, hash))
+      puts_with_format(@indices.put_template(name, hash))
     end
 
     desc 'create_aliases', 'create aliases'
     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])
+      @indices.create_aliases(options[:alias], options[:indices])
     end
 
     desc 'recovery', 'recovery'
     def recovery
-      @core.recovery
+      @indices.recovery
     end
 
     desc 'delete', 'delete'
     option :index, aliases: '-i', type: :string, default: nil, required: true, desc: 'index'
     option :type, type: :string, aliases: '-t', default: nil, desc: 'type'
-    option :query, type: :string, aliases: '-q', default: nil, desc: 'query'
+    option :query, type: :hash, aliases: '-q', default: nil, desc: 'query'
     def delete
-      @core.delete(options[:index], options[:type], options[:query])
+      @indices.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])
+      @indices.delete_template(options[:name])
     end
 
     desc 'template', 'show template'
     def template
-      puts_with_format(@core.template)
+      puts_with_format(@indices.template)
     end
 
     desc 'settings', 'show template'
     def settings
-      puts_with_format(@core.settings)
+      puts_with_format(@indices.settings)
     end
 
     desc 'warmer', 'warmer'
     def warmer
-      puts_with_format(@core.warmer)
+      puts_with_format(@indices.warmer)
     end
 
     desc 'refresh', 'refresh'
     def refresh
-      puts_with_format(@core.refresh)
+      puts_with_format(@indices.refresh)
     end
 
     desc 'nodes_info', 'view nodes info'
     def nodes_info
-      puts_with_format @core.nodes_info
+      puts_with_format @nodes.nodes_info
     end
 
     desc 'nodes_stats', 'view nodes stats'
     def nodes_stats
-      puts_with_format @core.nodes_stats
+      puts_with_format @nodes.nodes_stats
     end
 
     private

data/lib/ej/constants.rb

@@ -0,0 +1,3 @@
+module Ej
+  DEFAULT_PER = 1000
+end

data/lib/ej/core.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-# coding: utf-8
 require 'yajl'
 require 'elasticsearch'
 require 'hashie'
@@ -12,16 +10,13 @@ end
 
 module Ej
   class Core
-    DEFAULT_PER = 1000
-    def initialize(host, index, debug)
-      @logger =  Logger.new($stderr)
-      @logger.level = debug ? Logger::DEBUG : Logger::INFO
-
-      @index = index
-      @client = Elasticsearch::Client.new hosts: host, logger: @logger, index: @index
+    def initialize(values)
+      @logger =  values.logger
+      @index = values.index
+      @client = values.client
     end
 
-    def search(type, query, size, from, source_only, routing = nil, fields = nil, sort = nil)
+    def search(type, query, size, from, meta, routing = nil, fields = nil, sort = nil)
       body = { from: from }
       body[:size] = size unless size.nil?
       if sort
@@ -36,7 +31,7 @@ module Ej
       search_option[:routing] = routing unless routing.nil?
       search_option[:_source] = fields.nil? ? nil : fields.join(',')
       results = HashWrapper.new(@client.search(search_option))
-      source_only ? get_sources(results) : results
+      meta ? results : Util.get_sources(results)
     end
 
     def distinct(term, type, query)
@@ -45,42 +40,6 @@ module Ej
       @client.search index: @index, type: type, body: body
     end
 
-    def copy(source, dest, query, per_size, proc_num, define_from = 0)
-      per = per_size || DEFAULT_PER
-      logger = Logger.new($stdout)
-      source_client = Elasticsearch::Client.new hosts: source, index: @index
-      dest_client = Elasticsearch::Client.new hosts: dest
-      calculate_body = { size: 0 }
-      calculate_body[:query] = { query_string: { query: query } } unless query.nil?
-      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|
-        from = num * per
-        if from < define_from
-          logger.info("skip index (#{num} #{from}-#{from + per})/#{total}")
-          next
-        end
-        body = { size: per, from: from }
-        body[:query] = { query_string: { query: query } } unless query.nil?
-        data = HashWrapper.new(source_client.search index: @index, body: body)
-        docs = data.hits.hits
-        bulk_message = []
-        docs.each do |doc|
-          source = doc.delete('_source')
-          doc.delete('_score')
-          ['_id', '_type', '_index'].each do |meta_field|
-            source.delete(meta_field)
-          end
-          bulk_message << { index: doc.to_h }
-          bulk_message << source
-        end
-        send_with_retry(dest_client, bulk_message)
-
-        logger.info("copy complete (#{num} #{from}-#{from + docs.size})/#{total}")
-      end
-    end
-
     def dump(query, per_size)
       per = per_size || DEFAULT_PER
       num = 0
@@ -170,151 +129,88 @@ module Ej
       @client.search index: @index, body: body, size: 0
     end
 
-    def aliases
-      @client.indices.get_aliases
-    end
-
-    def health
-      @client.cluster.health
-    end
-
-    def state
-      @client.cluster.state
-    end
-
-    def indices
-      @client.cat.indices format: 'json'
-    end
-
-    def stats
-      @client.indices.stats index: @index
-    end
-
-    def put_mapping(index, type, body)
-      @client.indices.create index: index unless @client.indices.exists index: index
-      @client.indices.put_mapping index: index, type: type, body: body
-    end
-
-    def mapping
-      data = @client.indices.get_mapping index: @index
-      @index == '_all' ? data : data[@index]['mappings']
-    end
-
-    def put_template(name, hash)
-      @client.indices.put_template name: name, body: hash
-    end
-
-    def create_aliases(als, indices)
-      actions = []
-      indices.each do |index|
-        actions << { add: { index: index, alias: als } }
-      end
-      @client.indices.update_aliases body: {
-        actions: actions
-      }
-    end
-
-    def recovery
-      @client.indices.recovery index: @index
-    end
-
-    def delete(index, type, query)
-      if query.nil?
-        if type.nil?
-          @client.indices.delete index: index
+    def bulk(timestamp_key, type, add_timestamp, id_keys, index, data)
+      template = id_keys.map { |key| '%s' }.join('_') unless id_keys.nil?
+      bulk_message = []
+      data.each do |record|
+        if timestamp_key.nil?
+          timestamp = Time.now.to_datetime.to_s
         else
-          @client.delete_by_query index: index, type: type, q: '*'
+          timestamp = record[timestamp_key].to_time.to_datetime.to_s
         end
-      else
-        @client.delete_by_query index: index, type: type, q: query
+        record.merge!('@timestamp' => timestamp) if add_timestamp
+        meta = { index: { _index: index, _type: type } }
+        meta[:index][:_id] = Util.generate_id(template, record, id_keys) unless id_keys.nil?
+        bulk_message << meta
+        bulk_message << record
       end
+      connect_with_retry { @client.bulk body: bulk_message unless bulk_message.empty? }
     end
 
-    def template
-      @client.indices.get_template
-    end
+    def copy(source, dest, query, per_size, scroll)
+      source_client = Elasticsearch::Client.new hosts: source
+      dest_client = Elasticsearch::Client.new hosts: dest
 
-    def delete_template(name)
-      @client.indices.delete_template name: name
-    end
+      scroll_option = get_scroll_option(@index, query, per_size, scroll)
+      r = connect_with_retry { source_client.search(scroll_option) }
+      total = r['hits']['total']
+      i = 0
+      i += bulk_results(r, dest_client, i, total)
 
-    def settings
-      @client.indices.get_settings
-    end
-
-    def warmer
-      @client.indices.get_warmer index: @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)
+      end
     end
 
-    def refresh
-      @client.indices.refresh index: @index
-    end
+    private
 
-    def nodes_info
-      @client.nodes.info
+    def bulk_results(results, dest_client, before_size, total)
+      bulk_message = convert_results(results)
+      connect_with_retry do
+        dest_client.bulk body: bulk_message unless bulk_message.empty?
+        to_size = before_size + (bulk_message.size/2)
+        @logger.info "copy complete (#{before_size}-#{to_size})/#{total}"
+      end
+      return (bulk_message.size/2)
     end
 
-    def nodes_stats
-      @client.nodes.stats
+    def get_scroll_option(index, query, size, scroll)
+      body = {}
+      body[:query] = { query_string: { query: query } } unless query.nil?
+      search_option = { index: index, scroll: scroll, body: body, size: (size || DEFAULT_PER) }
+      search_option
     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?
+    def convert_results(search_results)
+      data = HashWrapper.new(search_results)
+      docs = data.hits.hits
       bulk_message = []
-      data.each do |record|
-        if timestamp_key.nil?
-          timestamp = Time.now.to_datetime.to_s
-        else
-          timestamp = record[timestamp_key].to_time.to_datetime.to_s
+      docs.each do |doc|
+        source = doc.delete('_source')
+        doc.delete('_score')
+        ['_id', '_type', '_index'].each do |meta_field|
+          source.delete(meta_field)
         end
-        record.merge!('@timestamp' => timestamp) if add_timestamp
-        meta = { index: { _index: index, _type: type } }
-        meta[:index][:_id] = generate_id(template, record, id_keys) unless id_keys.nil?
-        bulk_message << meta
-        bulk_message << record
-      end
-      bulk_message.each_slice(10000).each do |block|
-        send_with_retry(@client, block)
+        bulk_message << { index: doc.to_h }
+        bulk_message << source
       end
+      bulk_message
     end
 
-    private
-
-    def send_with_retry(client, bulk_message, retry_on_failure = 5)
+    def connect_with_retry(retry_on_failure = 5)
       retries = 0
       begin
-        client.bulk body: bulk_message unless bulk_message.empty?
+        yield if block_given?
       rescue => e
         if retries < retry_on_failure
           retries += 1
-          @logger.warn "Could not push logs to Elasticsearch, resetting connection and trying again. #{e.message}"
+          @logger.warn "Could not connect to Elasticsearch, resetting connection and trying again. #{e.message}"
           sleep 2**retries
           retry
         end
-        raise "Could not push logs to Elasticsearch after #{retries} retries. #{e.message}"
-      end
-    end
-
-    def parse_json(buffer)
-      begin
-        data = Yajl::Parser.parse(buffer)
-      rescue => e
-        data = []
-        buffer.split("\n").each do |line|
-          data << Yajl::Parser.parse(line)
-        end
+        raise "Could not connect to Elasticsearch after #{retries} retries. #{e.message}"
       end
-      data.class == Array ? data : [data]
     end
-
-    def generate_id(template, record, id_keys)
-      template % id_keys.map { |key| record[key] }
-    end
-
-    def get_sources(results)
-      results.hits.hits.map { |result| result._source }
-    end
-
   end
 end

data/lib/ej/indices.rb

@@ -0,0 +1,86 @@
+module Ej
+  class Indices
+    def initialize(values)
+      @logger =  values.logger
+      @index = values.index
+      @client = values.client
+    end
+
+    def aliases
+      @client.indices.get_aliases
+    end
+
+    def indices
+      @client.cat.indices format: 'json'
+    end
+
+    def stats
+      @client.indices.stats index: @index
+    end
+
+    def put_template(name, hash)
+      @client.indices.put_template name: name, body: hash
+    end
+
+    def create_aliases(als, indices)
+      actions = []
+      indices.each do |index|
+        actions << { add: { index: index, alias: als } }
+      end
+      @client.indices.update_aliases body: {
+        actions: actions
+      }
+    end
+
+    def recovery
+      @client.indices.recovery index: @index
+    end
+
+    def put_mapping(index, type, body)
+      @client.indices.create index: index unless @client.indices.exists index: index
+      @client.indices.put_mapping index: index, type: type, body: body
+    end
+
+    def mapping
+      data = @client.indices.get_mapping index: @index
+      @index == '_all' ? data : data[@index]['mappings']
+    end
+
+    def delete(index, type, query)
+      if query.nil?
+        if type.nil?
+          @client.indices.delete index: index
+        else
+          @client.delete_by_query index: index, type: type, q: '*'
+        end
+      else
+        body = {
+          query: {
+            match: query
+          }
+        }
+        @client.delete_by_query index: index, body: body
+      end
+    end
+
+    def template
+      @client.indices.get_template
+    end
+
+    def delete_template(name)
+      @client.indices.delete_template name: name
+    end
+
+    def settings
+      @client.indices.get_settings
+    end
+
+    def warmer
+      @client.indices.get_warmer index: @index
+    end
+
+    def refresh
+      @client.indices.refresh index: @index
+    end
+  end
+end

data/lib/ej/nodes.rb

@@ -0,0 +1,17 @@
+module Ej
+  class Nodes
+    def initialize(values)
+      @logger =  values.logger
+      @index = values.index
+      @client = values.client
+    end
+
+    def nodes_info
+      @client.nodes.info
+    end
+
+    def nodes_stats
+      @client.nodes.stats
+    end
+  end
+end

data/lib/ej/util.rb

@@ -0,0 +1,23 @@
+module Ej
+  class Util
+    def self.parse_json(buffer)
+      begin
+        data = Yajl::Parser.parse(buffer)
+      rescue => e
+        data = []
+        buffer.lines.each do |line|
+          data << Yajl::Parser.parse(line)
+        end
+      end
+      data.class == Array ? data : [data]
+    end
+
+    def self.generate_id(template, record, id_keys)
+      template % id_keys.map { |key| record[key] }
+    end
+
+    def self.get_sources(results)
+      results.hits.hits.map { |result| result._source }
+    end
+  end
+end

data/lib/ej/values.rb

@@ -0,0 +1,18 @@
+module Ej
+  class Values
+    attr_reader :client
+    attr_reader :index
+    attr_reader :logger
+
+    def initialize(global_options)
+      @logger =  Logger.new($stderr)
+      @logger.level = global_options[:debug] ? Logger::DEBUG : Logger::INFO
+      @client = Elasticsearch::Client.new(
+        hosts: global_options[:host],
+        logger: @logger,
+        index: global_options[:index]
+      )
+      @index = global_options[:index]
+    end
+  end
+end

data/lib/ej/version.rb

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

data/spec/commands_spec.rb

@@ -14,7 +14,7 @@ describe Ej::Commands do
     output.should include('--query')
     output.should include('--size')
     output.should include('--from')
-    output.should include('--source-only')
+    output.should include('--meta')
   end
 
   it "should exists copy option" do

data/spec/core_spec.rb

@@ -3,29 +3,20 @@ require 'ej'
 
 describe Ej::Core do
   before do
-    @core = Core.new('localhost', '_all', false)
+    values = Values.new(
+      {
+        index: '_all',
+        host: 'localhost',
+        debug: false
+      }
+    )
+    @core = Core.new(values)
   end
 
   it "core not nil" do
     @core.should_not nil
   end
 
-  it "parse json" do
-    @core.send(:parse_json, '{"id":1, "name":"rspec"}').should == [{"id" => 1, "name" => "rspec"}]
-  end
-
-  it "parse json" do
-    json = %[{"id":1, "name":"rspec"}
-      {"id":1, "name":"rspec"}
-      {"id":1, "name":"rspec"}
-      {"id":1, "name":"rspec"}] 
-    @core.send(:parse_json, json).should == [{"id" => 1, "name" => "rspec"}, {"id" => 1, "name" => "rspec"}, {"id" => 1, "name" => "rspec"}, {"id" => 1, "name" => "rspec"}]
-  end
-
-  it "generate id" do
-    @core.send(:generate_id, '%s_%s', {"id" => 1, "name" => "rspec"}, ['id', 'name']).should == '1_rspec'
-  end
-
   after do
   end
 end

data/spec/util_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+require 'ej'
+
+describe Ej::Util do
+  before do
+  end
+
+  it "parse json" do
+    Util.parse_json('{"id":1, "name":"rspec"}').should == [{"id" => 1, "name" => "rspec"}]
+  end
+
+  it "parse jsonl" do
+    json = %[{"id":1, "name":"rspec"}
+      {"id":1, "name":"rspec"}
+      {"id":1, "name":"rspec"}
+      {"id":1, "name":"rspec"}]
+    Util.parse_json(json).should == [{"id" => 1, "name" => "rspec"}, {"id" => 1, "name" => "rspec"}, {"id" => 1, "name" => "rspec"}, {"id" => 1, "name" => "rspec"}]
+  end
+
+  it "parse json array" do
+    json = %[[
+      {"id":1, "name":"rspec"},
+      {"id":2, "name":"rspec"},
+      {"id":3, "name":"rspec"},
+      {"id":4, "name":"rspec"}
+    ]]
+    Util.parse_json(json).should == [{"id" => 1, "name" => "rspec"}, {"id" => 2, "name" => "rspec"}, {"id" => 3, "name" => "rspec"}, {"id" => 4, "name" => "rspec"}]
+  end
+
+  it "generate id" do
+    Util.generate_id('%s_%s', {"id" => 1, "name" => "rspec"}, ['id', 'name']).should == '1_rspec'
+  end
+
+  after do
+  end
+end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: ej
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - toyama0919
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-08 00:00:00.000000000 Z
+date: 2017-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -160,6 +160,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".pryrc"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -167,13 +168,20 @@ files:
 - bin/ej
 - ej.gemspec
 - lib/ej.rb
+- lib/ej/cluster.rb
 - lib/ej/commands.rb
+- lib/ej/constants.rb
 - lib/ej/core.rb
+- lib/ej/indices.rb
+- lib/ej/nodes.rb
+- lib/ej/util.rb
+- lib/ej/values.rb
 - lib/ej/version.rb
 - spec/commands_spec.rb
 - spec/core_spec.rb
 - spec/ej_spec.rb
 - spec/spec_helper.rb
+- spec/util_spec.rb
 - template/ejrc.erb
 - template/not_analyze_template.json
 homepage: https://github.com/toyama0919/ej
@@ -196,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: elasticsearch command line utility.
@@ -205,4 +213,4 @@ test_files:
 - spec/core_spec.rb
 - spec/ej_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 
+- spec/util_spec.rb