sensu-plugin 0.1.4 → 0.1.5

data/lib/sensu-handler.rb

@@ -1,16 +1,11 @@
 require 'net/http'
 require 'json'
+require 'sensu-plugin/utils'
 
 module Sensu
 
-  NET_HTTP_REQ_CLASS = {
-    'GET'    => Net::HTTP::Get,
-    'POST'   => Net::HTTP::Post,
-    'DELETE' => Net::HTTP::Delete,
-    'PUT'    => Net::HTTP::Put
-  }
-
   class Handler
+    include Sensu::Plugin::Utils
 
     # Implementing classes should override this.
 
@@ -39,34 +34,6 @@ module Sensu
       end
     end
 
-    def config_files
-      if ENV['SENSU_CONFIG_FILES']
-        ENV['SENSU_CONFIG_FILES'].split(':')
-      else
-        ['/etc/sensu/config.json'] + Dir['/etc/sensu/conf.d/*.json']
-      end
-    end
-
-    def load_config(filename)
-      JSON.parse(File.open(filename, 'r').read) rescue Hash.new
-    end
-
-    def settings
-      @settings ||= config_files.map {|f| load_config(f) }.reduce {|a, b| a.deep_merge(b) }
-    end
-
-    def read_event(file)
-      begin
-        @event = ::JSON.parse(file.read)
-        @event['occurrences'] ||= 1
-        @event['check']       ||= Hash.new
-        @event['client']      ||= Hash.new
-      rescue => error
-        puts 'error reading event: ' + error.message
-        exit 0
-      end
-    end
-
     at_exit do
       handler = @@autorun.new
       handler.read_event(STDIN)
@@ -83,7 +50,7 @@ module Sensu
 
     def api_request(method, path, &blk)
       http = Net::HTTP.new(settings['api']['host'], settings['api']['port'])
-      req = NET_HTTP_REQ_CLASS[method.to_s.upcase].new(path)
+      req = net_http_req_class(method).new(path)
       if settings['api']['user'] && settings['api']['password']
         req.basic_auth(settings['api']['user'], settings['api']['password'])
       end
@@ -159,20 +126,3 @@ module Sensu
   end
 
 end
-
-# Monkey Patching.
-
-class Array
-  def deep_merge(other_array, &merger)
-    concat(other_array).uniq
-  end
-end
-
-class Hash
-  def deep_merge(other_hash, &merger)
-    merger ||= proc do |key, old_value, new_value|
-      old_value.deep_merge(new_value, &merger) rescue new_value
-    end
-    merge(other_hash, &merger)
-  end
-end

data/lib/sensu-plugin.rb

@@ -1,6 +1,6 @@
 module Sensu
   module Plugin
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
     EXIT_CODES = {
       'OK'       => 0,
       'WARNING'  => 1,

data/lib/sensu-plugin/utils.rb

@@ -0,0 +1,64 @@
+module Sensu
+  module Plugin
+    module Utils
+
+      def config_files
+        if ENV['SENSU_CONFIG_FILES']
+          ENV['SENSU_CONFIG_FILES'].split(':')
+        else
+          ['/etc/sensu/config.json'] + Dir['/etc/sensu/conf.d/**/*.json']
+        end
+      end
+
+      def load_config(filename)
+        JSON.parse(File.open(filename, 'r').read) rescue Hash.new
+      end
+
+      def settings
+        @settings ||= config_files.map {|f| load_config(f) }.reduce {|a, b| a.deep_merge(b) }
+      end
+
+      def read_event(file)
+        begin
+          @event = ::JSON.parse(file.read)
+          @event['occurrences'] ||= 1
+          @event['check']       ||= Hash.new
+          @event['client']      ||= Hash.new
+        rescue => e
+          puts 'error reading event: ' + e.message
+          exit 0
+        end
+      end
+
+      def net_http_req_class(method)
+        case method.to_s.upcase
+        when 'GET'
+          Net::HTTP::Get
+        when 'POST'
+          Net::HTTP::Post
+        when 'DELETE'
+          Net::HTTP::Delete
+        when 'PUT'
+          Net::HTTP::Put
+        end
+      end
+    end
+  end
+end
+
+# Monkey Patching.
+
+class Array
+  def deep_merge(other_array, &merger)
+    concat(other_array).uniq
+  end
+end
+
+class Hash
+  def deep_merge(other_hash, &merger)
+    merger ||= proc do |key, old_value, new_value|
+      old_value.deep_merge(new_value, &merger) rescue new_value
+    end
+    merge(other_hash, &merger)
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sensu-plugin
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Decklin Foster
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-09 00:00:00 -07:00
+date: 2012-11-14 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,14 +61,15 @@ extra_rdoc_files: []
 
 files: 
 - lib/sensu-handler.rb
+- lib/sensu-plugin.rb
 - lib/sensu-plugin/check/cli.rb
 - lib/sensu-plugin/cli.rb
 - lib/sensu-plugin/metric/cli.rb
-- lib/sensu-plugin.rb
+- lib/sensu-plugin/utils.rb
 - test/external_check_test.rb
 - test/external_handler_test.rb
-- test/external_metric_test.rb
 - test/handle_filter_test.rb
+- test/external_metric_test.rb
 - test/helper.rb
 has_rdoc: true
 homepage: https://github.com/sonian/sensu-plugin
@@ -107,6 +108,6 @@ summary: Sensu Plugins
 test_files: 
 - test/external_check_test.rb
 - test/external_handler_test.rb
-- test/external_metric_test.rb
 - test/handle_filter_test.rb
+- test/external_metric_test.rb
 - test/helper.rb