nagios_check 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0be1e0cf8818d77cf5df2270e14dc0b22666b3fc
-  data.tar.gz: 7939ff0f301d34eda715e3c7af90f48629f493cb
+SHA256:
+  metadata.gz: 9fc94a2d97088c48f83d820d58bae3cd3b98531feb9007fd9ba44a5f9853dfd4
+  data.tar.gz: dd9022e057eb61941652f6e4a3f15fc179e6f4de15b310d090121b8ea2277028
 SHA512:
-  metadata.gz: 2ef4a3d420ce9a217769345c5e1bddce5b574bff440b4f095d0f32d79a9c526cc13ced9a1951d0ef9822cc1b4e761ffe754ad199fe67c4a56f57b84bf09edd6e
-  data.tar.gz: 1e3d9531a483d3e7a418891d22762d6361602a038dabb3700c45d04ae5a5b88f450a27ffa28a4d7151f8921bfebeaa72e55148c665ce4e21e693ef80d6bf23be
+  metadata.gz: f7b5358d1903d83548fca5e8a951a06e2af1cec7f2ef58670eb32be2678f82402ae5823b43c3826cecb39de235a77d1b9caf52e26359e87bf98fbd71c485c843
+  data.tar.gz: 0f7d461c349997293955d4679b805511f3b619648b61c4cb52e24dbf67c30c63b94e0983d45a68ae8bca073ab0e27f16c724ec75ae43b1a0d62056609891ec13

data/.travis.yml

@@ -0,0 +1,17 @@
+language: ruby
+sudo: false
+cache:
+  directories:
+    - ../bundle
+rvm:
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+  - 2.1
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
+  - ruby-head
+branches:
+  only:
+    - master

data/README.md

@@ -1,6 +1,9 @@
 NagiosCheck
 ============
 
+[![Gem Version](https://badge.fury.io/rb/nagios_check.svg)](https://badge.fury.io/rb/nagios_check)
+[![Build Status](https://travis-ci.org/dbroeglin/nagios_check.svg?branch=master)](https://travis-ci.org/dbroeglin/nagios_check)
+
 Description
 -----------
 
@@ -47,7 +50,9 @@ class SimpleCheck
 
   def check
     time = do_some_check(options.host, options.port)
+    
     store_value :duration, time
+    store_message "The check took #{time} seconds"
   end
 end
 
@@ -60,20 +65,56 @@ The command can then be used by Nagios:
   ruby simple_check.rb -H my_host -P my_port -w 4 -c 8 -t 10
 ```
 
-If the value returned by `do_some_check` is between 0 and 4 inclusive the result is OK.  If it is greater than 4 and less than 8 inclusive the result is WARNING. If it is greater than 8 the result is CRITICAL. See [Nagios Developer Guidelines][nagios-dev] for more details on how the arguments of `-w` and `-c` are interpreted.
+If the number passed to `store_value` is between 0 and 4 inclusive the result is OK.  If it is greater than 4 and less than 8 inclusive the result is WARNING. If it is greater than 8 the result is CRITICAL. See [Nagios Developer Guidelines][nagios-dev] for more details on how the arguments of `-w` and `-c` are interpreted.
+
+If `store_value` is called multiple times, the value from the first call is used to determine the result. Multiple `store_value` calls can be used to include additional performance data in the output.
 
 If the check method lasts more than 10 seconds, it times out and the returned value is UNKNOWN.
 
-An alternative shorter way of writting the above check would be:
+Calling `store_message` is optional. However, the text passed to `store_message` will be displayed next to the check status in the Nagios web interface and can be included in notification mails to provide some context in a human readable format. 
+
+If the only metric we are interested is the time it takes to execute the check, an alternative shorter way of writting the above would be:
 
 ```ruby
 def check
-  time(value_name: 'duration' do
+  time(value_name: 'duration') do
     do_some_check(options.host, options.port)
   end
 end
 ```
 
+This check will execute `do_some_check` measure the time it takes to execute it and return both status and performance data labeled `duration`. 
+
+Writing Tests for Checks
+------------------------
+
+Checks can be integration tested by calling the `perform` method
+instead of the `run` method. `perform` takes an array of command line
+arguments and returns a `NagiosCheck::Result` object, which supports
+`ok?`, `warning?` and `critical?` methods to query the status and
+exposes the stored values:
+
+```ruby
+RSpec.describe SomeCheck do
+  it 'is ok by default' do
+    result = SomeCheck.new.perform(%w(-w 5 -c 10))
+
+    expect(result).to be_ok
+  end
+
+  it 'results in warning if there are more thn 5 uploads purchases' do
+    # Setup environment such that the check detects problems
+    # ...
+
+    result = SomeCheck.new.perform(%w(-w 5 -c 10))
+
+    expect(result).to be_warning
+    expect(result.values[:some_stored_value]).to eq(6)
+  end
+end
+
+```
+
 License
 -------
 Released under the MIT License.  See the [MIT-LICENSE][license] file for further details.

data/Rakefile

@@ -2,3 +2,5 @@ require 'bundler/gem_tasks'
 
 require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:rspec)
+
+task :default => :rspec

data/lib/nagios_check/version.rb

@@ -1,3 +1,3 @@
 module NagiosCheck
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/lib/nagios_check.rb

@@ -12,6 +12,27 @@ module NagiosCheck
   attr_reader :options
   attr_accessor :message
 
+  class Result
+    attr_reader :exit_status, :output, :values
+
+    def initialize(exit_status, output, values)
+      @exit_status = exit_status
+      @output = output
+      @values = values
+    end
+
+    def critical?
+      exit_status == 2
+    end
+
+    def warning?
+      exit_status == 1
+    end
+
+    def ok?
+      exit_status == 0
+    end
+  end
 
   def prepare
     @values = {}
@@ -19,10 +40,16 @@ module NagiosCheck
   end
 
   def run
+    result = perform(ARGV)
+    puts result.output
+    exit result.exit_status
+  end
+
+  def perform(argv)
     prepare
     return_val, status = 3, "UNKNOWN"
     begin
-      parse_options
+      parse_options(argv)
       if @options.t
         check_with_timeout
       else
@@ -43,8 +70,8 @@ module NagiosCheck
         "#{name}=#{value};;;;"
       end.join(' ')
     end
-    puts msg
-    exit return_val
+
+    Result.new(return_val, msg, @values)
   end
 
   def store_message(message)

data/nagios_check.gemspec

@@ -18,6 +18,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency "rspec", "~> 2.14.0"
-  s.add_development_dependency "rake"
+  s.add_development_dependency "rspec", "~> 3.13"
+  s.add_development_dependency "rake", ">= 12.3.3"
 end

data/spec/finish_spec.rb

@@ -2,12 +2,12 @@ require 'spec_helper'
 def before_finish_test
   before(:each) do
     subject.prepare
-    description = example.metadata[:example_group][:example_group][:description_args].first
+    description = RSpec.current_example.example_group.metadata[:parent_example_group][:description_args].first
     if description.kind_of?(String) && /^when options are '(.*)'$/ =~ description
       subject.send :parse_options, $1.split
     end
 
-    description = example.metadata[:example_group][:description_args].first
+    description = RSpec.current_example.example_group.metadata[:description_args].first
     if description.kind_of?(String) && /^when value is (.*)$/ =~ description
       subject.store_value 'val', $1.to_f
     end
@@ -33,26 +33,24 @@ describe OkTestCheck do
   before_finish_test
 
   context "when options are ''" do
-    it "should fail when no value is given" do
-      lambda {
-        subject.finish
-      }.should raise_error(RuntimeError, "No value was provided")
-    end
+      it "should fail when no value is given" do
+        expect { subject.finish }.to raise_error(RuntimeError, "No value was provided")
+      end
 
-    context "when value is 0" do
-      specify { subject.finish.should == [0, "OK"] }
-    end
-    context "when value is 5" do
-      specify { subject.finish.should == [0, "OK"] }
-    end
-    context "when value is 10" do
-      specify { subject.finish.should == [0, "OK"] }
-    end
+      context "when value is 0" do
+        specify { expect(subject.finish).to eq([0, "OK"]) }
+      end
+      context "when value is 5" do
+        specify { expect(subject.finish).to eq([0, "OK"]) }
+      end
+      context "when value is 10" do
+        specify { expect(subject.finish).to eq([0, "OK"]) }
+      end
 
-    context "when nil is given" do
-      before { subject.store_value 'val', nil }
-      specify { subject.finish.should == [3, "UNKNOWN"] }
-    end
+      context "when nil is given" do
+        before { subject.store_value 'val', nil }
+        specify { expect(subject.finish).to eq([3, "UNKNOWN"]) }
+      end
   end
 end
 
@@ -61,21 +59,20 @@ describe WarningTestCheck do
 
   context "when options are '-w 10'" do
     context "when value is -1" do
-      specify { subject.finish.should == [1, "WARNING"] }
+      specify { expect(subject.finish).to eq([1, "WARNING"]) }
     end
     context "when value is 0" do
-      specify { subject.finish.should == [0, "OK"] }
+      specify { expect(subject.finish).to eq([0, "OK"]) }
     end
     context "when value is 5" do
-      specify { subject.finish.should == [0, "OK"] }
+      specify { expect(subject.finish).to eq([0, "OK"]) }
     end
     context "when value is 10" do
-      specify { subject.finish.should == [0, "OK"] }
+      specify { expect(subject.finish).to eq([0, "OK"]) }
     end
     context "when value is 11" do
-      specify { subject.finish.should == [1, "WARNING"] }
-    end
-  end
+      specify { expect(subject.finish).to eq([1, "WARNING"]) }
+    end  end
 end
 
 describe CriticalTestCheck do
@@ -83,25 +80,25 @@ describe CriticalTestCheck do
 
   context "when options are '-w 10 -c 20'" do
     context "when value is -1" do
-      specify { subject.finish.should == [2, "CRITICAL"] }
+      specify { expect(subject.finish).to eq([2, "CRITICAL"]) }
     end
     context "when value is 0" do
-      specify { subject.finish.should == [0, "OK"] }
+      specify { expect(subject.finish).to eq([0, "OK"]) }
     end
     context "when value is 5" do
-      specify { subject.finish.should == [0, "OK"] }
+      specify { expect(subject.finish).to eq([0, "OK"]) }
     end
     context "when value is 10" do
-      specify { subject.finish.should == [0, "OK"] }
+      specify { expect(subject.finish).to eq([0, "OK"]) }
     end
     context "when value is 15" do
-      specify { subject.finish.should == [1, "WARNING"] }
+      specify { expect(subject.finish).to eq([1, "WARNING"]) }
     end
     context "when value is 20" do
-      specify { subject.finish.should == [1, "WARNING"] }
+      specify { expect(subject.finish).to eq([1, "WARNING"]) }
     end
     context "when value is 21" do
-      specify { subject.finish.should == [2, "CRITICAL"] }
+      specify { expect(subject.finish).to eq([2, "CRITICAL"]) }
     end
   end
 end

data/spec/options_spec.rb

@@ -8,7 +8,7 @@ describe NagiosCheck do
 
     specify { subject.send :parse_options, [] }
   end
-  
+
   context "when warning is specified" do
     subject do
       Class::new do
@@ -19,19 +19,19 @@ describe NagiosCheck do
 
     it("works with no arguments"){ subject.send :parse_options, %w{} }
     specify { subject.send :parse_options, %w{-w 10} }
-   
+
     it "fails if -w has no argument" do
-      lambda {
-        subject.send :parse_options, %w{-w} 
-      }.should raise_error(OptionParser::MissingArgument)
+      expect {
+        subject.send :parse_options, %w{-w}
+      }.to raise_error(OptionParser::MissingArgument)
     end
     it "fails if -c is given" do
-      lambda {
-        subject.send :parse_options, %w{-c} 
-      }.should raise_error(OptionParser::InvalidOption)
+      expect {
+        subject.send :parse_options, %w{-c}
+      }.to raise_error(OptionParser::InvalidOption)
     end
   end
-  
+
   context "when critical is specified" do
     subject do
       Class::new do
@@ -42,20 +42,20 @@ describe NagiosCheck do
 
     it("works with no arguments"){ subject.send :parse_options, %w{} }
     specify { subject.send :parse_options, %w{-c 10} }
-   
+
     it "fails if -c has no argument" do
-      lambda {
-        subject.send :parse_options, %w{-c} 
-      }.should raise_error(OptionParser::MissingArgument)
+      expect {
+        subject.send :parse_options, %w{-c}
+      }.to raise_error(OptionParser::MissingArgument)
     end
-   
+
     it "fails if -w is given" do
-      lambda {
-        subject.send :parse_options, %w{-w} 
-      }.should raise_error(OptionParser::InvalidOption)
+      expect {
+        subject.send :parse_options, %w{-w}
+      }.to raise_error(OptionParser::InvalidOption)
     end
   end
-  
+
   context "when a non mandatory option is specified" do
     subject do
       Class::new do
@@ -69,27 +69,27 @@ describe NagiosCheck do
 
     it "works with '-a 10'" do
       subject.send :parse_options, %w{-a 10}
-      subject.options.a.should == "10"
-    end   
-    
+      expect(subject.options.a).to eq("10")
+    end
+
     it "works with '-b 20' and converts to int" do
       subject.send :parse_options, %w{-b 20}
-      subject.options.b.should == 20
-    end   
+      expect(subject.options.b).to eq(20)
+    end
 
     it "fails if -a has no argument" do
-      lambda {
-        subject.send :parse_options, %w{-a} 
-      }.should raise_error(OptionParser::MissingArgument)
+      expect {
+        subject.send :parse_options, %w{-a}
+      }.to raise_error(OptionParser::MissingArgument)
     end
-   
+
     it "fails if -w is given" do
-      lambda {
-        subject.send :parse_options, %w{-w} 
-      }.should raise_error(OptionParser::InvalidOption)
+      expect {
+        subject.send :parse_options, %w{-w}
+      }.to raise_error(OptionParser::InvalidOption)
     end
   end
-  
+
   context "when a mandatory option is specified in arg list" do
     subject do
       Class::new do
@@ -99,14 +99,14 @@ describe NagiosCheck do
     end
 
     it "fails if -a is not given" do
-      lambda {
-        subject.send :parse_options, %w{} 
-      }.should raise_error(NagiosCheck::MissingOption)
+      expect {
+        subject.send :parse_options, %w{}
+      }.to raise_error(NagiosCheck::MissingOption)
     end
 
-    it "parses option a 3.14" do 
-      subject.send :parse_options, %w{-a 3.14} 
-      subject.options.a.should == 3.14
+    it "parses option a 3.14" do
+      subject.send :parse_options, %w{-a 3.14}
+      expect(subject.options.a).to eq(3.14)
     end
   end
 
@@ -119,26 +119,26 @@ describe NagiosCheck do
     end
 
     it "fails if -a is not given" do
-      lambda {
-        subject.send :parse_options, %w{} 
-      }.should raise_error(NagiosCheck::MissingOption)
+      expect {
+        subject.send :parse_options, %w{}
+      }.to raise_error(NagiosCheck::MissingOption)
     end
 
-    it "parses option a 3.14" do 
-      subject.send :parse_options, %w{-a 3.14} 
-      subject.options.a.should == 3.14
+    it "parses option a 3.14" do
+      subject.send :parse_options, %w{-a 3.14}
+      expect(subject.options.a).to eq(3.14)
     end
   end
 
   shared_examples_for "default provided" do
     it "defaults to 3.14" do
-      subject.send :parse_options, %w{} 
-      subject.options.a.should == 3.14 
+      subject.send :parse_options, %w{}
+      expect(subject.options.a).to eq(3.14)
     end
 
-    it "parses option a at 1.4142" do 
+    it "parses option a at 1.4142" do
       subject.send :parse_options, %w{-a 1.4142}
-      subject.options.a.should == 1.4142
+      expect(subject.options.a).to eq(1.4142)
     end
   end
 

data/spec/range_spec.rb

@@ -4,164 +4,164 @@ require 'pp'
 
 describe NagiosCheck::Range do
   subject { @range }
-  before(:each) do 
-    description = example.metadata[:example_group][:description_args].first 
+  before(:each) do
+    description = RSpec.current_example.metadata[:example_group][:description_args].first
     if /^when pattern is (.*)/ =~ description
       @range = NagiosCheck::Range::new($1)
     end
   end
 
   context "when pattern is 10" do
-    it { should     alert_if -1 } 
-    it { should_not alert_if 0 } 
-    it { should_not alert_if 0.1 } 
-    it { should_not alert_if 1 } 
-    it { should_not alert_if 9 } 
-    it { should_not alert_if 9.9 } 
-    it { should_not alert_if 10 } 
-    it { should_not alert_if 10.0 } 
-    it { should     alert_if 10.1 } 
+    it { is_expected.to     alert_if(-1) }
+    it { is_expected.not_to alert_if(0) }
+    it { is_expected.not_to alert_if(0.1) }
+    it { is_expected.not_to alert_if(1) }
+    it { is_expected.not_to alert_if(9) }
+    it { is_expected.not_to alert_if(9.9) }
+    it { is_expected.not_to alert_if(10) }
+    it { is_expected.not_to alert_if(10.0) }
+    it { is_expected.to     alert_if(10.1) }
   end
 
   context "when pattern is :10" do
-    it { should     alert_if -1 } 
-    it { should_not alert_if 0 } 
-    it { should_not alert_if 0.1 } 
-    it { should_not alert_if 1 } 
-    it { should_not alert_if 9 } 
-    it { should_not alert_if 9.9 } 
-    it { should_not alert_if 10 } 
-    it { should_not alert_if 10.0 } 
-    it { should     alert_if 10.1 } 
-  end
-  
+    it { is_expected.to     alert_if(-1) }
+    it { is_expected.not_to alert_if(0) }
+    it { is_expected.not_to alert_if(0.1) }
+    it { is_expected.not_to alert_if(1) }
+    it { is_expected.not_to alert_if(9) }
+    it { is_expected.not_to alert_if(9.9) }
+    it { is_expected.not_to alert_if(10) }
+    it { is_expected.not_to alert_if(10.0) }
+    it { is_expected.to     alert_if(10.1) }
+  end
+
   context "when pattern is @:10" do
-    it { should_not alert_if -1 }
-    it { should     alert_if 0 }
-    it { should     alert_if 5 }
-    it { should     alert_if 10 }
-    it { should     alert_if 10.0 }
-    it { should_not alert_if 11 }
+    it { is_expected.not_to alert_if(-1) }
+    it { is_expected.to     alert_if(0) }
+    it { is_expected.to     alert_if(5) }
+    it { is_expected.to     alert_if(10) }
+    it { is_expected.to     alert_if(10.0) }
+    it { is_expected.not_to alert_if(11) }
   end
 
   context "when pattern is 10:" do
-    it { should     alert_if -1 } 
-    it { should     alert_if 1 } 
-    it { should     alert_if 9.9 } 
-    it { should_not alert_if 10 } 
-    it { should_not alert_if 10.0 } 
-    it { should_not alert_if 10.1 } 
-    it { should_not alert_if 11 } 
-  end
-  
+    it { is_expected.to     alert_if(-1) }
+    it { is_expected.to     alert_if(1) }
+    it { is_expected.to     alert_if(9.9) }
+    it { is_expected.not_to alert_if(10) }
+    it { is_expected.not_to alert_if(10.0) }
+    it { is_expected.not_to alert_if(10.1) }
+    it { is_expected.not_to alert_if(11) }
+  end
+
   context "when pattern is @10:" do
-    it { should_not alert_if -1 }
-    it { should_not alert_if 1 }
-    it { should_not alert_if 9.9 }
-    it { should     alert_if 10 }
-    it { should     alert_if 10.0 }
-    it { should     alert_if 10.1 }
-    it { should     alert_if 11 }
+    it { is_expected.not_to alert_if(-1) }
+    it { is_expected.not_to alert_if(1) }
+    it { is_expected.not_to alert_if(9.9) }
+    it { is_expected.to     alert_if(10) }
+    it { is_expected.to     alert_if(10.0) }
+    it { is_expected.to     alert_if(10.1) }
+    it { is_expected.to     alert_if(11) }
   end
 
   context "when pattern is 10:11" do
-    it { should     alert_if -1 } 
-    it { should     alert_if 1 } 
-    it { should     alert_if 9.9 } 
-    it { should_not alert_if 10 } 
-    it { should_not alert_if 10.0 } 
-    it { should_not alert_if 10.1 } 
-    it { should_not alert_if 10.9 } 
-    it { should_not alert_if 11 } 
-    it { should     alert_if 11.1 } 
-    it { should     alert_if 12 } 
-  end
-  
+    it { is_expected.to     alert_if(-1) }
+    it { is_expected.to     alert_if(1) }
+    it { is_expected.to     alert_if(9.9) }
+    it { is_expected.not_to alert_if(10) }
+    it { is_expected.not_to alert_if(10.0) }
+    it { is_expected.not_to alert_if(10.1) }
+    it { is_expected.not_to alert_if(10.9) }
+    it { is_expected.not_to alert_if(11) }
+    it { is_expected.to     alert_if(11.1) }
+    it { is_expected.to     alert_if(12) }
+  end
+
   context "when pattern is 10:10" do
-    it { should     alert_if -1 }
-    it { should     alert_if 1 }
-    it { should     alert_if 9.9 }
-    it { should_not alert_if 10 }
-    it { should_not alert_if 10.0 }
-    it { should     alert_if 10.1 }
-    it { should     alert_if 10.9 }
-    it { should     alert_if 11 }
-    it { should     alert_if 11.1 }
-    it { should     alert_if 12 }
+    it { is_expected.to     alert_if(-1) }
+    it { is_expected.to     alert_if(1) }
+    it { is_expected.to     alert_if(9.9) }
+    it { is_expected.not_to alert_if(10) }
+    it { is_expected.not_to alert_if(10.0) }
+    it { is_expected.to     alert_if(10.1) }
+    it { is_expected.to     alert_if(10.9) }
+    it { is_expected.to     alert_if(11) }
+    it { is_expected.to     alert_if(11.1) }
+    it { is_expected.to     alert_if(12) }
   end
 
   context "when pattern is @10:10" do
-    it { should_not alert_if -1 }
-    it { should_not alert_if 1 }
-    it { should_not alert_if 9.9 }
-    it { should     alert_if 10 }
-    it { should     alert_if 10.0 }
-    it { should_not alert_if 10.1 }
-    it { should_not alert_if 10.9 }
-    it { should_not alert_if 11 }
-    it { should_not alert_if 11.1 }
-    it { should_not alert_if 12 }
+    it { is_expected.not_to alert_if(-1) }
+    it { is_expected.not_to alert_if(1) }
+    it { is_expected.not_to alert_if(9.9) }
+    it { is_expected.to     alert_if(10) }
+    it { is_expected.to     alert_if(10.0) }
+    it { is_expected.not_to alert_if(10.1) }
+    it { is_expected.not_to alert_if(10.9) }
+    it { is_expected.not_to alert_if(11) }
+    it { is_expected.not_to alert_if(11.1) }
+    it { is_expected.not_to alert_if(12) }
   end
 
   context "when pattern is @10:11" do
-    it { should_not alert_if -1 }
-    it { should_not alert_if 1 }
-    it { should_not alert_if 9.9 }
-    it { should     alert_if 10 } 
-    it { should     alert_if 10.0 } 
-    it { should     alert_if 10.1 }
-    it { should     alert_if 11 } 
-    it { should_not alert_if 11.1 }
-    it { should_not alert_if 12 }
+    it { is_expected.not_to alert_if(-1) }
+    it { is_expected.not_to alert_if(1) }
+    it { is_expected.not_to alert_if(9.9) }
+    it { is_expected.to     alert_if(10) }
+    it { is_expected.to     alert_if(10.0) }
+    it { is_expected.to     alert_if(10.1) }
+    it { is_expected.to     alert_if(11) }
+    it { is_expected.not_to alert_if(11.1) }
+    it { is_expected.not_to alert_if(12) }
   end
 
   context "when pattern is @10.05:11.05" do
-    it { should_not alert_if -1 }
-    it { should_not alert_if 1 }
-    it { should_not alert_if 9.9 }
-    it { should_not alert_if 10 }
-    it { should_not alert_if 10.0 }
-    it { should     alert_if 10.1 }
-    it { should     alert_if 11 }
-    it { should_not alert_if 11.1 }
-    it { should_not alert_if 12 }
+    it { is_expected.not_to alert_if(-1) }
+    it { is_expected.not_to alert_if(1) }
+    it { is_expected.not_to alert_if(9.9) }
+    it { is_expected.not_to alert_if(10) }
+    it { is_expected.not_to alert_if(10.0) }
+    it { is_expected.to     alert_if(10.1) }
+    it { is_expected.to     alert_if(11) }
+    it { is_expected.not_to alert_if(11.1) }
+    it { is_expected.not_to alert_if(12) }
   end
 
   context "when pattern is -1:1" do
-    it { should     alert_if -2 } 
-    it { should_not alert_if -1 } 
-    it { should_not alert_if -0.9 } 
-    it { should_not alert_if 0 } 
-    it { should_not alert_if 0.9 } 
-    it { should_not alert_if 1 } 
-    it { should     alert_if 2 } 
-  end
-  
+    it { is_expected.to     alert_if(-2) }
+    it { is_expected.not_to alert_if(-1) }
+    it { is_expected.not_to alert_if(-0.9) }
+    it { is_expected.not_to alert_if(0) }
+    it { is_expected.not_to alert_if(0.9) }
+    it { is_expected.not_to alert_if(1) }
+    it { is_expected.to     alert_if(2) }
+  end
+
   context "when pattern is ~:1" do
-    it { should_not alert_if -2 } 
-    it { should_not alert_if -1 } 
-    it { should_not alert_if 0 } 
-    it { should_not alert_if 1 } 
-    it { should     alert_if 2 } 
+    it { is_expected.not_to alert_if(-2) }
+    it { is_expected.not_to alert_if(-1) }
+    it { is_expected.not_to alert_if(0) }
+    it { is_expected.not_to alert_if(1) }
+    it { is_expected.to     alert_if(2) }
   end
-  
+
   context "when pattern is @~:1" do
-    it { should     alert_if -2 }
-    it { should     alert_if -1 }
-    it { should     alert_if 0 }
-    it { should     alert_if 1 } 
-    it { should_not alert_if 2 }
+    it { is_expected.to     alert_if(-2) }
+    it { is_expected.to     alert_if(-1) }
+    it { is_expected.to     alert_if(0) }
+    it { is_expected.to     alert_if(1) }
+    it { is_expected.not_to alert_if(2) }
   end
 
-  context "when nil pattern" do 
+  context "when nil pattern" do
     it "raises an error" do
-      lambda { NagiosCheck::Range.new nil }.should raise_error
+      expect { NagiosCheck::Range.new nil }.to raise_error(RuntimeError, "Pattern should not be nil")
     end
   end
-  
-  context "when empty pattern" do 
+
+  context "when empty pattern" do
     it "raises an error" do
-      lambda { NagiosCheck::Range.new "" }.should raise_error
+      expect { NagiosCheck::Range.new "" }.to raise_error(RuntimeError, "Pattern should not be nil")
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,30 +1,15 @@
 require 'nagios_check'
 
-module Matchers
-  class Contain
-    def initialize(expected)
-      @expected = expected
-    end
-
-    def matches?(actual)
-      @actual = actual
-      !@actual.include?(@expected)
-    end
-
-    def failure_message
-      "expected #{@actual} to alert for value #{@expected}" 
-    end
-
-    def negative_failure_message
-      "expected #{@actual} not to alert for value #{@expected}"
-    end
+RSpec::Matchers.define :alert_if do |expected|
+  match do |actual|
+    !actual.include?(expected)
   end
 
-  def alert_if(value)
-    Contain::new(value)
+  failure_message do |actual|
+    "expected that #{actual} would alert for value #{expected}"
   end
-end
 
-RSpec.configure do |config|  
-  config.include(Matchers)  
+  failure_message_when_negated do |actual|
+    "expected that #{actual} would not alert for value #{expected}"
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nagios_check
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Dominique Broeglin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-01-27 00:00:00.000000000 Z
+date: 2024-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '3.13'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.3.3
 description: An easy to use DSL for building custom probes for the Nagios monitoring
   system
 email:
@@ -47,6 +47,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -63,7 +64,7 @@ files:
 homepage: https://github.com/dbroeglin/nagios_check
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -78,9 +79,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: nagios_check
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.5.7
+signing_key:
 specification_version: 4
 summary: Ruby Nagios Check Integration
 test_files: