merge from upstream master

plugins/rails3/rails3.plugin.zsh

@@ -13,6 +13,7 @@ alias rd='_rails_command destroy'
 alias rdb='_rails_command dbconsole'
 alias rdbm='rake db:migrate db:test:clone'
 alias rg='_rails_command generate'
+alias rgm='_rails_command generate migration'
 alias rp='_rails_command plugin'
 alias ru='_rails_command runner'
 alias rs='_rails_command server'

plugins/rbenv/rbenv.plugin.zsh

+_homebrew-installed() {
+  type brew &> /dev/null
+}
+
+_rbenv-from-homebrew-installed() {
+  brew --prefix rbenv &> /dev/null
+}
+
 FOUND_RBENV=0
-for rbenvdir in "$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv" ; do
+rbenvdirs=("$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv")
+if _homebrew-installed && _rbenv-from-homebrew-installed ; then
+    rbenvdirs=($(brew --prefix rbenv) "${rbenvdirs[@]}")
+fi
+
+for rbenvdir in "${rbenvdirs[@]}" ; do
   if [ -d $rbenvdir/bin -a $FOUND_RBENV -eq 0 ] ; then
     FOUND_RBENV=1
     export RBENV_ROOT=$rbenvdir
     export PATH=${rbenvdir}/bin:$PATH
-    eval "$(rbenv init -)"
+    eval "$(rbenv init - zsh)"
 
     alias rubies="rbenv versions"
     alias gemsets="rbenv gemset list"

plugins/rbfu/rbfu.plugin.zsh

+# Enables rbfu with --auto option, if available.
+#
+# Also provides a command to list all installed/available
+# rubies. To ensure compatibility with themes, creates the
+# rvm_prompt_info function to return the $RBFU_RUBY_VERSION
+# version.
+
+command -v rbfu &>/dev/null
+
+if [[ $? -eq 0 ]]; then
+  eval "$(rbfu --init --auto)"
+
+  # Internal: Print ruby version details, if it's currently
+  # active etc.
+  function _rbfu_rubies_print() {
+    local rb rb_out
+    rb=$(basename $1)
+    rb_out="$rb"
+    [[ -h $1 ]] && rb_out="$rb_out${fg[green]}@${reset_color}"
+    [[ "x$rb" == "x$2" ]] && rb_out="${fg[red]}$rb_out ${fg[red]}*${reset_color}"
+    echo $rb_out
+  }
+
+  # Public: Provide a list with all available rubies, this basically depends
+  # on `ls -1` and .rfbu/rubies. Highlights the currently active ruby version
+  # and aliases.
+  function rbfu-rubies() {
+    local rbfu_dir active_rb
+    rbfu_dir=$RBFU_RUBIES
+    active_rb=$RBFU_RUBY_VERSION
+    [[ -z "$rbfu_dir" ]] && rbfu_dir="${HOME}/.rbfu/rubies"
+    [[ -z "$active_rb" ]] && active_rb="system"
+    _rbfu_rubies_print "${rbfu_dir}/system" $active_rb
+    for rb in $(ls -1 $rbfu_dir); do
+      _rbfu_rubies_print "${rbfu_dir}/${rb}" $active_rb
+    done
+  }
+
+  # Public: Create rvm_prompt_info command for themes compatibility, unless
+  # it has already been defined.
+  [ ! -x rvm_prompt_info ] && function rvm_prompt_info() { echo "${RBFU_RUBY_VERSION:=system}" }
+fi

plugins/screen/screen.plugin.zsh

+# if using GNU screen, let the zsh tell screen what the title and hardstatus
+# of the tab window should be.
+if [[ $TERM == "screen" ]]; then
+  if [[ $_GET_PATH == '' ]]; then
+    _GET_PATH='echo $PWD | sed "s/^\/Users\//~/;s/^\/home\//~/;s/^~$USER/~/"'
+  fi
+  if [[ $_GET_HOST == '' ]]; then
+    _GET_HOST='echo $HOST | sed "s/\..*//"'
+  fi
+
+  # use the current user as the prefix of the current tab title 
+  TAB_TITLE_PREFIX='"`'$_GET_HOST'`:`'$_GET_PATH' | sed "s:..*/::"`$PROMPT_CHAR"'
+  # when at the shell prompt, show a truncated version of the current path (with
+  # standard ~ replacement) as the rest of the title.
+  TAB_TITLE_PROMPT='$SHELL:t'
+  # when running a command, show the title of the command as the rest of the
+  # title (truncate to drop the path to the command)
+  TAB_TITLE_EXEC='$cmd[1]:t'
+
+  # use the current path (with standard ~ replacement) in square brackets as the
+  # prefix of the tab window hardstatus.
+  TAB_HARDSTATUS_PREFIX='"[`'$_GET_PATH'`] "'
+  # when at the shell prompt, use the shell name (truncated to remove the path to
+  # the shell) as the rest of the title
+  TAB_HARDSTATUS_PROMPT='$SHELL:t'
+  # when running a command, show the command name and arguments as the rest of
+  # the title
+  TAB_HARDSTATUS_EXEC='$cmd'
+
+  # tell GNU screen what the tab window title ($1) and the hardstatus($2) should be
+  function screen_set()
+  {
+    # set the tab window title (%t) for screen
+    print -nR $'\033k'$1$'\033'\\\
+
+    # set hardstatus of tab window (%h) for screen
+    print -nR $'\033]0;'$2$'\a'
+  }
+  # called by zsh before executing a command
+  function preexec()
+  {
+    local -a cmd; cmd=(${(z)1}) # the command string
+    eval "tab_title=$TAB_TITLE_PREFIX:$TAB_TITLE_EXEC"
+    eval "tab_hardstatus=$TAB_HARDSTATUS_PREFIX:$TAB_HARDSTATUS_EXEC"
+    screen_set $tab_title $tab_hardstatus
+  }
+  # called by zsh before showing the prompt
+  function precmd()
+  {
+    eval "tab_title=$TAB_TITLE_PREFIX:$TAB_TITLE_PROMPT"
+    eval "tab_hardstatus=$TAB_HARDSTATUS_PREFIX:$TAB_HARDSTATUS_PROMPT"
+    screen_set $tab_title $tab_hardstatus
+  }
+fi
\ No newline at end of file

plugins/sublime/sublime.plugin.zsh

+# Sublime Text 2 Aliases
+#unamestr = 'uname'
+
+if [[ $('uname') == 'Linux' ]]; then
+	alias st='/usr/bin/sublime_text&'
+elif  [[ $('uname') == 'Darwin' ]]; then
+	alias st='/Applications/Sublime\ Text\ 2.app/Contents/SharedSupport/bin/subl'
+fi
+alias stt='st .'

plugins/suse/suse.plugin.zsh

+alias zi='sudo zypper install'
+alias zrf='sudo zypper refresh'
+alias zs='zypper search'
+alias zup='sudo zypper dist-upgrade'
+alias zrm='sudo zypper remove'
+alias zp='sudo zypper patch'
+alias zps='sudo zypper ps'

plugins/svn/svn.plugin.zsh

@@ -16,7 +16,7 @@ function svn_get_repo_name {
     if [ $(in_svn) ]; then
         svn info | sed -n 's/Repository\ Root:\ .*\///p' | read SVN_ROOT
     
-        svn info | sed -n "s/URL:\ .*$SVN_ROOT\///p" | sed "s/\/.*$//"
+        svn info | sed -n "s/URL:\ .*$SVN_ROOT\///p"
     fi
 }
 

plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh

+WRAPPER_FOUND=0
+for wrapsource in "/usr/bin/virtualenvwrapper.sh" "/usr/local/bin/virtualenvwrapper.sh" "/etc/bash_completion.d/virtualenvwrapper" ; do
+  if [[ -e $wrapsource ]] ; then
+    WRAPPER_FOUND=1
+    source $wrapsource
+
+    if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
+      # Automatically activate Git projects' virtual environments based on the
+      # directory name of the project. Virtual environment name can be overridden
+      # by placing a .venv file in the project root with a virtualenv name in it
+      function workon_cwd {
+          # Check that this is a Git repo
+          PROJECT_ROOT=`git rev-parse --show-toplevel 2> /dev/null`
+          if (( $? == 0 )); then
+              # Check for virtualenv name override
+              ENV_NAME=`basename "$PROJECT_ROOT"`
+              if [[ -f "$PROJECT_ROOT/.venv" ]]; then
+                  ENV_NAME=`cat "$PROJECT_ROOT/.venv"`
+              fi
+              # Activate the environment only if it is not already active
+              if [[ "$VIRTUAL_ENV" != "$WORKON_HOME/$ENV_NAME" ]]; then
+                  if [[ -e "$WORKON_HOME/$ENV_NAME/bin/activate" ]]; then
+                      workon "$ENV_NAME" && export CD_VIRTUAL_ENV="$ENV_NAME"
+                  fi
+              fi
+          elif [ $CD_VIRTUAL_ENV ]; then
+              # We've just left the repo, deactivate the environment
+              # Note: this only happens if the virtualenv was activated automatically
+              deactivate && unset CD_VIRTUAL_ENV
+          fi
+          unset PROJECT_ROOT
+      }
+
+      # New cd function that does the virtualenv magic
+      function cd {
+          builtin cd "$@" && workon_cwd
+      }
+    fi
+
+    break
+  fi
+done
+
+if [ $WRAPPER_FOUND -eq 0 ] ; then
+  print "zsh virtualenvwrapper plugin: Couldn't activate virtualenvwrapper. Please run \`pip install virtualenvwrapper\`."
+fi

plugins/yum/yum.plugin.zsh

@@ -3,10 +3,14 @@
 alias ys="yum search"                       # search package
 alias yp="yum info"                         # show package info
 alias yl="yum list"                         # list packages
+alias ygl="yum grouplist"                   # list package groups
 alias yli="yum list installed"              # print all installed packages
+alias ymc="yum makecache"                   # rebuilds the yum package list
 
 alias yu="sudo yum update"                  # upgrate packages
 alias yi="sudo yum install"                 # install package
+alias ygi="sudo yum groupinstall"           # install package group
 alias yr="sudo yum remove"                  # remove package
+alias ygr="sudo yum groupremove"            # remove pagage group
 alias yrl="sudo yum remove --remove-leaves" # remove package and leaves
-alias yc="sudo yum clean all"               # clean cache
+alias yc="sudo yum clean all"               # clean cache
\ No newline at end of file

themes/af-magic.zsh-theme

+# af-magic.zsh-theme
+#
+# Author: Andy Fleming
+# URL: http://andyfleming.com/
+# Repo: https://github.com/andyfleming/oh-my-zsh
+# Direct Link: https://github.com/andyfleming/oh-my-zsh/blob/master/themes/af-magic.zsh-theme
+#
+# Created on:		June 19, 2012
+# Last modified on:	June 20, 2012
+
+
+
+if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="green"; fi
+local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
+
+# primary prompt
+PROMPT='$FG[237]------------------------------------------------------------%{$reset_color%}
+$FG[032]%~\
+$(git_prompt_info) \
+$FG[105]%(!.#.»)%{$reset_color%} '
+PROMPT2='%{$fg[red]%}\ %{$reset_color%}'
+RPS1='${return_code}'
+
+
+# color vars
+eval my_gray='$FG[237]'
+eval my_orange='$FG[214]'
+
+# right prompt
+RPROMPT='$my_gray%n@%m%{$reset_color%}%'
+
+# git settings
+ZSH_THEME_GIT_PROMPT_PREFIX="$FG[075](branch:"
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+ZSH_THEME_GIT_PROMPT_DIRTY="$my_orange*%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="$FG[075])%{$reset_color%}"

themes/fino-time.zsh-theme

+# Fino-time theme by Aexander Berezovsky (http://berezovsky.me) based on Fino by Max Masnick (http://max.masnick.me)
+
+# Use with a dark background and 256-color terminal!
+# Meant for people with RVM and git. Tested only on OS X 10.7.
+
+# You can set your computer name in the ~/.box-name file if you want.
+
+# Borrowing shamelessly from these oh-my-zsh themes:
+#   bira
+#   robbyrussell
+#
+# Also borrowing from http://stevelosh.com/blog/2010/02/my-extravagant-zsh-prompt/
+
+function virtualenv_info {
+    [ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`') '
+}
+
+function prompt_char {
+    git branch >/dev/null 2>/dev/null && echo '±' && return
+    echo '○'
+}
+
+function box_name {
+    [ -f ~/.box-name ] && cat ~/.box-name || hostname -s
+}
+
+
+local rvm_ruby='‹$(rvm-prompt i v g)›%{$reset_color%}'
+local current_dir='${PWD/#$HOME/~}'
+local git_info='$(git_prompt_info)'
+
+
+PROMPT="╭─%{$FG[040]%}%n%{$reset_color%} %{$FG[239]%}at%{$reset_color%} %{$FG[033]%}$(box_name)%{$reset_color%} %{$FG[239]%}in%{$reset_color%} %{$terminfo[bold]$FG[226]%}${current_dir}%{$reset_color%}${git_info} %{$FG[239]%}using%{$FG[243]%} ${rvm_ruby} %D - %*
+╰─$(virtualenv_info)$(prompt_char) "
+
+ZSH_THEME_GIT_PROMPT_PREFIX=" %{$FG[239]%}on%{$reset_color%} %{$fg[255]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$FG[202]%}✘✘✘"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$FG[040]%}✔"

themes/nebirhos.zsh-theme

@@ -6,7 +6,7 @@ if [ -e ~/.rvm/bin/rvm-prompt ]; then
     RUBY_PROMPT_="%{$fg_bold[blue]%}rvm:(%{$fg[green]%}\$(~/.rvm/bin/rvm-prompt s i v g)%{$fg_bold[blue]%})%{$reset_color%} "
 else
   if which rbenv &> /dev/null; then
-    RUBY_PROMPT_="%{$fg_bold[blue]%}rvm:(%{$fg[green]%}\$(rbenv version | sed -e 's/ (set.*$//')%{$fg_bold[blue]%})%{$reset_color%} "
+    RUBY_PROMPT_="%{$fg_bold[blue]%}rbenv:(%{$fg[green]%}\$(rbenv version | sed -e 's/ (set.*$//')%{$fg_bold[blue]%})%{$reset_color%} "
   fi
 fi
 

themes/steeef.zsh-theme

@@ -81,7 +81,7 @@ add-zsh-hook chpwd steeef_chpwd
 function steeef_precmd {
     if [[ -n "$PR_GIT_UPDATE" ]] ; then
         # check for untracked files or updated submodules, since vcs_info doesn't
-        if [[ ! -z $(git ls-files --other --exclude-standard 2> /dev/null) ]]; then
+        if git ls-files --other --exclude-standard --directory 2> /dev/null | grep -q "."; then
             PR_GIT_UPDATE=1
             FMT_BRANCH="(%{$turquoise%}%b%u%c%{$hotpink%}●${PR_RST})"
         else

themes/terminalparty.zsh-theme

@@ -2,7 +2,7 @@ PROMPT='%{$fg[green]%} %% '
 # RPS1='%{$fg[blue]%}%~%{$reset_color%} '
 RPS1='%{$fg[white]%}%2~$(git_prompt_info) %{$fg_bold[blue]%}%m%{$reset_color%}'
 
-ZSH_THEME_GIT_PROMPT_PREFIX=" (%{$fg[yellow]%}"
+ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[yellow]%}("
 ZSH_THEME_GIT_PROMPT_SUFFIX=")%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%} ⚡%{$fg[yellow]%}"

tools/check_for_upgrade.sh

@@ -23,7 +23,7 @@ then
   fi
 
   epoch_diff=$(($(_current_epoch) - $LAST_EPOCH))
-  if [ $epoch_diff -gt 6 ]
+  if [ $epoch_diff -gt 13 ]
   then
     if [ "$DISABLE_UPDATE_PROMPT" = "true" ]
     then

tools/install.sh

@@ -5,7 +5,10 @@ then
 fi
 
 echo "\033[0;34mCloning Oh My Zsh...\033[0m"
-/usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh
+hash git >/dev/null && /usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh || {
+  echo "git not installed"
+  exit
+}
 
 echo "\033[0;34mLooking for an existing zsh config...\033[0m"
 if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]