sensu-cli 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWUwZDFkN2IxNjBjNzJkMmRhMDM0NTYxMjcyMGExODg0M2U0Zjc3Mg==
+    OWQ3MTA4MWI1YTNjM2U3OWNlMmY0MGI5ZmQ4ZmMyYzZiMGE4ZDQ2NQ==
   data.tar.gz: !binary |-
-    ZGMyNDBjMjkwYmJlYzVhZmE5OWM2NmRjN2JmMThmM2YxZTZkMWI1Nw==
+    YzA2OWJkYmUxYzUxNzBmY2MzNTA3Y2EzZDIzZjJmNWEwMmM4NzRlNg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YmE4OThmNTNlNTU4Yjk0ODRmMDQ0NWI2M2IxMTYxYzBlZDM5MjVhYWYyYjVi
-    Y2ZlNTk5YmFjOTQxNTc4MWQzYzYwOWE0NjQ3YjM2Y2ZjZTI3YzUyNTIwZGJm
-    NjQ0OGUzMjNmOWI1MjA3NWI2MzNlMmRkZWQ1MmM0ZTkzZGFkNzQ=
+    ZmNjODVjNGUzZmYwNDUwMDc2ZmY0ODA3NTAyMmZmMmNhMDljZjMxNmViZDRk
+    OTFlYjBjNDU5YmU5MzA0MmEyOTc1ZWVmYmRhNDVjZGE4MTVlNDg1NTU3NDY0
+    NTlhNzA2ODM2NzFiMmUyNzAxYTJiMjZhNzQwYjg5MGE5YTYxZjg=
   data.tar.gz: !binary |-
-    MzAwZDI5NjFhNjczMDVhYzQyY2U5NDQ4ZWNjOTFkMjE4ZDNkOTBkZjk2ZGM4
-    ZWFjNTlmZmY2Nzk5YmNhOGYyYzNlM2Y2YTA1ZmVlYzA1ZDQ0ZjNhMjU3ZmI5
-    ZDZlZGJlM2RlMjRlZTcwZWQ4MjI5MWQ5ZTBlNWQ5MjlmNzg3NzY=
+    MDRlNmU5ODk0ZGIxY2Y4ZDdiZTExZGFjNmExMGY4MTg3NTU3NDU5YTM4N2Zk
+    YzNjMTIxNGVjMGYwNDljZDE2NjNkMzBkYzg4NmEyYmIwMmI0MGJhNmFkMDE5
+    MDE5ZTZkZGY1NmI0ODc5MDc4NTNlMzMwN2ZiODFlNDFhNjg0ODc=

data/bin/sensu

@@ -3,6 +3,6 @@ unless $:.include?(File.dirname(__FILE__) + '/../lib/')
   $: << File.dirname(__FILE__) + '/../lib'
 end
 
-require 'sensu-cli/sensu'
-sensu = SensuCli::Core.new
+require 'sensu-cli/base'
+sensu = SensuCli::Base.new
 sensu.setup

data/bin/sensu-cli

@@ -3,6 +3,6 @@ unless $:.include?(File.dirname(__FILE__) + '/../lib/')
   $: << File.dirname(__FILE__) + '/../lib'
 end
 
-require 'sensu-cli/sensu'
-sensu = SensuCli::Core.new
+require 'sensu-cli/base'
+sensu = SensuCli::Base.new
 sensu.setup

data/lib/sensu-cli/base.rb

@@ -0,0 +1,102 @@
+require 'rubygems' if RUBY_VERSION < '1.9.0'
+require 'net/https'
+require 'json'
+require 'sensu-cli/settings'
+require 'sensu-cli/cli'
+require 'sensu-cli/editor'
+require 'sensu-cli/pretty'
+require 'sensu-cli/path.rb'
+require 'rainbow'
+
+module SensuCli
+  class Base
+
+    def setup
+      clis = Cli.new
+      cli = clis.global
+      settings
+      @command = cli[:command]
+      api_path(cli)
+      make_call
+    end
+
+    def settings
+      directory = "#{Dir.home}/.sensu"
+      file = "#{directory}/settings.rb"
+      alt = "/etc/sensu/sensu-cli/settings.rb"
+      settings = Settings.new
+      if settings.is_file?(file)
+        SensuCli::Config.from_file(file)
+      elsif settings.is_file?(alt)
+        SensuCli::Config.from_file(alt)
+      else
+        settings.create(directory,file)
+      end
+    end
+
+    def api_path(cli)
+      p = PathCreator.new
+      p.respond_to?(@command) ? path = p.send(@command, cli) : (puts "Something Bad Happened";exit)
+      @api = {:path => path[:path], :method => cli[:method], :command => cli[:command], :payload => (path[:payload] || false)}
+    end
+
+    def http_request
+      http = Net::HTTP.new(Config.host, Config.port)
+      http.read_timeout = 15
+      http.open_timeout = 5
+      if Config.ssl
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      end
+      case @api[:method]
+      when 'Get'
+        req =  Net::HTTP::Get.new(@api[:path])
+      when 'Delete'
+        req =  Net::HTTP::Delete.new(@api[:path])
+      when 'Post'
+        req =  Net::HTTP::Post.new(@api[:path],initheader = {'Content-Type' => 'application/json'})
+        req.body = @api[:payload]
+      end
+      req.basic_auth(Config.user, Config.password) if Config.user && Config.password
+      begin
+        http.request(req)
+      rescue Timeout::Error
+        puts "HTTP request has timed out.".color(:red)
+        exit
+      rescue StandardError => e
+        puts "An HTTP error occurred.  Check your settings. #{e}".color(:red)
+        exit
+      end
+    end
+
+    def make_call
+      res = http_request
+      msg = response_codes(res.code,res.body)
+      res.code != '200' ? exit : Pretty.print(msg)
+      Pretty.count(msg)
+    end
+
+    def response_codes(code,body)
+      case code
+      when '200'
+        JSON.parse(body)
+      when '201'
+        puts "The stash has been created." if @command == "stashes" || @command == "silence"
+      when '202'
+        puts "The item was submitted for processing."
+      when '204'
+        puts "Sensu is healthy" if @command == 'health'
+        puts "The item was successfully deleted." if @command == 'aggregates' || @command == 'stashes'
+      when '400'
+        puts "The payload is malformed.".color(:red)
+      when '401'
+        puts "The request requires user authentication.".color(:red)
+      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))
+      end
+    end
+
+  end
+end

data/lib/sensu-cli/path.rb

@@ -0,0 +1,95 @@
+module SensuCli
+  class PathCreator
+
+    def clients(cli)
+      path = "/clients"
+      path << "/#{cli[:fields][:name]}" if cli[:fields][:name]
+      path << "/history" if cli[:fields][:history]
+      path << pagination(cli)
+      respond(path)
+    end
+
+    def info(cli)
+      path = "/info"
+      respond(path)
+    end
+
+    def health(cli)
+      path = "/health?consumers=#{cli[:fields][:consumers]}&messages=#{cli[:fields][:messages]}"
+      respond(path)
+    end
+
+    def stashes(cli)
+      if cli[:fields][:create]
+        e = Editor.new
+        payload = e.create_stash(cli[:fields][:create_path]).to_json
+      end
+      path = "/stashes"
+      path << "/#{cli[:fields][:path]}" if cli[:fields][:path]
+      path << pagination(cli)
+      respond(path,payload)
+    end
+
+    def checks(cli)
+      if cli[:fields][:name]
+        path = "/check/#{cli[:fields][:name]}"
+      elsif cli[:fields][:subscribers]
+        payload = {:check => cli[:fields][:check],:subscribers => cli[:fields][:subscribers]}.to_json
+        path = "/check/request"
+      else
+        path = "/checks"
+      end
+      respond(path,payload)
+    end
+
+    def events(cli)
+      path = "/events"
+      path << "/#{cli[:fields][:client]}" if cli[:fields][:client]
+      path << "/#{cli[:fields][:check]}" if cli[:fields][:check]
+      respond(path)
+    end
+
+    def resolve(cli)
+      payload = {:client => cli[:fields][:client], :check => cli[:fields][:check]}.to_json
+      path = "/event/resolve"
+      respond(path,payload)
+    end
+
+    def silence(cli)
+      payload = {:timestamp => Time.now.to_i}
+      payload.merge!({:reason => cli[:fields][:reason]}) if cli[:fields][:reason]
+      if cli[:fields][:expires]
+        expires = Time.now.to_i + (cli[:fields][:expires] * 60)
+        payload.merge!({:expires => expires})
+      end
+      payload = payload.to_json
+      path = "/stashes/silence"
+      path << "/#{cli[:fields][:client]}" if cli[:fields][:client]
+      path << "/#{cli[:fields][:check]}" if cli[:fields][:check]
+      respond(path,payload)
+    end
+
+    def aggregates(cli)
+      path = "/aggregates"
+      path << "/#{cli[:fields][:check]}" if cli[:fields][:check]
+      path << "/#{cli[:fields][:id]}" if cli[:fields][:id]
+      path << pagination(cli)
+      respond(path)
+    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]}"
+      else
+        page = ""
+      end
+    end
+
+    def respond(path,payload=false)
+      {:path => path, :payload => payload}
+    end
+
+  end
+end

data/lib/sensu-cli/pretty.rb

@@ -0,0 +1,33 @@
+module SensuCli
+  class Pretty
+
+    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)
+              end
+            else
+              puts item.to_s.color(:cyan)
+            end
+          end
+        end
+      else
+        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
+
+  end
+end

data/lib/sensu-cli/version.rb

@@ -1,3 +1,3 @@
 module SensuCli
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Bryan Brandau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-21 00:00:00.000000000 Z
+date: 2013-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -62,9 +62,11 @@ extra_rdoc_files: []
 files:
 - bin/sensu
 - bin/sensu-cli
+- lib/sensu-cli/base.rb
 - lib/sensu-cli/cli.rb
 - lib/sensu-cli/editor.rb
-- lib/sensu-cli/sensu.rb
+- lib/sensu-cli/path.rb
+- lib/sensu-cli/pretty.rb
 - lib/sensu-cli/settings.rb
 - lib/sensu-cli/version.rb
 - lib/sensu-cli.rb

data/lib/sensu-cli/sensu.rb

@@ -1,206 +0,0 @@
-require 'rubygems' if RUBY_VERSION < '1.9.0'
-require 'net/https'
-require 'json'
-require 'sensu-cli/settings'
-require 'sensu-cli/cli'
-require 'sensu-cli/editor'
-require 'rainbow'
-
-module SensuCli
-  class Core
-
-    def setup
-      clis = Cli.new
-      cli = clis.global
-      settings
-      @command = cli[:command]
-      api_path(cli)
-      make_call
-    end
-
-    def settings
-      directory = "#{Dir.home}/.sensu"
-      file = "#{directory}/settings.rb"
-      alt = "/etc/sensu/sensu-cli/settings.rb"
-      settings = Settings.new
-      if settings.is_file?(file)
-        SensuCli::Config.from_file(file)
-      elsif settings.is_file?(alt)
-        SensuCli::Config.from_file(alt)
-      else
-        settings.create(directory,file)
-      end
-    end
-
-    def api_path(cli)
-      self.respond_to?(@command) ? path = send(@command, cli) : (puts "Something Bad Happened";exit)
-      @api = {:path => path, :method => cli[:method], :command => cli[:command], :payload => (@payload || false)}
-    end
-
-    def clients(cli)
-      path = "/clients"
-      path << "/#{cli[:fields][:name]}" if cli[:fields][:name]
-      path << "/history" if cli[:fields][:history]
-      path << pagination(cli)
-    end
-
-    def info(cli)
-      path = "/info"
-    end
-
-    def health(cli)
-      path = "/health?consumers=#{cli[:fields][:consumers]}&messages=#{cli[:fields][:messages]}"
-    end
-
-    def stashes(cli)
-      if cli[:fields][:create]
-        e = Editor.new
-        @payload = e.create_stash(cli[:fields][:create_path]).to_json
-      end
-      path = "/stashes"
-      path << "/#{cli[:fields][:path]}" if cli[:fields][:path]
-      path << pagination(cli)
-    end
-
-    def checks(cli)
-      if cli[:fields][:name]
-        path = "/check/#{cli[:fields][:name]}"
-      elsif cli[:fields][:subscribers]
-        @payload = {:check => cli[:fields][:check],:subscribers => cli[:fields][:subscribers]}.to_json
-        path = "/check/request"
-      else
-        path = "/checks"
-      end
-    end
-
-    def events(cli)
-      path = "/events"
-      path << "/#{cli[:fields][:client]}" if cli[:fields][:client]
-      path << "/#{cli[:fields][:check]}" if cli[:fields][:check]
-      path
-    end
-
-    def resolve(cli)
-      @payload = {:client => cli[:fields][:client], :check => cli[:fields][:check]}.to_json
-      path = "/event/resolve"
-    end
-
-    def silence(cli)
-      payload = {:timestamp => Time.now.to_i}
-      payload.merge!({:reason => cli[:fields][:reason]}) if cli[:fields][:reason]
-      if cli[:fields][:expires]
-        expires = Time.now.to_i + (cli[:fields][:expires] * 60)
-        payload.merge!({:expires => expires})
-      end
-      @payload = payload.to_json
-      path = "/stashes/silence"
-      path << "/#{cli[:fields][:client]}" if cli[:fields][:client]
-      path << "/#{cli[:fields][:check]}" if cli[:fields][:check]
-      path
-    end
-
-    def aggregates(cli)
-      path = "/aggregates"
-      path << "/#{cli[:fields][:check]}" if cli[:fields][:check]
-      path << "/#{cli[:fields][:id]}" if cli[:fields][:id]
-      path << pagination(cli)
-    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]}"
-      else
-        page = ""
-      end
-    end
-
-    def http_request
-      http = Net::HTTP.new(Config.host, Config.port)
-      http.read_timeout = 15
-      http.open_timeout = 5
-      if Config.ssl
-        http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      end
-      case @api[:method]
-      when 'Get'
-        req =  Net::HTTP::Get.new(@api[:path])
-      when 'Delete'
-        req =  Net::HTTP::Delete.new(@api[:path])
-      when 'Post'
-        req =  Net::HTTP::Post.new(@api[:path],initheader = {'Content-Type' => 'application/json'})
-        req.body = @api[:payload]
-      end
-      req.basic_auth(Config.user, Config.password) if Config.user && Config.password
-      begin
-        http.request(req)
-      rescue Timeout::Error
-        puts "HTTP request has timed out.".color(:red)
-        exit
-      rescue StandardError => e
-        puts "An HTTP error occurred.  Check your settings. #{e}".color(:red)
-        exit
-      end
-    end
-
-    def make_call
-      res = http_request
-      msg = response_codes(res.code,res.body)
-      res.code != '200' ? exit : pretty(msg)
-      count(msg)
-    end
-
-    def response_codes(code,body)
-      case code
-      when '200'
-        JSON.parse(body)
-      when '201'
-        puts "The stash has been created." if @command == "stashes"
-      when '202'
-        puts "The item was submitted for processing."
-      when '204'
-        puts "Sensu is healthy" if @command == 'health'
-        puts "The item was successfully deleted." if @command == 'aggregates' || @command == 'stashes'
-      when '400'
-        puts "The payload is malformed.".color(:red)
-      when '401'
-        puts "The request requires user authentication.".color(:red)
-      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))
-      end
-    end
-
-    def pretty(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
-          end
-        end
-      else
-        puts "no values for this request".color(:cyan)
-      end
-    end
-
-    def count(res)
-      res.is_a?(Hash) ? count = res.length : count = res.count
-      puts "#{count} total items".color(:yellow) if count
-    end
-
-  end
-end