From 77091fe8779ee290404c016e0279d66d13cf2fae Mon Sep 17 00:00:00 2001
From: Hendrik Mans <hendrik@mans.de>
Date: Tue, 29 Jan 2013 18:44:08 +0100
Subject: [PATCH] Simplify & consolidate Ruby version reporting.

---
 themes/base.theme.bash | 35 +++--------------------------------
 1 file changed, 3 insertions(+), 32 deletions(-)

diff --git a/themes/base.theme.bash b/themes/base.theme.bash
index f096fda4..08bc977d 100644
--- a/themes/base.theme.bash
+++ b/themes/base.theme.bash
@@ -18,17 +18,8 @@ SCM_SVN_CHAR='⑆'
 SCM_NONE='NONE'
 SCM_NONE_CHAR='○'
 
-RVM_THEME_PROMPT_PREFIX=' |'
-RVM_THEME_PROMPT_SUFFIX='|'
-
-VIRTUALENV_THEME_PROMPT_PREFIX=' |'
-VIRTUALENV_THEME_PROMPT_SUFFIX='|'
-
-RBENV_THEME_PROMPT_PREFIX=' |'
-RBENV_THEME_PROMPT_SUFFIX='|'
-
-RBFU_THEME_PROMPT_PREFIX=' |'
-RBFU_THEME_PROMPT_SUFFIX='|'
+RUBY_THEME_PROMPT_PREFIX=' |'
+RUBY_THEME_PROMPT_SUFFIX='|'
 
 function scm {
   if [[ -f .git/HEAD ]]; then SCM=$SCM_GIT
@@ -112,28 +103,8 @@ function hg_prompt_vars {
     SCM_CHANGE=$(hg summary 2> /dev/null | grep parent | awk '{print $2}')
 }
 
-function rvm_version_prompt {
-  if which rvm &> /dev/null; then
-    rvm=$(rvm tools identifier) || return
-    echo -e "$RVM_THEME_PROMPT_PREFIX$rvm$RVM_THEME_PROMPT_SUFFIX"
-  fi
-}
-
-function rbenv_version_prompt {
-  if which rbenv &> /dev/null; then
-    rbenv=$(rbenv version-name) || return
-    echo -e "$RBENV_THEME_PROMPT_PREFIX$rbenv$RBENV_THEME_PROMPT_SUFFIX"
-  fi
-}
-
-function rbfu_version_prompt {
-  if [[ $RBFU_RUBY_VERSION ]]; then
-    echo -e "${RBFU_THEME_PROMPT_PREFIX}${RBFU_RUBY_VERSION}${RBFU_THEME_PROMPT_SUFFIX}"
-  fi
-}
-
 function ruby_version_prompt {
-  echo -e "$(rbfu_version_prompt)$(rbenv_version_prompt)$(rvm_version_prompt)"
+  echo -e "${RUBY_THEME_PROMPT_PREFIX}$(ruby -v | awk '{print $2}')${RUBY_THEME_PROMPT_SUFFIX}"
 }
 
 function virtualenv_prompt {