nagios_check 0.0.3 → 0.0.4

data/README.md

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

data/lib/nagios_check.rb

@@ -63,17 +63,15 @@ module NagiosCheck
 
   module ClassMethods
     def on(*args, &block)
-      mandatory = args.delete(:mandatory)
-      @option_specs[option_name(args.first)] = [args, mandatory,  block]
-    end
-
-    def store(name, opts = {})
-      @defaults[name] = opts[:default] if opts.has_key?(:default)
-      transform = opts[:transform]
-      Proc::new do |value|
-        value = value.send transform if transform
-        self.options.send "#{name}=", value
+      name = option_name(args.first)
+      option_params = {
+        mandatory: args.delete(:mandatory) ? true : false
+      }
+      if args.last.respond_to? :has_key? 
+        option_params.merge! args.pop
       end
+      @defaults[name] = option_params[:default] if option_params.has_key? :default
+      @option_specs[name] = [args, option_params,  block]
     end
 
     def defaults
@@ -100,7 +98,8 @@ module NagiosCheck
     
     def check_options!(options)
       @option_specs.each do |name, spec|
-        if spec[1] == :mandatory && options.send(name).nil? 
+        _, option_params, _ = spec
+        if option_params[:mandatory] && options.send(name).nil? 
           raise MissingOption.new(name)
         end
       end
@@ -135,7 +134,12 @@ module NagiosCheck
     unless @opt_parse
       opt_parse = OptionParser::new
       self.class.instance_variable_get("@option_specs").each do |name, spec|
-        args, mand, block = spec
+        args, option_params, block = spec
+        if block.nil?
+          block = Proc::new do |value|
+            self.options.send "#{name}=", value
+          end
+        end
         opt_parse.on(*args) do |value| 
           instance_exec(value, &block) 
         end

data/lib/nagios_check/version.rb

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

data/nagios_check.gemspec

@@ -19,4 +19,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_development_dependency "rspec", ">= 2.0.0"
+  s.add_development_dependency "rake"
 end

data/spec/options_spec.rb

@@ -60,8 +60,8 @@ describe NagiosCheck do
     subject do
       Class::new do
         include NagiosCheck
-        on "-a VALUE", &store(:a)
-        on "-b VALUE", &store(:b, transform: :to_i)
+        on "-a VALUE"
+        on "-b VALUE", Integer
       end.new
     end
 
@@ -90,11 +90,11 @@ describe NagiosCheck do
     end
   end
   
-  context "when a mandatory option is specified" do
+  context "when a mandatory option is specified in arg list" do
     subject do
       Class::new do
         include NagiosCheck
-        on "-a VALUE", :mandatory, &store(:a)
+        on "-a VALUE", :mandatory, Float
       end.new
     end
 
@@ -104,6 +104,63 @@ describe NagiosCheck do
       }.should raise_error(NagiosCheck::MissingOption)
     end
 
-    specify { subject.send :parse_options, %w{-a foo} }
+    it "parses option a 3.14" do 
+      subject.send :parse_options, %w{-a 3.14} 
+      subject.options.a.should == 3.14
+    end
+  end
+
+  context "when a mandatory option is specified in option params hash" do
+    subject do
+      Class::new do
+        include NagiosCheck
+        on "-a VALUE", Float, mandatory: true
+      end.new
+    end
+
+    it "fails if -a is not given" do
+      lambda {
+        subject.send :parse_options, %w{} 
+      }.should 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
+    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 
+    end
+
+    it "parses option a at 1.4142" do 
+      subject.send :parse_options, %w{-a 1.4142}
+      subject.options.a.should == 1.4142
+    end
+  end
+
+  context "when a default is provided" do
+    subject do
+      Class::new do
+        include NagiosCheck
+        on "-a VALUE", Float, default: 3.14
+      end.new
+    end
+
+    it_behaves_like "default provided"
+  end
+
+  context "when a default is provided and option is mandatory" do
+    subject do
+      Class::new do
+        include NagiosCheck
+        on "-a VALUE", Float, default: 3.14, mandatory: true
+      end.new
+    end
+
+    it_behaves_like "default provided"
   end
 end

metadata

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