make integrity playing nice with bundler

v22_with_bundler_fix.diff

From 63597ebd62b45b601643e8329f242807e384d743 Mon Sep 17 00:00:00 2001
From: Damian Caruso <[email protected]>
Date: Tue, 26 Oct 2010 01:18:20 -0300
Subject: [PATCH] make integrity playing nice with bundler

---
 init.rb                  |    2 +-
 lib/integrity/builder.rb |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/init.rb b/init.rb
index 60752fd..249c508 100644
--- a/init.rb
+++ b/init.rb
@@ -1,6 +1,6 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "lib"))
 
-require ".bundle/environment"
+require "bundler/setup"
 require "integrity"
 
 # Uncomment as appropriate for the notifier you want to use
diff --git a/lib/integrity/builder.rb b/lib/integrity/builder.rb
index 4b6ffa3..c3dcde2 100644
--- a/lib/integrity/builder.rb
+++ b/lib/integrity/builder.rb
@@ -48,7 +48,9 @@ module Integrity
 
     def run
       cmd = "(cd #{repo.directory} && #{@build.project.command} 2>&1)"
-      IO.popen(cmd, "r") { |io| @output = io.read }
+      Bundler.with_clean_env do
+        IO.popen(cmd, "r") { |io| @output = io.read }
+      end
       @status = $?.success?
     end
 
-- 
1.7.0.4