ej 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0d23dab3ff243a967dac0c83855aec202e66335
-  data.tar.gz: 512d2f7a5191fda2bda9c825e7eadcf435457c27
+  metadata.gz: c6a06d5628b4e5d30dd820cf0059142022db16af
+  data.tar.gz: 4a1e3cbe19bd7a73f1a3a9d717a43c0b5c2d17b6
 SHA512:
-  metadata.gz: 41ffacc81eb4bdb1bdbea0cc2c9b6acade8f3f88ca1185fd07bdf778c35abea78a5058aa0f4d7b4c852f3dc0458addfabdbf7ce688223fa4feca205f1662d9b1
-  data.tar.gz: 3e34edf2b15359fc9b4f4729c55006fa40a5ff92dd399489fc0f89ab01b993c74fbae42b6c8400268133baecfbb3bd11db291a73a843ebf730228ebdd5c0fca6
+  metadata.gz: 668b2706ada7508073b8dee5e37d97991d7eb143f17dba84510d88dddfd82175342d0054a3a3d8b4206e17cc9a9b2b40a26605f6c1dce562f16c2b2dc54cbe9d
+  data.tar.gz: 4c0b9939592bae0dd2650a5e710c6faf8f0c0c9803d235c0249ece62b1a71f506a3f9d6b6cd6b620d380a5e172f3b77cc8d91b492fd6a375a57ff07a87fe1af6

data/README.md

@@ -1,6 +1,8 @@
 # Ej
 
-elasticsearch utility
+elasticsearch command line utility
+
+required ruby version >= 2.0
 
 ## Installation
 
@@ -24,7 +26,7 @@ Or install it yourself as:
 ej -s
 ```
 
-### other host
+### other host(default host is localhost)
 ```bash
 ej -s -h other_host
 ```
@@ -36,12 +38,17 @@ ej -s "ip_address: 127.0.0.1" -i logstash-2014.07.01
 
 ### index list
 ```bash
-ej -l
+ej -l -h other_host
+```
+
+### count
+```bash
+ej -c "log_date: 2014-01-15"
 ```
 
 ### facet
 ```bash
-ej -c ip_address -q "log_date: 2014-01-15"
+ej -f session_id -q "log_date: 2014-01-15"
 ```
 
 ### mapping
@@ -49,6 +56,11 @@ ej -c ip_address -q "log_date: 2014-01-15"
 ej -m
 ```
 
+### delete index
+```bash
+ej delete -i logstash-2014.07.01 -h other_host
+```
+
 
 ## Contributing
 

data/ej.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["toyama0919@gmail.com"]
   spec.summary       = %q{Command-line Elasticsearch TO JSON processor.}
   spec.description   = %q{Command-line Elasticsearch TO JSON processor.}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/toyama0919/ej"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")

data/lib/ej/commands.rb

@@ -8,14 +8,10 @@ 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
@@ -34,18 +30,6 @@ module Ej
       @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'
@@ -121,27 +105,27 @@ module Ej
       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)
@@ -157,15 +141,15 @@ module Ej
       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
@@ -175,11 +159,12 @@ module Ej
       @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'
@@ -188,22 +173,22 @@ module Ej
       @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
@@ -219,15 +204,5 @@ module Ej
       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

data/lib/ej/core.rb

@@ -157,11 +157,15 @@ module Ej
       @client.indices.recovery index: @index
     end
 
-    def delete(index, query)
+    def delete(index, type, query)
       if query.nil?
-        @client.indices.delete index: index
+        if type.nil?
+          @client.indices.delete index: index
+        else
+          @client.delete_by_query index: index, type: type, q: '*'
+        end
       else
-        @client.delete_by_query index: index, q: query
+        @client.delete_by_query index: index, type: type, q: query
       end
     end
 

data/lib/ej/version.rb

@@ -1,3 +1,3 @@
 module Ej
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ej
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - toyama0919
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-22 00:00:00.000000000 Z
+date: 2014-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -158,7 +158,7 @@ files:
 - lib/ej/version.rb
 - template/ejrc.erb
 - template/not_analyze_template.json
-homepage: ''
+homepage: https://github.com/toyama0919/ej
 licenses:
 - MIT
 metadata: {}
@@ -183,3 +183,4 @@ signing_key:
 specification_version: 4
 summary: Command-line Elasticsearch TO JSON processor.
 test_files: []
+has_rdoc: