nagios_check 0.0.2 → 0.0.3

data/README.md

@@ -38,7 +38,7 @@ require "nagios_check"
 class SimpleCheck
   include NagiosCheck
 
-  on "-H HOST", :required, &store(:host)
+  on "-H HOST", :mandatory, &store(:host)
   on "-P PORT",            &store(:port, default: 8080, transform: :to_i)
 
   enable_warning

data/Rakefile

@@ -1 +1,4 @@
 require 'bundler/gem_tasks'
+
+require "rspec/core/rake_task"
+RSpec::Core::RakeTask.new(:rspec)

data/lib/nagios_check.rb

@@ -9,6 +9,7 @@ module NagiosCheck
   attr_reader :options
   attr_accessor :message
 
+
   def prepare
     @values = {}
     self.message = nil
@@ -62,7 +63,8 @@ module NagiosCheck
 
   module ClassMethods
     def on(*args, &block)
-      @ons << [args, args.delete(:mandatory), block]
+      mandatory = args.delete(:mandatory)
+      @option_specs[option_name(args.first)] = [args, mandatory,  block]
     end
 
     def store(name, opts = {})
@@ -76,7 +78,7 @@ module NagiosCheck
 
     def defaults
       @defaults
-    end
+    end  
 
     def enable_warning(*args)
       on("-w RANGE", *args) do |value| 
@@ -95,12 +97,34 @@ module NagiosCheck
         @timeout = value.to_f 
       end
     end
+    
+    def check_options!(options)
+      @option_specs.each do |name, spec|
+        if spec[1] == :mandatory && options.send(name).nil? 
+          raise MissingOption.new(name)
+        end
+      end
+    end
+
+    private
+
+    def option_name(arg) 
+      if arg =~ /^--\[no-\]([^-\s][^\s]*)/
+        $1.to_sym
+      elsif arg =~ /^--([^-\s][^\s]*)/
+        $1.to_sym
+      elsif arg =~ /^-([^-\s][^\s]*)/
+        $1.to_sym
+      else
+        raise "Unable to parse option '#{arg}'" 
+      end
+    end
   end
 
   def self.included(base)
     base.extend(ClassMethods)
     base.instance_eval do 
-      @ons = []
+      @option_specs = {} 
       @defaults = {}
     end
   end
@@ -110,7 +134,8 @@ module NagiosCheck
   def opt_parse
     unless @opt_parse
       opt_parse = OptionParser::new
-      self.class.instance_variable_get("@ons").each do |args, mand, block|
+      self.class.instance_variable_get("@option_specs").each do |name, spec|
+        args, mand, block = spec
         opt_parse.on(*args) do |value| 
           instance_exec(value, &block) 
         end
@@ -123,6 +148,7 @@ module NagiosCheck
   def parse_options(argv = ARGV)
     @options = OpenStruct::new(self.class.defaults)
     opt_parse.parse!(argv)
+    self.class.check_options!(@options)
   end
 
 
@@ -130,6 +156,6 @@ module NagiosCheck
     Timeout.timeout(@timeout) { check } 
   end
 
-  class MissingOption < StandardError
-  end
+  class MissingOption < StandardError; end
+  class MissingOption < StandardError; end
 end

data/lib/nagios_check/version.rb

@@ -1,3 +1,3 @@
 module NagiosCheck
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/nagios_check.gemspec

@@ -17,4 +17,6 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
+
+  s.add_development_dependency "rspec", ">= 2.0.0"
 end

data/spec/options_spec.rb

@@ -89,4 +89,21 @@ describe NagiosCheck do
       }.should raise_error(OptionParser::InvalidOption)
     end
   end
+  
+  context "when a mandatory option is specified" do
+    subject do
+      Class::new do
+        include NagiosCheck
+        on "-a VALUE", :mandatory, &store(:a)
+      end.new
+    end
+
+    it "fails if -a is not given" do
+      lambda {
+        subject.send :parse_options, %w{} 
+      }.should raise_error(NagiosCheck::MissingOption)
+    end
+
+    specify { subject.send :parse_options, %w{-a foo} }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nagios_check
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-30 00:00:00.000000000Z
-dependencies: []
+date: 2011-12-09 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2152787360 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :development
+  prerelease: false
+  version_requirements: *2152787360
 description: An easy to use DSL for building custom probes for the Nagios monitoring
   system
 email: