sensu-cli 0.5.0 → 0.6.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Mjk0ZjhhMjdkYjBjMzE1ODQwZTdhNmU3NWEyZDU1MGU5YWRkZTdiOQ==
-  data.tar.gz: !binary |-
-    ODgyZTA5OThlMjlmYWFlODVkY2Y4MjRkYTBmNmMwZjM5MThkNGJjMQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    M2U4NzY3MTlkNmI4YzM0MjYxNzRhZTQwZjNiMGZlZTg1YWU1MzU1ODY1Nzk0
-    NjY5YWMyZWU2MzNmOTVjMGJmZTMyMjQ4NzBiMGQ5NGFjN2Y0OTg4ODc3YmUy
-    ODUzOGY1M2RiMDc5OTc4MmJiMWI2OTE3ZWZmYTY5MzQxY2IwZDc=
-  data.tar.gz: !binary |-
-    YmYyNTU5MzUwYzQ5N2E4OTNiODRmY2Q2NjMyY2ZmNTBmNTJjYjcwZmI4YTky
-    Yzk2M2NhNTliNzdmZTkzMzQ5NTAyN2EwZTU5MjEyYTkwNDBjZmRmYjliYWZm
-    NzU4NDlmNDVmYmFiNzk0ODgzYTBkOTU4YmZlY2U1YTJkZWIxMWM=
+SHA1:
+  metadata.gz: b624e824d48454f911f02c14d4c06058683c5adb
+  data.tar.gz: 707b5fa3ea1c9be3fa6353e10760dccb77a90f30
+SHA512:
+  metadata.gz: 3306b9df492dd691806e05be10990047c997e01bc9d8f4d17727fcb3a1c0be1b018a1874777803288d50ceb592fe9788127d468d4efc3ae25cd92d5b8ab8a141
+  data.tar.gz: aef133f48f50ed3b9fc95a56a4c6ff1d06f07aa3cde98ee1e13899f922e1ee7960285faab5dd39666dfa99469fb87d89f4b6f9055fe2809c60eae75917e1655b

data/README.md

@@ -47,7 +47,9 @@ This format was chosen so you can do some ENV magic via your profile and setting
 `ssl`  Boolean - Optional - Defaults False   
 `read_timeout` Integer - Optional - Default 15 (seconds)   
 `open_timeout` Integer - Optional - Default 5 (seconds)   
-`pretty_colors` Boolean - Optional - Default True   
+`pretty_colors` Boolean - Optional - Default True    
+`proxy_address` String - Optional    
+`proxy_port` Integer - Optional    
 
 Examples
 -----------

data/lib/sensu-cli/api.rb

@@ -5,7 +5,8 @@ require 'rainbow/ext/string'
 module SensuCli
   class Api
     def request(opts)
-      http = Net::HTTP.new(opts[:host], opts[:port])
+      http = Net::HTTP.new(opts[:host], opts[:port], opts[:proxy_address],
+                           opts[:proxy_port])
       http.read_timeout = opts[:read_timeout]
       http.open_timeout = opts[:open_timeout]
       if opts[:ssl]

data/lib/sensu-cli/base.rb

@@ -39,24 +39,26 @@ module SensuCli
         :user => Config.user || nil,
         :read_timeout => Config.read_timeout || 15,
         :open_timeout => Config.open_timeout || 5,
-        :password => Config.password || nil
+        :password => Config.password || nil,
+        :proxy_address => Config.proxy_address || :ENV,
+        :proxy_port => Config.proxy_port || nil
       }
       api = Api.new
       res = api.request(opts)
       msg = api.response(res.code, res.body, @api[:command])
       msg = Filter.new(@cli[:fields][:filter]).process(msg) if @cli[:fields][:filter]
+      endpoint = @api[:command]
       if res.code != '200'
         SensuCli::die(0)
       elsif @cli[:fields][:format] == 'single'
-        Pretty.single(msg)
+        Pretty.single(msg, endpoint)
       elsif @cli[:fields][:format] == 'table'
-        endpoint = @api[:command]
         fields = nil || @cli[:fields][:fields]
         Pretty.table(msg, endpoint, fields)
       elsif @cli[:fields][:format] == 'json'
         Pretty.json(msg)
       else
-        Pretty.print(msg)
+        Pretty.print(msg, endpoint)
       end
       Pretty.count(msg) unless @cli[:fields][:format] == 'table'
     end

data/lib/sensu-cli/cli.rb

@@ -206,7 +206,7 @@ module SensuCli
       case command
       when 'list'
         p = Trollop::options do
-          opt :filter, 'Field and value to filter on: client,graphite', :type => :string
+          opt :filter, 'Field and value to filter on: client,graphite (use "name" as field for client or event name)', :type => :string
           opt :format, 'Available formats; single, table, json', :short => 'f', :type => :string
         end
         Trollop::die :format, 'Available optional formats: single, table, json'.color(:red) if p[:format] != 'table' && p[:format] != 'single' && p[:format] != 'json' && p[:format]

data/lib/sensu-cli/pretty.rb

@@ -1,30 +1,37 @@
 require 'rainbow/ext/string'
 require 'hirb'
 require 'json'
+require 'erubis'
 
 module SensuCli
   class Pretty
     class << self
-      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)
+      def print(res, endpoint = nil)
+        return no_values if res.empty?
+        case endpoint
+        when 'events'
+          template = File.read('lib/sensu-cli/templates/event.erb')
+          renderer = Erubis::Eruby.new(template)
+          res.each do |event|
+            puts renderer.result(event)
+          end
+          return
+        end
+        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
           end
-        else
-          no_values
         end
       end
 
@@ -46,39 +53,38 @@ module SensuCli
         puts 'no values for this request'.color(:cyan)
       end
 
-      def single(res)
-        if !res.empty?
-          if res.is_a?(Array)
-            keys = res.map { |item| item.keys }.flatten.uniq.sort
+      def single(res, endpoint = nil)
+        return no_values if res.empty?
+        case endpoint
+        when 'events'
+          res = event_data(res)
+        end
+        keys = res.map { |item| item.keys }.flatten.uniq.sort
 
-            # Remove fields with spaces (breaks awkage)
-            keys.select! do |key|
-              res.none? { |item| item[key].to_s.include?(' ') }
-            end
+        # Remove fields with spaces (breaks awkage)
+        keys.select! do |key|
+          res.none? { |item| item[key].to_s.include?(' ') }
+        end
 
-            # 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
+        # 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
 
-            # Print header
-            lengths = keys.map { |key| "%-#{value_lengths[key]}s" }.join(' ')
-            puts format(lengths, *keys)
+        # Print header
+        lengths = keys.map { |key| "%-#{value_lengths[key]}s" }.join(' ')
+        puts format(lengths, *keys)
 
-            # Print value rows
-            res.each do |item|
-              if item.is_a?(Hash)
-                values = keys.map { |key| item[key] }
-                puts format(lengths, *values)
-              else
-                puts item.to_s.color(:cyan)
-              end
-            end
+        # Print value rows
+        res.each do |item|
+          if item.is_a?(Hash)
+            values = keys.map { |key| item[key] }
+            puts format(lengths, *values)
+          else
+            puts item.to_s.color(:cyan)
           end
-        else
-          no_values
         end
       end
 
@@ -86,25 +92,45 @@ module SensuCli
         fields.split(',')
       end
 
-      def table(res, endpoint, fields = nil)
-        if !res.empty?
-          if res.is_a?(Array)
-            terminal_size = Hirb::Util.detect_terminal_size
-            if endpoint == 'events'
-              keys = %w(check client status flapping occurrences handlers issued output)
-            else
-              if fields
-                keys = parse_fields(fields)
-              else
-                keys = res.map { |item| item.keys }.flatten.uniq
-              end
-            end
-            puts Hirb::Helpers::AutoTable.render(res, :max_width => terminal_size[0], :fields => keys)
-          end
+      def event_data(res)
+        events = []
+        res.each do |event|
+          events << {
+            'client' => event['client']['name'],
+            'address' => event['client']['address'],
+            'check' => event['check']['name'],
+            'interval' => event['check']['interval'],
+            'occurrences' => event['occurrences'],
+            'status' => event['check']['status'],
+            'handlers' => event['check']['handlers'],
+            'issued' => event['check']['issued'],
+            'executed' => event['check']['executed'],
+            'output' => event['check']['output'].rstrip
+          }
+        end
+        events
+      end
+
+      def table(res, endpoint = nil, fields = nil)
+        return no_values if res.empty?
+        case endpoint
+        when 'events'
+          keys = %w(check client address interval occurrences status handlers issued executed output)
+          render_table(event_data(res), keys)
         else
-          no_values
+          if fields
+            keys = parse_fields(fields)
+          else
+            keys = res.map { |item| item.keys }.flatten.uniq
+          end
+          render_table(res, keys)
         end
       end
+
+      def render_table(data, keys)
+        terminal_size = Hirb::Util.detect_terminal_size
+        puts Hirb::Helpers::AutoTable.render(data, :max_width => terminal_size[0], :fields => keys)
+      end
     end
   end
 end

data/lib/sensu-cli/templates/event.erb

@@ -0,0 +1,20 @@
+<%= "-------".color(:yellow) %>
+<%= "id:".color(:blue).bright %> <%= id.to_s.color(:green) %>
+<%= "client name:".color(:blue).bright %> <%= client['name'].to_s.color(:green) %>
+  <%= "address:".color(:cyan) %> <%= client['address'].to_s.color(:green) %>
+  <%= "subscriptions:".color(:cyan) %> <%= client['subscriptions'].to_s.color(:green) %>
+  <%= "version:".color(:cyan) %> <%= client['version'].to_s.color(:green) %>
+  <%= "timestamp:".color(:cyan) %> <%= client['timestamp'].to_s.color(:green) %>
+<%= "check name:".color(:blue).bright %> <%= check['name'].to_s.color(:green) %>
+  <%= "command:".color(:cyan) %> <%= check['command'].to_s.color(:green) %>
+  <%= "handlers:".color(:cyan) %> <%= check['handlers'].to_s.color(:green) %>
+  <%= "interval:".color(:cyan) %> <%= check['interval'].to_s.color(:green) %>
+  <%= "subscribers:".color(:cyan) %> <%= check['subscribers'].to_s.color(:green) %>
+  <%= "issued:".color(:cyan) %> <%= check['issued'].to_s.color(:green) %>
+  <%= "executed:".color(:cyan) %> <%= check['executed'].to_s.color(:green) %>
+  <%= "duration:".color(:cyan) %> <%= check['duration'].to_s.color(:green) %>
+  <%= "output:".color(:cyan) %> <%= check['output'].rstrip.to_s.color(:green) %>
+  <%= "status:".color(:cyan) %> <%= check['status'].to_s.color(:green) %>
+  <%= "history:".color(:cyan) %> <%= check['history'].to_s.color(:green) %>
+<%= "occurrences:".color(:blue).bright %> <%= occurrences.to_s.color(:green) %>
+<%= "action:".color(:blue).bright %> <%= action.to_s.color(:green) %>

data/lib/sensu-cli/version.rb

@@ -1,3 +1,3 @@
 module SensuCli
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

data/sensu-cli.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
   s.add_dependency('trollop', '2.0')
   s.add_dependency('mixlib-config', '2.1.0')
   s.add_dependency('hirb', '0.7.1')
+  s.add_dependency('erubis', '2.7.0')
 
   s.add_development_dependency('rspec')
   s.add_development_dependency('rubocop')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-cli
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Bryan Brandau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-11 00:00:00.000000000 Z
+date: 2014-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -66,32 +66,46 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.7.1
+- !ruby/object:Gem::Dependency
+  name: erubis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: rspec
   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
         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
         version: '0'
 description: A command line utility for interacting with the Sensu api.
@@ -102,8 +116,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- README.md
 - bin/sensu
 - bin/sensu-cli
+- lib/sensu-cli.rb
 - lib/sensu-cli/api.rb
 - lib/sensu-cli/base.rb
 - lib/sensu-cli/cli.rb
@@ -112,10 +128,9 @@ files:
 - lib/sensu-cli/path.rb
 - lib/sensu-cli/pretty.rb
 - lib/sensu-cli/settings.rb
+- lib/sensu-cli/templates/event.erb
 - lib/sensu-cli/version.rb
-- lib/sensu-cli.rb
 - sensu-cli.gemspec
-- README.md
 - settings.example.rb
 homepage: http://github.com/agent462/sensu-cli
 licenses:
@@ -128,17 +143,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A command line utility for Sensu.