20ecca2ba9a9cf88a48fdfc48c4d3e2718752843

Message

rbenv: improve rbenv loading based on pyenv (#7626)

Diff

This diff is truncated to protect this page.

  1diff --git a/plugins/pyenv/pyenv.plugin.zsh b/plugins/pyenv/pyenv.plugin.zsh
  2index 4e92b80176052f5d57debb35e2dd06ee9f232c97..40e58b5c243b9f4c7a40c5470c78a51c0b7b2f9e 100644
  3--- a/plugins/pyenv/pyenv.plugin.zsh
  4+++ b/plugins/pyenv/pyenv.plugin.zsh
  5@@ -38,4 +38,4 @@ else
  6     }
  7 fi
  8 
  9-unset FOUND_PYENV dir
 10+unset FOUND_PYENV pyenvdirs dir
 11diff --git a/plugins/rbenv/rbenv.plugin.zsh b/plugins/rbenv/rbenv.plugin.zsh
 12index 7430e962525a493c0e86c08a21768c2c9fd4ad90..ed46d355b3f9668ce16bf3bc8012fbda0c2c8c6e 100644
 13--- a/plugins/rbenv/rbenv.plugin.zsh
 14+++ b/plugins/rbenv/rbenv.plugin.zsh
 15@@ -1,60 +1,65 @@
 16-_homebrew-installed() {
 17-  type brew &> /dev/null
 18-}
 19-
 20-FOUND_RBENV=0
 21-rbenvdirs=("$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv" "/usr/local/opt/rbenv")
 22-if _homebrew-installed && rbenv_homebrew_path=$(brew --prefix rbenv 2>/dev/null); then
 23-    rbenvdirs=($rbenv_homebrew_path "${rbenvdirs[@]}")
 24-    unset rbenv_homebrew_path
 25-    if [[ $RBENV_ROOT = '' ]]; then 
 26-      RBENV_ROOT="$HOME/.rbenv"
 27-    fi
 28+# This plugin loads rbenv into the current shell and provides prompt info via
 29+# the 'rbenv_prompt_info' function.
 30+
 31+FOUND_RBENV=$+commands[rbenv]
 32+
 33+if [[ $FOUND_RBENV -ne 1 ]]; then
 34+    rbenvdirs=("$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv" "/usr/local/opt/rbenv")
 35+    for dir in $rbenvdirs; do
 36+        if [[ -d $dir/bin ]]; then
 37+            export PATH="$dir/bin:$PATH"
 38+            FOUND_RBENV=1
 39+            break
 40+        fi
 41+    done
 42 fi
 43 
 44-for rbenvdir in "${rbenvdirs[@]}" ; do
 45-  if [ -d $rbenvdir/bin -a $FOUND_RBENV -eq 0 ] ; then
 46-    FOUND_RBENV=1
 47-    if [[ $RBENV_ROOT = '' ]]; then
 48-      RBENV_ROOT=$rbenvdir
 49+if [[ $FOUND_RBENV -ne 1 ]]; then
 50+    if (( $+commands[brew] )) && dir=$(brew --prefix rbenv 2>/dev/null); then
 51+        if [[ -d $dir/bin ]]; then
 52+            export PATH="$dir/bin:$PATH"
 53+            FOUND_RBENV=1
 54+        fi
 55     fi
 56-    export RBENV_ROOT
 57-    export PATH=${rbenvdir}/bin:$PATH
 58+fi
 59+
 60+if [[ $FOUND_RBENV -eq 1 ]]; then
 61     eval "$(rbenv init --no-rehash - zsh)"
 62 
 63     alias rubies="rbenv versions"
 64     alias gemsets="rbenv gemset list"
 65 
 66     function current_ruby() {
 67-      echo "$(rbenv version-name)"
 68+        echo "$(rbenv version-name)"
 69     }
 70 
 71     function current_gemset() {
 72-      echo "$(rbenv gemset active 2&>/dev/null | sed -e ":a" -e '$ s/\n/+/gp;N;b a' | head -n1)"
 73+        echo "$(rbenv gemset active 2&>/dev/null | sed -e ":a" -e '$ s/\n/+/gp;N;b a' | head -n1)"
 74     }
 75 
 76-    function gems {
 77-      local rbenv_path=$(rbenv prefix)
 78-      gem list $@ | sed -E \
 79-        -e "s/\([0-9a-z, \.]+( .+)?\)/$fg[blue]&$reset_color/g" \
 80-        -e "s|$(echo $rbenv_path)|$fg[magenta]\$rbenv_path$reset_color|g" \
 81-        -e "s/$current_ruby@global/$fg[yellow]&$reset_color/g" \
 82-        -e "s/$current_ruby$current_gemset$/$fg[green]&$reset_color/g"
 83+    function gems() {
 84+        local rbenv_path=$(rbenv prefix)
 85+        gem list $@ | sed -E \
 86+          -e "s/\([0-9a-z, \.]+( .+)?\)/$fg[blue]&$reset_color/g" \
 87+          -e "s|$(echo $rbenv_path)|$fg[magenta]\$rbenv_path$reset_color|g" \
 88+          -e "s/$current_ruby@global/$fg[yellow]&$reset_color/g" \
 89+          -e "s/$current_ruby$current_gemset$/$fg[green]&$reset_color/g"
 90     }
 91 
 92     function rbenv_prompt_info() {
 93-      if [[ -n $(current_gemset) ]] ; then
 94-        echo "$(current_ruby)@$(current_gemset)"
 95-      else
 96-        echo "$(current_ruby)"
 97-      fi
 98+        if [[ -n $(current_gemset) ]] ; then
 99+            echo "$(current_ruby)@$(current_gemset)"
100+        else
101+            echo "$(current_ruby)"
102+        fi
103     }
104-  fi
105-done
106-unset rbenvdir
107-
108-if [ $FOUND_RBENV -eq 0 ] ; then
109-  alias rubies='ruby -v'
110-  function gemsets() { echo 'not supported' }
111-  function rbenv_prompt_info() { echo "system: $(ruby -v | cut -f-2 -d ' ')" }
112+else
113+    alias rubies="ruby -v"
114+    function gemsets() { echo "not supported" }