sensu-cli 0.3.1 → 0.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzQyZTY3YzM1OTNlNzM3NzdmMWQ4MzcxN2E0MWQxOWQ1MjRhYzM1Nw==
+    MjIwNTc1ZDI4NDJiZjU2ODJlYWU0MDk2NTIxYWQyZTY4NWZjMzJjZg==
   data.tar.gz: !binary |-
-    MzUyYzcwNjQ5MzA5MDE0ODIzYTFjZDdlODcxYTNkMDBlOTVhNDM3Ng==
+    ZGZiYWRmM2QwMmZkODc3MTRmNDMxMjI3NjBhNjM1MTdlZmNiYWJmMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NzEzOTlhNjk3MjNlMmU1NjZkYTk2M2ZmZjg2OGNkOWQ5OTU1M2UxOTIwNDQy
-    MWM2NmY2MGNkZDgxNmNlN2ZmMTkyZjljNTFkN2NlNjcwZmI3MjVlNWVlODBh
-    YWVkOGMxNTI0N2JjYWU4OTdkMTg3Y2I4OGJmZjAyOGQzZWQ0MWI=
+    MDA0MTcyMmUyZGVkMDdmYjE0MTIyZjZkZWM2NTU1OGI0YzJiYzQyNjM1NTIz
+    OGU4MGFiN2NlMTRkMGQ5NmY4NmRlZjY5ZDUxYWE2OGQ3Y2JjMjQxMWJjNGJj
+    NTE3ZDNkNDI1YTM0MjJjZjkyOWFkZWVkNjdjMWFiMTYzYjkxZDM=
   data.tar.gz: !binary |-
-    ZWRjNjMwNGM3NDZmNTZkYTUyMGJkMDZlYTBkYWVjZmY4MzQ5M2Q5YmViZmU1
-    YmY0NGUzOGQ1ZjNhOTZiM2I5ZGQ4NTFkOWY4YzhiNjZkYjlhMDYyMzc5MGQw
-    NzYxZTE0NGQzZDZhNWZhZGUwMzdhMzJkOGIwZDViNjJlZDgzMDQ=
+    MTA5YmM2MWI5NzU1NzMyMzdlYTRlMTRiNjRhMWM1NDAyZTc3MGRmOTlmM2Mw
+    NTJkZmYwNzFhOTJjNTZlNTM3YThjYjZlNzkzZGVlMzA0MzVhODA5NTVlOGZh
+    ZWQ1OWM1NDNjMWFlMTM5YjhlYThlMTRhM2I4YmMzOGI3MDRjNmU=

data/README.md

@@ -41,23 +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)
 
-* If your Sensu API has basic auth, add the parameters to the config.
-
-````
-host  "127.0.0.1"
-port  "4567"
-ssl   false
-user "some_user"
-password "some_secret_password"
-````
-If `read_timeout` and `open_timeout` are not set, they default to 15 and
-5 seconds respectively.
-
-Expire Silenced Hosts/Checks
-----------------------------
-I added an expires option to `sensu-cli silence` to be used like `sensu-cli silence HOST -e 30` where `-e` denotes the number of minutes from now a host/checks silence should expire.  This won't work by itself.  We add a key to the silence stash with a time in the future.  If you run [check-stashes](https://github.com/agent462/sensu-check-stashes) on your sensu-server it will check for expired stashes and delete them.
-
-There is also a reason option `-r` available.  Be nice and use it so your colleagues know what you're doing.
+* 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
 -----------
@@ -111,10 +101,6 @@ Contributions
 -------------
 Please provide a pull request.  I'm an ops guy, not a developer, so if you're submitting code cleanup, all I ask is that you explain the improvement so I can learn.
 
-TODO
-----
-* cleanup the cli
-* Once complete api support is implemented I'll add other features like filtering or issuing a event.
 
 License and Author
 ==================

data/lib/sensu-cli.rb

@@ -6,6 +6,7 @@ require 'sensu-cli/path.rb'
 require 'sensu-cli/api.rb'
 require 'sensu-cli/base.rb'
 require 'sensu-cli/version.rb'
+require 'sensu-cli/filter.rb'
 
 module SensuCli
 end

data/lib/sensu-cli/api.rb

@@ -1,10 +1,9 @@
 require 'net/https'
 require 'json'
-require 'rainbow'
+require 'rainbow/ext/string'
 
 module SensuCli
   class Api
-
     def request(opts)
       http = Net::HTTP.new(opts[:host], opts[:port])
       http.read_timeout = opts[:read_timeout]
@@ -16,11 +15,11 @@ module SensuCli
       proxy_header = { 'api-proxy' => 'true' }
       case opts[:method]
       when 'Get'
-        req =  Net::HTTP::Get.new(opts[:path], initheader = proxy_header)
+        req =  Net::HTTP::Get.new(opts[:path], proxy_header)
       when 'Delete'
-        req =  Net::HTTP::Delete.new(opts[:path], initheader = proxy_header)
+        req =  Net::HTTP::Delete.new(opts[:path], proxy_header)
       when 'Post'
-        req =  Net::HTTP::Post.new(opts[:path], initheader = proxy_header.merge!({ 'Content-Type' => 'application/json' }))
+        req =  Net::HTTP::Post.new(opts[:path], proxy_header.merge!('Content-Type' => 'application/json'))
         req.body = opts[:payload]
       end
       req.basic_auth(opts[:user], opts[:password]) if opts[:user] && opts[:password]
@@ -60,6 +59,5 @@ module SensuCli
         end
       end
     end
-
   end
 end

data/lib/sensu-cli/base.rb

@@ -1,6 +1,5 @@
 module SensuCli
   class Base
-
     def setup
       clis = Cli.new
       @cli = clis.global
@@ -14,13 +13,14 @@ module SensuCli
       file = "#{directory}/settings.rb"
       alt = '/etc/sensu/sensu-cli/settings.rb'
       settings = Settings.new
-      if settings.is_file?(file)
+      if settings.file?(file)
         SensuCli::Config.from_file(file)
-      elsif settings.is_file?(alt)
+      elsif settings.file?(alt)
         SensuCli::Config.from_file(alt)
       else
         settings.create(directory, file)
       end
+      Rainbow.enabled = Config.pretty_colors == false ? false : true
     end
 
     def api_path(cli)
@@ -45,6 +45,7 @@ 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]
       if res.code != '200'
         exit
       elsif @cli[:fields][:format] == 'single'
@@ -60,6 +61,5 @@ module SensuCli
       end
       Pretty.count(msg) unless @cli[:fields][:format] == 'table'
     end
-
   end
 end

data/lib/sensu-cli/cli.rb

@@ -1,9 +1,9 @@
 require 'trollop'
 require 'sensu-cli/version'
-require 'rainbow'
+require 'rainbow/ext/string'
 
 module SensuCli
-  class Cli
+  class Cli # rubocop:disable ClassLength
     SUB_COMMANDS    = %w(info client check event stash aggregate silence resolve health)
     CLIENT_COMMANDS = %w(list show delete history)
     CHECK_COMMANDS  = %w(list show request)
@@ -109,7 +109,7 @@ module SensuCli
     end
 
     def deep_merge(hash_one, hash_two)
-      hash_one.merge(hash_two) { |key, hash_one_item, hash_two_item| deep_merge(hash_one_item, hash_two_item) }
+      hash_one.merge(hash_two) { |_key, hash_one_item, hash_two_item| deep_merge(hash_one_item, hash_two_item) }
     end
 
     def parser(cli)
@@ -127,7 +127,7 @@ module SensuCli
       ARGV.shift
     end
 
-    def client
+    def client # rubocop:disable MethodLength
       opts = parser('CLIENT')
       command = next_argv
       explode_if_empty(opts, command)
@@ -138,6 +138,7 @@ module SensuCli
           opt :offset, 'The number of clients to offset before returning', :short => 'o', :type => :string
           opt :format, 'Available formats; single, table, json', :short => 'f', :type => :string
           opt :fields, 'Fields for table ouput: -F name,address,subscriptions', :short => 'F', :type => :string
+          opt :filter, 'Field and value to filter on: name,graphite', :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]
         Trollop::die :fields, 'Fields must be used in conjunction with --format table'.color(:red) if p[:format] != 'table' && p[:fields]
@@ -215,7 +216,7 @@ module SensuCli
         p = Trollop::options
         item = next_argv
         check = next_argv
-        explode(opts) if check == nil
+        explode(opts) if check.nil?
         deep_merge({ :command => 'events', :method => 'Delete', :fields => { :client => item, :check => check } }, { :fields => p })
       else
         explode(opts)
@@ -289,7 +290,7 @@ module SensuCli
         opt :expire, 'The number of seconds the silenced event is valid', :short => 'e', :type => :integer
       end
       command = next_argv
-      explode(opts) if command == nil
+      explode(opts) if command.nil?
       deep_merge({ :command => 'silence', :method => 'Post', :fields => { :client => command } }, { :fields => p })
     end
 
@@ -300,6 +301,5 @@ module SensuCli
       ARGV.empty? ? explode(opts) : check = next_argv
       deep_merge({ :command => 'resolve', :method => 'Post', :fields => { :client => command, :check => check } }, { :fields => p })
     end
-
   end
 end

data/lib/sensu-cli/editor.rb

@@ -3,9 +3,8 @@ require 'tempfile'
 
 module SensuCli
   class Editor
-
     def create_stash(create_path)
-      file = temp_file({ :path => create_path, :content => { :timestamp => Time.now.to_i } })
+      file = temp_file(:path => create_path, :content => { :timestamp => Time.now.to_i })
       edit(file)
     end
 
@@ -26,6 +25,5 @@ module SensuCli
       file.close
       file.path
     end
-
   end
 end

data/lib/sensu-cli/filter.rb

@@ -0,0 +1,26 @@
+module SensuCli
+  class Filter
+    class << self
+      def filter_split(filter)
+        filter.sub(' ', '').split(',')
+      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
+        else
+          res
+        end
+      end
+    end
+  end
+end

data/lib/sensu-cli/path.rb

@@ -1,6 +1,5 @@
 module SensuCli
   class PathCreator
-
     def clients(cli)
       path = '/clients'
       path << "/#{cli[:fields][:name]}" if cli[:fields][:name]
@@ -9,7 +8,7 @@ module SensuCli
       respond(path)
     end
 
-    def info(cli)
+    def info(*)
       path = '/info'
       respond(path)
     end
@@ -57,14 +56,14 @@ module SensuCli
 
     def silence(cli)
       content = { :timestamp => Time.now.to_i }
-      content.merge!({ :owner => cli[:fields][:owner] }) if cli[:fields][:owner]
-      content.merge!({ :reason => cli[:fields][:reason] }) if cli[:fields][:reason]
+      content.merge!(:owner => cli[:fields][:owner]) if cli[:fields][:owner]
+      content.merge!(:reason => cli[:fields][:reason]) if cli[:fields][:reason]
       payload = { :content =>  content }
-      payload.merge!({ :expire => cli[:fields][:expire].to_i }) if cli[:fields][:expire]
+      payload.merge!(:expire => cli[:fields][:expire].to_i) if cli[:fields][:expire]
       silence_path = 'silence'
       silence_path << "/#{cli[:fields][:client]}" if cli[:fields][:client]
       silence_path << "/#{cli[:fields][:check]}" if cli[:fields][:check]
-      payload = payload.merge!({ :path => silence_path }).to_json
+      payload = payload.merge!(:path => silence_path).to_json
       respond('/stashes', payload)
     end
 
@@ -77,22 +76,21 @@ module SensuCli
     end
 
     def pagination(cli)
-      if cli[:fields].has_key?(:limit) && cli[:fields].has_key?(:offset)
-        page = "?limit=#{cli[:fields][:limit]}&offset=#{cli[:fields][:offset]}"
-      elsif cli[:fields].has_key?(:limit)
-        page = "?limit=#{cli[:fields][:limit]}"
+      if cli[:fields].key?(:limit) && cli[:fields].key?(:offset)
+        "?limit=#{cli[:fields][:limit]}&offset=#{cli[:fields][:offset]}"
+      elsif cli[:fields].key?(:limit)
+        "?limit=#{cli[:fields][:limit]}"
       else
-        page = ''
+        ''
       end
     end
 
-    def method_missing(method_name, *args)
+    def method_missing(method_name, *_args)
       puts "Path method: #{method_name} does not exist. "
     end
 
     def respond(path, payload = false)
       { :path => path, :payload => payload }
     end
-
   end
 end

data/lib/sensu-cli/pretty.rb

@@ -1,11 +1,10 @@
-require 'rainbow'
+require 'rainbow/ext/string'
 require 'hirb'
 require 'json'
 
 module SensuCli
   class Pretty
     class << self
-
       def print(res)
         if !res.empty?
           if res.is_a?(Hash)
@@ -25,7 +24,7 @@ module SensuCli
             end
           end
         else
-          self.no_values
+          no_values
         end
       end
 
@@ -65,22 +64,21 @@ module SensuCli
             end
 
             # Print header
-            format = keys.map { |key| "%-#{value_lengths[key]}s" }.join(' ')
-            puts sprintf(format, *keys)
+            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] }
-                format = keys.map { |key| "%-#{value_lengths[key]}s" }.join(' ')
-                puts sprintf(format, *values)
+                puts format(lengths, *values)
               else
                 puts item.to_s.color(:cyan)
               end
             end
           end
         else
-          self.no_values
+          no_values
         end
       end
 
@@ -93,21 +91,20 @@ module SensuCli
           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]
+              keys = %w(check client status flapping occurrences handlers issued output)
             else
               if fields
-                keys = self.parse_fields(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 })
+            puts Hirb::Helpers::AutoTable.render(res, :max_width => terminal_size[0], :fields => keys)
           end
         else
-          self.no_values
+          no_values
         end
       end
-
     end
   end
 end

data/lib/sensu-cli/settings.rb

@@ -1,11 +1,10 @@
 require 'fileutils'
 require 'mixlib/config'
-require 'rainbow'
+require 'rainbow/ext/string'
 
 module SensuCli
   class Settings
-
-    def is_file?(file)
+    def file?(file)
       !File.readable?(file) ? false : true # rubocop:disable FavorUnlessOverNegatedIf
     end
 
@@ -15,11 +14,9 @@ module SensuCli
       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
     end
-
   end
 
   class Config
     extend(Mixlib::Config)
   end
-
 end

data/lib/sensu-cli/version.rb

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

data/sensu-cli.gemspec

@@ -4,23 +4,23 @@ Gem::Specification.new do |s|
   s.name        = 'sensu-cli'
   s.version     = SensuCli::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.summary     = "A command line utility for Sensu."
-  s.description = "A command line utility for interacting with the Sensu api."
-  s.authors     = ["Bryan Brandau"]
+  s.summary     = 'A command line utility for Sensu.'
+  s.description = 'A command line utility for interacting with the Sensu api.'
+  s.authors     = ['Bryan Brandau']
   s.email       = 'agent462@gmail.com'
   s.has_rdoc    = false
-  s.licenses    = ['MIT','APACHE']
-  s.homepage    ='http://github.com/agent462/sensu-cli'
+  s.licenses    = %w(MIT APACHE)
+  s.homepage    = 'http://github.com/agent462/sensu-cli'
 
-  s.add_dependency('rainbow', '1.1.4')
+  s.add_dependency('rainbow', '2.0.0')
   s.add_dependency('trollop', '2.0')
-  s.add_dependency('mixlib-config', '1.1.2')
+  s.add_dependency('mixlib-config', '2.1.0')
   s.add_dependency('hirb', '0.7.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.files         = Dir.glob('{bin,lib}/**/*') + %w(sensu-cli.gemspec README.md settings.example.rb)
   s.executables   = Dir.glob('bin/**/*').map { |file| File.basename(file) }
   s.require_paths = ['lib']
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Bryan Brandau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-12 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: hirb
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,7 @@ files:
 - lib/sensu-cli/base.rb
 - lib/sensu-cli/cli.rb
 - lib/sensu-cli/editor.rb
+- lib/sensu-cli/filter.rb
 - lib/sensu-cli/path.rb
 - lib/sensu-cli/pretty.rb
 - lib/sensu-cli/settings.rb