From 415194941cdce3b6aec97e7f147d2f07a93dbd70 Mon Sep 17 00:00:00 2001
From: Sudarshan Wadkar <wadkar@cmu.edu>
Date: Fri, 4 Mar 2016 15:44:58 -0500
Subject: [PATCH 1/2] [WIP] Rebase to origin:next branch

---
 powerlevel9k.zsh-theme | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index 72d37318..2ef4fe3c 100755
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -622,6 +622,17 @@ prompt_rbenv() {
   fi
 }
 
+# chruby information
+# see https://github.com/postmodern/chruby/issues/245 for chruby_auto issue with ZSH
+prompt_chruby() {
+  local chruby_env
+  chrb_env="$(chruby 2> /dev/null | grep \* | tr -d '* ')"
+  # Don't show anything if the chruby did not change the default ruby
+  if [[ "${chrb_env:-system}" != "system" ]]; then
+    "$1_prompt_segment" "$0" "$2" "red" "$DEFAULT_COLOR" "${chrb_env}" 'RUBY_ICON'
+  fi
+}
+
 # Print an icon if user is root.
 prompt_root_indicator() {
   if [[ "$UID" -eq 0 ]]; then

From 88fd11a8657eaefa5477d07538dbbbc24b905d2c Mon Sep 17 00:00:00 2001
From: Sudarshan Wadkar <wadkar@cmu.edu>
Date: Fri, 4 Mar 2016 15:52:51 -0500
Subject: [PATCH 2/2] Update README.md with `chruby` prompt info

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 353f48ad..14ea5378 100644
--- a/README.md
+++ b/README.md
@@ -100,7 +100,8 @@ The segments that are currently available are:
 * **os_icon** - Display a nice little icon, depending on your operating system.
 * **php_version** - Show the current PHP version.
 * **ram** - Show free RAM
-* [rbenv](#rbenv) - Ruby environment information (if one is active).
+* [rbenv](#rbenv) - Ruby environment information using `rbenv` (if one is active).
+* [chruby](#chruby) - Ruby environment information using `chruby` (if one is active; also, see postmodern/chruby#245 for issue with auto switching of ruby).
 * **root_indicator** - An indicator if the user is root.
 * [rspec_stats](#rspec_stats) - Show a ratio of test classes vs code classes for RSpec.
 * **rust_version** - Display the current rust version.