sensu-plugin 0.1.6 → 0.1.7

data/lib/sensu-handler.rb

@@ -73,7 +73,7 @@ module Sensu
       end
       if @event['occurrences'] > occurrences && @event['action'] == 'create'
         number = refresh.fdiv(interval).to_i
-        unless @event['occurrences'] % number == 0
+        unless number == 0 || @event['occurrences'] % number == 0
           bail 'only handling every ' + number.to_s + ' occurrences'
         end
       end

data/lib/sensu-plugin.rb

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

data/test/handle_filter_test.rb

@@ -12,7 +12,7 @@ class TestFilterExternal < MiniTest::Unit::TestCase
   def test_resolve_not_enough_occurrences
     event = {
       'client' => { 'name' => 'test' },
-      'check' => { 'name' => 'test', 'occurrences' => 2},
+      'check' => { 'name' => 'test', 'occurrences' => 2 },
       'occurrences' => 1
     }
     output = run_script_with_input(JSON.generate(event))
@@ -23,7 +23,7 @@ class TestFilterExternal < MiniTest::Unit::TestCase
   def test_resolve_enough_occurrences
     event = {
       'client' => { 'name' => 'test' },
-      'check' => { 'name' => 'test', 'occurrences' => 2},
+      'check' => { 'name' => 'test', 'occurrences' => 2 },
       'occurrences' => 3
     }
     output = run_script_with_input(JSON.generate(event))
@@ -31,17 +31,65 @@ class TestFilterExternal < MiniTest::Unit::TestCase
     assert_match(/^Event:/, output)
   end
 
-  def test_resolve_enough_occurrences_exactly
+  def test_refresh_enough_occurrences
     event = {
       'client' => { 'name' => 'test' },
-      'check' => { 'name' => 'test', 'occurrences' => 2},
-      'occurrences' => 2
+      'check' => { 'name' => 'test' },
+      'occurrences' => 60,
+      'action' => 'create'
     }
     output = run_script_with_input(JSON.generate(event))
     assert_equal(0, $?.exitstatus)
     assert_match(/^Event:/, output)
   end
 
+  def test_refresh_not_enough_occurrences
+    event = {
+      'client' => { 'name' => 'test' },
+      'check' => { 'name' => 'test' },
+      'occurrences' => 59,
+      'action' => 'create'
+    }
+    output = run_script_with_input(JSON.generate(event))
+    assert_equal(0, $?.exitstatus)
+    assert_match(/^only handling every/, output)
+  end
+
+  def test_refresh_bypass
+    event = {
+      'client' => { 'name' => 'test' },
+      'check' => { 'name' => 'test', 'refresh' => 0 },
+      'occurrences' => 59,
+      'action' => 'create'
+    }
+    output = run_script_with_input(JSON.generate(event))
+    assert_equal(0, $?.exitstatus)
+    assert_match(/^Event:/, output)
+  end
+
+  def test_refresh_less_than_interval
+    event = {
+      'client' => { 'name' => 'test' },
+      'check' => { 'name' => 'test', 'refresh' => 30 },
+      'occurrences' => 59,
+      'action' => 'create'
+    }
+    output = run_script_with_input(JSON.generate(event))
+    assert_equal(0, $?.exitstatus)
+    assert_match(/^Event:/, output)
+  end
+
+  def test_resolve_not_enough_occurrences
+    event = {
+      'client' => { 'name' => 'test' },
+      'check' => { 'name' => 'test', 'occurrences' => 2 },
+      'occurrences' => 1
+    }
+    output = run_script_with_input(JSON.generate(event))
+    assert_equal(0, $?.exitstatus)
+    assert_match(/^not enough occurrences/, output)
+  end
+
   def test_dependency_event_exists
     event = {
       'client' => { 'name' => 'test' },

data/test/helper.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+gem 'minitest' if RUBY_VERSION < '1.9.0'
 require 'minitest/autorun'
 
 module SensuPluginTestHelper
@@ -8,13 +9,13 @@ module SensuPluginTestHelper
   end
 
   def run_script(*args)
-    IO.popen([@script] + args, 'r+') do |child|
+    IO.popen(([@script] + args).join(' '), 'r+') do |child|
       child.read
     end
   end
 
   def run_script_with_input(input, *args)
-    IO.popen([@script] + args, 'r+') do |child|
+    IO.popen(([@script] + args).join(' '), 'r+') do |child|
       child.puts input
       child.close_write
       child.read

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sensu-plugin
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Decklin Foster
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-07 00:00:00 -08:00
+date: 2013-03-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,6 +63,20 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: minitest
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: Plugins and helper libraries for Sensu, a monitoring framework
 email: 
 - decklin@red-bean.com