nagios-zfs 0.0.1 → 0.1.0

data/bin/check_zpool

@@ -2,4 +2,4 @@
 
 require 'nagios/zfs'
 
-Nagios::ZFS::ZpoolPlugin.new.check!
+Nagios::ZFS::ZpoolPlugin.check

data/features/check_zpool_capacity.feature

@@ -19,6 +19,10 @@ Feature: Check zpool capacity
     When I run `check_zpool -p tank -w 81 -c 82`
     Then the status should be ok
 
+  Scenario: Display actual capacity
+    When I run `check_zpool -p tank -w 79 -c 80`
+    Then the stdout should contain "tank 80%"
+
   #NOTE: This currently does not work!
   #Scenario: Unknown zpool name
     #When I run `check_zpool -p foo -w 81 -c 82`

data/lib/nagios/zfs/version.rb

@@ -1,5 +1,5 @@
 module Nagios
   module ZFS
-    VERSION = '0.0.1'
+    VERSION = '0.1.0'
   end
 end

data/lib/nagios/zfs/zpool.rb

@@ -1,7 +1,10 @@
 module Nagios
   module ZFS
     class Zpool
+      attr_reader :name
+
       def initialize(name)
+        raise 'missing pool name' if [nil, ''].include?(name)
         @name = name
       end
 

data/lib/nagios/zfs/zpool_plugin.rb

@@ -9,7 +9,7 @@ module Nagios
 
       option :critical,
         :short => '-c CRITICAL_CAPACITY',
-        :short => '--critical CRITICAL_CAPACITY',
+        :long  => '--critical CRITICAL_CAPACITY',
         :proc  => Proc.new { |config| config.to_i }
 
       option :warning,
@@ -35,6 +35,10 @@ module Nagios
         true
       end
 
+      def message
+        "#{zpool.name} #{zpool.capacity}%"
+      end
+
     private
 
       def critical_capacity?

data/nagios-zfs.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'nagiosplugin', '~> 2.0'
+  spec.add_dependency 'nagiosplugin', '~> 2.1'
   spec.add_dependency 'mixlib-cli', '~> 1.3'
 
   spec.add_development_dependency 'bundler', '~> 1.3'

data/spec/nagios/zfs/zpool_plugin_spec.rb

@@ -78,6 +78,16 @@ module Nagios
         end
       end
 
+      describe '#message' do
+        it 'includes the pool name and capcity' do
+          zpool = double('zpool')
+          zpool.should_receive(:name).and_return('tank')
+          zpool.should_receive(:capacity).and_return(42)
+          plugin.stub(:zpool).and_return(zpool)
+          expect(plugin.message).to eq('tank 42%')
+        end
+      end
+
       describe '#zpool' do
         let(:zpool) { double('zpool') }
 

data/spec/nagios/zfs/zpool_spec.rb

@@ -9,6 +9,18 @@ module Nagios
         Zpool.any_instance.stub(:`).and_return('')
       end
 
+      it 'raises an error on empty pool name' do
+        [nil, ''].each do |name|
+          expect { Zpool.new(name) }.to raise_error /missing pool name/
+        end
+      end
+
+      describe '#name' do
+        it 'returns the pool name' do
+          expect(zpool.name).to eq('tank')
+        end
+      end
+
       describe '#capacity' do
         it 'returns the capacity' do
           zpool.should_receive(:query).and_return("tank\t87%\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nagios-zfs
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
@@ -182,7 +182,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4547917835531828401
+      hash: 4578558176594243719
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -191,13 +191,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4547917835531828401
+      hash: 4578558176594243719
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: nagios-zfs-0.0.1
+summary: nagios-zfs-0.1.0
 test_files:
 - features/check_zpool_capacity.feature
 - features/step_definitions/dev_steps.rb