lib/ej/commands.rb in ej-0.1.11 vs lib/ej/commands.rb in ej-0.1.12

- old
+ new

@@ -1,8 +1,8 @@ require 'ej/core' require 'thor' -require 'yajl' +require 'json' 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' @@ -69,18 +69,20 @@ 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 :scroll, type: :string, default: "1m", desc: 'scroll' option :dest_index, type: :string, desc: 'dest index' + option :slice_max, type: :numeric, desc: 'slice max' def copy @core.copy( options[:source], options[:dest], options[:query], options[:per], options[:scroll], - options[:dest_index] + options[:dest_index], + options[:slice_max] ) end desc 'dump', 'dump index' option :query, type: :string, aliases: '-q', default: nil, desc: 'query' @@ -169,11 +171,11 @@ 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) + hash = JSON.parse(json) 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" option :index, aliases: '-i', type: :string, default: nil, required: true, desc: 'index' @@ -184,11 +186,11 @@ 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) + hash = JSON.parse(STDIN.read) 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' @@ -253,10 +255,10 @@ end private def puts_with_format(object) - puts Yajl::Encoder.encode(object, pretty: true) + puts JSON.pretty_generate(object) end end end