From 08dea31e54aa6ecef8ce0efcb0f52346e572a830 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <p.hoeg@northwind.sg>
Date: Thu, 29 Sep 2011 17:38:09 +0800
Subject: [PATCH 1/3] fix: battery prompt when no rbenv exists

---
 plugins/battery/battery.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh
index c1cab9ec3..429475549 100644
--- a/plugins/battery/battery.plugin.zsh
+++ b/plugins/battery/battery.plugin.zsh
@@ -6,4 +6,5 @@ else
   error_msg='no battery'
   function battery_pct_remaining() { echo $error_msg }
   function battery_time_remaining() { echo $error_msg }
+  function battery_pct_prompt() { echo '' }
 fi

From 2c4435c73e7f5fe1abe794c0653ca058352af89a Mon Sep 17 00:00:00 2001
From: Peter Hoeg <p.hoeg@northwind.sg>
Date: Thu, 29 Sep 2011 17:42:36 +0800
Subject: [PATCH 2/3] fix: do not show message if no battery present

---
 plugins/battery/battery.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh
index 429475549..834d84a14 100644
--- a/plugins/battery/battery.plugin.zsh
+++ b/plugins/battery/battery.plugin.zsh
@@ -1,4 +1,4 @@
-if [[ $(acpi | grep -c ^Battery) -gt 0 ]] ; then
+if [[ $(acpi 2&>/dev/null | grep -c ^Battery) -gt 0 ]] ; then
   function battery_pct_remaining() { echo "$(acpi | cut -f2 -d ',' | tr -cd '[:digit:]')" }
   function battery_time_remaining() { echo $(acpi | cut -f3 -d ',') }
   function battery_pct_prompt() { echo "%{$fg[red]%}[$(battery_pct_remaining)]%{$reset_color%}" }

From 809d7a7e3fdb5d8e8c21e6d4e295c21128f694b0 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <p.hoeg@northwind.sg>
Date: Thu, 29 Sep 2011 17:51:03 +0800
Subject: [PATCH 3/3] fix: load current ruby and gemset every time

---
 plugins/rbenv/rbenv.plugin.zsh | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/plugins/rbenv/rbenv.plugin.zsh b/plugins/rbenv/rbenv.plugin.zsh
index d82d028f7..705097ab3 100644
--- a/plugins/rbenv/rbenv.plugin.zsh
+++ b/plugins/rbenv/rbenv.plugin.zsh
@@ -6,8 +6,13 @@ if [ -d $rbenvdir ] ; then
   alias rubies="rbenv versions"
   alias gemsets="rbenv gemset list"
 
-  current_ruby=$(rbenv version | cut -f1 -d ' ')
-  current_gemset=$($benv gemset active 2&>/dev/null | grep -v 'no active gemsets')
+  function current_ruby() {
+    echo "$(rbenv version | cut -f1 -d ' ')"
+  }
+
+  function current_gemset() {
+    echo "$(rbenv gemset active 2&>/dev/null | grep -v 'no active gemsets')"
+  }
 
   function gems {
     local rbenv_path=$(rbenv prefix)
@@ -19,10 +24,10 @@ if [ -d $rbenvdir ] ; then
   }
 
   function rbenv_prompt_info() {
-    if [[ -n $current_gemset ]] ; then
-      echo "${current_ruby}@${current_gemset}"
+    if [[ -n $(current_gemset) ]] ; then
+      echo "$(current_ruby)@$(current_gemset)"
     else
-      echo "${current_ruby}"
+      echo "$(current_ruby)"
     fi
   }
 else