estool 0.0.6.pre.alpha → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 734b762b75084c2f6aabe764e0366c823ab12c30
-  data.tar.gz: 9d0b92d3c3fcf0c001241240f4d76e0d21fc1692
+  metadata.gz: 764824d476cbad5de5c72e93ddc216bc324e3ad6
+  data.tar.gz: 100c7e0d05de50f740e34d0f0cb79efa334213a1
 SHA512:
-  metadata.gz: 955f2a559a3ce1d249f16b702642ec228522ecfbab4c4bf279c60b17b80fe1e52817dd0fa667fb4b1ebb07e66671a4eff780c41c05108452e0c32d1162ead312
-  data.tar.gz: 9610236bc16ad7038df4dec8341efd458e3d7e5113a2a4811eaa5d15cc14b3b519a700cfe3722de11163e69162b4fa857c838ca89106e2aa1f4da7ff521685ac
+  metadata.gz: cacab163c5fcf0b083da8d08960f846dec60aa5cb15b75c0f316ad4116d763117ed01d237b0fba0990d77076b16a478eecd5396bc01fb8befac74dea165571b8
+  data.tar.gz: daa86ea9eaec1063339b7c41cd2775b8a2df16327356f188653a87d407a85e34a9b6de1b34db9778ea0e358aa3d628efc956f3ce0391e6390665a2ea99de86de

data/lib/estool/actions/cat.rb

@@ -1,13 +1,44 @@
+require 'active_support'
 require 'elasticsearch-api'
 require 'estool/connections'
 
 module Estool::Actions
   class Cat
-    def self.run(action, data, options)
-      client = Estool::Connections.start_conn(options[:host], options[:port])
+
+    def initialize(command,options)
+      @cmd = command
+      @data = options.except(:host, :port)
+      @server = options.slice(:host, :port)
+    end
+
+    def format_options(data)
+      params = {}
+      data.each do |k, v|
+        case k
+          when 'verbose'
+            params.merge!(v: v)
+          when 'output'
+            params.merge!(format: v)
+          when 'timeout'
+            params.merge!(master_timeout: v)
+          when 'name'
+            params.merge!(name: v)
+          when 'node'
+            params.merge!(node_id: v)
+          when 'primary'
+            params.merge!(pri: v)
+          else
+            puts 'does not exist'
+        end
+      end
+      return params
+    end
+
+    def cat(action, options, server)
+      client = Estool::Connections.start_conn(server[:host], server[:port])
       Estool::Connections.test_conn(client)
       begin
-        puts client.cat.send(action, data)
+        puts client.cat.send(action, options)
       rescue ArgumentError => args
         puts "
              #{args}
@@ -16,5 +47,10 @@ module Estool::Actions
         exit 1
       end
     end
+
+    def run
+      params = format_options(@data)
+      cat(@cmd, params, @server)
+    end
   end
 end

data/lib/estool/cat.rb

@@ -1,4 +1,5 @@
 require 'thor'
+require 'estool/actions/cat'
 
 module Estool
   class Cat < Thor
@@ -18,18 +19,17 @@ module Estool
                   :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'
+    # 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
-      require 'estool/cat/aliases'
-      Aliases.new(options).run
+      Estool::Actions::Cat.new(:aliases, options).run
     end
 
     desc 'allocation [OPTIONS]', 'Display shard allocation information'
@@ -42,8 +42,7 @@ module Estool
                  :enum => %w{b k m g},
                  :aliases => '-b'
     def allocation
-      require 'estool/cat/allocation'
-      Allocation.new(options).run
+      Estool::Actions::Cat.new(:allocation, options).run
     end
 
     desc 'count [OPTIONS]', 'Return Document count for cluster or indices'
@@ -51,8 +50,7 @@ module Estool
                   :banner => 'Index to count documents',
                   :aliases => '-i'
     def count
-      require 'estool/cat/count'
-      Count.new(options).run
+      Estool::Actions::Cat.new(:count, options).run
     end
 
     desc 'fielddata [OPTIONS]', 'Return field data usage data'
@@ -65,14 +63,12 @@ module Estool
                   :enum => %w{b k m g},
                   :aliases => '-b'
     def fielddata
-      require 'estool/cat/fielddata'
-      Fielddata.new(options).run
+      Estool::Actions::Cat.new(:fielddata, options).run
     end
 
     desc 'health [OPTIONS]', 'Display Elasticsearch Cluster health'
     def health
-      require 'estool/cat/health'
-      Health.new(options).run
+      Estool::Actions::Cat.new(:health, options).run
     end
 
     desc 'indices [OPTIONS]', 'Display indices statistics across the cluster'
@@ -89,38 +85,32 @@ module Estool
                   :enum => %w{b k m g},
                   :aliases => '-b'
     def indices
-      require 'estool/cat/indices'
-      Indices.new(options).run
+      Estool::Actions::Cat.new(:indices, options).run
     end
 
     desc 'master [OPTIONS]', 'Display current master node'
     def master
-      require 'estool/cat/master'
-      Master.new(options).run
+      Estool::Actions::Cat.new(:master, options).run
     end
 
     desc 'nodeattrs [OPTIONS]', 'Display custom node attributes'
     def nodeattrs
-      require 'estool/cat/nodeattrs'
-      Nodeattrs.new(options).run
+      Estool::Actions::Cat.new(:nodeattrs, options).run
     end
 
     desc 'nodes [OPTIONS]', 'Display Elasticsearch Nodes'
     def nodes
-      require 'estool/cat/nodes'
-      Nodes.new(options).run
+      Estool::Actions::Cat.new(:nodes, options).run
     end
 
     desc 'ptasks [OPTIONS]', 'Display Elasticsearch Pending Task in tabular format'
     def ptasks
-      require 'estool/cat/ptasks'
-      Ptasks.new(options).run
+      Estool::Actions::Cat.new(:pending_tasks, options).run
     end
 
     desc 'plugins [OPTIONS]', 'Display Elasticsearch Plugins'
     def plugins
-      require 'estool/cat/plugin'
-      Plugin.new(options).run
+      Estool::Actions::Cat.new(:plugins, options).run
     end
 
     desc 'recovery [OPTIONS]', 'Display shard recovery status'
@@ -133,14 +123,12 @@ module Estool
                   :enum => %w{b k m g},
                   :aliases => '-b'
     def recovery
-      require 'estool/cat/recovery'
-      Recovery.new(options).run
+      Estool::Actions::Cat.new(:recovery, options).run
     end
 
     desc 'repositories [OPTIONS]', 'Display registered repositories'
     def repositories
-      require 'estool/cat/repositories'
-      Repositories.new(options).run
+      Estool::Actions::Cat.new(:repositories, options).run
     end
   end
 end

data/lib/estool/version.rb

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

data/lib/estool.rb

@@ -1,9 +1,5 @@
 #!/usr/bin/env ruby
-require 'elasticsearch'
-require 'net/http'
-require 'optparse'
 require 'estool/cat'
-require 'estool/connections'
 require 'thor'
 
 module Estool

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: estool
 version: !ruby/object:Gem::Version
-  version: 0.0.6.pre.alpha
+  version: 0.0.7
 platform: ruby
 authors:
 - David Hollinger III
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-09 00:00:00.000000000 Z
+date: 2016-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch-api
@@ -58,19 +58,6 @@ files:
 - lib/estool.rb
 - lib/estool/actions/cat.rb
 - lib/estool/cat.rb
-- lib/estool/cat/aliases.rb
-- lib/estool/cat/allocation.rb
-- lib/estool/cat/count.rb
-- lib/estool/cat/fielddata.rb
-- lib/estool/cat/health.rb
-- lib/estool/cat/indices.rb
-- lib/estool/cat/master.rb
-- lib/estool/cat/nodeattrs.rb
-- lib/estool/cat/nodes.rb
-- lib/estool/cat/plugin.rb
-- lib/estool/cat/ptasks.rb
-- lib/estool/cat/recovery.rb
-- lib/estool/cat/repositories.rb
 - lib/estool/connections.rb
 - lib/estool/version.rb
 homepage: https://github.com/dhollinger/estool
@@ -88,9 +75,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1

data/lib/estool/cat/aliases.rb

@@ -1,27 +0,0 @@
-require 'estool/actions/cat'
-
-module Estool
-  class Cat::Aliases
-
-    def initialize(options)
-      @verbose = options[:verbose]
-      @output = options[:output]
-      @timeout = options[:timeout]
-      @name = options[:name]
-      @server = {
-          host: options[:host],
-          port: options[:port]
-      }
-    end
-
-    def run
-      data = {
-          v: @verbose,
-          format: @output,
-          master_timeout: @timeout,
-          name: @name
-      }
-      Estool::Actions::Cat.run(:aliases, data, @server)
-    end
-  end
-end

data/lib/estool/cat/allocation.rb

@@ -1,27 +0,0 @@
-require 'estool/actions/cat'
-
-module Estool
-  class Cat::Allocation
-
-    def initialize(options)
-      @verbose = options[:verbose]
-      @node = options[:node]
-      @bytes = options[:bytes]
-      @output = options[:output]
-      @server = {
-          host: options[:host],
-          port: options[:port]
-      }
-    end
-
-    def run
-      data = {
-          v: @verbose,
-          node_id: @node,
-          bytes: @bytes,
-          format: @output
-      }
-      Estool::Actions::Cat.run(:allocation, data, @server)
-    end
-  end
-end

data/lib/estool/cat/count.rb

@@ -1,27 +0,0 @@
-require 'estool/actions/cat'
-
-module Estool
-  class Cat::Count
-
-    def initialize(options)
-      @verbose = options[:verbose]
-      @output = options[:output]
-      @timeout = options[:timeout]
-      @index = options[:index]
-      @server = {
-          host: options[:host],
-          port: options[:port]
-      }
-    end
-
-    def run
-      data = {
-          v: @verbose,
-          format: @output,
-          master_timeout: @timeout,
-          index: @index
-      }
-      Estool::Actions::Cat.run(:count, data, @server)
-    end
-  end
-end

data/lib/estool/cat/fielddata.rb

@@ -1,27 +0,0 @@
-require 'estool/actions/cat'
-
-module Estool
-  class Cat::Fielddata
-
-    def initialize(options)
-      @verbose = options[:verbose]
-      @timeout = options[:timeout]
-      @bytes = options[:bytes]
-      @fields = options[:fields]
-      @server = {
-          host: options[:host],
-          port: options[:port]
-      }
-    end
-
-    def run
-      data = {
-          v: @verbose,
-          master_timeout: @timeout,
-          bytes: @bytes
-      }
-      data[:fields] = @fields unless @fields.nil?
-      Estool::Actions::Cat.run(:fielddata, data, @server)
-    end
-  end
-end

data/lib/estool/cat/health.rb

@@ -1,25 +0,0 @@
-require 'estool/actions/cat'
-
-module Estool
-  class Cat::Health
-
-    def initialize(options)
-      @verbose = options[:verbose]
-      @output = options[:output]
-      @timeout = options[:timeout]
-      @server = {
-          host: options[:host],
-          port: options[:port]
-      }
-    end
-
-    def run
-      data = {
-          v: @verbose,
-          format: @output,
-          master_timeout: @timeout
-      }
-      Estool::Actions::Cat.run(:health, data, @server)
-    end
-  end
-end

data/lib/estool/cat/indices.rb

@@ -1,29 +0,0 @@
-require 'estool/actions/cat'
-
-module Estool
-  class Cat::Indices
-
-    def initialize(options)
-      @verbose = options[:verbose]
-      @bytes = options[:bytes]
-      @primary = options[:primary]
-      @output = options[:output]
-      @index = options[:index]
-      @server = {
-          host: options[:host],
-          port: options[:port]
-      }
-    end
-
-    def run
-      data = {
-          v: @verbose,
-          bytes: @bytes,
-          pri: @primary,
-          format: @output
-      }
-      data[:index] = @index unless @index.nil?
-      Estool::Actions::Cat.run(:indices, data, @server)
-    end
-  end
-end

data/lib/estool/cat/master.rb

@@ -1,24 +0,0 @@
-require 'estool/actions/cat'
-
-module Estool
-  class Cat::Master
-
-    def initialize(options)
-      @verbose = options[:verbose]
-      @output = options[:output]
-      @server = {
-          host: options[:host],
-          port: options[:port]
-      }
-    end
-
-    def run
-      data = {
-          v: @verbose,
-          format: @output
-      }
-      Estool::Actions::Cat.run(:master, data, @server)
-    end
-
-  end
-end

data/lib/estool/cat/nodeattrs.rb

@@ -1,24 +0,0 @@
-require 'estool/actions/cat'
-
-module Estool
-  class Cat::Nodeattrs
-
-    def initialize(options)
-      @verbose = options[:verbose]
-      @output = options[:output]
-      @server = {
-          host: options[:host],
-          port: options[:port]
-      }
-    end
-
-    def run
-      data = {
-          v: @verbose,
-          format: @output
-      }
-      Estool::Actions::Cat.run(:nodeattrs, data, @server)
-    end
-
-  end
-end

data/lib/estool/cat/nodes.rb

@@ -1,23 +0,0 @@
-require 'estool/actions/cat'
-
-module Estool
-  class Cat::Nodes
-
-    def initialize(options)
-      @verbose = options[:verbose]
-      @output = options[:output]
-      @server = {
-          host: options[:host],
-          port: options[:port]
-      }
-    end
-
-    def run
-      data = {
-          v: @verbose,
-          format: @output
-      }
-      Estool::Actions::Cat.run(:nodes, data, @server)
-    end
-  end
-end

data/lib/estool/cat/plugin.rb

@@ -1,21 +0,0 @@
-require 'estool/actions/cat'
-
-module Estool
-  class Cat::Plugin
-
-    def initialize(options)
-      @verbose = options[:verbose]
-      @server = {
-          host: options[:host],
-          port: options[:port]
-      }
-    end
-
-    def run
-      data = {
-          v: @verbose
-      }
-      Estool::Actions::Cat.run(:plugins, data, @server)
-    end
-  end
-end

data/lib/estool/cat/ptasks.rb

@@ -1,23 +0,0 @@
-require 'estool/actions/cat'
-
-module Estool
-  class Cat::Ptasks
-
-    def initialize(options)
-      @verbose = options[:verbose]
-      @output = options[:output]
-      @server = {
-          host: options[:host],
-          port: options[:port]
-      }
-    end
-
-    def run
-      data = {
-          v: @verbose,
-          format: @output,
-      }
-      Estool::Actions::Cat.run(:pending_tasks, data, @server)
-    end
-  end
-end

data/lib/estool/cat/recovery.rb

@@ -1,27 +0,0 @@
-require 'estool/actions/cat'
-
-module Estool
-  class Cat::Recovery
-
-    def initialize(options)
-      @verbose = options[:verbose]
-      @bytes = options[:bytes]
-      @index = options[:index]
-      @output = options[:output]
-      @server = {
-          host: options[:host],
-          port: options[:port]
-      }
-    end
-
-    def run
-      data = {
-          v: @verbose,
-          format: @output,
-      }
-      data[:index] = @index unless @index.nil?
-      data[:bytes] = @bytes unless @bytes.nil?
-      Estool::Actions::Cat.run(:recovery, data, @server)
-    end
-  end
-end

data/lib/estool/cat/repositories.rb

@@ -1,21 +0,0 @@
-require 'estool/actions/cat'
-
-module Estool
-  class Cat::Repositories
-
-    def initialize(options)
-      @verbose = options[:verbose]
-      @server = {
-          host: options[:host],
-          port: options[:port]
-      }
-    end
-
-    def run
-      data = {
-          v: @verbose
-      }
-      Estool::Actions::Cat.run(:repositories, data, @server)
-    end
-  end
-end