Merge branch 'master' of git://github.com/ohmyzsh/ohmyzsh

lib/completion.zsh

@@ -32,9 +32,9 @@ zstyle ':completion:*' list-colors ''
 zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=01;34=0=01'
 
 if [[ "$OSTYPE" = solaris* ]]; then
-  zstyle ':completion:*:*:*:*:processes' command "ps -u $USER -o pid,user,comm"
+  zstyle ':completion:*:*:*:*:processes' command "ps -u $USERNAME -o pid,user,comm"
 else
-  zstyle ':completion:*:*:*:*:processes' command "ps -u $USER -o pid,user,comm -w -w"
+  zstyle ':completion:*:*:*:*:processes' command "ps -u $USERNAME -o pid,user,comm -w -w"
 fi
 
 # disable named-directories autocompletion

lib/diagnostics.zsh

@@ -112,7 +112,7 @@ function _omz_diag_dump_one_big_text() {
   command uname -a
   builtin echo OSTYPE=$OSTYPE
   builtin echo ZSH_VERSION=$ZSH_VERSION
-  builtin echo User: $USER
+  builtin echo User: $USERNAME
   builtin echo umask: $(umask)
   builtin echo
   _omz_diag_dump_os_specific_version

lib/functions.zsh

@@ -13,7 +13,7 @@ function upgrade_oh_my_zsh() {
   omz update
 }
 
-function take() {
+function takedir() {
   mkdir -p $@ && cd ${@:$#}
 }
 
@@ -37,6 +37,30 @@ function open_command() {
   ${=open_cmd} "$@" &>/dev/null
 }
 
+function takeurl() {
+  data=$(mktemp)
+  curl -L $1 > $data
+  tar xf $data
+  thedir=$(tar tf $data | head -1)
+  rm $data
+  cd $thedir
+}
+
+function takegit() {
+  git clone $1
+  cd $(basename ${1%%.git})
+}
+
+function take() {
+  if [[ $1 =~ ^(https?|ftp).*\.tar\.(gz|bz2|xz)$ ]]; then
+    takeurl $1
+  elif [[ $1 =~ ^([A-Za-z0-9]\+@|https?|git|ssh|ftps?|rsync).*\.git/?$ ]]; then
+    takegit $1
+  else
+    takedir $1
+  fi
+}
+
 #
 # Get the value of an alias.
 #

lib/prompt_info_functions.zsh

@@ -18,6 +18,7 @@ function chruby_prompt_info \
   vi_mode_prompt_info \
   virtualenv_prompt_info \
   jenv_prompt_info \
+  tf_prompt_info \
 {
   return 1
 }