From 3594e27eeb18179f1762751bf32d1bc9f9757f67 Mon Sep 17 00:00:00 2001 From: Chris McCuller Date: Wed, 8 Jul 2015 09:02:23 -0400 Subject: [PATCH 01/36] Nicer formatting --- plugins/ember-cli/README.md | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/plugins/ember-cli/README.md b/plugins/ember-cli/README.md index d1dedf884..ec33ee21b 100644 --- a/plugins/ember-cli/README.md +++ b/plugins/ember-cli/README.md @@ -1,22 +1,24 @@ # Ember-cli -**Maintainer:** [BilalBudhani](http://www.github.com/BilalBudhani) +**Maintainer:*[BilalBudhani](http://www.github.com/BilalBudhani) Ember-cli (http://www.ember-cli.com/) ### List of Aliases -alias es='ember serve' -alias ea='ember addon' -alias eb='ember build' -alias ed='ember destroy' -alias eg='ember generate' -alias eh='ember help' -alias ein='ember init' -alias eia='ember install:addon' -alias eib='ember install:bower' -alias ein='ember install:npm' -alias ei='ember install' -alias et='ember test' -alias eu='ember update' -alias ev='ember version' +Alias | Ember-CLI command +----- | ----------------- +**es** | *ember serve* +**ea** | *ember addon* +**eb** | *ember build* +**ed** | *ember destroy* +**eg** | *ember generate* +**eh** | *ember help* +**ein** | *ember init* +**eia** | *ember install:addon* +**eib** | *ember install:bower* +**ein** | *ember install:npm* +**ei** | *ember install* +**et** | *ember test* +**eu** | *ember update* +**ev** | *ember version* From 30ef85664822595e29acdbc840c45d5772d84b5d Mon Sep 17 00:00:00 2001 From: Chris McCuller Date: Thu, 3 Sep 2015 09:47:02 -0400 Subject: [PATCH 02/36] Fix maintainer line --- plugins/ember-cli/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/ember-cli/README.md b/plugins/ember-cli/README.md index ec33ee21b..f5eca1ad0 100644 --- a/plugins/ember-cli/README.md +++ b/plugins/ember-cli/README.md @@ -1,6 +1,6 @@ # Ember-cli -**Maintainer:*[BilalBudhani](http://www.github.com/BilalBudhani) +**Maintainer:**[BilalBudhani](http://www.github.com/BilalBudhani) Ember-cli (http://www.ember-cli.com/) From d49cacfb7bb96049185c2edfaf3c330b0bde338e Mon Sep 17 00:00:00 2001 From: Victor Torres Date: Fri, 2 Oct 2015 23:16:56 -0300 Subject: [PATCH 03/36] Add branch plugin --- plugins/branch/README.md | 33 ++++++++++++++++++++++++++++++++ plugins/branch/branch.plugin.zsh | 26 +++++++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 plugins/branch/README.md create mode 100644 plugins/branch/branch.plugin.zsh diff --git a/plugins/branch/README.md b/plugins/branch/README.md new file mode 100644 index 000000000..f970266a8 --- /dev/null +++ b/plugins/branch/README.md @@ -0,0 +1,33 @@ +# Branch + +Displays the current Git or Mercurial branch fast. + +## Speed test + +### Mercurial + +```shell +$ time hg branch +0.11s user 0.14s system 70% cpu 0.355 total +``` + +### Branch plugin + +```shell +$ time sh /tmp/branch_prompt_info.sh +0.01s user 0.01s system 81% cpu 0.018 total +``` + +## Usage + +Edit your theme file (eg.: `~/.oh-my-zsh/theme/robbyrussell.zsh-theme`) +adding `$(branch_prompt_info)` in your prompt like this: + +```diff +- PROMPT='${ret_status}%{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}' ++ PROMPT='${ret_status}%{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)$(branch_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}' +``` + +## Maintainer + +Victor Torres () diff --git a/plugins/branch/branch.plugin.zsh b/plugins/branch/branch.plugin.zsh new file mode 100644 index 000000000..c918ea2b5 --- /dev/null +++ b/plugins/branch/branch.plugin.zsh @@ -0,0 +1,26 @@ +# Branch: displays the current Git or Mercurial branch fast. +# Victor Torres +# Oct 2, 2015 + +function branch_prompt_info() { + # Defines path as current directory + path=$(pwd) + # While current path is not root path + while [ $path != '/' ]; + do + # Git repository + if [ -d ${path}/.git ]; + then + echo '±' $(/bin/cat ${path}/.git/HEAD | /usr/bin/cut -d / -f 3-) + return; + fi + # Mercurial repository + if [ -d ${path}/.hg ]; + then + echo '☿' $(/bin/cat ${path}/.hg/branch) + return; + fi + # Defines path as parent directory and keeps looking for :) + path=$(/usr/bin/dirname $path) + done +} From ee8f3771e93c940cd1271dad0a6e9b6ab7cad0c4 Mon Sep 17 00:00:00 2001 From: Giordano Vicari Date: Mon, 5 Oct 2015 19:44:00 +0200 Subject: [PATCH 04/36] Added support to subtask through gulp --tasks-simple command --- plugins/gulp/gulp.plugin.zsh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/gulp/gulp.plugin.zsh b/plugins/gulp/gulp.plugin.zsh index f7eaefa85..587549526 100644 --- a/plugins/gulp/gulp.plugin.zsh +++ b/plugins/gulp/gulp.plugin.zsh @@ -2,12 +2,12 @@ # # gulp-autocompletion-zsh -# +# # Autocompletion for your gulp.js tasks # # Copyright(c) 2014 André König # MIT Licensed -# +# # # André König @@ -20,7 +20,7 @@ # in the current directory. # function $$gulp_completion { - compls="$(grep -Eo "gulp.task\((['\"](([a-zA-Z0-9]|-)*)['\"],)" gulpfile.js 2>/dev/null | grep -Eo "['\"](([a-zA-Z0-9]|-)*)['\"]" | sed s/"['\"]"//g | sort)" + compls=$(gulp --tasks-simple >/dev/null | sort) completions=(${=compls}) compadd -- $completions From e5164d7b704d34f1f15c297b18cb90ecd22991a0 Mon Sep 17 00:00:00 2001 From: Gustavo Villa Date: Thu, 15 Oct 2015 16:14:54 -0300 Subject: [PATCH 05/36] Add 'rake stats' alias. --- plugins/rails/rails.plugin.zsh | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh index a390c919c..8af1d6301 100644 --- a/plugins/rails/rails.plugin.zsh +++ b/plugins/rails/rails.plugin.zsh @@ -61,6 +61,7 @@ alias rr='rake routes' alias rrg='rake routes | grep' alias rt='rake test' alias rmd='rake middleware' +alias rsts='rake stats' # legacy stuff alias sstat='thin --stats "/thin/stats" start' From 67abf0f955551e22335f5912a87e92d278afb669 Mon Sep 17 00:00:00 2001 From: Alexander Golikov Date: Thu, 22 Oct 2015 16:58:44 +0500 Subject: [PATCH 06/36] Update frontcube.zsh-theme MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix «rvm» variable usage in RPROMPT out --- themes/frontcube.zsh-theme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/frontcube.zsh-theme b/themes/frontcube.zsh-theme index d9f5b6d9c..539e744f8 100644 --- a/themes/frontcube.zsh-theme +++ b/themes/frontcube.zsh-theme @@ -4,7 +4,7 @@ PROMPT=' %{$fg_bold[gray]%}%~%{$fg_bold[blue]%}%{$fg_bold[blue]%} % %{$reset_color%} %{$fg[green]%}➞ %{$reset_color%' -RPROMPT='$(git_prompt_info) $(rvm)' +RPROMPT='$(git_prompt_info) ${rvm}' ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}[git:" ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" From 9e4aba4c8c59c9fce50590f78e12fdff0b69c792 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sun, 1 Nov 2015 00:21:26 +0100 Subject: [PATCH 07/36] archlinux: use $+commands instead of 'command -v' in a subshell --- plugins/archlinux/archlinux.plugin.zsh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh index b83c24560..99de5b936 100644 --- a/plugins/archlinux/archlinux.plugin.zsh +++ b/plugins/archlinux/archlinux.plugin.zsh @@ -2,7 +2,7 @@ # Usage is also described at https://github.com/robbyrussell/oh-my-zsh/wiki/Plugins # Look for yaourt, and add some useful functions if we have it. -if [[ -x `command -v yaourt` ]]; then +if (( $+commands[yaourt] )); then upgrade () { yaourt -Syu } @@ -21,11 +21,11 @@ if [[ -x `command -v yaourt` ]]; then alias yalst='yaourt -Qe' # List installed packages, even those installed from AUR (they're tagged as "local") alias yaorph='yaourt -Qtd' # Remove orphans using yaourt # Additional yaourt alias examples - if [[ -x `command -v abs` && -x `command -v aur` ]]; then + if (( $+commands[abs] && $+commands[aur] )); then alias yaupd='yaourt -Sy && sudo abs && sudo aur' # Update and refresh the local package, ABS and AUR databases against repositories - elif [[ -x `command -v abs` ]]; then + elif (( $+commands[abs] )); then alias yaupd='yaourt -Sy && sudo abs' # Update and refresh the local package and ABS databases against repositories - elif [[ -x `command -v aur` ]]; then + elif (( $+commands[aur] )); then alias yaupd='yaourt -Sy && sudo aur' # Update and refresh the local package and AUR databases against repositories else alias yaupd='yaourt -Sy' # Update and refresh the local package database against repositories @@ -49,11 +49,11 @@ alias pacreps='pacman -Ss' # Search for package(s) in the repositori alias pacloc='pacman -Qi' # Display information about a given package in the local database alias paclocs='pacman -Qs' # Search for package(s) in the local database # Additional pacman alias examples -if [[ -x `command -v abs` && -x `command -v aur` ]]; then +if (( $+commands[abs] && $+commands[aur] )); then alias pacupd='sudo pacman -Sy && sudo abs && sudo aur' # Update and refresh the local package, ABS and AUR databases against repositories -elif [[ -x `command -v abs` ]]; then +elif (( $+commands[abs] )); then alias pacupd='sudo pacman -Sy && sudo abs' # Update and refresh the local package and ABS databases against repositories -elif [[ -x `command -v aur` ]]; then +elif (( $+commands[aur] )); then alias pacupd='sudo pacman -Sy && sudo aur' # Update and refresh the local package and AUR databases against repositories else alias pacupd='sudo pacman -Sy' # Update and refresh the local package database against repositories From f6557932e9f8e4366198856baff92ec3afbe5b5c Mon Sep 17 00:00:00 2001 From: Alberto Gireud Date: Thu, 22 Oct 2015 11:15:14 -0500 Subject: [PATCH 08/36] Add OSX support for command-not-found --- plugins/command-not-found/command-not-found.plugin.zsh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/plugins/command-not-found/command-not-found.plugin.zsh b/plugins/command-not-found/command-not-found.plugin.zsh index 797554a13..0e2f2133f 100644 --- a/plugins/command-not-found/command-not-found.plugin.zsh +++ b/plugins/command-not-found/command-not-found.plugin.zsh @@ -23,3 +23,11 @@ if [ -f /usr/libexec/pk-command-not-found ]; then return $retval } fi + +# OSX command-not-found support +# https://github.com/Homebrew/homebrew-command-not-found +if type brew &> /dev/null; then + if brew command command-not-found-init > /dev/null 2>&1; then + eval "$(brew command-not-found-init)"; + fi +fi From cc116f65d621f25a97beee108cfb8884ef5f3518 Mon Sep 17 00:00:00 2001 From: Andrew Janke Date: Fri, 6 Nov 2015 19:44:26 -0500 Subject: [PATCH 09/36] agnoster: stronger warning about changing SEGMENT_SEPARATOR character --- themes/agnoster.zsh-theme | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme index e54346acf..c981213f8 100644 --- a/themes/agnoster.zsh-theme +++ b/themes/agnoster.zsh-theme @@ -43,7 +43,8 @@ CURRENT_BG='NONE' # This is defined using a Unicode escape sequence so it is unambiguously readable, regardless of # what font the user is viewing this source code in. Do not replace the # escape sequence with a single literal character. - SEGMENT_SEPARATOR=$'\ue0b0' #  + # Do not change this! Do not make it '\u2b80'; that is the old, wrong code point. + SEGMENT_SEPARATOR=$'\ue0b0' } # Begin a segment From d7797503418422148e84bc06c9e446bdd77c3a01 Mon Sep 17 00:00:00 2001 From: moyamo Date: Thu, 19 Nov 2015 19:03:56 +0200 Subject: [PATCH 10/36] Default to using terminfo to set the terminal title Currently, the title is only set on supported terminals (i.e. xterm, urxvt, screen etc.). Using terminfo entries to set the terminal title adds support for many more terminals. --- lib/termsupport.zsh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh index 7cf15b0a0..84c1e186e 100644 --- a/lib/termsupport.zsh +++ b/lib/termsupport.zsh @@ -28,6 +28,14 @@ function title { if [[ "$TERM_PROGRAM" == "iTerm.app" ]]; then print -Pn "\e]2;$2:q\a" # set window name print -Pn "\e]1;$1:q\a" # set tab name + else + # Try to use terminfo to set the title + # If the feature is available set title + if [[ -n "$terminfo[fsl]" ]] && [[ -n "$terminfo[tsl]" ]]; then + echoti tsl + print -Pn "$1" + echoti fsl + fi fi ;; esac From 71deb74552d54630d99ae1db3647ebed7b3bc735 Mon Sep 17 00:00:00 2001 From: moyamo Date: Mon, 14 Dec 2015 13:05:51 +0200 Subject: [PATCH 11/36] Fix indentation --- lib/termsupport.zsh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh index 84c1e186e..871ab28df 100644 --- a/lib/termsupport.zsh +++ b/lib/termsupport.zsh @@ -32,10 +32,10 @@ function title { # Try to use terminfo to set the title # If the feature is available set title if [[ -n "$terminfo[fsl]" ]] && [[ -n "$terminfo[tsl]" ]]; then - echoti tsl - print -Pn "$1" - echoti fsl - fi + echoti tsl + print -Pn "$1" + echoti fsl + fi fi ;; esac From cf5db83facf67a27faa2860241f6ddc1d7e27b4f Mon Sep 17 00:00:00 2001 From: Victor Torres Date: Mon, 14 Dec 2015 17:39:26 -0300 Subject: [PATCH 12/36] Implementing mcornella's suggestions in pull request 4451. --- plugins/branch/branch.plugin.zsh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/branch/branch.plugin.zsh b/plugins/branch/branch.plugin.zsh index c918ea2b5..a1e9ca31b 100644 --- a/plugins/branch/branch.plugin.zsh +++ b/plugins/branch/branch.plugin.zsh @@ -4,23 +4,23 @@ function branch_prompt_info() { # Defines path as current directory - path=$(pwd) + local current_dir=$PWD # While current path is not root path - while [ $path != '/' ]; + while [[ $current_dir != '/' ]] do # Git repository - if [ -d ${path}/.git ]; + if [[ -d "${current_dir}/.git" ]] then - echo '±' $(/bin/cat ${path}/.git/HEAD | /usr/bin/cut -d / -f 3-) + echo '±' ${"$(<"$current_dir/.git/HEAD")"##*/} return; fi # Mercurial repository - if [ -d ${path}/.hg ]; + if [[ -d "${current_dir}/.hg" ]] then - echo '☿' $(/bin/cat ${path}/.hg/branch) + echo '☿' $(<"$current_dir/.hg/branch") return; fi # Defines path as parent directory and keeps looking for :) - path=$(/usr/bin/dirname $path) + current_dir="${current_dir:h}" done } From fe63ed09b7a8d8040dbbe9892f89c1c46d4ff75d Mon Sep 17 00:00:00 2001 From: Victor Torres Date: Mon, 14 Dec 2015 20:58:29 -0300 Subject: [PATCH 13/36] Updating speed test info and using zsh command line. --- plugins/branch/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/branch/README.md b/plugins/branch/README.md index f970266a8..56ab8da4b 100644 --- a/plugins/branch/README.md +++ b/plugins/branch/README.md @@ -14,13 +14,13 @@ $ time hg branch ### Branch plugin ```shell -$ time sh /tmp/branch_prompt_info.sh -0.01s user 0.01s system 81% cpu 0.018 total +$ time zsh /tmp/branch_prompt_info_test.zsh +0.00s user 0.01s system 78% cpu 0.014 total ``` ## Usage -Edit your theme file (eg.: `~/.oh-my-zsh/theme/robbyrussell.zsh-theme`) +Edit your theme file (eg.: `~/.oh-my-zsh/theme/robbyrussell.zsh-theme`) adding `$(branch_prompt_info)` in your prompt like this: ```diff From 9f552130bd0c390420a51bbfd2933c065a1581d0 Mon Sep 17 00:00:00 2001 From: Andrew Janke Date: Thu, 25 Jun 2015 15:04:01 -0400 Subject: [PATCH 14/36] Move current_branch() from git plugin to core lib/git.zsh Fixes #4085: core -> plugin dependency issue. Rename it to git_current_branch for clarity that it's git-specific. Update all plugins that were calling it to use new name. Fix variable leaks by making more variables in lib/git.zsh local. Have lib/git.zsh use [[ ]] instead of [ ] everywhere. --- lib/git.zsh | 69 ++++++++++++++++++++-------------- plugins/git/git.plugin.zsh | 31 ++++++--------- themes/eastwood.zsh-theme | 4 +- themes/gallois.zsh-theme | 6 ++- themes/josh.zsh-theme | 4 +- themes/juanghurtado.zsh-theme | 4 +- themes/mortalscumbag.zsh-theme | 4 +- themes/peepcode.zsh-theme | 2 +- themes/sunrise.zsh-theme | 1 - 9 files changed, 64 insertions(+), 61 deletions(-) diff --git a/lib/git.zsh b/lib/git.zsh index 1e203c7c6..51e323a75 100644 --- a/lib/git.zsh +++ b/lib/git.zsh @@ -1,5 +1,6 @@ -# get the name of the branch we are on +# Outputs current branch info in prompt format function git_prompt_info() { + local ref if [[ "$(command git config --get oh-my-zsh.hide-status 2>/dev/null)" != "1" ]]; then ref=$(command git symbolic-ref HEAD 2> /dev/null) || \ ref=$(command git rev-parse --short HEAD 2> /dev/null) || return 0 @@ -7,9 +8,8 @@ function git_prompt_info() { fi } - # Checks if working tree is dirty -parse_git_dirty() { +function parse_git_dirty() { local STATUS='' local FLAGS FLAGS=('--porcelain') @@ -29,32 +29,26 @@ parse_git_dirty() { fi } -# get the difference between the local and remote branches -git_remote_status() { +# Gets the difference between the local and remote branches +function git_remote_status() { + local remote ahead behind git_remote_status git_remote_status_detailed remote=${$(command git rev-parse --verify ${hook_com[branch]}@{upstream} --symbolic-full-name 2>/dev/null)/refs\/remotes\/} - if [[ -n ${remote} ]] ; then + if [[ -n ${remote} ]]; then ahead=$(command git rev-list ${hook_com[branch]}@{upstream}..HEAD 2>/dev/null | wc -l) behind=$(command git rev-list HEAD..${hook_com[branch]}@{upstream} 2>/dev/null | wc -l) - if [ $ahead -eq 0 ] && [ $behind -eq 0 ] - then - git_remote_status="$ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE" - elif [ $ahead -gt 0 ] && [ $behind -eq 0 ] - then + if [[ $ahead -gt 0 ]] && [[ $behind -eq 0 ]]; then git_remote_status="$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE" git_remote_status_detailed="$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE_COLOR$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE$((ahead))%{$reset_color%}" - elif [ $behind -gt 0 ] && [ $ahead -eq 0 ] - then + elif [[ $behind -gt 0 ]] && [[ $ahead -eq 0 ]]; then git_remote_status="$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE" git_remote_status_detailed="$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE_COLOR$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE$((behind))%{$reset_color%}" - elif [ $ahead -gt 0 ] && [ $behind -gt 0 ] - then + elif [[ $ahead -gt 0 ]] && [[ $behind -gt 0 ]]; then git_remote_status="$ZSH_THEME_GIT_PROMPT_DIVERGED_REMOTE" git_remote_status_detailed="$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE_COLOR$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE$((ahead))%{$reset_color%}$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE_COLOR$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE$((behind))%{$reset_color%}" fi - if [ $ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_DETAILED ] - then + if [[ -n $ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_DETAILED ]]; then git_remote_status="$ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_PREFIX$remote$git_remote_status_detailed$ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_SUFFIX" fi @@ -62,31 +56,47 @@ git_remote_status() { fi } +# Outputs the name of the current branch +# Usage example: git pull origin $(git_current_branch) +# Using '--quiet' with 'symbolic-ref' will not cause a fatal error (128) if +# it's not a symbolic ref, but in a Git repo. +function git_current_branch() { + local ref + ref=$(command git symbolic-ref --quiet HEAD 2> /dev/null) + local ret=$? + if [[ $ret != 0 ]]; then + [[ $ret == 128 ]] && return # no git repo. + ref=$(command git rev-parse --short HEAD 2> /dev/null) || return + fi + echo ${ref#refs/heads/} +} + + # Gets the number of commits ahead from remote function git_commits_ahead() { if $(echo "$(command git log @{upstream}..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then - COMMITS=$(command git log @{upstream}..HEAD | grep '^commit' | wc -l | tr -d ' ') + local COMMITS=$(command git log @{upstream}..HEAD | grep '^commit' | wc -l | tr -d ' ') echo "$ZSH_THEME_GIT_COMMITS_AHEAD_PREFIX$COMMITS$ZSH_THEME_GIT_COMMITS_AHEAD_SUFFIX" fi } # Outputs if current branch is ahead of remote function git_prompt_ahead() { - if [[ -n "$(command git rev-list origin/$(current_branch)..HEAD 2> /dev/null)" ]]; then + if [[ -n "$(command git rev-list origin/$(git_current_branch)..HEAD 2> /dev/null)" ]]; then echo "$ZSH_THEME_GIT_PROMPT_AHEAD" fi } # Outputs if current branch is behind remote function git_prompt_behind() { - if [[ -n "$(command git rev-list HEAD..origin/$(current_branch) 2> /dev/null)" ]]; then + if [[ -n "$(command git rev-list HEAD..origin/$(git_current_branch) 2> /dev/null)" ]]; then echo "$ZSH_THEME_GIT_PROMPT_BEHIND" fi } # Outputs if current branch exists on remote or not function git_prompt_remote() { - if [[ -n "$(command git show-ref origin/$(current_branch) 2> /dev/null)" ]]; then + if [[ -n "$(command git show-ref origin/$(git_current_branch) 2> /dev/null)" ]]; then echo "$ZSH_THEME_GIT_PROMPT_REMOTE_EXISTS" else echo "$ZSH_THEME_GIT_PROMPT_REMOTE_MISSING" @@ -95,16 +105,17 @@ function git_prompt_remote() { # Formats prompt string for current git commit short SHA function git_prompt_short_sha() { - SHA=$(command git rev-parse --short HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER" + local SHA=$(command git rev-parse --short HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER" } # Formats prompt string for current git commit long SHA function git_prompt_long_sha() { - SHA=$(command git rev-parse HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER" + local SHA=$(command git rev-parse HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER" } # Get the status of the working tree -git_prompt_status() { +function git_prompt_status() { + local INDEX STATUS INDEX=$(command git status --porcelain -b 2> /dev/null) STATUS="" if $(echo "$INDEX" | command grep -E '^\?\? ' &> /dev/null); then @@ -150,9 +161,9 @@ git_prompt_status() { echo $STATUS } -#compare the provided version of git to the version installed and on path -#prints 1 if input version <= installed version -#prints -1 otherwise +# Compares the provided version of git to the version installed and on path +# Outputs -1, 0, or 1 if the installed version is less than, equal to, or +# greater than the input version, respectively. function git_compare_version() { local INPUT_GIT_VERSION=$1; local INSTALLED_GIT_VERSION @@ -173,7 +184,7 @@ function git_compare_version() { echo 0 } -#this is unlikely to change so make it all statically assigned +# This is unlikely to change so make it all statically assigned POST_1_7_2_GIT=$(git_compare_version "1.7.2") -#clean up the namespace slightly by removing the checker function +# Clean up the namespace slightly by removing the checker function unset -f git_compare_version diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index d78b82df3..b851fb97d 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -6,19 +6,12 @@ zstyle -s ":vcs_info:git:*:-all-" "command" _omz_git_git_cmd # Functions # -# The current branch name -# Usage example: git pull origin $(current_branch) -# Using '--quiet' with 'symbolic-ref' will not cause a fatal error (128) if -# it's not a symbolic ref, but in a Git repo. +# The name of the current branch +# Back-compatibility wrapper for when this function was defined here in +# the plugin, before being pulled in to core lib/git.zsh as git_current_branch() +# to fix the core -> git plugin dependency. function current_branch() { - local ref - ref=$($_omz_git_git_cmd symbolic-ref --quiet HEAD 2> /dev/null) - local ret=$? - if [[ $ret != 0 ]]; then - [[ $ret == 128 ]] && return # no git repo. - ref=$($_omz_git_git_cmd rev-parse --short HEAD 2> /dev/null) || return - fi - echo ${ref#refs/heads/} + git_current_branch } # The list of remotes function current_repository() { @@ -99,7 +92,7 @@ alias gfo='git fetch origin' alias gg='git gui citool' alias gga='git gui citool --amend' ggf() { -[[ "$#" != 1 ]] && local b="$(current_branch)" +[[ "$#" != 1 ]] && local b="$(git_current_branch)" git push --force origin "${b:=$1}" } compdef _git ggf=git-checkout @@ -107,23 +100,23 @@ ggl() { if [[ "$#" != 0 ]] && [[ "$#" != 1 ]]; then git pull origin "${*}" else -[[ "$#" == 0 ]] && local b="$(current_branch)" +[[ "$#" == 0 ]] && local b="$(git_current_branch)" git pull origin "${b:=$1}" fi } compdef _git ggl=git-checkout -alias ggpull='git pull origin $(current_branch)' +alias ggpull='git pull origin $(git_current_branch)' compdef _git ggpull=git-checkout ggp() { if [[ "$#" != 0 ]] && [[ "$#" != 1 ]]; then git push origin "${*}" else -[[ "$#" == 0 ]] && local b="$(current_branch)" +[[ "$#" == 0 ]] && local b="$(git_current_branch)" git push origin "${b:=$1}" fi } compdef _git ggp=git-checkout -alias ggpush='git push origin $(current_branch)' +alias ggpush='git push origin $(git_current_branch)' compdef _git ggpush=git-checkout ggpnp() { if [[ "$#" == 0 ]]; then @@ -133,9 +126,9 @@ ggl "${*}" && ggp "${*}" fi } compdef _git ggpnp=git-checkout -alias ggsup='git branch --set-upstream-to=origin/$(current_branch)' +alias ggsup='git branch --set-upstream-to=origin/$(git_current_branch)' ggu() { -[[ "$#" != 1 ]] && local b="$(current_branch)" +[[ "$#" != 1 ]] && local b="$(git_current_branch)" git pull --rebase origin "${b:=$1}" } compdef _git ggu=git-checkout diff --git a/themes/eastwood.zsh-theme b/themes/eastwood.zsh-theme index 1b284cdc2..88134f8e6 100644 --- a/themes/eastwood.zsh-theme +++ b/themes/eastwood.zsh-theme @@ -14,9 +14,9 @@ ZSH_THEME_GIT_PROMPT_CLEAN="" # Customized git status, oh-my-zsh currently does not allow render dirty status before branch git_custom_status() { - local cb=$(current_branch) + local cb=$(git_current_branch) if [ -n "$cb" ]; then - echo "$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_PREFIX$(current_branch)$ZSH_THEME_GIT_PROMPT_SUFFIX" + echo "$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_PREFIX$(git_current_branch)$ZSH_THEME_GIT_PROMPT_SUFFIX" fi } diff --git a/themes/gallois.zsh-theme b/themes/gallois.zsh-theme index d383ed583..515325e38 100644 --- a/themes/gallois.zsh-theme +++ b/themes/gallois.zsh-theme @@ -1,3 +1,5 @@ +# Depends on the git plugin for work_in_progress() + ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[green]%}[" ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%}" ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}*%{$reset_color%}" @@ -5,9 +7,9 @@ ZSH_THEME_GIT_PROMPT_CLEAN="" #Customized git status, oh-my-zsh currently does not allow render dirty status before branch git_custom_status() { - local cb=$(current_branch) + local cb=$(git_current_branch) if [ -n "$cb" ]; then - echo "$(parse_git_dirty)%{$fg_bold[yellow]%}$(work_in_progress)%{$reset_color%}$ZSH_THEME_GIT_PROMPT_PREFIX$(current_branch)$ZSH_THEME_GIT_PROMPT_SUFFIX" + echo "$(parse_git_dirty)%{$fg_bold[yellow]%}$(work_in_progress)%{$reset_color%}$ZSH_THEME_GIT_PROMPT_PREFIX$(git_current_branch)$ZSH_THEME_GIT_PROMPT_SUFFIX" fi } diff --git a/themes/josh.zsh-theme b/themes/josh.zsh-theme index 12dfe4069..c8f0f4dd7 100644 --- a/themes/josh.zsh-theme +++ b/themes/josh.zsh-theme @@ -9,7 +9,7 @@ function josh_prompt { (( spare_width = ${COLUMNS} )) prompt=" " - branch=$(current_branch) + branch=$(git_current_branch) ruby_version=$(rvm_prompt_info || rbenv_prompt_info) path_size=${#PWD} branch_size=${#branch} @@ -31,7 +31,7 @@ function josh_prompt { prompt=" $prompt" done - prompt="%{%F{green}%}$PWD$prompt%{%F{red}%}$(rvm_prompt_info || rbenv_prompt_info)%{$reset_color%} $(current_branch)" + prompt="%{%F{green}%}$PWD$prompt%{%F{red}%}$(rvm_prompt_info || rbenv_prompt_info)%{$reset_color%} $(git_current_branch)" echo $prompt } diff --git a/themes/juanghurtado.zsh-theme b/themes/juanghurtado.zsh-theme index bc470e838..dbdfde7b8 100644 --- a/themes/juanghurtado.zsh-theme +++ b/themes/juanghurtado.zsh-theme @@ -1,5 +1,3 @@ -# Needs Git plugin for current_branch method - # Color shortcuts RED=$fg[red] YELLOW=$fg[yellow] @@ -40,4 +38,4 @@ ZSH_THEME_GIT_PROMPT_SHA_AFTER="%{$WHITE%}]" PROMPT=' %{$GREEN_BOLD%}%n@%m%{$WHITE%}:%{$YELLOW%}%~%u$(parse_git_dirty)$(git_prompt_ahead)%{$RESET_COLOR%} %{$BLUE%}>%{$RESET_COLOR%} ' -RPROMPT='%{$GREEN_BOLD%}$(current_branch)$(git_prompt_short_sha)$(git_prompt_status)%{$RESET_COLOR%}' +RPROMPT='%{$GREEN_BOLD%}$(git_current_branch)$(git_prompt_short_sha)$(git_prompt_status)%{$RESET_COLOR%}' diff --git a/themes/mortalscumbag.zsh-theme b/themes/mortalscumbag.zsh-theme index ccce4197a..55ece9760 100644 --- a/themes/mortalscumbag.zsh-theme +++ b/themes/mortalscumbag.zsh-theme @@ -5,7 +5,7 @@ function my_git_prompt() { STATUS="" # is branch ahead? - if $(echo "$(git log origin/$(current_branch)..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then + if $(echo "$(git log origin/$(git_current_branch)..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_AHEAD" fi @@ -37,7 +37,7 @@ function my_git_prompt() { } function my_current_branch() { - echo $(current_branch || echo "(no branch)") + echo $(git_current_branch || echo "(no branch)") } function ssh_connection() { diff --git a/themes/peepcode.zsh-theme b/themes/peepcode.zsh-theme index ca2a8862f..96e4f1192 100644 --- a/themes/peepcode.zsh-theme +++ b/themes/peepcode.zsh-theme @@ -28,7 +28,7 @@ git_dirty() { } git_prompt() { - local cb=$(current_branch) + local cb=$(git_current_branch) if [ -n "$cb" ]; then local repo_path=$(git_repo_path) echo " %{$fg_bold[grey]%}$cb %{$fg[white]%}$(git_commit_id)%{$reset_color%}$(git_mode)$(git_dirty)" diff --git a/themes/sunrise.zsh-theme b/themes/sunrise.zsh-theme index 28befd01b..57d2649c6 100644 --- a/themes/sunrise.zsh-theme +++ b/themes/sunrise.zsh-theme @@ -1,6 +1,5 @@ # Sunrise theme for oh-my-zsh # Intended to be used with Solarized: http://ethanschoonover.com/solarized -# (Needs Git plugin for current_branch method) # Color shortcuts R=$fg_no_bold[red] From 18ca953f12ef41395536776c9bfb5bc76b40b814 Mon Sep 17 00:00:00 2001 From: Robin Hallabro Date: Mon, 29 Jun 2015 07:48:35 +0200 Subject: [PATCH 15/36] Use consistent wording when updating When the user is asked to update oh-my-zsh it says "[Oh My Zsh] Would you like to check for updates? [Y/n]:". When the user agreed to update the next text would say "Upgrading Oh My Zsh" which is inconsistent with the question. --- tools/upgrade.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/upgrade.sh b/tools/upgrade.sh index fe8fbadca..d5e7e8ba8 100644 --- a/tools/upgrade.sh +++ b/tools/upgrade.sh @@ -20,7 +20,7 @@ else NORMAL="" fi -printf "${BLUE}%s${NORMAL}\n" "Upgrading Oh My Zsh" +printf "${BLUE}%s${NORMAL}\n" "Updating Oh My Zsh" cd "$ZSH" if git pull --rebase --stat origin master then From a8157293a776cdf8bd7c192033ab369a2f7bb9cb Mon Sep 17 00:00:00 2001 From: cknoblauch Date: Tue, 6 Oct 2015 18:22:26 -0300 Subject: [PATCH 16/36] colored-man plugin: Quoted PATH variable Some environments (in my case, cygwin) have PATH variables with directories with spaces in them, breaking colored-man. Adding quotes around the PATH environment variable makes the plugin run OK. --- plugins/colored-man-pages/colored-man-pages.plugin.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/colored-man-pages/colored-man-pages.plugin.zsh b/plugins/colored-man-pages/colored-man-pages.plugin.zsh index 5c613f49d..8ff240bf4 100644 --- a/plugins/colored-man-pages/colored-man-pages.plugin.zsh +++ b/plugins/colored-man-pages/colored-man-pages.plugin.zsh @@ -27,6 +27,6 @@ man() { LESS_TERMCAP_us=$(printf "\e[1;32m") \ PAGER=/usr/bin/less \ _NROFF_U=1 \ - PATH=${HOME}/bin:${PATH} \ + PATH="$HOME/bin:$PATH" \ man "$@" } From 09d2a597a588abd69647c37b082009125ae07b9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Cornell=C3=A0?= Date: Tue, 15 Dec 2015 04:09:31 +0100 Subject: [PATCH 17/36] Fix style of colored-man-pages plugin --- .../colored-man-pages.plugin.zsh | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/plugins/colored-man-pages/colored-man-pages.plugin.zsh b/plugins/colored-man-pages/colored-man-pages.plugin.zsh index 8ff240bf4..dd0f241f0 100644 --- a/plugins/colored-man-pages/colored-man-pages.plugin.zsh +++ b/plugins/colored-man-pages/colored-man-pages.plugin.zsh @@ -1,32 +1,32 @@ -if [ "$OSTYPE[0,7]" = "solaris" ] +if [ "$OSTYPE" = solaris* ] then - if [ ! -x ${HOME}/bin/nroff ] + if [ ! -x "$HOME/bin/nroff" ] then - mkdir -p ${HOME}/bin - cat > ${HOME}/bin/nroff < "$HOME/bin/nroff" < Date: Tue, 15 Dec 2015 09:35:29 +0100 Subject: [PATCH 18/36] znt: more optimizing workarounds for 5.0.6 <= zsh < 5.2 --- plugins/zsh-navigation-tools/README.md | 2 +- plugins/zsh-navigation-tools/n-list | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/plugins/zsh-navigation-tools/README.md b/plugins/zsh-navigation-tools/README.md index 630b2e840..4420dab82 100644 --- a/plugins/zsh-navigation-tools/README.md +++ b/plugins/zsh-navigation-tools/README.md @@ -105,7 +105,7 @@ colorize output of the tools, via their config files (check out e.g. n-cd.conf, it uses this). ## Performance -ZNT are fastest with Zsh before 5.0.8 and starting from 5.2 +ZNT are fastest with Zsh before 5.0.6 and starting from 5.2 vim:filetype=conf diff --git a/plugins/zsh-navigation-tools/n-list b/plugins/zsh-navigation-tools/n-list index d13e048bf..388712bd0 100644 --- a/plugins/zsh-navigation-tools/n-list +++ b/plugins/zsh-navigation-tools/n-list @@ -243,7 +243,9 @@ while (( 1 )); do # Take all elements, including duplicates and non-selectables typeset +U list - list=( "$@" ) + repeat 1; do + list=( "$@" ) + done # Remove non-selectable elements [ "$#NLIST_NONSELECTABLE_ELEMENTS" -gt 0 ] && for i in "${(nO)NLIST_NONSELECTABLE_ELEMENTS[@]}"; do @@ -309,7 +311,9 @@ while (( 1 )); do # Take all elements, including duplicates and non-selectables typeset +U list - list=( "$@" ) + repeat 1; do + list=( "$@" ) + done # Remove non-selectable elements only when in uniq mode [ "$NLIST_IS_UNIQ_MODE" -eq 1 ] && [ "$#NLIST_NONSELECTABLE_ELEMENTS" -gt 0 ] && From 8042394c7892b06d08e01907ab5d9887c10a252f Mon Sep 17 00:00:00 2001 From: Giordano Vicari Date: Tue, 15 Dec 2015 11:14:25 +0100 Subject: [PATCH 19/36] Update gulp.plugin.zsh Sort pipe dropped and fix 2>/dev/null --- plugins/gulp/gulp.plugin.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/gulp/gulp.plugin.zsh b/plugins/gulp/gulp.plugin.zsh index 587549526..2b3105135 100644 --- a/plugins/gulp/gulp.plugin.zsh +++ b/plugins/gulp/gulp.plugin.zsh @@ -20,7 +20,7 @@ # in the current directory. # function $$gulp_completion { - compls=$(gulp --tasks-simple >/dev/null | sort) + compls=$(gulp --tasks-simple 2>/dev/null) completions=(${=compls}) compadd -- $completions From 4f314e2a326a0b0934ed7df214b24c2b91f1c82d Mon Sep 17 00:00:00 2001 From: Giordano Vicari Date: Tue, 15 Dec 2015 11:41:36 +0100 Subject: [PATCH 20/36] Update gulp.plugin.zsh Add local stuff --- plugins/gulp/gulp.plugin.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/gulp/gulp.plugin.zsh b/plugins/gulp/gulp.plugin.zsh index 2b3105135..e941d5a6a 100644 --- a/plugins/gulp/gulp.plugin.zsh +++ b/plugins/gulp/gulp.plugin.zsh @@ -20,9 +20,9 @@ # in the current directory. # function $$gulp_completion { - compls=$(gulp --tasks-simple 2>/dev/null) + local compls=$(gulp --tasks-simple 2>/dev/null) - completions=(${=compls}) + local completions=(${=compls}) compadd -- $completions } From 5e310c530814e80b73b166f215225f7fca8be119 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Cornell=C3=A0?= Date: Tue, 15 Dec 2015 11:52:48 +0100 Subject: [PATCH 21/36] Fix syntax error in colored-man-pages Commit 09d2a597a5 introduced the bug, which is due to using single brackets conditions at the same time as *. This commit should fix it and use double brackets everywhere else. Fixes #4699 --- plugins/colored-man-pages/colored-man-pages.plugin.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/colored-man-pages/colored-man-pages.plugin.zsh b/plugins/colored-man-pages/colored-man-pages.plugin.zsh index dd0f241f0..44e0c71a1 100644 --- a/plugins/colored-man-pages/colored-man-pages.plugin.zsh +++ b/plugins/colored-man-pages/colored-man-pages.plugin.zsh @@ -1,6 +1,6 @@ -if [ "$OSTYPE" = solaris* ] +if [[ "$OSTYPE" = solaris* ]] then - if [ ! -x "$HOME/bin/nroff" ] + if [[ ! -x "$HOME/bin/nroff" ]] then mkdir -p "$HOME/bin" cat > "$HOME/bin/nroff" < Date: Tue, 15 Dec 2015 03:06:23 +0100 Subject: [PATCH 22/36] Add hub's completion file This uses the version at commit 35c76bf (2015-12-08) https://github.com/github/hub/commit/35c76bf91dc3d699173599464b9b41cb877ee440 --- plugins/github/_hub | 163 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 163 insertions(+) create mode 100644 plugins/github/_hub diff --git a/plugins/github/_hub b/plugins/github/_hub new file mode 100644 index 000000000..3a6493878 --- /dev/null +++ b/plugins/github/_hub @@ -0,0 +1,163 @@ +#compdef hub + +# Zsh will source this file when attempting to autoload the "_hub" function, +# typically on the first attempt to complete the hub command. We define two new +# setup helper routines (one for the zsh-distributed version, one for the +# git-distributed, bash-based version). Then we redefine the "_hub" function to +# call "_git" after some other interception. +# +# This is pretty fragile, if you think about it. Any number of implementation +# changes in the "_git" scripts could cause problems down the road. It would be +# better if the stock git completions were just a bit more permissive about how +# it allowed third-party commands to be added. + +(( $+functions[__hub_setup_zsh_fns] )) || +__hub_setup_zsh_fns () { + (( $+functions[_git-alias] )) || + _git-alias () { + _arguments \ + '-s[output shell script suitable for eval]' \ + '1::shell:(zsh bash csh)' + } + + (( $+functions[_git-browse] )) || + _git-browse () { + _arguments \ + '-u[output the URL]' \ + '2::subpage:(wiki commits issues)' + } + + (( $+functions[_git-compare] )) || + _git-compare () { + _arguments \ + '-u[output the URL]' \ + ':[start...]end range:' + } + + (( $+functions[_git-create] )) || + _git-create () { + _arguments \ + '::name (REPOSITORY or ORGANIZATION/REPOSITORY):' \ + '-p[make repository private]' \ + '-d[description]:description' \ + '-h[home page]:repository home page URL:_urls' + } + + (( $+functions[_git-fork] )) || + _git-fork () { + _arguments \ + '--no-remote[do not add a remote for the new fork]' + } + + (( $+functions[_git-pull-request] )) || + _git-pull-request () { + _arguments \ + '-f[force (skip check for local commits)]' \ + '-b[base]:base ("branch", "owner\:branch", "owner/repo\:branch"):' \ + '-h[head]:head ("branch", "owner\:branch", "owner/repo\:branch"):' \ + - set1 \ + '-m[message]' \ + '-F[file]' \ + '-a[user]' \ + '-M[milestone]' \ + '-l[labels]' \ + - set2 \ + '-i[issue]:issue number:' \ + - set3 \ + '::issue-url:_urls' + } + + # stash the "real" command for later + functions[_hub_orig_git_commands]=$functions[_git_commands] + + # Replace it with our own wrapper. + declare -f _git_commands >& /dev/null && unfunction _git_commands + _git_commands () { + local ret=1 + # call the original routine + _call_function ret _hub_orig_git_commands + + # Effectively "append" our hub commands to the behavior of the original + # _git_commands function. Using this wrapper function approach ensures + # that we only offer the user the hub subcommands when the user is + # actually trying to complete subcommands. + hub_commands=( + alias:'show shell instructions for wrapping git' + pull-request:'open a pull request on GitHub' + fork:'fork origin repo on GitHub' + create:'create new repo on GitHub for the current project' + browse:'browse the project on GitHub' + compare:'open GitHub compare view' + ci-status:'lookup commit in GitHub Status API' + ) + _describe -t hub-commands 'hub command' hub_commands && ret=0 + + return ret + } +} + +(( $+functions[__hub_setup_bash_fns] )) || +__hub_setup_bash_fns () { + # TODO more bash-style fns needed here to complete subcommand args. They take + # the form "_git_CMD" where "CMD" is something like "pull-request". + + # Duplicate and rename the 'list_all_commands' function + eval "$(declare -f __git_list_all_commands | \ + sed 's/__git_list_all_commands/__git_list_all_commands_without_hub/')" + + # Wrap the 'list_all_commands' function with extra hub commands + __git_list_all_commands() { + cat <<-EOF +alias +pull-request +fork +create +browse +compare +ci-status +EOF + __git_list_all_commands_without_hub + } + + # Ensure cached commands are cleared + __git_all_commands="" +} + +# redefine _hub to a much smaller function in the steady state +_hub () { + # only attempt to intercept the normal "_git" helper functions once + (( $+__hub_func_replacement_done )) || + () { + # At this stage in the shell's execution the "_git" function has not yet + # been autoloaded, so the "_git_commands" or "__git_list_all_commands" + # functions will not be defined. Call it now (with a bogus no-op service + # to prevent premature completion) so that we can wrap them. + if declare -f _git >& /dev/null ; then + _hub_noop () { __hub_zsh_provided=1 } # zsh-provided will call this one + __hub_noop_main () { __hub_git_provided=1 } # git-provided will call this one + local service=hub_noop + _git + unfunction _hub_noop + unfunction __hub_noop_main + service=git + fi + + if (( $__hub_zsh_provided )) ; then + __hub_setup_zsh_fns + elif (( $__hub_git_provided )) ; then + __hub_setup_bash_fns + fi + + __hub_func_replacement_done=1 + } + + # Now perform the actual completion, allowing the "_git" function to call our + # replacement "_git_commands" function as needed. Both versions expect + # service=git or they will call nonexistent routines or end up in an infinite + # loop. + service=git + declare -f _git >& /dev/null && _git +} + +# make sure we actually attempt to complete on the first "tab" from the user +_hub From 015437cab8676749ec4f181b0bdc813aa5d406e8 Mon Sep 17 00:00:00 2001 From: Giordano Vicari Date: Tue, 15 Dec 2015 12:14:41 +0100 Subject: [PATCH 23/36] Update gulp.plugin.zsh Remove `local` stuff that cause an error in shell --- plugins/gulp/gulp.plugin.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/gulp/gulp.plugin.zsh b/plugins/gulp/gulp.plugin.zsh index e941d5a6a..2b3105135 100644 --- a/plugins/gulp/gulp.plugin.zsh +++ b/plugins/gulp/gulp.plugin.zsh @@ -20,9 +20,9 @@ # in the current directory. # function $$gulp_completion { - local compls=$(gulp --tasks-simple 2>/dev/null) + compls=$(gulp --tasks-simple 2>/dev/null) - local completions=(${=compls}) + completions=(${=compls}) compadd -- $completions } From 3ebbb40b31fa1ce9f10040742cdb06ea04fa7c41 Mon Sep 17 00:00:00 2001 From: Pavan Rikhi Date: Tue, 15 Dec 2015 10:53:13 -0500 Subject: [PATCH 24/36] colored-man-pages: Use Portable `less` Path --- plugins/colored-man-pages/colored-man-pages.plugin.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/colored-man-pages/colored-man-pages.plugin.zsh b/plugins/colored-man-pages/colored-man-pages.plugin.zsh index 44e0c71a1..54f0bdda9 100644 --- a/plugins/colored-man-pages/colored-man-pages.plugin.zsh +++ b/plugins/colored-man-pages/colored-man-pages.plugin.zsh @@ -25,7 +25,7 @@ man() { LESS_TERMCAP_so=$(printf "\e[1;44;33m") \ LESS_TERMCAP_ue=$(printf "\e[0m") \ LESS_TERMCAP_us=$(printf "\e[1;32m") \ - PAGER=/usr/bin/less \ + PAGER="${commands[less]:-$PAGER}" \ _NROFF_U=1 \ PATH="$HOME/bin:$PATH" \ man "$@" From 247a582d09d4d98d6695c2c88797d893be2f3bbd Mon Sep 17 00:00:00 2001 From: Paul Calabro Date: Tue, 15 Dec 2015 22:52:13 -0700 Subject: [PATCH 25/36] Fixed a typo. --- plugins/git-extras/git-extras.plugin.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/git-extras/git-extras.plugin.zsh b/plugins/git-extras/git-extras.plugin.zsh index 507bf1b25..0dcd630e8 100644 --- a/plugins/git-extras/git-extras.plugin.zsh +++ b/plugins/git-extras/git-extras.plugin.zsh @@ -4,7 +4,7 @@ # # Completion script for git-extras (http://github.com/tj/git-extras). # -# This depends on and reueses some of the internals of the _git completion +# This depends on and reuses some of the internals of the _git completion # function that ships with zsh itself. It will not work with the _git that ships # with git. # From 0842384987e73f258474b7af87032daee56a5bc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Cornell=C3=A0?= Date: Thu, 17 Dec 2015 18:37:49 +0100 Subject: [PATCH 26/36] Put `local var` declaration in its own line in lib/git.zsh In places, the local statement will override the exit code and the written command won't have the effect intended when it was written. For example, when it's not inside a git repo the exit code won't be true, but the local statement will make it true regardless. See #4708. --- lib/git.zsh | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/lib/git.zsh b/lib/git.zsh index 51e323a75..de51daafa 100644 --- a/lib/git.zsh +++ b/lib/git.zsh @@ -75,7 +75,8 @@ function git_current_branch() { # Gets the number of commits ahead from remote function git_commits_ahead() { if $(echo "$(command git log @{upstream}..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then - local COMMITS=$(command git log @{upstream}..HEAD | grep '^commit' | wc -l | tr -d ' ') + local COMMITS + COMMITS=$(command git log @{upstream}..HEAD | grep '^commit' | wc -l | tr -d ' ') echo "$ZSH_THEME_GIT_COMMITS_AHEAD_PREFIX$COMMITS$ZSH_THEME_GIT_COMMITS_AHEAD_SUFFIX" fi } @@ -105,12 +106,14 @@ function git_prompt_remote() { # Formats prompt string for current git commit short SHA function git_prompt_short_sha() { - local SHA=$(command git rev-parse --short HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER" + local SHA + SHA=$(command git rev-parse --short HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER" } # Formats prompt string for current git commit long SHA function git_prompt_long_sha() { - local SHA=$(command git rev-parse HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER" + local SHA + SHA=$(command git rev-parse HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER" } # Get the status of the working tree @@ -165,11 +168,10 @@ function git_prompt_status() { # Outputs -1, 0, or 1 if the installed version is less than, equal to, or # greater than the input version, respectively. function git_compare_version() { - local INPUT_GIT_VERSION=$1; - local INSTALLED_GIT_VERSION - INPUT_GIT_VERSION=(${(s/./)INPUT_GIT_VERSION}); - INSTALLED_GIT_VERSION=($(command git --version 2>/dev/null)); - INSTALLED_GIT_VERSION=(${(s/./)INSTALLED_GIT_VERSION[3]}); + local INPUT_GIT_VERSION INSTALLED_GIT_VERSION + INPUT_GIT_VERSION=(${(s/./)1}) + INSTALLED_GIT_VERSION=($(command git --version 2>/dev/null)) + INSTALLED_GIT_VERSION=(${(s/./)INSTALLED_GIT_VERSION[3]}) for i in {1..3}; do if [[ $INSTALLED_GIT_VERSION[$i] -gt $INPUT_GIT_VERSION[$i] ]]; then @@ -187,4 +189,4 @@ function git_compare_version() { # This is unlikely to change so make it all statically assigned POST_1_7_2_GIT=$(git_compare_version "1.7.2") # Clean up the namespace slightly by removing the checker function -unset -f git_compare_version +unfunction git_compare_version From fdde897debf11bda824c85a87743ae85ab26b47c Mon Sep 17 00:00:00 2001 From: Satoshi Ohmori Date: Sun, 3 Jan 2016 21:36:42 +0900 Subject: [PATCH 27/36] Update year to 2016 --- MIT-LICENSE.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MIT-LICENSE.txt b/MIT-LICENSE.txt index dfbd90035..b9a350de0 100644 --- a/MIT-LICENSE.txt +++ b/MIT-LICENSE.txt @@ -1,6 +1,6 @@ The MIT License -Copyright (c) 2009-2015 Robby Russell and contributors (see https://github.com/robbyrussell/oh-my-zsh/contributors) +Copyright (c) 2009-2016 Robby Russell and contributors (see https://github.com/robbyrussell/oh-my-zsh/contributors) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 03cc1f74f37c538dbc774051165bdd24ab05e586 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Cornell=C3=A0?= Date: Mon, 4 Jan 2016 17:17:20 +0100 Subject: [PATCH 28/36] Cleanup LICENSE file and fix README link --- MIT-LICENSE.txt | 13 +++++++------ README.markdown | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/MIT-LICENSE.txt b/MIT-LICENSE.txt index b9a350de0..42f607f5d 100644 --- a/MIT-LICENSE.txt +++ b/MIT-LICENSE.txt @@ -1,6 +1,7 @@ -The MIT License +The MIT License (MIT) -Copyright (c) 2009-2016 Robby Russell and contributors (see https://github.com/robbyrussell/oh-my-zsh/contributors) +Copyright (c) 2009-2016 Robby Russell and contributors +See the full list at https://github.com/robbyrussell/oh-my-zsh/contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -9,13 +10,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.markdown b/README.markdown index 9d7210f77..33128ef97 100644 --- a/README.markdown +++ b/README.markdown @@ -210,4 +210,4 @@ We have [stickers](http://shop.planetargon.com/products/ohmyzsh-stickers-set-of- ## License -Oh My Zsh is released under the [MIT license](https://github.com/robbyrussell/oh-my-zsh/blob/master/MIT-LICENSE.txt). +Oh My Zsh is released under the [MIT license](MIT-LICENSE.txt). From 3dfd2166faa0660cbdddf5df3cd902d9c87d3c3a Mon Sep 17 00:00:00 2001 From: Stefan Wrobel Date: Thu, 7 Jan 2016 17:31:03 -0800 Subject: [PATCH 29/36] chruby plugin locals moved inside function --- plugins/chruby/chruby.plugin.zsh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/chruby/chruby.plugin.zsh b/plugins/chruby/chruby.plugin.zsh index 164b4319f..758b4a56c 100644 --- a/plugins/chruby/chruby.plugin.zsh +++ b/plugins/chruby/chruby.plugin.zsh @@ -16,9 +16,6 @@ # rvm and rbenv plugins also provide this alias alias rubies='chruby' -local _chruby_path -local _chruby_auto - _homebrew-installed() { whence brew &> /dev/null } @@ -42,6 +39,9 @@ if _ruby-build_installed; then fi _source_from_omz_settings() { + local _chruby_path + local _chruby_auto + zstyle -s :omz:plugins:chruby path _chruby_path zstyle -s :omz:plugins:chruby auto _chruby_auto From 9dd8def1693afee18d47f97375b913d4d3e60cda Mon Sep 17 00:00:00 2001 From: Andrew Janke Date: Fri, 18 Dec 2015 16:47:48 -0500 Subject: [PATCH 30/36] forklift: update homepage URL and tweak formatting --- plugins/forklift/README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/forklift/README.md b/plugins/forklift/README.md index b452a357c..6c5cbab23 100644 --- a/plugins/forklift/README.md +++ b/plugins/forklift/README.md @@ -4,10 +4,12 @@ Plugin for ForkLift, an FTP application for OS X. ### Requirements -* [ForkLift](http://forkliftapp.com/forklift/) +* [ForkLift](http://www.binarynights.com/forklift/) ### Usage -* If `fl` is called without arguments then the current folder is opened in ForkLift. Is equivalent to `fl .` +fl [*file_or_folder*] -* If `fl` is called with a directory as the argument, then that directory is opened in ForkLift \ No newline at end of file +* If `fl` is called without arguments then the current folder is opened in ForkLift. This is equivalent to `fl .`. + +* If `fl` is called with a directory as the argument, then that directory is opened in ForkLift. If called with a non-directory file as the argument, then the file's parent directory is opened. From 87f8251388ed2d99a430fd7f9695b8dc1048d3d2 Mon Sep 17 00:00:00 2001 From: Michele Bologna Date: Wed, 13 Jan 2016 15:36:59 +0100 Subject: [PATCH 31/36] Re-added $ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE Re-added $ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE variable which was removed in 9f55213 --- lib/git.zsh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/git.zsh b/lib/git.zsh index de51daafa..f91b516bd 100644 --- a/lib/git.zsh +++ b/lib/git.zsh @@ -37,7 +37,9 @@ function git_remote_status() { ahead=$(command git rev-list ${hook_com[branch]}@{upstream}..HEAD 2>/dev/null | wc -l) behind=$(command git rev-list HEAD..${hook_com[branch]}@{upstream} 2>/dev/null | wc -l) - if [[ $ahead -gt 0 ]] && [[ $behind -eq 0 ]]; then + if [[ $ahead -eq 0 ]] && [[ $behind -eq 0 ]]; then + git_remote_status="$ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE" + elif [[ $ahead -gt 0 ]] && [[ $behind -eq 0 ]]; then git_remote_status="$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE" git_remote_status_detailed="$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE_COLOR$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE$((ahead))%{$reset_color%}" elif [[ $behind -gt 0 ]] && [[ $ahead -eq 0 ]]; then From b9ace281798c4c2565d57dc67d4c0687d9d36e82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CValentin?= <“valentin.bud@gmail.com”> Date: Thu, 31 Dec 2015 15:05:15 +0200 Subject: [PATCH 32/36] Vault basic autocompletion. --- plugins/vault/README.md | 18 ++ plugins/vault/_vault | 400 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 418 insertions(+) create mode 100644 plugins/vault/README.md create mode 100644 plugins/vault/_vault diff --git a/plugins/vault/README.md b/plugins/vault/README.md new file mode 100644 index 000000000..0f61c9410 --- /dev/null +++ b/plugins/vault/README.md @@ -0,0 +1,18 @@ +## Vault (https://www.vaultproject.io) autocomplete plugin + +- Adds autocomplete options for all vault commands. + +####Show help for all commands +![General Help](http://i.imgur.com/yv5Db1r.png "Help for all commands") + + +####Create new Vault token +![Create token](http://i.imgur.com/xMegNgh.png "Create token") + + +####Enable audit backends +![Audit backends](http://i.imgur.com/fKLeiSF.png "Audit backends") + + + +Crafted with <3 by Valentin Bud ([@valentinbud](https://twitter.com/valentinbud)) \ No newline at end of file diff --git a/plugins/vault/_vault b/plugins/vault/_vault new file mode 100644 index 000000000..c5338dffa --- /dev/null +++ b/plugins/vault/_vault @@ -0,0 +1,400 @@ +#compdef vault + +typeset -a main_args +main_args=( + '(-version)-version[Prints the Vault version]' + '(-help)-help[Prints Vault Help]' +) + +typeset -a general_args +general_args=( + '(-help)-help[Prints Help]' + '(-address)-address=-[The address of the Vault server. Overrides the VAULT_ADDR environment variable if set.]:address:' + '(-ca-cert)-ca-cert=-[Path to a PEM encoded CA cert file to use to verify the Vault server SSL certificate. Overrides the VAULT_CACERT environment variable if set.]:file:_files -g "*.pem"' + '(-ca-path)-ca-path=-[Path to a directory of PEM encoded CA cert files to verify the Vault server SSL certificate. If both -ca-cert and -ca-path are specified, -ca-path is used.Overrides the VAULT_CAPATH environment variable if set.]:directory:_directories' + '(-client-cert)-client-cert=-[Path to a PEM encoded client certificate for TLS authentication to the Vault server. Must also specify -client-key. Overrides the VAULT_CLIENT_CERT environment variable if set.]:file:_files -g "*.pem"' + '(-client-key)-client-key=-[Path to an unencrypted PEM encoded private key matching the client certificate from -client-cert. Overrides the VAULT_CLIENT_KEY environment variable if set.]:file:_files -g "*.pem"' + '(-tls-skip-verify)-tls-skip-verify[Do not verify TLS certificate. This is highly not recommended. Verification will also be skipped if VAULT_SKIP_VERIFY is set.]' +) + +typeset -a audit_enable_args +audit_enable_args=( + '(-description)-description=-[A human-friendly description for the backend. This shows up only when querying the enabled backends.]:description:' + '(-id)-id=-[Specify a unique ID for this audit backend. This is purely for referencing this audit backend. By default this will be the backend type.]:id:' +) + +typeset -a auth_args +auth_args=( + '(-method)-method=-[Outputs help for the authentication method with the given name for the remote server. If this authentication method is not available, exit with code 1.]:method:(cert ldap github userpass app-id)' + '(-method-help)-method-help[If set, the help for the selected method will be shown.]' + '(-methods)-methods[List the available auth methods.]' + '(-no-verify)-no-verify[Do not verify the token after creation; avoids a use count]' +) + +typeset -a auth_enable_args +auth_enable_args=( + '(-description)-description=-[Human-friendly description of the purpose for the auth provider. This shows up in the auth-list command.]:description:' + '(-path)-path=-[Mount point for the auth provider. This defaults to the type of the mount. This will make the auth provider available at "/auth/"]:path:' +) + +typeset -a init_args +init_args=( + '(-key-shares)-key-shares=-[(default: 5) The number of key shares to split the master key into.]:keyshares:' + '(-key-threshold)-key-threshold=-[(default: 3) The number of key shares required to reconstruct the master key.]:keythreshold:' + '(-pgp-keys)-pgp-keys[If provided, must be a comma-separated list of files on disk containing binary- or base64-format public PGP keys. The number of files must match "key-shares". The output unseal keys will encrypted and hex-encoded, in order, with the given public keys. If you want to use them with the "vault unseal" command, you will need to hex decode and decrypt; this will be the plaintext unseal key.]:pgpkeys:_files' +) + +typeset -a mount_tune_args +mount_tune_args=( + '(-default-lease-ttl)-default-lease-ttl=-[Default lease time-to-live for this backend. If not specified, uses the system default, or the previously set value. Set to "system" to explicitly set it to use the system default.]:defaultleasettl:' + '(-max-lease-ttl)-max-lease-ttl=-[Max lease time-to-live for this backend. If not specified, uses the system default, or the previously set value. Set to "system" to explicitly set it to use the system default.]:maxleasettl:' +) + +typeset -a mount_args +mount_args=( + $mount_tune_args + '(-path)-path=-[Mount point for the logical backend. This defauls to the type of the mount.]:path:' + '(-description)-description=-[Human-friendly description of the purpose for the mount. This shows up in the mounts command.]:description:' +) + +typeset -a rekey_args +rekey_args=( + $init_args + '(-init)-init[Initialize the rekey operation by setting the desired number of shares and the key threshold. This can only be done if no rekey is already initiated.]:init:' + '(-cancel)-cancel[Reset the rekey process by throwing away prior keys and the rekey configuration.]:cancel:' + '(-status)-status[Prints the status of the current rekey operation. This can be used to see the status without attempting to provide an unseal key.]:status:' +) + +typeset -a ssh_args +ssh_args=( + '(-role)-role[Role to be used to create the key. ]:role:' + '(-no-exec)-no-exec[Shows the credentials but does not establish connection.]:noexec:' + '(-mount-point)-mount-point[Mount point of SSH backend. If the backend is mounted at "ssh", which is the default as well, this parameter can be skipped.]:mountpoint:' + '(-format)-format[If no-exec option is enabled, then the credentials will be printed out and SSH connection will not be established. The format of the output can be "json" or "table". JSON output is useful when writing scripts. Default is "table".]:format:(json table)' +) + +typeset -a token_create_args +token_create_args=( + '(-id)-id=-[The token value that clients will use to authenticate with vault. If not provided this defaults to a 36 character UUID. A root token is required to specify the ID of a token.]:id:' + '(-display-name)-display-name=-[A display name to associate with this token. This is a non-security sensitive value used to help identify created secrets, i.e. prefixes.]:displayname:' + '(-ttl)-ttl=-[TTL to associate with the token. This option enables the tokens to be renewable.]:ttl:' + '*-metadata=-[Metadata to associate with the token. This shows up in the audit log. This can be specified multiple times.]:metadata:' + '(-orphan)-orphan[If specified, the token will have no parent. Only root tokens can create orphan tokens. This prevents the new token from being revoked with your token.]:orphan:' + '(-no-default-policy)-no-default-policy[If specified, the token will not have the "default" policy included in its policy set.]:nodefaultpolicy:' + '*-policy=-[Policy to associate with this token. This can be specified multiple times.]:policy:__vault_policies' + '(-use-limit)-use-limit=-[The number of times this token can be used until it is automatically revoked.]:uselimit:' + '(-format)-format=-[The format for output. By default it is a whitespace-delimited table. This can also be json.]:format:(json table)' +) + +typeset -a server_args +server_args=( + '*-config=-[Path to the configuration file or directory. This can be specified multiple times. If it is a directory, all files with a ".hcl" or ".json" suffix will be loaded.]:config:_files' + '-dev[Enables Dev mode. In this mode, Vault is completely in-memory and unsealed. Do not run the Dev server in production!]:dev:' + '-log-level=-[Log verbosity. Defaults to "info", will be outputtedto stderr. Supported values: "trace", "debug", "info", "warn", "err"]:loglevel:(trace debug info warn err)' +) + +_vault_audit-list() { + _arguments : \ + ${general_args[@]} && ret=0 +} + +_vault_audit-disable() { + # vault audit-list doesn't print the backend id so for now + # no *smart* autocompletion for this subcommand. + _arguments : \ + ${general_args[@]} \ + ':::(file syslog)' && ret=0 +} + +_vault_audit-enable() { + _arguments : \ + ${general_args[@]} \ + ${audit_enable_args[@]} \ + ': :->backends' \ + '*:: :->backendconfig' && ret=0 + + case $state in + backends) + local -a backends + backends=( + 'file:The "file" audit backend writes audit logs to a file.' + 'syslog:The "syslog" audit backend writes audit logs to syslog.' + ) + _describe -t backends 'vault audit backends' backends && ret=0 + ;; + backendconfig) + case ${line[1]} in + file) + _values -w "Audit Backend File" \ + 'path[(required) - The path to where the file will be written. If this path exists, the audit backend will append to it.]:file:_files' \ + 'log_raw[(optional) Should security sensitive information be logged raw. Defaults to "false".]:log_raw:(true false)' && ret=0 + ;; + syslog) + _values -w "Audit Backend Syslog" \ + 'facility[(optional) - The syslog facility to use. Defaults to "AUTH".]:facility:(kern user mail daemon auth syslog lpr news uucp authpriv ftp cron local0 local1 local2 local3 local4 local5 local6 local7)' \ + 'tag[(optional) - The syslog tag to use. Defaults to "vault".]:tag:' \ + 'log_raw[(optional) Should security sensitive information be logged raw.]:log_raw:(true false)' && ret=0 + ;; + esac + ;; + esac +} + +_vault_auth() { + _arguments : \ + ${general_args[@]} \ + ${auth_args[@]} && ret=0 +} + +_vault_auth-enable() { + _arguments : \ + ${general_args[@]} \ + ${auth_enable_args[@]} \ + ':::(cert ldap github userpass app-id)' && ret=0 +} + +__vault_auth_methods() { + local -a authmethods + authmethods=($(vault auth -methods | awk 'NR>1{split ($1,a,"/"); print a[1]":["$2"]"}')) + _describe -t authmethods 'authmethods' authmethods && ret=0 +} + +_vault_auth-disable() { + _arguments : \ + ${general_args[@]} \ + ':::__vault_auth_methods' && ret=0 + +} + +_vault_init() { + _arguments : \ + ${general_args[@]} \ + ${init_args[@]} && ret=0 +} + +_vault_key-status() { + _arguments : \ + ${general_args[@]} && ret=0 +} + +__vault_mounts() { + local -a mounts + mounts=($(vault mounts | awk 'NR>1{split ($1,a,"/"); print a[1]":["$2"]"}')) + _describe -t mounts 'mounts' mounts && ret=0 +} + +_vault_mounts() { + _arguments : \ + ${general_args[@]} && ret=0 +} + +_vault_mount() { + # to find out how many types of backens are there + _arguments : \ + ${general_args[@]} \ + ${mount_args[@]} \ + ':::(generic ssh)' && ret=0 +} + +_vault_mount-tune() { + _arguments : \ + ${general_args[@]} \ + ${mount_tune_args[@]} \ + ':::__vault_mounts' && ret=0 +} + +_vault_unmount() { + _arguments : \ + ${general_args[@]} \ + ':::__vault_mounts' && ret=0 +} + +_vault_remount() { + _arguments : \ + ${general_args[@]} \ + ':::__vault_mounts' \ + ':::' && ret=0 +} + +__vault_policies() { + local -a policies + policies=($(vault policies | awk '{print $1":["$1"]"}')) + _describe -t policies 'policies' policies && ret=0 +} + +_vault_policies() { + _arguments : \ + ${general_args[@]} \ + ':::__vault_policies' && ret=0 +} + +_vault_policy-delete() { + _arguments : \ + ${general_args[@]} \ + ':::__vault_policies' && ret=0 +} + +_vault_policy-write() { + _arguments : \ + ${general_args[@]} \ + ': ::' \ + '::policy:_files' && ret=0 +} + +_vault_status() { + _arguments : \ + ${general_args[@]} && ret=0 +} + +_vault_rekey() { + _arguments : \ + ${general_args[@]} \ + ${rekey_args[@]} \ + ': ::' && ret=0 +} + +_vault_rotate() { + _arguments : \ + ${general_args[@]} && ret=0 +} + +_vault_seal() { + _arguments : \ + ${general_args[@]} && ret=0 +} + +_vault_ssh() { + _arguments : \ + ${general_args[@]} \ + ${ssh_args[@]} \ + ': ::' && ret=0 +} + +_vault_token-create() { + _arguments : \ + ${general_args[@]} \ + ${token_create_args[@]} && ret=0 +} + +_vault_token-renew() { + _arguments : \ + ${general_args[@]} \ + '(-format)-format=-[The format for output. By default it is a whitespace-delimited table. This can also be json.]:format:(json table)' \ + ': ::' \ + ': ::' && ret=0 +} + +_vault_token-revoke() { + _arguments : \ + ${general_args[@]} \ + '(-mode)-mode=-[The type of revocation to do. See the documentation above for more information.]:mode:( orphan path)' \ + ': ::' && ret=0 +} + +_vault_unseal() { + _arguments : \ + ${general_args[@]} \ + '(-reset)-reset[Reset the unsealing process by throwing away prior keys in process to unseal the vault.]:reset:' \ + ': ::' && ret=0 +} + +_vault_version() { + # no args +} + +_vault_delete() { + _arguments : \ + ${general_args[@]} \ + ': ::' && ret=0 +} + +_vault_path-help() { + _arguments : \ + ${general_args[@]} \ + ': ::' && ret=0 +} + +_vault_revoke() { + _arguments : \ + ${general_args[@]} \ + '(-format)-format=-[The format for output. By default it is a whitespace-delimited table. This can also be json.]:format:(json table)' \ + ': ::' \ + ': ::' && ret=0 +} + +_vault_server() { + _arguments : \ + ${server_args[@]} && ret=0 + +} + +_vault_write() { + _arguments : \ + ${general_args[@]} \ + '(-f -force)'{-f,-force}'[Force the write to continue without any data values specified. This allows writing to keys that do not need or expect any fields to be specified.]:force:' \ + ': ::' \ + ': ::' && ret=0 +} + +_vault_read() { + _arguments : \ + ${general_args[@]} \ + '(-format)-format=-[The format for output. By default it is a whitespace-delimited table. This can also be json.]:format:(json table)' \ + '(-field)-field=-[If included, the raw value of the specified field will be output raw to stdout.]:field:' \ + ': ::' && ret=0 +} + +_vault_commands() { + local -a commands + + commands=( + "delete":"Delete operation on secrets in Vault" + "path-help":"Look up the help for a path" + "read":"Read data or secrets from Vault" + "renew":"Renew the lease of a secret" + "revoke":"Revoke a secret" + "server":"Start a Vault server" + "status":"Outputs status of whether Vault is sealed and if HA mode is enabled" + "write":"Write secrets or configuration into Vault" + "audit-disable":"Disable an audit backend" + "audit-enable":"Enable an audit backend" + "audit-list":"Lists enabled audit backends in Vault" + "auth":"Prints information about how to authenticate with Vault" + "auth-disable":"Disable an auth provider" + "auth-enable":"Enable a new auth provider" + "init":"Initialize a new Vault server" + "key-status":"Provides information about the active encryption key" + "mount":"Mount a logical backend" + "mount-tune":"Tune mount configuration parameters" + "mounts":"Lists mounted backends in Vault" + "policies":"List the policies on the server" + "policy-delete":"Delete a policy from the server" + "policy-write":"Write a policy to the server" + "rekey":"Rekeys Vault to generate new unseal keys" + "remount":"Remount a secret backend to a new path" + "rotate":"Rotates the backend encryption key used to persist data" + "seal":"Seals the vault server" + "ssh":"Initiate a SSH session" + "token-create":"Create a new auth token" + "token-renew":"Renew an auth token if there is an associated lease" + "token-revoke":"Revoke one or more auth tokens" + "unmount":"Unmount a secret backend" + "unseal":"Unseals the vault server" + "version":"Prints the Vault version" + ) + + _describe -t commands 'vault command' commands && ret=0 +} + +local curcontext=$curcontext ret=1 +_arguments : \ + ${main_args[@]} \ + '*:: :->subcommands' && ret=0 +if ((CURRENT == 1 )); then + _vault_commands && ret=0 +fi +if [[ $state == subcommands ]]; then + # (( CURRENT -- )) + curcontext="${curcontext%:*:*}:vault-$words[1]:" + _call_function ret _vault_$words[1] +fi From 77f93f61c5ee6fea9131a1791bd3b106b4b8da4f Mon Sep 17 00:00:00 2001 From: Sebastian Gniazdowski Date: Thu, 7 Jan 2016 11:06:12 +0100 Subject: [PATCH 33/36] znt: optimizations for zsh<=5.2, use $BUFFER if cmd is not from history --- .../zsh-navigation-tools/.config/znt/n-cd.conf | 2 +- plugins/zsh-navigation-tools/README.md | 2 +- plugins/zsh-navigation-tools/n-history | 2 +- plugins/zsh-navigation-tools/n-list | 17 +++++++++++++---- plugins/zsh-navigation-tools/n-list-draw | 2 +- plugins/zsh-navigation-tools/n-list-input | 6 +++--- plugins/zsh-navigation-tools/znt-history-widget | 6 +++++- 7 files changed, 25 insertions(+), 12 deletions(-) diff --git a/plugins/zsh-navigation-tools/.config/znt/n-cd.conf b/plugins/zsh-navigation-tools/.config/znt/n-cd.conf index f8c49bfac..7ed7828ea 100644 --- a/plugins/zsh-navigation-tools/.config/znt/n-cd.conf +++ b/plugins/zsh-navigation-tools/.config/znt/n-cd.conf @@ -1,4 +1,5 @@ # Hotlist +# Try to use $ZSH_VERSION, e.g. /usr/share/zsh/$ZSH_VERSION/functions local hotlist hotlist=( ~/.config/znt @@ -7,7 +8,6 @@ hotlist=( /usr/local/share/zsh/site-functions /usr/local/share/zsh /usr/local/bin - /usr/lib ) # Suppress adding (to directory stack) directories visited by n-cd diff --git a/plugins/zsh-navigation-tools/README.md b/plugins/zsh-navigation-tools/README.md index 4420dab82..32a86bba9 100644 --- a/plugins/zsh-navigation-tools/README.md +++ b/plugins/zsh-navigation-tools/README.md @@ -25,7 +25,7 @@ widgets exist, znt-cd-widget and znt-kill-widget, they can be too assigned to key combinations (no need for autoload when using Oh My Zsh): zle -N znt-cd-widget - bindkey "^T" znt-cd-widget + bindkey "^A" znt-cd-widget zle -N znt-kill-widget bindkey "^Y" znt-kill-widget diff --git a/plugins/zsh-navigation-tools/n-history b/plugins/zsh-navigation-tools/n-history index c9e53316b..9f1d6279b 100644 --- a/plugins/zsh-navigation-tools/n-history +++ b/plugins/zsh-navigation-tools/n-history @@ -42,7 +42,7 @@ if [ "$REPLY" -gt 0 ]; then # ZLE? if [ "${(t)CURSOR}" = "integer-local-special" ]; then zle redisplay - zle kill-whole-line + zle kill-buffer zle -U "$selected" else print -zr "$selected" diff --git a/plugins/zsh-navigation-tools/n-list b/plugins/zsh-navigation-tools/n-list index 388712bd0..50159b4a0 100644 --- a/plugins/zsh-navigation-tools/n-list +++ b/plugins/zsh-navigation-tools/n-list @@ -1,6 +1,7 @@ # $1, $2, ... - elements of the list # $NLIST_NONSELECTABLE_ELEMENTS - array of indexes (1-based) that cannot be selected # $REPLY is the output variable - contains index (1-based) or -1 when no selection +# $reply (array) is the second part of the output - use the index (REPLY) to get selected element # # Copy this file into /usr/share/zsh/site-functions/ # and add 'autoload n-list` to .zshrc @@ -164,6 +165,7 @@ integer current_difference=0 local prev_search_buffer="" integer prev_uniq_mode=0 integer prev_start_idx=-1 +local MBEGIN MEND MATCH mbegin mend match # Ability to remember the list between calls if [[ -z "$NLIST_REMEMBER_STATE" || "$NLIST_REMEMBER_STATE" -eq 0 || "$NLIST_REMEMBER_STATE" -eq 2 ]]; then @@ -264,11 +266,15 @@ while (( 1 )); do local search_pattern="" local colsearch_pattern="" if [ -n "$search_buffer" ]; then - # Patterns will be *foo*~^*bar* and foo|bar) + # Patterns will be *foo*~^*bar* and (foo|bar) search_pattern="${search_buffer// ##/*~^*}" colsearch_pattern="${search_buffer// ##/|}" - list=( "${(@M)list:#(#i)*$~search_pattern*}" ) + # The repeat will make the matching work on a fresh heap + repeat 1; do + list=( "${(@M)list:#(#i)*$~search_pattern*}" ) + done + last_element="$#list" fi @@ -287,7 +293,10 @@ while (( 1 )); do if [ -n "$colsearch_pattern" ]; then local red=$'\x1b[00;31m' reset=$'\x1b[00;00m' - disp_list=( "${(@)disp_list//(#mi)($~colsearch_pattern)/$red${MATCH}$reset}" ) + # The repeat will make the matching work on a fresh heap + repeat 1; do + disp_list=( "${(@)disp_list//(#mi)($~colsearch_pattern)/$red${MATCH}$reset}" ) + done fi # We have display list, lets replace newlines with "\n" when needed (1/2) @@ -380,7 +389,7 @@ while (( 1 )); do # Get the special (i.e. "keypad") key or regular key if [ -n "$key" ]; then - final_key="$key" + final_key="$key" elif [ -n "$keypad" ]; then final_key="$keypad" else diff --git a/plugins/zsh-navigation-tools/n-list-draw b/plugins/zsh-navigation-tools/n-list-draw index 1b2571fbd..2f8b1d0d5 100644 --- a/plugins/zsh-navigation-tools/n-list-draw +++ b/plugins/zsh-navigation-tools/n-list-draw @@ -98,7 +98,7 @@ shift 7 integer max_text_len=page_width-x_offset [ "$bold" = "0" ] && bold="" || bold="+bold" -[[ "$active_text" = "underline" || "$active_text" = "reverse" ]] || active_text="reverse" +[[ "$active_text" = "underline" || "$active_text" = "reverse" ]] || local active_text="reverse" # With Linux terminal underline won't work properly [ "$TERM" = "linux" ] && active_text="reverse" diff --git a/plugins/zsh-navigation-tools/n-list-input b/plugins/zsh-navigation-tools/n-list-input index 380acdc00..957cd5a0b 100644 --- a/plugins/zsh-navigation-tools/n-list-input +++ b/plugins/zsh-navigation-tools/n-list-input @@ -44,7 +44,7 @@ case "$key" in [ "$current_idx" -lt "$last_element" ] && current_idx=current_idx+1; _nlist_compute_first_to_show_idx ;; - (PPAGE) + (PPAGE|$'\b'|$'\C-?'|BACKSPACE) current_idx=current_idx-page_height [ "$current_idx" -lt 1 ] && current_idx=1; _nlist_compute_first_to_show_idx @@ -72,7 +72,7 @@ case "$key" in current_idx=last_element _nlist_compute_first_to_show_idx ;; - ($'\n') + ($'\n'|ENTER) # Is that element selectable? # Check for this only when there is no search if [[ "$NLIST_SEARCH_BUFFER" != "" || "$NLIST_IS_UNIQ_MODE" -eq 1 || @@ -137,7 +137,7 @@ esac else case "$key" in - ($'\n') + ($'\n'|ENTER) search=0 _nlist_cursor_visibility 0 ;; diff --git a/plugins/zsh-navigation-tools/znt-history-widget b/plugins/zsh-navigation-tools/znt-history-widget index 9ddae606d..a4a26cbfc 100644 --- a/plugins/zsh-navigation-tools/znt-history-widget +++ b/plugins/zsh-navigation-tools/znt-history-widget @@ -1,7 +1,11 @@ autoload znt-usetty-wrapper n-history local NLIST_START_IN_SEARCH_MODE=1 local NLIST_START_IN_UNIQ_MODE=1 -local NLIST_SET_SEARCH_TO="$BUFFER" + +# Only if current $BUFFER doesn't come from history +if [ "$HISTCMD" = "$HISTNO" ]; then + local NLIST_SET_SEARCH_TO="$BUFFER" +fi znt-usetty-wrapper n-history "$@" From 7daa207dbc92afc9bf1ea5bc41ff3e7611409f52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Larivi=C3=A8re?= Date: Sat, 4 Apr 2015 20:24:24 -0400 Subject: [PATCH 34/36] Adding support for stdin input in the encode64 plugin --- plugins/encode64/encode64.plugin.zsh | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/plugins/encode64/encode64.plugin.zsh b/plugins/encode64/encode64.plugin.zsh index 53de6478a..979e06742 100644 --- a/plugins/encode64/encode64.plugin.zsh +++ b/plugins/encode64/encode64.plugin.zsh @@ -1,4 +1,17 @@ -encode64(){ printf '%s' $1 | base64 } -decode64(){ printf '%s' $1 | base64 --decode } +encode64() { + if [[ $# -eq 0 ]]; then + cat | base64 + else + printf '%s' $1 | base64 + fi +} + +decode64() { + if [[ $# -eq 0 ]]; then + cat | base64 --decode + else + printf '%s' $1 | base64 --decode + fi +} alias e64=encode64 alias d64=decode64 From 494b07b093aaaf3bdc05946cd5daae64847d4744 Mon Sep 17 00:00:00 2001 From: low-ghost Date: Wed, 23 Dec 2015 08:47:05 -0500 Subject: [PATCH 35/36] Update gitignore.plugin: comma separated arguments MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Seems like this is more like the intended effect, splits arguments with commas for proper gitignore.io api request. Thanks for teaching me about custom compdef completions! Updated with zsh join operator by Marc Cornellà --- plugins/gitignore/gitignore.plugin.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/gitignore/gitignore.plugin.zsh b/plugins/gitignore/gitignore.plugin.zsh index 481d487ba..ba1b38711 100644 --- a/plugins/gitignore/gitignore.plugin.zsh +++ b/plugins/gitignore/gitignore.plugin.zsh @@ -1,4 +1,4 @@ -function gi() { curl -sL https://www.gitignore.io/api/$@ ;} +function gi() { curl -sL https://www.gitignore.io/api/${(j:,:)@} } _gitignoreio_get_command_list() { curl -sL https://www.gitignore.io/api/list | tr "," "\n" From 5464fe3e4ad02a33243f42bcd8c91a287bc26185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Cornell=C3=A0?= Date: Mon, 18 Jan 2016 22:04:16 +0100 Subject: [PATCH 36/36] Center Oh My Zsh logo Also, fix a couple of typos / style issues. --- README.markdown | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.markdown b/README.markdown index 33128ef97..843c0c6ba 100644 --- a/README.markdown +++ b/README.markdown @@ -1,21 +1,21 @@ -![Oh My Zsh](https://s3.amazonaws.com/ohmyzsh/oh-my-zsh-logo.png) - +

+ Oh My Zsh +

Oh My Zsh is an open source, community-driven framework for managing your [zsh](http://www.zsh.org/) configuration. That sounds boring. Let's try this again. __Oh My Zsh is a way of life!__ Once installed, your terminal prompt will become the talk of the town _or your money back!_ Each time you interact with your command prompt, you'll be able to take advantage of the hundreds of bundled plugins and pretty themes. Strangers will come up to you in cafés and ask you, _"that is amazing. are you some sort of genius?"_ Finally, you'll begin to get the sort of attention that you always felt that you deserved. ...or maybe you'll just use the time that you saved to start flossing more often. -To learn more, visit [ohmyz.sh](http://ohmyz.sh) and/or follow [ohmyzsh](https://twitter.com/ohmyzsh) on Twitter. +To learn more, visit [ohmyz.sh](http://ohmyz.sh) and follow [@ohmyzsh](https://twitter.com/ohmyzsh) on Twitter. ## Getting Started - ### Prerequisites __Disclaimer:__ _Oh My Zsh works best on Mac OS X and Linux._ * Unix-based operating system (Mac OS X or Linux) -* [Zsh](http://www.zsh.org) should be installed (v4.3.9 or more recent). If not pre-installed (`zsh --version` to confirm), check the following instruction here: [Installing-ZSH](https://github.com/robbyrussell/oh-my-zsh/wiki/Installing-ZSH) +* [Zsh](http://www.zsh.org) should be installed (v4.3.9 or more recent). If not pre-installed (`zsh --version` to confirm), check the following instruction here: [Installing ZSH](https://github.com/robbyrussell/oh-my-zsh/wiki/Installing-ZSH) * `curl` or `wget` should be installed * `git` should be installed