lib/ej/commands.rb in ej-0.0.5 vs lib/ej/commands.rb in ej-0.0.6

@@ -6,18 +6,14 @@
 require 'ej/core'
 require 'active_support/core_ext/array'
 require 'active_support/core_ext/string'
 require 'logger'
 
-USER_SETTING_FILE = "#{ENV['HOME']}/.ejrc"
-CURRENT_SETTING_FILE = ".ejrc"
-
 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 :profile, aliases: '-p', type: :string, default: 'default', desc: 'profile by .ejrc'
     class_option :debug, aliases: '-d', type: :string, default: false, desc: 'debug mode'
     map '-s' => :search
     map '-f' => :facet
     map '-c' => :count
     map '-I' => :bulk
@@ -32,22 +28,10 @@
       super(args, options, config)
       @global_options = config[:shell].base.options
       @core = Ej::Core.new(@global_options['host'], @global_options['index'], @global_options['debug'])
     end
 
-    desc 'init', 'init'
-    def init
-      setting_file_path = "#{ENV['HOME']}/.ejrc"
-      default = {}
-      default['default'] = {}
-      default['default']['host'] = ask("What is default host?", default: 'localhost')
-      default['default']['port'] = ask("What is default port?", default: 9200)
-      default['default']['index'] = ask("What is default index?", default: '_all')
-      File.write(setting_file_path, default.to_yaml)
-      say("save setting file #{setting_file_path}", :green)
-    end
-
     desc '-s [lucene query]', 'search'
     option :type, type: :string, aliases: '-t', default: nil, desc: 'type'
     option :size, type: :numeric, aliases: '-n', default: 10, desc: 'size'
     option :from, type: :numeric, aliases: '--from', default: 0, desc: 'from'
     option :source_only, type: :boolean, aliases: '--so', default: true, desc: 'from'
@@ -119,31 +103,31 @@
     desc '-a', 'list aliases'
     def aliases
       puts_json(@core.aliases)
     end
 
-    desc 'state', 'health'
+    desc 'state', 'state'
     def state
       puts_json(@core.state)
     end
 
-    desc 'indices', 'indices'
+    desc 'indices', 'show indices summary'
     def indices
       puts_json(@core.indices)
     end
 
-    desc 'stats', 'count'
+    desc 'stats', 'index stats'
     def stats
       puts_json(@core.stats)
     end
 
-    desc 'mapping', 'count'
+    desc 'mapping', 'show mapping'
     def mapping
       puts_json(@core.mapping)
     end
 
-    desc 'not_analyzed', 'not_analyzed'
+    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))
     end
@@ -155,57 +139,58 @@
     def put_routing
       body = { options['type'] => {"_routing"=>{"required"=>true, "path"=>options['path']}}}
       puts_json(@core.put_mapping(options['index'], options['type'], body))
     end
 
-    desc 'put_template', 'put_template'
+    desc 'put_template', 'put template'
     def put_template(name)
       hash = Yajl::Parser.parse(STDIN.read)
       puts_json(@core.put_template(name, hash))
     end
 
-    desc 'create_aliases', 'create_aliases'
-    option :alias, type: :string, aliases: '-a', default: nil, required: true, desc: 'type'
-    option :indices, type: :array, aliases: '-x', default: nil, required: true, desc: 'type'
+    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'])
     end
 
     desc 'recovery', 'recovery'
     def recovery
       @core.recovery
     end
 
-    desc 'delete', 'delete index'
-    option :index, aliases: '-i', type: :string, default: nil, required: true, desc: 'profile by .database.yml'
+    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'
     def delete
-      @core.delete(options['index'], 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'])
     end
 
-    desc 'template', 'get template'
+    desc 'template', 'show template'
     def template
       puts_json(@core.template)
     end
 
-    desc 'settings', 'get template'
+    desc 'settings', 'show template'
     def settings
       puts_json(@core.settings)
     end
 
-    desc 'warmer', 'get warmer'
+    desc 'warmer', 'warmer'
     def warmer
       puts_json(@core.warmer)
     end
 
-    desc 'refresh', 'get refresh'
+    desc 'refresh', 'refresh'
     def refresh
       puts_json(@core.refresh)
     end
 
     desc '--j2h', 'json to hash'
@@ -217,17 +202,7 @@
 
     def puts_json(object)
       puts Yajl::Encoder.encode(object)
     end
 
-    def setting
-      if File.exist?(CURRENT_SETTING_FILE)
-        return YAML.load_file(CURRENT_SETTING_FILE)
-      end
-
-      if File.exist?(USER_SETTING_FILE)
-        return YAML.load_file(USER_SETTING_FILE)
-      end
-      return { host: 'localhost', index: '_all', port: 9200 }
-    end
   end
 end