sensu-cli 0.1.1 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWQ3MTA4MWI1YTNjM2U3OWNlMmY0MGI5ZmQ4ZmMyYzZiMGE4ZDQ2NQ==
+    MTNkNGJlNWUzNzViYjgwYTYyYmVkOGQ0MzdkMzM5YjAyY2Q1ODdjMw==
   data.tar.gz: !binary |-
-    YzA2OWJkYmUxYzUxNzBmY2MzNTA3Y2EzZDIzZjJmNWEwMmM4NzRlNg==
+    NzJlM2Q0MmRmOTg2YjA1ZGY2YmYxNzY2MjAwYzIwNDEwMTBiM2U4NQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZmNjODVjNGUzZmYwNDUwMDc2ZmY0ODA3NTAyMmZmMmNhMDljZjMxNmViZDRk
-    OTFlYjBjNDU5YmU5MzA0MmEyOTc1ZWVmYmRhNDVjZGE4MTVlNDg1NTU3NDY0
-    NTlhNzA2ODM2NzFiMmUyNzAxYTJiMjZhNzQwYjg5MGE5YTYxZjg=
+    MDcyNDdhYTRhOWUwZmNlOWNiZTA2Y2I4ZTU4Y2NkZWNkNTliYmFkOTk4NTlh
+    M2M2YzMxNWJlZGRkN2Q1MGNlMGJhNzcyZGUwNzM5MzFlZWY2NDhhYzZkNDZh
+    OTE2Y2M4MDg4OWZmNjJiOGM0NTkxMDQyMmM5YTcwYzlhYTdiMGM=
   data.tar.gz: !binary |-
-    MDRlNmU5ODk0ZGIxY2Y4ZDdiZTExZGFjNmExMGY4MTg3NTU3NDU5YTM4N2Zk
-    YzNjMTIxNGVjMGYwNDljZDE2NjNkMzBkYzg4NmEyYmIwMmI0MGJhNmFkMDE5
-    MDE5ZTZkZGY1NmI0ODc5MDc4NTNlMzMwN2ZiODFlNDFhNjg0ODc=
+    MmIxZWZhYzc3MmI5MjI0OTcxMjY0ZjkzMGRjYzAxYTkwNmZmZTIyZjU2ODg0
+    YzE5YjlhZjMxNWY0MjUyNDc2YmZiNTQ3MWYyOWRlZWI3MjFjYWUxMWYwZjIz
+    ZGY0NDQ1MWJhOWRkNTMyYmJjYTFkZDU5ODNkMWJiNzg3MTJhZDY=

data/bin/sensu

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

data/lib/sensu-cli/api.rb

@@ -0,0 +1,60 @@
+require 'net/https'
+require 'json'
+require 'rainbow'
+
+module SensuCli
+  class Api
+
+    def request(opts)
+      http = Net::HTTP.new(opts[:host], opts[:port])
+      http.read_timeout = 15
+      http.open_timeout = 5
+      if opts[:ssl]
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      end
+      case opts[:method]
+      when 'Get'
+        req =  Net::HTTP::Get.new(opts[:path])
+      when 'Delete'
+        req =  Net::HTTP::Delete.new(opts[:path])
+      when 'Post'
+        req =  Net::HTTP::Post.new(opts[:path],initheader = {'Content-Type' => 'application/json'})
+        req.body = opts[:payload]
+      end
+      req.basic_auth(opts[:user], opts[:password]) if opts[:user] && opts[: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 response(code,body,command=nil)
+      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/base.rb

@@ -1,13 +1,3 @@
-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
 
@@ -15,7 +5,6 @@ module SensuCli
       clis = Cli.new
       cli = clis.global
       settings
-      @command = cli[:command]
       api_path(cli)
       make_call
     end
@@ -36,67 +25,27 @@ module SensuCli
 
     def api_path(cli)
       p = PathCreator.new
-      p.respond_to?(@command) ? path = p.send(@command, cli) : (puts "Something Bad Happened";exit)
+      p.respond_to?(cli[:command]) ? path = p.send(cli[: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)
+      opts = {
+        :path => @api[:path],
+        :method => @api[:method],
+        :payload => @api[:payload],
+        :host => Config.host,
+        :port => Config.port,
+        :ssl => Config.ssl || false,
+        :user => Config.user || nil,
+        :password => Config.password || nil
+      }
+      api = Api.new
+      res = api.request(opts)
+      msg = api.response(res.code, res.body, @api[:command])
       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/cli.rb

@@ -1,5 +1,6 @@
 require 'trollop'
 require 'sensu-cli/version'
+require 'rainbow'
 
 module SensuCli
   class Cli

data/lib/sensu-cli/editor.rb

@@ -5,12 +5,11 @@ module SensuCli
   class Editor
 
     def create_stash(create_path)
-      @create_path = create_path
-      file = create_file
-      open(file)
+      file = temp_file({:path => create_path, :content => {:timestamp => Time.now.to_i }})
+      edit(file)
     end
 
-    def open(file)
+    def edit(file)
       ENV['EDITOR'] ? editor = ENV['EDITOR'] : editor = 'vi'
       system("#{editor} #{file}")
       begin
@@ -21,8 +20,7 @@ module SensuCli
       end
     end
 
-    def create_file
-      template = {:path => @create_path, :content => {:timestamp => Time.now.to_i }}
+    def temp_file(template)
       file = Tempfile.new('sensu')
       file.write(JSON.pretty_generate(template))
       file.close

data/lib/sensu-cli/path.rb

@@ -87,6 +87,10 @@ module SensuCli
       end
     end
 
+    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

data/lib/sensu-cli/pretty.rb

@@ -1,3 +1,5 @@
+require 'rainbow'
+
 module SensuCli
   class Pretty
 

data/lib/sensu-cli/settings.rb

@@ -1,5 +1,6 @@
 require 'fileutils'
 require 'mixlib/config'
+require 'rainbow'
 
 module SensuCli
   class Settings

data/lib/sensu-cli/version.rb

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

data/lib/sensu-cli.rb

@@ -1,2 +1,11 @@
+require 'sensu-cli/settings'
+require 'sensu-cli/cli'
+require 'sensu-cli/editor'
+require 'sensu-cli/pretty'
+require 'sensu-cli/path.rb'
+require 'sensu-cli/api.rb'
+require 'sensu-cli/base.rb'
+require 'sensu-cli/version.rb'
+
 module SensuCli
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Bryan Brandau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-22 00:00:00.000000000 Z
+date: 2013-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -62,6 +62,7 @@ extra_rdoc_files: []
 files:
 - bin/sensu
 - bin/sensu-cli
+- lib/sensu-cli/api.rb
 - lib/sensu-cli/base.rb
 - lib/sensu-cli/cli.rb
 - lib/sensu-cli/editor.rb