sensu-cli 0.4.0 → 0.5.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjIwNTc1ZDI4NDJiZjU2ODJlYWU0MDk2NTIxYWQyZTY4NWZjMzJjZg==
+    Mjk0ZjhhMjdkYjBjMzE1ODQwZTdhNmU3NWEyZDU1MGU5YWRkZTdiOQ==
   data.tar.gz: !binary |-
-    ZGZiYWRmM2QwMmZkODc3MTRmNDMxMjI3NjBhNjM1MTdlZmNiYWJmMA==
+    ODgyZTA5OThlMjlmYWFlODVkY2Y4MjRkYTBmNmMwZjM5MThkNGJjMQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MDA0MTcyMmUyZGVkMDdmYjE0MTIyZjZkZWM2NTU1OGI0YzJiYzQyNjM1NTIz
-    OGU4MGFiN2NlMTRkMGQ5NmY4NmRlZjY5ZDUxYWE2OGQ3Y2JjMjQxMWJjNGJj
-    NTE3ZDNkNDI1YTM0MjJjZjkyOWFkZWVkNjdjMWFiMTYzYjkxZDM=
+    M2U4NzY3MTlkNmI4YzM0MjYxNzRhZTQwZjNiMGZlZTg1YWU1MzU1ODY1Nzk0
+    NjY5YWMyZWU2MzNmOTVjMGJmZTMyMjQ4NzBiMGQ5NGFjN2Y0OTg4ODc3YmUy
+    ODUzOGY1M2RiMDc5OTc4MmJiMWI2OTE3ZWZmYTY5MzQxY2IwZDc=
   data.tar.gz: !binary |-
-    MTA5YmM2MWI5NzU1NzMyMzdlYTRlMTRiNjRhMWM1NDAyZTc3MGRmOTlmM2Mw
-    NTJkZmYwNzFhOTJjNTZlNTM3YThjYjZlNzkzZGVlMzA0MzVhODA5NTVlOGZh
-    ZWQ1OWM1NDNjMWFlMTM5YjhlYThlMTRhM2I4YmMzOGI3MDRjNmU=
+    YmYyNTU5MzUwYzQ5N2E4OTNiODRmY2Q2NjMyY2ZmNTBmNTJjYjcwZmI4YTky
+    Yzk2M2NhNTliNzdmZTkzMzQ5NTAyN2EwZTU5MjEyYTkwNDBjZmRmYjliYWZm
+    NzU4NDlmNDVmYmFiNzk0ODgzYTBkOTU4YmZlY2U1YTJkZWIxMWM=

data/README.md

@@ -41,13 +41,13 @@ open_timeout 20
 ````
 This format was chosen so you can do some ENV magic via your profile and setting up an alias. For details see the [wiki](https://github.com/agent462/sensu-cli/wiki)
 
-* All Configuration Settings
-`host` String - Required
-`port` String/Integer - Required
-`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
+* All Configuration Settings   
+`host` String - Required   
+`port` String/Integer - Required   
+`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   
 
 Examples
 -----------

data/lib/sensu-cli.rb

@@ -9,4 +9,8 @@ require 'sensu-cli/version.rb'
 require 'sensu-cli/filter.rb'
 
 module SensuCli
+  def self.die(code = 0, msg = nil)
+    at_exit { puts msg }
+    Kernel.exit(code)
+  end
 end

data/lib/sensu-cli/api.rb

@@ -26,11 +26,9 @@ module SensuCli
       begin
         http.request(req)
       rescue Timeout::Error
-        puts 'HTTP request has timed out.'.color(:red)
-        exit
+        SensuCli::die(1, 'HTTP request has timed out.'.color(:red))
       rescue StandardError => e
-        puts "An HTTP error occurred.  Check your settings. #{e}".color(:red)
-        exit
+        SensuCli::die(1, "An HTTP error occurred.  Check your settings. #{e}".color(:red))
       end
     end
 

data/lib/sensu-cli/base.rb

@@ -1,8 +1,7 @@
 module SensuCli
   class Base
     def setup
-      clis = Cli.new
-      @cli = clis.global
+      @cli = Cli.new.global
       settings
       api_path(@cli)
       make_call
@@ -25,7 +24,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) # rubocop:disable Semicolon
+      p.respond_to?(cli[:command]) ? path = p.send(cli[:command], cli) : SensuCli::die(1, 'Something Bad Happened')
       @api = { :path => path[:path], :method => cli[:method], :command => cli[:command], :payload => (path[:payload] || false) }
     end
 
@@ -45,9 +44,9 @@ module SensuCli
       api = Api.new
       res = api.request(opts)
       msg = api.response(res.code, res.body, @api[:command])
-      msg = Filter.filter_json(msg, @cli[:fields][:filter]) if @cli[:fields][:filter]
+      msg = Filter.new(@cli[:fields][:filter]).process(msg) if @cli[:fields][:filter]
       if res.code != '200'
-        exit
+        SensuCli::die(0)
       elsif @cli[:fields][:format] == 'single'
         Pretty.single(msg)
       elsif @cli[:fields][:format] == 'table'

data/lib/sensu-cli/cli.rb

@@ -180,14 +180,18 @@ module SensuCli
       opts = parser('CHECK')
       command = next_argv
       explode_if_empty(opts, command)
-      p = Trollop::options
       item = next_argv
       case command
       when 'list'
+        p = Trollop::options do
+          opt :filter, 'Field and value to filter on: command,procs', :type => :string
+        end
         { :command => 'checks', :method => 'Get', :fields => p }
       when 'show'
+        p = Trollop::options
         deep_merge({ :command => 'checks', :method => 'Get', :fields => { :name => item } }, { :fields => p })
       when 'request'
+        p = Trollop::options
         ARGV.empty? ? explode(opts) : subscribers = next_argv.split(',')
         deep_merge({ :command => 'checks', :method => 'Post', :fields => { :check => item, :subscribers => subscribers } }, { :fields => p })
       else
@@ -202,6 +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 :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]
@@ -233,6 +238,7 @@ module SensuCli
           opt :limit, 'The number of stashes to return', :short => 'l', :type => :string
           opt :offset, 'The number of stashes to offset before returning', :short => 'o', :type => :string
           opt :format, 'Available formats; single, table, json', :short => 'f', :type => :string
+          opt :filter, 'Field and value to filter on: path,graphite', :type => :string
         end
         Trollop::die :offset, 'Offset depends on the limit option --limit ( -l )'.color(:red) if p[:offset] && !p[:limit]
         Trollop::die :format, 'Available optional formats: single, table, json'.color(:red) if p[:format] != 'table' && p[:format] != 'single' && p[:format] != 'json' && p[:format]
@@ -260,7 +266,9 @@ module SensuCli
       explode_if_empty(opts, command)
       case command
       when 'list'
-        p = Trollop::options
+        p = Trollop::options do
+          opt :filter, 'Field and value to filter on: issued,1399505890', :type => :string
+        end
         { :command => 'aggregates', :method => 'Get', :fields => p }
       when 'show'
         p = Trollop::options do

data/lib/sensu-cli/editor.rb

@@ -14,8 +14,7 @@ module SensuCli
       begin
         JSON.parse(File.read(file))
       rescue JSON::ParserError
-        puts 'The stash you created has Invalid JSON.'
-        exit
+        SensuCli::die(1, 'The stash you created has invalid JSON.')
       end
     end
 

data/lib/sensu-cli/filter.rb

@@ -1,25 +1,38 @@
 module SensuCli
   class Filter
-    class << self
-      def filter_split(filter)
-        filter.sub(' ', '').split(',')
-      end
+    attr_reader :filter
+
+    def initialize(filter_data)
+      filter_split(filter_data)
+    end
 
-      def filter_json(res, filter)
-        filter = filter_split(filter)
-        if !res.empty?
-          res.select do |item|
-            if item.key? filter[0]
-              if item[filter[0]].is_a?(Array)
-                item unless item[filter[0]].select { |value| value.include? filter[1] }.empty?
-              else
-                item if item[filter[0]].include? filter[1]
-              end
-            end
-          end
+    def filter_split(filter)
+      @filter = filter.sub(' ', '').split(',')
+    end
+
+    def match?(data)
+      data.to_s.include? filter[1]
+    end
+
+    def inspect_hash(data)
+      data.any? do |key, value|
+        if value.is_a?(Array)
+          match?(value) if key == filter[0]
+        elsif value.is_a?(Hash)
+          process(value)
         else
-          res
+          match?(value) if key == filter[0]
+        end
+      end
+    end
+
+    def process(data)
+      if data.is_a?(Array)
+        data.select do |value|
+          process(value)
         end
+      elsif data.is_a?(Hash)
+        inspect_hash(data)
       end
     end
   end

data/lib/sensu-cli/settings.rb

@@ -11,8 +11,7 @@ module SensuCli
     def create(directory, file)
       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
+      SensuCli::die(0, "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))
     end
   end
 

data/lib/sensu-cli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-cli
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Bryan Brandau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-07 00:00:00.000000000 Z
+date: 2014-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow