nagi 0.2.1 → 0.2.2

data/NEWS

@@ -1,3 +1,6 @@
+0.2.2: 2012-06-26
+- Fixed quote escaping in Utility::execute(). Again.
+
 0.2.1: 2012-05-31
 - Added force parameter for DSL status methods
 

data/README.md

@@ -140,11 +140,11 @@ Nagi do
   collect :all
 
   check do |args|
-		begin
-			output = execute('df')
-		rescue StandardError => e
-			critical "df failed: #{e.message}", true
-		end
+    begin
+      output = execute 'df'
+    rescue StandardError => e
+      critical "df failed: #{e.message}", true
+    end
     output.lines.each do |line|
       if line =~ /^.*?(\d+)%\s*(.*)$/
         if $1.to_i > args[:percentage].to_i

data/lib/nagi/utility.rb

@@ -3,11 +3,11 @@ module Nagi
     module_function
 
     def execute(command)
-      command = command.gsub(/'/, "\'")
+      command = command.gsub(/"/, '\\"')
       if defined?(Open3.capture2)
-        output, status = Open3.capture2e("/bin/bash -o pipefail -c '#{command}'")
+        output, status = Open3.capture2e("/bin/bash -o pipefail -c \"#{command}\"")
       else
-        IO.popen("/bin/bash -o pipefail -c '#{command}' 2>&1") do |io|
+        IO.popen("/bin/bash -o pipefail -c \"#{command}\" 2>&1") do |io|
           output = io.read
         end
         status = $?

data/lib/nagi/version.rb

@@ -1,3 +1,3 @@
 module Nagi
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/spec/nagi/utility_spec.rb

@@ -2,8 +2,8 @@ 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'
+    Nagi::Utility.execute("echo 'x y z'").should eq 'x y z'
+    Nagi::Utility.execute('echo "x y z"').should eq 'x y z'
   end
 
   it 'raises exception on non-zero status' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nagi
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-31 00:00:00.000000000 Z
+date: 2012-06-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70118921103600 !ruby/object:Gem::Requirement
+  requirement: &70365699752920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70118921103600
+  version_requirements: *70365699752920
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70118921102940 !ruby/object:Gem::Requirement
+  requirement: &70365699751780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70118921102940
+  version_requirements: *70365699751780
 description: A DSL for writing Nagios plugins
 email:
 - erik@bengler.no
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A DSL for writing Nagios plugins