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

LICENSE.txt

 The MIT License (MIT)
 
-Copyright (c) 2009-2016 Robby Russell and contributors
+Copyright (c) 2009-2017 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

lib/completion.zsh

@@ -5,7 +5,7 @@ WORDCHARS=''
 
 unsetopt menu_complete   # do not autoselect the first completion entry
 unsetopt flowcontrol
-setopt auto_menu         # show completion menu on succesive tab press
+setopt auto_menu         # show completion menu on successive tab press
 setopt complete_in_word
 setopt always_to_end
 

lib/functions.zsh

@@ -86,7 +86,7 @@ function default() {
 }
 
 #
-# Set enviroment variable "$1" to default value "$2" if "$1" is not yet defined.
+# Set environment variable "$1" to default value "$2" if "$1" is not yet defined.
 #
 # Arguments:
 #    1. name - The env variable to set

plugins/archlinux/README.md

@@ -73,6 +73,8 @@
 | pacupd       | sudo pacman -Sy                         | Update and refresh the local package database                |
 | pacupg       | sudo pacman -Syu                        | Sync with repositories before upgrading packages             |
 | upgrade      | sudo pacman -Syu                        | Sync with repositories before upgrading packages             |
+| pacfileupg   | sudo pacman -Fy                         | Download fresh package databases from the server             |
+| pacfiles     | pacman -Fs                              | Search package file names for matching strings.              |
 
 | Function       | Description                                          |
 |----------------|------------------------------------------------------|

plugins/archlinux/archlinux.plugin.zsh

@@ -82,6 +82,8 @@ alias pacinsd='sudo pacman -S --asdeps'
 alias pacmir='sudo pacman -Syy'
 alias paclsorphans='sudo pacman -Qdt'
 alias pacrmorphans='sudo pacman -Rs $(pacman -Qtdq)'
+alias pacfileupg='sudo pacman -Fy'
+alias pacfiles='pacman tFs'
 
 
 if (( $+commands[abs] && $+commands[aur] )); then

plugins/autoenv/autoenv.plugin.zsh

 # Activates autoenv or reports its failure
 () {
 if ! type autoenv_init >/dev/null; then
-  for d (~/.autoenv /usr/local/opt/autoenv /usr/local/bin); do
+  for d (~/.autoenv ~/.local/bin /usr/local/opt/autoenv /usr/local/bin); do
     if [[ -e $d/activate.sh ]]; then
       autoenv_dir=$d
       break

plugins/battery/battery.plugin.zsh

@@ -100,7 +100,7 @@ elif [[ "$OSTYPE" = linux*  ]] ; then
       else
         color='red'
       fi
-      echo "%{$fg[$color]%}[$(battery_pct_remaining)%%]%{$reset_color%}"
+      echo "%{$fg[$color]%}$(battery_pct_remaining)%%%{$reset_color%}"
     else
       echo "∞"
     fi

plugins/cask/README.md

-# cask plugin
+# Cask plugin
 
-Loads `cask` completion from non-standard locations, such as if installed
+[Cask](https://github.com/cask/cask) is a project management tool for Emacs that helps
+automate the package development cycle; development, dependencies, testing, building,
+packaging and more.
+
+This plugin loads `cask` completion from non-standard locations, such as if installed
 via Homebrew or others. To enable it, add `cask` to your plugins array:
 
 ```zsh
 plugins=(... cask)
 ```
 
-Make sure you have the `cask` directory in your `$PATH` before loading
-Oh My Zsh, otherwise you'll get the "command not found" error.
+Make sure you have the `cask` directory in your `$PATH` before loading Oh My Zsh,
+otherwise you'll get a "command not found" error.

plugins/composer/composer.plugin.zsh

@@ -39,14 +39,17 @@ alias c='composer'
 alias csu='composer self-update'
 alias cu='composer update'
 alias cr='composer require'
+alias crm='composer remove'
 alias ci='composer install'
 alias ccp='composer create-project'
 alias cdu='composer dump-autoload'
+alias cdo='composer dump-autoload --optimize-autoloader'
 alias cgu='composer global update'
 alias cgr='composer global require'
+alias cgrm='composer global remove'
 
 # install composer in the current directory
 alias cget='curl -s https://getcomposer.org/installer | php'
 
 # Add Composer's global binaries to PATH
-export PATH=$PATH:~/.composer/vendor/bin
+export PATH=$PATH:$(composer global config bin-dir --absolute) 2>/dev/null

plugins/dotenv/README.md

+# dotenv
+
+Automatically load your project ENV variables from `.env` file when you `cd` into project root directory.
+
+Storing configuration in the environment is one of the tenets of a [twelve-factor app](http://www.12factor.net). Anything that is likely to change between deployment environments–such as resource handles for databases or credentials for external services–should be extracted from the code into environment variables.
+
+## Installation
+
+Just add the plugin to your `.zshrc`:
+
+```sh
+plugins=(git man dotenv)
+```
+
+## Usage
+
+Create `.env` file inside your project directory and put your local ENV variables there.
+
+For example:
+```sh
+export AWS_S3_TOKEN=d84a83539134f28f412c652b09f9f98eff96c9a
+export SECRET_KEY=7c6c72d959416d5aa368a409362ec6e2ac90d7f
+export MONGO_URI=mongodb://127.0.0.1:27017
+export PORT=3001
+```
+`export` is optional. This format works as well:
+```sh
+AWS_S3_TOKEN=d84a83539134f28f412c652b09f9f98eff96c9a
+SECRET_KEY=7c6c72d959416d5aa368a409362ec6e2ac90d7f
+MONGO_URI=mongodb://127.0.0.1:27017
+PORT=3001
+```
+
+**It's strongly recommended to add `.env` file to `.gitignore`**, because usually it contains sensitive information such as your credentials, secret keys, passwords etc. You don't want to commit this file, it supposed to be local only.

plugins/dotenv/dotenv.plugin.zsh

+#!/bin/zsh
+
+source_env() {
+  if [[ -f .env ]]; then
+    source .env
+  fi
+}
+
+autoload -U add-zsh-hook
+add-zsh-hook chpwd source_env

plugins/droplr/README.md

 # droplr
 
-Use [Droplr](https://droplr.com/) from the comand line to upload files and shorten
+Use [Droplr](https://droplr.com/) from the command line to upload files and shorten
 links. It needs to have [Droplr.app](https://droplr.com/apps) installed and logged
 in. MacOS only.
 

plugins/git/git.plugin.zsh

@@ -43,6 +43,7 @@ alias g='git'
 alias ga='git add'
 alias gaa='git add --all'
 alias gapa='git add --patch'
+alias gau='git add --update'
 
 alias gb='git branch'
 alias gba='git branch -a'

plugins/gnu-utils/gnu-utils.plugin.zsh

@@ -52,7 +52,7 @@ if [[ -x "${commands[gwhoami]}" ]]; then
 
       #
       # This method is inflexible since the aliases are at risk of being
-      # overriden resulting in the BSD coreutils being called.
+      # overridden resulting in the BSD coreutils being called.
       #
       # (( ${+commands[$gcmd]} )) && \
       # alias "$gcmd[2,-1]"="${prefix}/${gcmd//"["/"\\["}"

plugins/gradle/gradle.plugin.zsh

@@ -24,29 +24,60 @@ function _gradle_core_commands() {
 function _gradle_arguments() {
     _arguments -C \
     '-a[Do not rebuild project dependencies]' \
-    '-h[Help]' \
-    '-D[System property]' \
+    '-b[Specifies the build file]' \
+    '-c[Specifies the settings file]' \
     '-d[Log at the debug level]' \
-    '--gui[Launches the Gradle GUI app]' \
-    '--stop[Stop the Gradle daemon]' \
-    '--daemon[Use the Gradle daemon]' \
-    '--no-daemon[Do not use the Gradle daemon]' \
-    '--rerun-task [Specifies that any task optimization is ignored.]' \
-    '-i[Log at the info level]' \
-    '-m[Dry run]' \
-    '-P[Set a project property]' \
-    '-p[Specifies the start directory]' \
-    '--profile[Profile the build time]' \
-    '-q[Log at the quiet level (only show errors)]' \
-    '-v[Print the Gradle version info]' \
+    '-g[Specifies the Gradle user home directory]' \
+    '-h[Shows a help message]' \
+    '-i[Set log level to INFO]' \
+    '-m[Runs the build with all task actions disabled]' \
+    '-p[Specifies the start directory for Gradle]' \
+    '-q[Log errors only]' \
+    '-s[Print out the stacktrace also for user exceptions]' \
+    '-t[Continuous mode. Automatically re-run build after changes]' \
+    '-u[Don''t search in parent directories for a settings.gradle file]' \
+    '-v[Prints Gradle version info]' \
     '-x[Specify a task to be excluded]' \
-    '-b[Specifies the build file.]' \
-    '-c[Specifies the settings file.]' \
-    '--continue[Continues task execution after a task failure.]' \
-    '-g[Specifies the Gradle user home directory.]' \
-    '-I[Specifies an initialization script.]' \
-    '--refresh-dependencies[Refresh the state of dependencies.]' \
-    '-u[Don''t search in parent directories for a settings.gradle file.]' \
+    '-D[Set a system property]' \
+    '-I[Specifies an initialization script]' \
+    '-P[Sets a project property of the root project]' \
+    '-S[Print out the full (very verbose) stacktrace]' \
+    '--build-file[Specifies the build file]' \
+    '--configure-on-demand[Only relevant projects are configured]' \
+    '--console[Type of console output to generate (plain, auto, or rich)]' \
+    '--continue[Continues task execution after a task failure]' \
+    '--continuous[Continuous mode. Automatically re-run build after changes]' \
+    '--daemon[Use the Gradle Daemon]' \
+    '--debug[Log at the debug level]' \
+    '--dry-run[Runs the build with all task actions disabled]' \
+    '--exclude-task[Specify a task to be excluded]' \
+    '--full-stacktrace[Print out the full (very verbose) stacktrace]' \
+    '--gradle-user-home[Specifies the Gradle user home directory]' \
+    '--gui[Launches the Gradle GUI app (Deprecated)]' \
+    '--help[Shows a help message]' \
+    '--include-build[Run the build as a composite, including the specified build]' \
+    '--info[Set log level to INFO]' \
+    '--init-script[Specifies an initialization script]' \
+    '--max-workers[Set the maximum number of workers that Gradle may use]' \
+    '--no-daemon[Do not use the Gradle Daemon]' \
+    '--no-rebuild[Do not rebuild project dependencies]' \
+    '--no-search-upwards[Don''t search in parent directories for a settings.gradle file]' \
+    '--offline[Build without accessing network resources]' \
+    '--parallel[Build projects in parallel]' \
+    '--profile[Profile build time and create report]' \
+    '--project-cache-dir[Specifies the project-specific cache directory]' \
+    '--project-dir[Specifies the start directory for Gradle]' \
+    '--project-prop[Sets a project property of the root project]' \
+    '--quiet[Log errors only]' \
+    '--recompile-scripts[Forces scripts to be recompiled, bypassing caching]' \
+    '--refresh-dependencies[Refresh the state of dependencies]' \
+    '--rerun-task[Specifies that any task optimization is ignored]' \
+    '--settings-file[Specifies the settings file]' \
+    '--stacktrace[Print out the stacktrace also for user exceptions]' \
+    '--status[Print Gradle Daemon status]' \
+    '--stop[Stop all Gradle Daemons]' \
+    '--system-prop[Set a system property]' \
+    '--version[Prints Gradle version info]' \
     '*::command:->command' \
     && return 0
 }
@@ -61,7 +92,7 @@ _gradle_does_task_list_need_generating () {
 }
 
 ##############
-# Parse the tasks from `gradle(w) tasks --all` into .gradletasknamecache
+# Parse the tasks from `gradle(w) tasks --all` and return them to the calling function.
 # All lines in the output from gradle(w) that are between /^-+$/ and /^\s*$/
 # are considered to be tasks. If and when gradle adds support for listing tasks
 # for programmatic parsing, this method can be deprecated.
@@ -76,7 +107,7 @@ _gradle_parse_tasks () {
       task_name_buffer=""
     elif [[ $line =~ ^\s*$ ]]; then
       if [[ "$lines_might_be_tasks" = true ]]; then
-        # If a newline is found, send the buffer to .gradletasknamecache
+        # If a newline is found, echo the buffer to the calling function
         while read -r task; do
           echo $task | awk '/[a-zA-Z0-9:-]+/ {print $1}'
         done <<< "$task_name_buffer"
@@ -90,6 +121,25 @@ _gradle_parse_tasks () {
   done <<< "$1"
 }
 
+
+##############
+# Gradle tasks from subprojects are allowed to be executed without specifying
+# the subproject; that task will then be called on all subprojects.
+# gradle(w) tasks --all only lists tasks per subproject, but when autocompleting
+# we often want to be able to run a specific task on all subprojects, e.g.
+# "gradle clean".
+# This function uses the list of tasks from "gradle tasks --all", and for each
+# line grabs everything after the last ":" and combines that output with the original
+# output. The combined list is returned as the result of this function.
+##############
+_gradle_parse_and_extract_tasks () {
+  # All tasks
+  tasks=$(_gradle_parse_tasks "$1")
+  # Task name without sub project(s) prefix
+  simple_tasks=$(echo $tasks | awk 'BEGIN { FS = ":" } { print $NF }')
+  echo "$tasks\n$simple_tasks"
+}
+
 ##############################################################################
 # Discover the gradle tasks by running "gradle tasks --all"
 ############################################################################
@@ -97,7 +147,7 @@ _gradle_tasks () {
   if [[ -f build.gradle ]]; then
     _gradle_arguments
     if _gradle_does_task_list_need_generating; then
-      _gradle_parse_tasks "$(gradle tasks --all)" > .gradletasknamecache
+      _gradle_parse_and_extract_tasks "$(gradle tasks --all)" > .gradletasknamecache
     fi
     compadd -X "==== Gradle Tasks ====" $(cat .gradletasknamecache)
   fi
@@ -107,7 +157,7 @@ _gradlew_tasks () {
   if [[ -f build.gradle ]]; then
     _gradle_arguments
     if _gradle_does_task_list_need_generating; then
-      _gradle_parse_tasks "$(./gradlew tasks --all)" > .gradletasknamecache
+      _gradle_parse_and_extract_tasks "$(./gradlew tasks --all)" > .gradletasknamecache
     fi
     compadd -X "==== Gradlew Tasks ====" $(cat .gradletasknamecache)
   fi

plugins/heroku/_heroku

@@ -31,6 +31,10 @@ _1st_arguments=(
   "domains\:add":"add a custom domain to an app"
   "domains\:remove":"remove a custom domain from an app"
   "domains\:clear":"remove all custom domains from an app"
+  "features":"list available app features"
+  "features\:disable":"disables a feature"
+  "features\:enable":"enables an feature"
+  "features\:info":"displays additional information about feature"
   "help":"list available commands or display help for a specific command"
   "keys":"display keys for the current user"
   "keys\:add":"add a key for the current user"
@@ -144,5 +148,4 @@ _arguments \
   '(--app)--app[the app name]' \
   '(--remote)--remote[the remote name]' \
   '(--help)--help[help about the current command]' \
-  &&  return 0
-
+  && return 0

plugins/history-substring-search/history-substring-search.zsh

@@ -244,7 +244,7 @@ _history-substring-search-end() {
 
   _history_substring_search_result=$BUFFER
 
-  # the search was succesful so display the result properly by clearing away
+  # the search was successful so display the result properly by clearing away
   # existing highlights and moving the cursor to the end of the result buffer
   if [[ $_history_substring_search_refresh_display -eq 1 ]]; then
     region_highlight=()

plugins/mix/_mix

@@ -86,6 +86,9 @@ case $state in
       (test)
          _files
          ;;
+      (run)
+         _files
+         ;;
     esac
   ;;
 esac

plugins/mvn/mvn.plugin.zsh

@@ -20,10 +20,9 @@ BACKGROUND_CYAN=`tput setab 6`
 BACKGROUND_WHITE=`tput setab 7`
 RESET_FORMATTING=`tput sgr0`
 
- 
+
 # Wrapper function for Maven's mvn command.
-mvn-color()
-{
+mvn-color() {
   (
   # Filter mvn output using sed. Before filtering set the locale to C, so invalid characters won't break some sed implementations
   unset LANG
@@ -37,7 +36,7 @@ mvn-color()
   echo -ne ${RESET_FORMATTING}
   )
 }
- 
+
 # Override the mvn command with the colorized one.
 #alias mvn="mvn-color"
 
@@ -65,13 +64,13 @@ alias mvnsrc='mvn dependency:sources'
 alias mvndocs='mvn dependency:resolve -Dclassifier=javadoc'
 
 function listMavenCompletions { 
-     reply=(
+    reply=(
         # common lifecycle
         clean process-resources compile process-test-resources test-compile test integration-test package verify install deploy site
-        
+
         # common plugins
         deploy failsafe install site surefire checkstyle javadoc jxr pmd ant antrun archetype assembly dependency enforcer gpg help release repository source eclipse idea jetty cargo jboss tomcat tomcat6 tomcat7 exec versions war ear ejb android scm buildnumber nexus repository sonar license hibernate3 liquibase flyway gwt
-       
+
         # deploy
         deploy:deploy-file
         # failsafe
@@ -82,7 +81,7 @@ function listMavenCompletions {
         site:site site:deploy site:run site:stage site:stage-deploy
         # surefire
         surefire:test
-            
+
         # checkstyle
         checkstyle:checkstyle checkstyle:check
         # javadoc
@@ -110,18 +109,18 @@ function listMavenCompletions {
         help:active-profiles help:all-profiles help:describe help:effective-pom help:effective-settings help:evaluate help:expressions help:system
         # release
         release:clean release:prepare release:rollback release:perform release:stage release:branch release:update-versions
-	# jgitflow
-	jgitflow:feature-start jgitflow:feature-finish jgitflow:release-start jgitflow:release-finish jgitflow:hotfix-start jgitflow:hotfix-finish jgitflow:build-number
+        # jgitflow
+        jgitflow:feature-start jgitflow:feature-finish jgitflow:release-start jgitflow:release-finish jgitflow:hotfix-start jgitflow:hotfix-finish jgitflow:build-number
         # repository
         repository:bundle-create repository:bundle-pack
         # source
         source:aggregate source:jar source:jar-no-fork
-            
+
         # eclipse
         eclipse:clean eclipse:eclipse
         # idea
         idea:clean idea:idea
-            
+
         # jetty
         jetty:run jetty:run-exploded
         # cargo
@@ -134,7 +133,7 @@ function listMavenCompletions {
         tomcat6:run tomcat6:run-war tomcat6:run-war-only tomcat6:stop tomcat6:deploy tomcat6:undeploy
         # tomcat7
         tomcat7:run tomcat7:run-war tomcat7:run-war-only tomcat7:deploy
-	# tomee
+        # tomee
         tomee:run tomee:run-war tomee:run-war-only tomee:stop tomee:deploy tomee:undeploy	
         # spring-boot
         spring-boot:run spring-boot:repackage
@@ -172,7 +171,8 @@ function listMavenCompletions {
         flyway:clean flyway:history flyway:init flyway:migrate flyway:status flyway:validate
         # gwt
         gwt:browser gwt:clean gwt:compile gwt:compile-report gwt:css gwt:debug gwt:eclipse gwt:eclipseTest gwt:generateAsync gwt:help gwt:i18n gwt:mergewebxml gwt:resources gwt:run gwt:sdkInstall gwt:source-jar gwt:soyc gwt:test
-
+        # asciidoctor
+        asciidoctor:process-asciidoc asciidoctor:auto-refresh asciidoctor:http asciidoctor:zip
         # options
         -Dmaven.test.skip=true -DskipTests -DskipITs -Dmaven.surefire.debug -DenableCiProfile -Dpmd.skip=true -Dcheckstyle.skip=true -Dtycho.mode=maven -Dmaven.test.failure.ignore=true -DgroupId= -DartifactId= -Dversion= -Dpackaging=jar -Dfile=