estool 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37793a5579184fc43104c1a9d5ceda2d311a0902
-  data.tar.gz: b47cd4d8b68c1cda023f4604f57c77f9cd5ea9a3
+  metadata.gz: b3770df1f149ae9be6d2638a703144645c1fd2ef
+  data.tar.gz: de5b0a2dacadfb14b308a35e2ed0f90179f1e4ea
 SHA512:
-  metadata.gz: 82205fdcaaa2e2d64d043efa6cc9c2954627b4523c473944654852edeceb6dba8af8545e04c755a79edec988823b329982ab3b59051806aaf44c3add07236ff1
-  data.tar.gz: c7be4fe976f8cd0464beb9fb97db843d81df2b42b77f1fb72c8f696c92816401be228f2bc42efa9c5d897d8eb1782ef9768b27ab97b706fd1486a6e64f7de3ca
+  metadata.gz: f4b21640caf7ca35ef97093afcd2c7a54c5de6b314912ffe99a95429bba797b55a3cab49b0f093cb928ed23453711176b59eec171e454cce7f467579fa89c636
+  data.tar.gz: 0f9e53f32d55b39ca70f02423ec26e13b8f67d79d9f490a6a38d8155621d789ce03aa2ae27755013dbd1bdb89b0745aa3a075a12dc581c4259ef9e1eeba72dbc

data/bin/estool

@@ -1,5 +1,35 @@
 #!/usr/bin/env ruby
+require 'gli'
 require 'estool'
 
-# Placeholder
-Estool::Cli.start(ARGV)
+module Estool
+  module Cli
+    include GLI::App
+    extend self
+
+    program_desc 'Command line tool for interacting with Elasticsearch'
+
+    version Estool::VERSION
+
+    subcommand_option_handling :normal
+    arguments :strict
+
+    # global Options
+    desc 'Elasticsearch Host'
+    arg_name 'HOST'
+    default_value '127.0.0.1'
+    flag [:h, :host]
+
+    desc 'Elasticsearch REST Port'
+    arg_name 'PORT'
+    default_value '9200'
+    flag [:p, :port]
+
+    desc 'Show verbose output'
+    switch [:v, :verbose], negatable: false
+
+    require 'estool/cli'
+
+    exit run(ARGV)
+  end
+end

data/lib/estool.rb

@@ -1,11 +1,2 @@
-#!/usr/bin/env ruby
-require 'estool/cat'
-require 'estool/index'
-require 'thor'
-
-module Estool
-  class Cli < Thor
-    register(Estool::Cat, 'cat', 'cat [SUBCOMMAND] [OPTIONS]', 'Display health and status information about the cluster', )
-    register(Estool::Index, 'index', 'index [SUBCOMMAND] [OPTIONS]', 'Manage cluster indices', )
-  end
-end
+require 'estool/version'
+#require 'estool/cli'

data/lib/estool/actions/cat.rb

@@ -15,17 +15,15 @@ module Estool::Actions
       params = {}
       data.each do |k, v|
         case k
-          when 'verbose'
+        when :verbose
             params.merge!(v: v)
-          when 'output'
+          when :output
             params.merge!(format: v)
-          when 'timeout'
-            params.merge!(master_timeout: v)
-          when 'name'
+          when :name
             params.merge!(name: v)
-          when 'node'
+          when :node
             params.merge!(node_id: v)
-          when 'primary'
+          when :primary
             params.merge!(pri: v)
           else
             params.merge!("#{k}": v)
@@ -42,7 +40,7 @@ module Estool::Actions
       rescue ArgumentError => args
         puts "
              #{args}
-        Usage: 'estool cat help #{action}' for more information
+        Usage: 'estool help #{action}' for more information
         "
         exit 1
       end
@@ -53,4 +51,4 @@ module Estool::Actions
       cat(@cmd, params, @server)
     end
   end
-end
+end

data/lib/estool/actions/index.rb

@@ -15,11 +15,11 @@ module Estool::Actions
       params = {}
       data.each do |k, v|
         case k
-          when 'name'
+        when :name
             params.merge!(index: v)
-          when 'update'
+          when :update
             params.merge!(update_all_types: v)
-          when 'wait'
+          when :wait
             params.merge!(wait_for_active_shards: v)
           else
             params.merge!("#{k}": v)
@@ -47,4 +47,4 @@ module Estool::Actions
       index(@cmd, params, @server)
     end
   end
-end
+end

data/lib/estool/cli.rb

@@ -0,0 +1,5 @@
+module Estool
+  module Cli
+    Dir[File.dirname(__FILE__) + '/cli/*.rb'].each { |file| require file }
+  end
+end

data/lib/estool/cli/aliases.rb

@@ -0,0 +1,33 @@
+require 'estool/actions/index'
+
+module Estool
+  module Cli
+    desc 'Interact with Elasticsearch Index Aliases'
+    command :aliases do |c|
+
+      c.desc 'Get a list of aliases'
+      c.long_desc %{
+        Get a list of all aliases or a list of aliases for a specific index.
+      }
+      c.command [:list, :ls] do |ls|
+
+        ls.flag 'name', :arg_name => 'alias name(s)',
+                        :desc => 'Comma separated list of aliases to get information about'
+
+        ls.flag [:index, :i], :arg_name => 'index name(s)',
+                              :desc => 'Comma separated list of index names'
+
+        ls.action do |global_options,options,args|
+          options = {
+            host: global_options[:host],
+            port: global_options[:port],
+            name: options[:name],
+            index: options[:index]
+          }
+          ls_alias = Estool::Actions::Index.new('get_aliases', options)
+          ls_alias.run
+        end
+      end
+    end
+  end
+end

data/lib/estool/cli/health.rb

@@ -0,0 +1,24 @@
+require 'estool/actions/cat'
+
+module Estool
+  module Cli
+    desc 'Get Cluster Health'
+    command :health do |c|
+
+      c.flag 'output', :default_value => 'text',
+                       :arg_name => 'output_type',
+                       :desc => 'Output Health status as text or json'
+
+      c.action do |global_options,options,args|
+        options = {
+          host: global_options[:host],
+          port: global_options[:port],
+          verbose: global_options[:verbose],
+          output: options[:output]
+        }
+        health = Estool::Actions::Cat.new('health', options)
+        health.run
+      end
+    end
+  end
+end

data/lib/estool/cli/index.rb

@@ -0,0 +1,92 @@
+require 'estool/actions/cat'
+require 'estool/actions/index'
+
+module Estool
+  module Cli
+    desc 'Interact with Cluster Indices'
+    arg_name 'subcommand'
+    command :index do |c|
+
+      c.desc 'Create a new index'
+      c.command :create do |create|
+        create.flag 'name', :required => true,
+                            :arg_name => 'index_name',
+                            :desc => 'Name of the index to create'
+
+        create.flag 'update', :default_value => false,
+                              :desc => 'Update the mapping for all fields with
+                                        same name across all types.'
+
+        create.flag 'wait', :default_value => 0,
+                            :desc => 'Wait until specified number of shards is active'
+
+        create.action do |global_options,options,args|
+          options = {
+            host: global_options[:host],
+            port: global_options[:port],
+            name: options[:name],
+            update: options[:update],
+            wait: options[:wait]
+          }
+          create = Estool::Actions::Index.new('create', options)
+          create.run
+        end
+      end
+
+      c.desc 'Delete Index or Indices'
+      c.command :delete do |delete|
+        delete.flag 'name', :required => true,
+                            :arg_name => 'index_name',
+                            :desc => 'Name of the index to delete'
+
+
+        delete.action do |global_options,options,args|
+          options = {
+            host: global_options[:host],
+            port: global_options[:port],
+            name: options[:name]
+          }
+          delete = Estool::Actions::Index.new('delete', options)
+          delete.run
+        end
+      end
+
+      c.desc 'List indices'
+      c.command :show do |show|
+        show.action do |global_options,options,args|
+          options = {
+            host: global_options[:host],
+            port: global_options[:port],
+            verbose: global_options[:verbose]
+          }
+          show = Estool::Actions::Cat.new('indices', options)
+          show.run
+        end
+      end
+
+      c.desc 'Close index'
+      c.command :close do |close|
+        close.switch 'ignore_unavailable', :default_value => false,
+                                           :desc => 'Ignore indices if unavailable.',
+                                           :negatable => false
+
+        close.flag 'name', :required => true,
+                           :arg_name => 'index_name',
+                           :desc => 'name of index to close'
+
+        close.action do |global_options,options,args|
+          options = {
+            host: global_options[:host],
+            port: global_options[:port],
+            ignore_unavailable: options[:ignore_unavailable],
+            name: options[:name]
+          }
+          close = Estool::Actions::Index.new('close', options)
+          close.run
+        end
+      end
+
+      c.default_command :show
+    end
+  end
+end

data/lib/estool/version.rb

@@ -1,4 +1,4 @@
 module Estool
   ESTOOL_ROOT = File.expand_path("../..", __FILE__)
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: estool
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - David Hollinger III
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-05 00:00:00.000000000 Z
+date: 2016-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch
@@ -78,9 +78,11 @@ files:
 - lib/estool.rb
 - lib/estool/actions/cat.rb
 - lib/estool/actions/index.rb
-- lib/estool/cat.rb
+- lib/estool/cli.rb
+- lib/estool/cli/aliases.rb
+- lib/estool/cli/health.rb
+- lib/estool/cli/index.rb
 - lib/estool/connections.rb
-- lib/estool/index.rb
 - lib/estool/version.rb
 homepage: https://github.com/dhollinger/estool
 licenses:
@@ -102,9 +104,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.5.2
 signing_key: 
 specification_version: 4
-summary: Command Line tool for interacting with Elasticsearch. Still in Development,
-  expect bugs and fast releases until 1.0.0
+summary: 'Command Line tool for interacting with Elasticsearch. Still in Development,
+  expect bugs and fast releases until 1.0.0. NOTE: version 0.2.0 involves a complete
+  CLI rewrite. Some options have not been reimplemented, others have changed, and
+  a new command implemented'
 test_files: []

data/lib/estool/cat.rb

@@ -1,134 +0,0 @@
-require 'thor'
-require 'estool/actions/cat'
-
-module Estool
-  class Cat < Thor
-    class_option 'host', :type => :string,
-                  :banner => 'Elasticsearch host to connect to',
-                  :default => 'localhost',
-                  :aliases => '-H'
-    class_option 'port', :type => :string,
-                  :banner => 'Port to use when connecting to Elasticsearch',
-                  :default => '9200',
-                  :aliases => '-p'
-    class_option 'verbose', :type => :boolean,
-                  :banner => 'Verbose option. Not all subcommands support it',
-                  :default => false,
-                  :aliases => '-v'
-    class_option 'output', :type => :string,
-                  :banner => 'Display output as json or text',
-                  :default => 'text',
-                  :aliases => '-o'
-    # class_option 'timeout', :type => :numeric,
-    #               :banner => 'Set Master Timeout in seconds',
-    #               :default => 30,
-    #               :aliases => '-t'
-
-    desc 'aliases [OPTIONS]', 'Display information about aliases'
-    method_option 'name', :type => :string,
-                  :banner => 'Name of alias(es) to display information about',
-                  :aliases => '-n'
-    def aliases
-      Estool::Actions::Cat.new(:aliases, options).run
-    end
-
-    desc 'allocation [OPTIONS]', 'Display shard allocation information'
-    method_option 'node', :type => :array,
-                  :banner => 'Comma separated list of nodes',
-                  :aliases => '-n'
-    method_option 'bytes', :type => :string,
-                 :banner => 'Unit to display byte values in.',
-                 :default => 'b',
-                 :enum => %w{b k m g},
-                 :aliases => '-b'
-    def allocation
-      Estool::Actions::Cat.new(:allocation, options).run
-    end
-
-    desc 'count [OPTIONS]', 'Return Document count for cluster or indices'
-    method_option 'index', :type => :string,
-                  :banner => 'Index to count documents',
-                  :aliases => '-i'
-    def count
-      Estool::Actions::Cat.new(:count, options).run
-    end
-
-    desc 'fielddata [OPTIONS]', 'Return field data usage data'
-    method_option 'fields', :type => :string,
-                  :banner => 'Comma separated list of fields',
-                  :aliases => '-f'
-    method_option 'bytes', :type => :string,
-                  :banner => 'Unit to display byte values in.',
-                  :default => 'b',
-                  :enum => %w{b k m g},
-                  :aliases => '-b'
-    def fielddata
-      Estool::Actions::Cat.new(:fielddata, options).run
-    end
-
-    desc 'health [OPTIONS]', 'Display Elasticsearch Cluster health'
-    def health
-      Estool::Actions::Cat.new(:health, options).run
-    end
-
-    desc 'indices [OPTIONS]', 'Display indices statistics across the cluster'
-    method_option 'index', :type => :string,
-                  :banner => 'Comma separated list of index names to display',
-                  :aliases => '-i'
-    method_option 'primary', :type => :boolean,
-                  :banner => 'Limit returned information to primary shards only',
-                  :aliases => '-P',
-                  :default => false
-    method_option 'bytes', :type => :string,
-                  :banner => 'Unit to display byte values in.',
-                  :default => 'b',
-                  :enum => %w{b k m g},
-                  :aliases => '-b'
-    def indices
-      Estool::Actions::Cat.new(:indices, options).run
-    end
-
-    desc 'master [OPTIONS]', 'Display current master node'
-    def master
-      Estool::Actions::Cat.new(:master, options).run
-    end
-
-    desc 'nodeattrs [OPTIONS]', 'Display custom node attributes'
-    def nodeattrs
-      Estool::Actions::Cat.new(:nodeattrs, options).run
-    end
-
-    desc 'nodes [OPTIONS]', 'Display Elasticsearch Nodes'
-    def nodes
-      Estool::Actions::Cat.new(:nodes, options).run
-    end
-
-    desc 'ptasks [OPTIONS]', 'Display Elasticsearch Pending Task in tabular format'
-    def ptasks
-      Estool::Actions::Cat.new(:pending_tasks, options).run
-    end
-
-    desc 'plugins [OPTIONS]', 'Display Elasticsearch Plugins'
-    def plugins
-      Estool::Actions::Cat.new(:plugins, options).run
-    end
-
-    desc 'recovery [OPTIONS]', 'Display shard recovery status'
-    method_option 'index', :type => :string,
-                  :banner => 'List of indexes to return information about. Comma-separated',
-                  :aliases => '-i'
-    method_option 'bytes', :type => :string,
-                  :banner => 'Unit to display byte values in.',
-                  :default => 'b',
-                  :enum => %w{b k m g},
-                  :aliases => '-b'
-    def recovery
-      Estool::Actions::Cat.new(:recovery, options).run
-    end
-
-    desc 'repositories [OPTIONS]', 'Display registered repositories'
-    def repositories
-      Estool::Actions::Cat.new(:repositories, options).run
-    end
-  end
-end

data/lib/estool/index.rb

@@ -1,37 +0,0 @@
-require 'thor'
-require 'estool/actions/index'
-
-module Estool
-  class Index < Thor
-    class_option 'host', :type => :string,
-                  :banner => 'Elasticsearch host to connect to',
-                  :default => 'localhost',
-                  :aliases => '-H'
-    class_option 'port', :type => :string,
-                  :banner => 'Port to use when connecting to Elasticsearch',
-                  :default => '9200',
-                  :aliases => '-p'
-    class_option 'name', :type => :string,
-                  :banner   => 'Index name',
-                  :aliases  => '-n',
-                  :required => true
-
-    desc 'create [OPTIONS]', 'Create new index'
-    method_option 'update', :type => :boolean,
-                  :banner  => 'Update the mapping for all fields with the same name across all types.',
-                  :default => false,
-                  :aliases => '-u'
-    method_option 'wait', :type => :numeric,
-                  :banner  => 'Wait until specified number of shards is active.',
-                  :default => 0,
-                  :aliases => '-w'
-    def create
-      Estool::Actions::Index.new(:create, options).run
-    end
-
-    desc 'delete [OPTIONS]', 'Delete index'
-    def delete
-      Estool::Actions::Index.new(:delete, options).run
-    end
-  end
-end