From c06b1c0d9a486a90565a4e5315e5a6b0d65c3f6c Mon Sep 17 00:00:00 2001
From: Bruno Pinto <bpinto@thoughtworks.com>
Date: Sat, 3 Nov 2012 11:28:33 -0200
Subject: [PATCH] bundler plugin was not working if the project didn't have
 bundler

---
 plugins/bundler/bundler.load | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/bundler/bundler.load b/plugins/bundler/bundler.load
index a0aa5f3..cb81a9d 100644
--- a/plugins/bundler/bundler.load
+++ b/plugins/bundler/bundler.load
@@ -8,17 +8,17 @@ end
 function _within-bundled-project
   set -l check_dir $PWD
   while [ $check_dir != "/" ]
-    [ -f "$check_dir/Gemfile" ] and return
+    test -f "$check_dir/Gemfile"; and return
     set check_dir (dirname $check_dir)
   end
   false
 end
 
 function _run-with-bundler
-  if _bundler-installed and _within-bundled-project
+  if begin; _bundler-installed; and _within-bundled-project; end
     command bundle exec $argv
   else
-    $argv
+    eval command $argv
   end
 end