steto 0.0.5 → 0.0.6

data/lib/steto/nagios_check.rb

@@ -19,14 +19,25 @@ module Steto
     def command_line
       # => "--critical=:critical --warning=:warning"
       params = options.map do |option, value| 
-        cli_option = option.to_s.gsub("_","-")
-        unless value == true
-          "--#{cli_option}=:#{option}"
+        unless option.size == 1
+          cli_option = option.to_s.gsub("_","-")
+          unless value == true
+            "--#{cli_option}=:#{option}"
+          else
+            "--#{cli_option}"
+          end
         else
-          "--#{cli_option}"
+          unless value == true
+            "-#{option} :#{option}"
+          else
+            "-#{option}"
+          end
         end
       end.sort.join(' ')
-      @command_line ||= Cocaine::CommandLine.new(command, params, options.merge(:expected_outcodes => [0, 1, 2, 3]))
+
+      command_options = Hash[options.map { |k,v| [ k, v.to_s ] }]
+
+      @command_line ||= Cocaine::CommandLine.new(command, params, command_options.merge(:expected_outcodes => [0, 1, 2, 3]))
     end
 
     def status_from_command_line

data/lib/steto/version.rb

@@ -1,3 +1,3 @@
 module Steto
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/steto/beep_reporter_spec.rb

@@ -4,17 +4,17 @@ describe Steto::BeepReporter do
 
   it "should beep twice when one of checks is critical" do
     subject.should_receive(:beep).with(2)
-    subject.report [ mock :status => Steto::Status.new(:critical) ]
+    subject.report [ mock(:status => Steto::Status.new(:critical)) ]
   end
 
   it "should beep when one of checks is warning" do
     subject.should_receive(:beep)
-    subject.report [ mock :status => Steto::Status.new(:warning) ]
+    subject.report [ mock(:status => Steto::Status.new(:warning)) ]
   end
 
   it "should not beep when no check is warning or critical" do
     subject.should_not_receive(:beep)
-    subject.report [ mock :status => Steto::Status.new(:info) ]
+    subject.report [ mock(:status => Steto::Status.new(:info)) ]
   end
 
 end

data/spec/steto/nagios_check_spec.rb

@@ -32,19 +32,30 @@ describe Steto::NagiosCheck do
 
   describe "#command_line" do
 
-    it "should use command as binary" do
+    before do
       subject.stub :command => "dummy"
+    end
+
+    it "should use command as binary" do
       subject.command_line.command.should == "dummy"
     end
 
     it "should use options as parameters" do
-      subject.stub :command => "dummy"
       subject.stub :options => { :warning => "1,0.5,0.5", :critical => "1,1,1" }
       subject.command_line.command.should == "dummy --critical='1,1,1' --warning='1,0.5,0.5'"
     end
 
+    it "should support non string options" do
+      subject.stub :options => { :port => 4567 }
+      subject.command_line.command.should == "dummy --port='4567'"
+    end
+
+    it "should support short options" do
+      subject.stub :options => { :p => 4567 }
+      subject.command_line.command.should == "dummy -p '4567'"
+    end
+
     it "should rename option with underscores" do
-      subject.stub :command => "dummy"
       subject.stub :options => { :with_underscore => "yes" }
       subject.command_line.command.should == "dummy --with-underscore='yes'"
     end

data/steto.gemspec

@@ -21,10 +21,10 @@ Gem::Specification.new do |s|
   # specify any dependencies here; for example:
   s.add_development_dependency "rspec"
   s.add_development_dependency "rake"
-  s.add_development_dependency "rcov"
+  s.add_development_dependency "simplecov"
   s.add_development_dependency "RedCloth"
 
-  s.add_runtime_dependency "cocaine"
+  s.add_runtime_dependency "cocaine", "0.2.1"
   s.add_runtime_dependency "parallel"
   s.add_runtime_dependency "json"
 end

metadata

@@ -1,132 +1,137 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: steto
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 0.0.6
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 5
-  version: 0.0.5
 platform: ruby
-authors: 
+authors:
 - Alban Peignier
 - Florent Peyraud
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-07 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+date: 2012-10-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: rcov
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: RedCloth
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  type: :runtime
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: cocaine
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.1
   type: :runtime
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+- !ruby/object:Gem::Dependency
   name: parallel
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: json
-  version_requirements: *id007
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby engine to check system status (with Nagios or custom checks)
-email: 
+email:
 - alban@tryphon.eu
 - florent@tryphon.eu
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Guardfile
@@ -157,38 +162,35 @@ files:
 - steto.gemspec
 homepage: https://github.com/tryphon/steto
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2351214180611345255
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -2351214180611345255
 requirements: []
-
 rubyforge_project: steto
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Check system status
-test_files: 
+test_files:
 - spec/spec_helper.rb
 - spec/steto/base_check_spec.rb
 - spec/steto/beep_reporter_spec.rb