sensu 0.8.9 → 0.8.10

data/.gitignore

@@ -1,7 +1,9 @@
+.bundle
+.vagrant
+.DS_Store
+vendor
+dump.rdb
+*.png
 pkg/*
 *~
-*.vagrant
 \#*
-dump.rdb
-.DS_Store
-*.png

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    sensu (0.8.9)
+    sensu (0.8.10)
       amqp (= 0.7.4)
       async_sinatra
+      bundler
       cabin (= 0.1.7)
       eventmachine (~> 1.0.0.beta.4)
       hashie
@@ -27,18 +28,21 @@ GEM
       json
     daemons (1.1.4)
     diff-lcs (1.1.3)
-    em-http-request (0.3.0)
-      addressable (>= 2.0.0)
-      escape_utils
-      eventmachine (>= 0.12.9)
+    em-http-request (1.0.0)
+      addressable (>= 2.2.3)
+      em-socksify
+      eventmachine (>= 1.0.0.beta.3)
+      http_parser.rb (>= 0.5.2)
+    em-socksify (0.1.0)
+      eventmachine
     em-spec (0.2.5)
       bacon
       eventmachine
       rspec (~> 2.6.0)
       test-unit
-    escape_utils (0.2.4)
     eventmachine (1.0.0.beta.4)
     hashie (1.2.0)
+    http_parser.rb (0.5.3)
     json (1.6.1)
     rack (1.3.5)
     rack-protection (1.1.4)

data/lib/sensu.rb

@@ -1,3 +1,3 @@
 module Sensu
-  VERSION = "0.8.9"
+  VERSION = "0.8.10"
 end

data/lib/sensu/api.rb

@@ -1,4 +1,5 @@
 require File.join(File.dirname(__FILE__), 'config')
+
 require 'sinatra/async'
 require 'redis'
 

data/lib/sensu/client.rb

@@ -77,8 +77,10 @@ module Sensu
           end
           if unmatched_tokens.empty?
             execute = proc do
-              IO.popen(command + ' 2>&1') do |io|
-                check.output = io.read
+              Bundler.with_clean_env do
+                IO.popen(command + ' 2>&1') do |io|
+                  check.output = io.read
+                end
               end
               check.status = $?.exitstatus
             end

data/lib/sensu/config.rb

@@ -1,5 +1,10 @@
 require 'rubygems' if RUBY_VERSION < '1.9.0'
+require 'bundler/setup'
+
+require File.join(File.dirname(__FILE__), 'helpers')
+
 gem 'eventmachine', '~> 1.0.0.beta.4'
+
 require 'optparse'
 require 'json'
 require 'hashie'
@@ -7,7 +12,6 @@ require 'uuidtools'
 require 'amqp'
 require 'cabin'
 require 'cabin/outputs/em-stdlib-logger'
-require File.join(File.dirname(__FILE__), 'helpers')
 
 module Sensu
   class Config

data/lib/sensu/server.rb

@@ -1,4 +1,5 @@
 require File.join(File.dirname(__FILE__), 'config')
+
 require 'redis'
 
 module Sensu
@@ -67,10 +68,12 @@ module Sensu
     def handle_event(event)
       handler = proc do
         output = ''
-        IO.popen(@settings.handlers[event.check.handler] + ' 2>&1', 'r+') do |io|
-          io.write(event.to_json)
-          io.close_write
-          output = io.read
+        Bundler.with_clean_env do
+          IO.popen(@settings.handlers[event.check.handler] + ' 2>&1', 'r+') do |io|
+            io.write(event.to_json)
+            io.close_write
+            output = io.read
+          end
         end
         output
       end

data/sensu.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |s|
   s.license     = "MIT"
   s.has_rdoc    = false
 
+  s.add_dependency("bundler")
   s.add_dependency("eventmachine", "~> 1.0.0.beta.4")
   s.add_dependency("amqp", "0.7.4")
   s.add_dependency("json")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 43
   prerelease: false
   segments: 
   - 0
   - 8
-  - 9
-  version: 0.8.9
+  - 10
+  version: 0.8.10
 platform: ruby
 authors: 
 - Sean Porter
@@ -16,13 +16,27 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-16 00:00:00 -08:00
+date: 2011-11-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: eventmachine
+  name: bundler
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: eventmachine
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -36,11 +50,11 @@ dependencies:
         - 4
         version: 1.0.0.beta.4
   type: :runtime
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: amqp
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -52,11 +66,11 @@ dependencies:
         - 4
         version: 0.7.4
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: json
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -66,11 +80,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: hashie
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -80,11 +94,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: uuidtools
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -94,11 +108,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: cabin
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -110,11 +124,11 @@ dependencies:
         - 7
         version: 0.1.7
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: ruby-redis
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -124,11 +138,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rack
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -140,11 +154,11 @@ dependencies:
         - 4
         version: 1.3.4
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: async_sinatra
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -154,11 +168,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: thin
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -168,11 +182,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -182,11 +196,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id011
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: em-spec
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -196,11 +210,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id012
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: em-http-request
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -210,7 +224,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id013
+  version_requirements: *id014
 description: A monitoring framework that aims to be simple, malleable, and scalable. Uses the publish/subscribe model.
 email: 
 - sean.porter@sonian.net