Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh

plugins/node/node.plugin.zsh

 # Open the node api for your current version to the optional section.
 # TODO: Make the section part easier to use.
 function node-docs {
-	open "http://nodejs.org/docs/$(node --version)/api/all.html#$1"
+	open "http://nodejs.org/docs/$(node --version)/api/all.html#all_$1"
 }

plugins/osx/osx.plugin.zsh

@@ -2,10 +2,9 @@
 #          FILE:  osx.plugin.zsh
 #   DESCRIPTION:  oh-my-zsh plugin file.
 #        AUTHOR:  Sorin Ionescu (sorin.ionescu@gmail.com)
-#       VERSION:  1.0.1
+#       VERSION:  1.1.0
 # ------------------------------------------------------------------------------
 
-
 function tab() {
   local command="cd \\\"$PWD\\\""
   (( $# > 0 )) && command="${command}; $*"
@@ -35,9 +34,67 @@ EOF
           launch session "Default Session"
           set current_session to current session
           tell current_session
-            write text "${command}"
+            write text "${command}; clear;"
+          end tell
+        end tell
+      end tell
+EOF
+  }
+}
+
+function vsplit_tab() {
+  local command="cd \\\"$PWD\\\""
+  (( $# > 0 )) && command="${command}; $*"
+
+  the_app=$(
+    osascript 2>/dev/null <<EOF
+      tell application "System Events"
+        name of first item of (every process whose frontmost is true)
+      end tell
+EOF
+  )
+
+  [[ "$the_app" == 'iTerm' ]] && {
+    osascript 2>/dev/null <<EOF
+      tell application "iTerm" to activate
+
+      tell application "System Events"
+        tell process "iTerm"
+          tell menu item "Split Vertically With Current Profile" of menu "Shell" of menu bar item "Shell" of menu bar 1
+            click
+          end tell
+        end tell
+        keystroke "${command}; clear;"
+        keystroke return
+      end tell
+EOF
+  }
+}
+
+function split_tab() {
+  local command="cd \\\"$PWD\\\""
+  (( $# > 0 )) && command="${command}; $*"
+
+  the_app=$(
+    osascript 2>/dev/null <<EOF
+      tell application "System Events"
+        name of first item of (every process whose frontmost is true)
+      end tell
+EOF
+  )
+
+  [[ "$the_app" == 'iTerm' ]] && {
+    osascript 2>/dev/null <<EOF
+      tell application "iTerm" to activate
+
+      tell application "System Events"
+        tell process "iTerm"
+          tell menu item "Split Horizontally With Current Profile" of menu "Shell" of menu bar item "Shell" of menu bar 1
+            click
           end tell
         end tell
+        keystroke "${command}; clear;"
+        keystroke return
       end tell
 EOF
   }

plugins/pass/_pass

+#compdef pass
+#autoload
+
+# Copyright (C) 2012:
+#    Johan Venant <jvenant@invicem.pro>
+#    Brian Mattern <rephorm@rephorm.com>
+#    Jason A. Donenfeld <Jason@zx2c4.com>.
+#    Santiago Borrazás <sanbor@gmail.com>
+# All Rights Reserved.
+# This file is licensed under the GPLv2+. Please see COPYING for more information.
+
+
+_pass () {
+	local cmd
+	if (( CURRENT > 2)); then
+		cmd=${words[2]}
+		# Set the context for the subcommand.
+		curcontext="${curcontext%:*:*}:pass-$cmd"
+		# Narrow the range of words we are looking at to exclude `pass'
+		(( CURRENT-- ))
+		shift words
+		# Run the completion for the subcommand
+		case "${cmd}" in
+			init)
+				_arguments : \
+					"-r[re-encrypt existing passwords]" \
+					"--reencrypt[re-encrypt existing passwords]"
+				_pass_complete_keys
+				;;
+			ls|list|edit)
+				_pass_complete_entries_with_subdirs
+				;;
+			insert)
+				_arguments : \
+					"-e[echo password to console]" \
+					"--echo[echo password to console]" \
+					"-m[multiline]" \
+					"--multiline[multiline]"
+				_pass_complete_entries_with_subdirs
+				;;
+			generate)
+				_arguments : \
+					"-n[don't include symbols in password]" \
+					"--no-symbols[don't include symbols in password]" \
+					"-c[copy password to the clipboard]" \
+					"--clip[copy password to the clipboard]"
+				_pass_complete_entries_with_subdirs
+				;;
+			rm)
+				_arguments : \
+					"-f[force deletion]" \
+					"--force[force deletion]" \
+					"-r[recursively delete]" \
+					"--recursive[recursively delete]"
+					_pass_complete_entries_with_subdirs
+				;;
+			git)
+				local -a subcommands
+				subcommands=(
+					"init:Initialize git repository"
+					"push:Push to remote repository"
+					"pull:Pull from remote repository"
+					"config:Show git config"
+					"log:Show git log"
+					"reflog:Show git reflog"
+				)
+				_describe -t commands 'pass git' subcommands
+				;;
+			show|*)
+				_pass_cmd_show
+				;;
+		esac
+	else
+		local -a subcommands
+		subcommands=(
+			"init:Initialize new password storage"
+			"ls:List passwords"
+			"show:Decrypt and print a password"
+			"insert:Insert a new password"
+			"generate:Generate a new password using pwgen"
+			"edit:Edit a password with \$EDITOR"
+			"rm:Remove the password"
+			"git:Call git on the password store"
+			"version:Output version information"
+			"help:Output help message"
+		)
+		_describe -t commands 'pass' subcommands
+		_arguments : \
+			"--version[Output version information]" \
+			"--help[Output help message]"
+		_pass_cmd_show
+	fi
+}
+
+_pass_cmd_show () {
+	_arguments : \
+		"-c[put it on the clipboard]" \
+		"--clip[put it on the clipboard]"
+	_pass_complete_entries
+}
+_pass_complete_entries_helper () {
+	local IFS=$'\n'
+	local prefix="${PASSWORD_STORE_DIR:-$HOME/.password-store}"
+	_values -C 'passwords' $(find "$prefix" \( -name .git -o -name .gpg-id \) -prune -o $@ -print | sed -e "s#${prefix}.##" -e 's#\.gpg##' | sort)
+}
+
+_pass_complete_entries_with_subdirs () {
+	_pass_complete_entries_helper
+}
+
+_pass_complete_entries () {
+	_pass_complete_entries_helper -type f
+}
+
+_pass_complete_keys () {
+	local IFS=$'\n'
+	# Extract names and email addresses from gpg --list-keys
+	_values 'gpg keys' $(gpg2 --list-secret-keys --with-colons | cut -d : -f 10 | sort -u | sed '/^$/d')
+}

plugins/per-directory-history/per-directory-history.plugin.zsh

@@ -65,12 +65,13 @@
 function per-directory-history-toggle-history() {
   if [[ $_per_directory_history_is_global == true ]]; then
     _per-directory-history-set-directory-history
-    echo "using local history\n"
+    print "\nusing local history\n"
   else
     _per-directory-history-set-global-history
-    echo "using global history\n"
+    print "\nusing global history\n"
   fi
-  zle reset-prompt
+  zle .push-line
+  zle .accept-line
 }
 
 autoload per-directory-history-toggle-history

plugins/python/python.plugin.zsh

 # Find python file
 alias pyfind='find . -name "*.py"'
 
-# Remove python compiled byte-code
-alias pyclean='find . -type f -name "*.py[co]" -delete'
+# Remove python compiled byte-code in either current directory or in a
+# list of specified directories
+function pyclean() {
+    ZSH_PYCLEAN_PLACES=${*:-'.'}
+    find ${ZSH_PYCLEAN_PLACES} -type f -name "*.py[co]" -delete
+}
 
 # Grep among .py files
 alias pygrep='grep --include="*.py"'

plugins/rails/rails.plugin.zsh

@@ -5,6 +5,8 @@ alias sp='ruby script/plugin'
 alias sr='ruby script/runner'
 alias ssp='ruby script/spec'
 alias rdbm='rake db:migrate'
+alias rdbtp='rake db:test:prepare'
+alias migrate='rake db:migrate && rake db:test:prepare'
 alias sc='ruby script/console'
 alias sd='ruby script/server --debugger'
 alias devlog='tail -f log/development.log'

plugins/rsync/rsync.plugin.zsh

+alias rsync-copy="rsync -av --progress -h"
+alias rsync-move="rsync -av --progress -h --remove-source-files"
+alias rsync-update="rsync -avu --progress -h"
+alias rsync-synchronize="rsync -avu --delete --progress -h"

plugins/rvm/_rvm

-#compdef rvm
-
-local curcontext="$curcontext" state line cmds ret=1
-
-_arguments -C \
-	'(- 1 *)'{-v,--version}'[display version information]' \
-	'(-l|--level)'{-l,--level}'+[patch level to use with rvm use / install]:number' \
-	'(--prefix)--prefix[path for all rvm files (~/.rvm/), with trailing slash!]:path:_files' \
-	'(--bin)--bin[path for binaries to be placed (~/.rvm/bin/)]:path:_files' \
-	'(--source)--source[src directory to use (~/.rvm/src/)]:path:_files' \
-	'(--archives)--archives[directory for downladed files (~/.rvm/archives/)]:path:_files' \
-	'-S[Specify a script file to attempt to load and run (rubydo)]:file:_files' \
-	'-e[Execute code from the command line]:code' \
-	'(-G)-G[root gem path to use]:path:_files' \
-	'(--gems)--gems[Used to set the gems_flag, use with remove to remove gems]' \
-	'(--archive)--archive[Used to set the archive_flag, use with remove to remove archive]' \
-	'(--patch)--patch[With MRI Rubies you may specify one or more full paths to patches]' \
-	'(-C|--configure)'{-C,--configure}'=[custom configure options]' \
-	'(--nice)--nice[process niceness (for slow computers, default 0)]:number' \
-	'(--ree)--ree-options[Options passed directly to ree ./installer on the command line]:options' \
-	'(--head)--head[with update, updates rvm to git head version]' \
-	'(--rubygems)--rubygems[with update, updates rubygems for selected ruby]' \
-	'(--default)--default[with ruby select, sets a default ruby for new shells]' \
-	'(--debug)--debug[Toggle debug mode on for very verbose output]' \
-	'(--trace)--trace[Toggle trace mode on to see EVERYTHING rvm is doing]' \
-	'(--force)--force[Force install, removes old install & source before install]' \
-	'(--summary)--summary[Used with rubydo to print out a summary of the commands run]' \
-	'(--latest)--latest[with gemset --dump skips version strings for latest gem]' \
-	'(--gems)--gems[with uninstall/remove removes gems with the interpreter]' \
-	'(--docs)--docs[with install, attempt to generate ri after installation]' \
-	'(--reconfigure)--reconfigure[Force ./configure on install even if Makefile already exists]' \
-	'1: :->cmds' \
-	'*: :->args' && ret=0
-
-case $state in
-	cmds)
-		cmds=( 
-            "version:show the rvm version installed in rvm_path"
-            "use:setup current shell to use a specific ruby version"
-            "reload:reload rvm source itself (useful after changing rvm source)"
-            "implode:(seppuku) removes the rvm installation completely. This means everything in $rvm_path (~/.rvm)."
-            "update:upgrades rvm to the latest version."
-            "reset:remove current and stored default & system settings."
-            "info :show the *current* environment information for current ruby"
-            "current:print the *current* ruby version and the name of any gemset being used."
-            "debug:show info plus additional information for common issues"
-            "install:install one or many ruby versions"
-            "uninstall:uninstall one or many ruby versions, leaves their sources"
-            "remove:uninstall one or many ruby versions and remove their sources"
-            "migrate:Lets you migrate all gemsets from one ruby to another."
-            "upgrade:Lets you upgrade from one version of a ruby to another, including migrating your gemsets semi-automatically."
-            "wrapper:generates a set of wrapper executables for a given ruby with the specified ruby and gemset combination. Used under the hood for passenger support and the like."
-            "cleanup:Lets you remove stale source folders / archives and other miscellaneous data associated with rvm."
-            "repair:Lets you repair parts of your environment e.g. wrappers, env files and and similar files (e.g. general maintenance)."
-            "snapshot:Lets your backup / restore an rvm installation in a lightweight manner."
-            "disk-usage:Tells you how much disk space rvm install is using."
-            "tools:Provides general information about the ruby environment, primarily useful when scripting rvm."
-            "docs:Tools to make installing ri and rdoc documentation easier."
-            "rvmrc:Tools related to managing rvmrc trust and loading."
-            "exec:runs an arbitrary command as a set operation."
-            "ruby:runs a named ruby file against specified and/or all rubies"
-            "gem:runs a gem command using selected ruby's 'gem'"
-            "rake:runs a rake task against specified and/or all rubies"
-            "tests:runs 'rake test' across selected ruby versions"
-            "specs:runs 'rake spec' across selected ruby versions"
-            "monitor:Monitor cwd for testing, run rake {spec,test} on changes."
-            "gemset:gemsets: http://rvm.beginrescueend.com/gemsets/"
-            "rubygems:Switches the installed version of rubygems for the current ruby."
-            "gemdir:display the path to the current gem directory (GEM_HOME)."
-            "srcdir:display the path to rvm source directory (may be yanked)"
-            "fetch:Performs an archive / src fetch only of the selected ruby."
-            "list:show currently installed rubies, interactive output."
-            "package:Install a dependency package {readline,iconv,zlib,openssl}"
-            "notes:Display notes, with operating system specifics."
-            "export:Temporarily set an environment variable in the current shell."
-            "unexport:Undo changes made to the environment by 'rvm export'."
-        )
-		_describe -t commands 'rvm command' cmds && ret=0
-		;;
-	args)
-		case $line[1] in
-			(use|uninstall|remove|list)
-				_values -S , 'rubies' $(rvm list strings | sed -e 's/ruby-\([^) ]*\)-\([^) ]*\)/ruby-\1-\2 \1-\2 \1/g') default system && ret=0
-				;;
-			(install|fetch)
-				_values -S , 'rubies' $(rvm list known_strings) && ret=0
-				;;
-			gemset)
-				if (( CURRENT == 3 )); then
-					_values 'gemset_commands' \
-                        'import' \
-                        'export' \
-                        'create' \
-                        'copy' \
-                        'rename' \
-                        'empty' \
-                        'delete' \
-                        'name' \
-                        'dir' \
-                        'list' \
-                        'list_all' \
-                        'gemdir' \
-                        'install' \
-                        'pristine' \
-                        'clear' \
-                        'use' \
-                        'update' \
-                        'unpack' \
-                        'globalcache'
-				else
-					_values -S , 'gemsets' $(rvm gemset list | grep -v gemset 2>/dev/null)
-				fi
-				ret=0
-				;;
-			package)
-				if (( CURRENT == 3 )); then
-					_values 'package_commands' \
-                        'install' \
-                        'uninstall'  
-				else
-					_values 'packages' \
-                        'readline' \
-                        'iconv' \
-                        'curl' \
-                        'openssl' \
-                        'zlib' \
-                        'autoconf' \
-                        'ncurses' \
-                        'pkgconfig' \
-                        'gettext' \
-                        'glib' \
-                        'mono' \
-                        'llvm' \
-                        'libxml2' \
-                        'libxslt' \
-                        'libyaml'
-				fi
-				ret=0
-				;;
-			*)
-				(( ret )) && _message 'no more arguments'
-				;;
-		esac
-		;;
-esac
-
-return ret

plugins/rvm/rvm.plugin.zsh

+fpath=($rvm_path/scripts/zsh/Completion $fpath)
+
 alias rubies='rvm list rubies'
 alias gemsets='rvm gemset list'
 
 local ruby18='ruby-1.8.7-p334'
-local ruby19='ruby-1.9.2-p180'
+local ruby19='ruby-1.9.3-p194'
 
 function rb18 {
 	if [ -z "$1" ]; then
@@ -42,3 +44,8 @@ function gems {
 		-Ee "s/$current_ruby@global/$fg[yellow]&$reset_color/g" \
 		-Ee "s/$current_ruby$current_gemset$/$fg[green]&$reset_color/g"
 }
+
+function _rvm_completion {
+  source $rvm_path"/scripts/zsh/Completion/_rvm"
+}
+compdef _rvm_completion rvm

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 [[ "$TERM" == screen* ]]; then
   if [[ $_GET_PATH == '' ]]; then
     _GET_PATH='echo $PWD | sed "s/^\/Users\//~/;s/^\/home\//~/;s/^~$USER/~/"'
   fi

plugins/sublime/sublime.plugin.zsh

 # Sublime Text 2 Aliases
 #unamestr = 'uname'
 
+local _sublime_darwin_subl=/Applications/Sublime\ Text\ 2.app/Contents/SharedSupport/bin/subl
+
 if [[ $('uname') == 'Linux' ]]; then
-	alias st='/usr/bin/sublime_text&'
+	if [ -f '/usr/bin/sublime_text' ]; then
+		st_run() { nohup /usr/bin/sublime_text $@ > /dev/null & }
+	else
+		st_run() { nohup /usr/bin/sublime-text $@ > /dev/null & }
+	fi
+alias st=st_run
 elif  [[ $('uname') == 'Darwin' ]]; then
-	alias st='/Applications/Sublime\ Text\ 2.app/Contents/SharedSupport/bin/subl'
+	# Check if Sublime is installed in user's home application directory
+	if [[ -a $HOME/${_sublime_darwin_subl} ]]; then
+		alias st='$HOME/${_sublime_darwin_subl}'
+	else
+		alias st='${_sublime_darwin_subl}'
+	fi
 fi
 alias stt='st .'

plugins/svn/svn.plugin.zsh

+
 function svn_prompt_info {
     if [ $(in_svn) ]; then
+        if [ "x$SVN_SHOW_BRANCH" = "xtrue" ]; then
+            unset SVN_SHOW_BRANCH
+            _DISPLAY=$(svn_get_branch_name)
+        else
+            _DISPLAY=$(svn_get_repo_name)
+        fi
         echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX\
-$ZSH_THEME_REPO_NAME_COLOR$(svn_get_repo_name)$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR$(svn_dirty)$ZSH_PROMPT_BASE_COLOR"
+$ZSH_THEME_REPO_NAME_COLOR$_DISPLAY$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR$(svn_dirty)$ZSH_PROMPT_BASE_COLOR"
+        unset _DISPLAY
     fi
 }
 
@@ -20,6 +28,16 @@ function svn_get_repo_name {
     fi
 }
 
+function svn_get_branch_name {
+    _DISPLAY=$(svn info 2> /dev/null | awk -F/ '/^URL:/ { for (i=0; i<=NF; i++) { if ($i == "branches" || $i == "tags" ) { print $(i+1); break }; if ($i == "trunk") { print $i; break } } }')
+    if [ "x$_DISPLAY" = "x" ]; then
+        svn_get_repo_name
+    else
+        echo $_DISPLAY
+    fi
+    unset _DISPLAY
+}
+
 function svn_get_rev_nr {
     if [ $(in_svn) ]; then
         svn info 2> /dev/null | sed -n s/Revision:\ //p
@@ -28,10 +46,12 @@ function svn_get_rev_nr {
 
 function svn_dirty_choose {
     if [ $(in_svn) ]; then
-        s=$(svn status|grep -E '^\s*[ACDIM!?L]' 2>/dev/null)
-        if [ $s ]; then 
+        svn status 2> /dev/null | grep -Eq '^\s*[ACDIM!?L]'
+        if [ $pipestatus[-1] -eq 0 ]; then
+            # Grep exits with 0 when "One or more lines were selected", return "dirty".
             echo $1
         else
+            # Otherwise, no lines were found, or an error occurred. Return clean.
             echo $2
         fi
     fi

plugins/symfony/symfony.plugin.zsh

+# symfony basic command completion
+
+_symfony_get_command_list () {
+    ./symfony | sed "1,/Available tasks/d" | awk 'BEGIN { cat=null; } /^[A-Za-z]+$/ { cat = $1; } /^  :[a-z]+/ { print cat $1; }'
+}
+
+_symfony () {
+  if [ -f symfony ]; then
+    compadd `_symfony_get_command_list`
+  fi
+}
+
+compdef _symfony symfony

plugins/symfony2/symfony2.plugin.zsh

@@ -11,7 +11,9 @@ _symfony2 () {
 }
 
 compdef _symfony2 app/console
+compdef _symfony2 sf
 
 #Alias
 alias sf2='php app/console'
 alias sf2clear='php app/console cache:clear'
+

plugins/systemd/systemd.plugin.zsh

+user_commands=(
+  list-units is-active status show help list-unit-files
+  is-enabled list-jobs show-environment)
+
+sudo_commands=(
+  start stop reload restart try-restart isolate kill
+  reset-failed enable disable reenable preset mask unmask
+  link load cancel set-environment unset-environment)
+
+for c in $user_commands; do; alias sc-$c="systemctl $c"; done
+for c in $sudo_commands; do; alias sc-$c="sudo systemctl $c"; done

plugins/themes/_theme

+#compdef theme
+
+_arguments "1: :($(lstheme | tr "\n" " "))"