sensu-cli 0.2.2 → 0.2.3

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MjBmYzYyYmQ2MzI3Y2M1YmRjNjU4OWQ5NDg3NmE3Yzg0M2UyODE4ZA==
+  data.tar.gz: !binary |-
+    YzhmYThlNmExMGM2NzlkMmMyYWZmZDY4YmY3MGY3NGVjMTExMjJjMw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NjkxYWI5MjRlOTY1NzY2NGUxZTNhN2JhNmViYzRlYTdmYjQ3MDYwZGZhOWRm
+    NzNmZDlmMjFlY2QyMWM3ZTBkYjAzMDhhNTYxMjRkMmM4OWU0ZDBiODZkM2M2
+    MzAxODU0ZGM1MDliMzI3MDQyOWRlYWJkYWI4ZDhhMzNkNDlkYTA=
+  data.tar.gz: !binary |-
+    ZDA1ZjIwYjFiYjYxOGE5YzAxNDQxNWQ3Y2M5NmFkNjk4OGM4YTVhMTAwMzg4
+    NTlkODA5YzRhNzgxNTY0NjdiOTFkZmQyZGZhNGY2NmM1N2U0YjEyYjgwMjg0
+    MDU5MWM5Y2Q2M2FmYThiOTQwZDIyOGM0ZmJiMjA2NzhhYmE0NTQ=

data/bin/sensu

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
-unless $:.include?(File.dirname(__FILE__) + '/../lib/')
-  $: << File.dirname(__FILE__) + '/../lib'
-end
+$LOAD_PATH << File.dirname(__FILE__) + '/../lib' unless $LOAD_PATH.include?(File.dirname(__FILE__) + '/../lib/')
 
 require 'sensu-cli'
 sensu = SensuCli::Base.new

data/bin/sensu-cli

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
-unless $:.include?(File.dirname(__FILE__) + '/../lib/')
-  $: << File.dirname(__FILE__) + '/../lib'
-end
+$LOAD_PATH << File.dirname(__FILE__) + '/../lib' unless $LOAD_PATH.include?(File.dirname(__FILE__) + '/../lib/')
 
 require 'sensu-cli'
 sensu = SensuCli::Base.new

data/lib/sensu-cli/api.rb

@@ -53,7 +53,11 @@ module SensuCli
       when '404'
         puts 'The item did not exist.'.color(:cyan)
       else
-        (command == 'health') ? (puts 'Sensu is not healthy.'.color(:red)) : (puts "There was an error while trying to complete your request. Response code: #{code}".color(:red))
+        if command == 'health'
+          puts 'Sensu is not healthy.'.color(:red)
+        else
+          puts "There was an error while trying to complete your request. Response code: #{code}".color(:red)
+        end
       end
     end
 

data/lib/sensu-cli/base.rb

@@ -3,10 +3,9 @@ module SensuCli
 
     def setup
       clis = Cli.new
-      cli = clis.global
-      @format = cli[:fields][:format] || 'long'
+      @cli = clis.global
       settings
-      api_path(cli)
+      api_path(@cli)
       make_call
     end
 
@@ -26,7 +25,7 @@ module SensuCli
 
     def api_path(cli)
       p = PathCreator.new
-      p.respond_to?(cli[:command]) ? path = p.send(cli[:command], cli) : (puts 'Something Bad Happened'; exit)
+      p.respond_to?(cli[:command]) ? path = p.send(cli[:command], cli) : (puts 'Something Bad Happened'; exit) # rubocop:disable Semicolon
       @api = { :path => path[:path], :method => cli[:method], :command => cli[:command], :payload => (path[:payload] || false) }
     end
 
@@ -46,12 +45,17 @@ module SensuCli
       msg = api.response(res.code, res.body, @api[:command])
       if res.code != '200'
         exit
-      elsif @format == 'single'
-        Pretty.table(msg)
+      elsif @cli[:fields][:format] == 'single'
+        Pretty.single(msg)
+        Pretty.count(msg)
+      elsif @cli[:fields][:format] == 'table'
+        endpoint = @api[:command]
+        fields = nil || @cli[:fields][:fields]
+        Pretty.table(msg, endpoint, fields)
       else
         Pretty.print(msg)
+        Pretty.count(msg)
       end
-      Pretty.count(msg)
     end
 
   end

data/lib/sensu-cli/cli.rb

@@ -93,7 +93,7 @@ module SensuCli
         stop_on SUB_COMMANDS
       end
 
-      opts = Trollop::with_standard_exception_handling global_opts do
+      Trollop::with_standard_exception_handling global_opts do
         global_opts.parse ARGV
         raise Trollop::HelpNeeded if ARGV.empty? # show help screen
       end
@@ -103,7 +103,7 @@ module SensuCli
     end
 
     def explode(opts)
-      explode = Trollop::with_standard_exception_handling opts do
+      Trollop::with_standard_exception_handling opts do
         raise Trollop::HelpNeeded # show help screen
       end
     end
@@ -113,7 +113,7 @@ module SensuCli
     end
 
     def parser(cli)
-      opts = Trollop::Parser.new do
+      Trollop::Parser.new do
         banner Cli.const_get("#{cli}_BANNER")
         stop_on Cli.const_get("#{cli}_COMMANDS")
       end
@@ -136,9 +136,11 @@ module SensuCli
         p = Trollop::options do
           opt :limit, 'The number if clients to return', :short => 'l', :type => :string
           opt :offset, 'The number of clients to offset before returning', :short => 'o', :type => :string
-          opt :format, 'Available formats; single (single line formatting)', :short => 'f', :type => :string
+          opt :format, 'Available formats; single, table', :short => 'f', :type => :string
+          opt :fields, 'Fields for table ouput: -F name,address,subscriptions', :short => 'F', :type => :string
         end
-        Trollop::die :format, 'Available optional formats: single'.color(:red) if p[:format] && p[:format] != 'single'
+        Trollop::die :format, 'Available optional formats: single, table'.color(:red) if p[:format] != 'table' && p[:format] != 'single' && p[:format]
+        Trollop::die :fields, 'Fields must be used in conjunction with --format table'.color(:red) if p[:format] != 'table' && p[:fields]
         Trollop::die :offset, 'Offset depends on the limit option --limit ( -l )'.color(:red) if p[:offset] && !p[:limit]
         { :command => 'clients', :method => 'Get', :fields => p }
       when 'delete'
@@ -165,7 +167,7 @@ module SensuCli
     end
 
     def health
-      opts = parser('HEALTH')
+      parser('HEALTH')
       p = Trollop::options do
         opt :consumers, 'The minimum number of consumers', :short => 'c', :type => :string, :required => true
         opt :messages, 'The maximum number of messages', :short => 'm', :type => :string, :required => true
@@ -199,9 +201,9 @@ module SensuCli
       case command
       when 'list'
         p = Trollop::options do
-          opt :format, 'Available formats; single (single line formatting)', :short => 'f', :type => :string
+          opt :format, 'Available formats; single, table', :short => 'f', :type => :string
         end
-        Trollop::die :format, 'Available optional formats: single'.color(:red) if p[:format] && p[:format] != 'single'
+        Trollop::die :format, 'Available optional formats: single, table'.color(:red) if p[:format] != 'table' && p[:format] != 'single' && p[:format]
         { :command => 'events', :method => 'Get', :fields => p }
       when 'show'
         p = Trollop::options do

data/lib/sensu-cli/pretty.rb

@@ -1,77 +1,109 @@
 require 'rainbow'
+require 'hirb'
+require 'terminfo'
 
 module SensuCli
   class Pretty
+    class << self
 
-    def self.print(res)
-      if !res.empty?
-        if res.is_a?(Hash)
-          res.each do |key, value|
-            puts "#{key}:  ".color(:cyan) + "#{value}".color(:green)
-          end
-        elsif res.is_a?(Array)
-          res.each do |item|
-            puts '-------'.color(:yellow)
-            if item.is_a?(Hash)
-              item.each do |key, value|
-                puts "#{key}:  ".color(:cyan) + "#{value}".color(:green)
+      def print(res)
+        if !res.empty?
+          if res.is_a?(Hash)
+            res.each do |key, value|
+              puts "#{key}:  ".color(:cyan) + "#{value}".color(:green)
+            end
+          elsif res.is_a?(Array)
+            res.each do |item|
+              puts '-------'.color(:yellow)
+              if item.is_a?(Hash)
+                item.each do |key, value|
+                  puts "#{key}:  ".color(:cyan) + "#{value}".color(:green)
+                end
+              else
+                puts item.to_s.color(:cyan)
               end
-            else
-              puts item.to_s.color(:cyan)
             end
           end
+        else
+          self.no_values
         end
-      else
+      end
+
+      def count(res)
+        res.is_a?(Hash) ? count = res.length : count = res.count
+        puts "#{count} total items".color(:yellow) if count
+      end
+
+      def clean(thing)
+        thing = thing.gsub("\n", '/\n') if thing.is_a?(String)
+        thing
+      end
+
+      def no_values
         puts 'no values for this request'.color(:cyan)
       end
-    end
 
-    def self.count(res)
-      res.is_a?(Hash) ? count = res.length : count = res.count
-      puts "#{count} total items".color(:yellow) if count
-    end
+      def single(res)
+        if !res.empty?
+          if res.is_a?(Array)
+            keys = res.map { |item| item.keys }.flatten.uniq.sort
 
-    def self.clean(thing)
-      thing = thing.gsub("\n", '/\n') if thing.is_a?(String)
-      thing
-    end
+            # Remove fields with spaces (breaks awkage)
+            keys.select! do |key|
+              res.none? { |item| item[key].to_s.include?(' ') }
+            end
 
-    def self.table(res)
-      if !res.empty?
-        if res.is_a?(Array)
-          keys = res.map { |item| item.keys }.flatten.uniq.sort
+            # Find max value lengths
+            value_lengths = {}
+            keys.each do |key|
+              max_value_length = res.map { |item| item[key].to_s.length }.max
+              value_lengths[key] = [max_value_length, key.length].max
+            end
 
-          # Remove fields with spaces (breaks awkage)
-          keys.select! do |key|
-            res.none? { |item| item[key].to_s.include?(' ') }
-          end
+            # Print header
+            format = keys.map { |key| "%-#{value_lengths[key]}s" }.join(' ')
+            puts sprintf(format, *keys)
 
-          # Find max value lengths
-          value_lengths = {}
-          keys.each do |key|
-            max_value_length = res.map { |item| item[key].to_s.length }.max
-            value_lengths[key] = [max_value_length, key.length].max
+            # Print value rows
+            res.each do |item|
+              if item.is_a?(Hash)
+                values = keys.map { |key| item[key] }
+                format = keys.map { |key| "%-#{value_lengths[key]}s" }.join(' ')
+                puts sprintf(format, *values)
+              else
+                puts item.to_s.color(:cyan)
+              end
+            end
           end
+        else
+          self.no_values
+        end
+      end
 
-          # Print header
-          format = keys.map { |key| "%-#{value_lengths[key]}s" }.join(' ')
-          puts sprintf(format, *keys)
+      def parse_fields(fields)
+        fields.split(',')
+      end
 
-          # Print value rows
-          res.each do |item|
-            if item.is_a?(Hash)
-              values = keys.map { |key| item[key] }
-              format = keys.map { |key| "%-#{value_lengths[key]}s" }.join(' ')
-              puts sprintf(format, *values)
+      def table(res, endpoint, fields = nil)
+        if !res.empty?
+          if res.is_a?(Array)
+            terminal_size = TermInfo.screen_size
+            if endpoint == 'events'
+              keys = %w[check client status flapping occurrences handlers issued output]
             else
-              puts item.to_s.color(:cyan)
+              if fields
+                keys = self.parse_fields(fields)
+              else
+                keys = res.map { |item| item.keys }.flatten.uniq
+              end
             end
+            puts Hirb::Helpers::AutoTable.render(res, { :max_width => terminal_size[1], :fields => keys })
           end
+        else
+          self.no_values
         end
-      else
-        puts 'no values for this request'.color(:cyan)
       end
-    end
 
+    end
   end
 end

data/lib/sensu-cli/settings.rb

@@ -6,11 +6,11 @@ module SensuCli
   class Settings
 
     def is_file?(file)
-      !File.readable?(file) ? false : true
+      !File.readable?(file) ? false : true # rubocop:disable FavorUnlessOverNegatedIf
     end
 
     def create(directory, file)
-      FileUtils.mkdir_p(directory) if !File.directory?(directory)
+      FileUtils.mkdir_p(directory) unless File.directory?(directory)
       FileUtils.cp(File.join(File.dirname(__FILE__), '../../settings.example.rb'), file)
       puts "We created the configuration file for you at #{file}.  You can also place this in /etc/sensu/sensu-cli. Edit the settings as needed.".color(:red)
       exit

data/lib/sensu-cli/version.rb

@@ -1,3 +1,3 @@
 module SensuCli
-    VERSION = '0.2.2'
+    VERSION = '0.2.3'
 end

data/sensu-cli.gemspec

@@ -11,11 +11,15 @@ Gem::Specification.new do |s|
   s.has_rdoc    = false
   s.licenses    = ['MIT','APACHE']
   s.homepage    ='http://github.com/agent462/sensu-cli'
+
   s.add_dependency('rainbow', '1.1.4')
   s.add_dependency('trollop', '2.0')
   s.add_dependency('mixlib-config', '1.1.2')
+  s.add_dependency('hirb', '0.7.1')
+  s.add_dependency('ruby-terminfo', '0.1.1')
 
   s.add_development_dependency('rspec')
+  s.add_development_dependency('rubocop')
 
   s.files         = Dir.glob('{bin,lib}/**/*') + %w[sensu-cli.gemspec README.md settings.example.rb]
   s.executables   = Dir.glob('bin/**/*').map { |file| File.basename(file) }

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: sensu-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.2
-  prerelease: 
+  version: 0.2.3
 platform: ruby
 authors:
 - Bryan Brandau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-03 00:00:00.000000000 Z
+date: 2013-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -54,15 +48,41 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.1.2
+- !ruby/object:Gem::Dependency
+  name: hirb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+- !ruby/object:Gem::Dependency
+  name: ruby-terminfo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +90,20 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -101,26 +134,25 @@ homepage: http://github.com/agent462/sensu-cli
 licenses:
 - MIT
 - APACHE
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A command line utility for Sensu.
 test_files: []