nagi 0.1.0 → 0.1.1

data/README.md

@@ -15,7 +15,7 @@ A typical plugin looks like this:
 #!/usr/bin/env ruby
 
 require 'nagi'
-require Resolv
+require 'resolv'
 
 Nagi do
   name 'check_dns'
@@ -32,7 +32,7 @@ Nagi do
     end
 
     if args[:ip] and ip != args[:ip]
-      critical "#{args[:hostname]} resolves to #{ip}, expected #{args[:ip]}
+      critical "#{args[:hostname]} resolves to #{ip}, expected #{args[:ip]}"
     else
       ok "#{args[:hostname]} resolves to #{ip}"
     end

data/lib/nagi/utility.rb

@@ -3,7 +3,15 @@ module Nagi
     module_function
 
     def execute(command)
-      output, status = Open3.capture2e("/bin/bash -o pipefail -c '#{command}'")
+      command = command.gsub(/'/, "\'")
+      if defined?(Open3.capture2)
+        output, status = Open3.capture2e("/bin/bash -o pipefail -c '#{command}'")
+      else
+        IO.popen("/bin/bash -o pipefail -c '#{command}' 2>&1") do |io|
+          output = io.read
+        end
+        status = $?
+      end
       raise "Shell failure, '#{output.gsub(/^\/bin\/bash: /, '').strip}'" if status.exitstatus != 0
       return output.strip
     end

data/lib/nagi/version.rb

@@ -1,3 +1,3 @@
 module Nagi
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/spec/nagi/optionparser_spec.rb

@@ -73,7 +73,7 @@ describe Nagi::OptionParser do
 
   describe '.switch' do
     it 'adds a switch' do
-      @parser.switch('name', '-t', '--test TEST',) do |value|
+      @parser.switch('name', '-t', '--test TEST') do |value|
       end
 
       @parser.top.list[-1].short[0].should eq '-t'

data/spec/nagi/utility_spec.rb

@@ -1,6 +1,11 @@
 require 'spec_helper'
 
 describe 'Nagi::Utility::execute' do
+  it 'handles special characters correctly' do
+    Nagi::Utility.execute("echo 'x'").should eq 'x'
+    Nagi::Utility.execute('echo "y"').should eq 'y'
+  end
+
   it 'raises exception on non-zero status' do
     lambda { Nagi::Utility.execute('exit 1') }.should raise_error StandardError
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nagi
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-18 00:00:00.000000000 Z
+date: 2012-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70154071720240 !ruby/object:Gem::Requirement
+  requirement: &70354822658820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70154071720240
+  version_requirements: *70354822658820
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70154071719820 !ruby/object:Gem::Requirement
+  requirement: &70354822658200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70154071719820
+  version_requirements: *70354822658200
 description: A DSL for writing Nagios plugins
 email:
 - erik@bengler.no