Amend comment section

PlugDiff to show pending updates as well

.travis.yml

@@ -1,15 +1,51 @@
 language: ruby
-rvm:
+sudo: false
-  - 1.8.7
+env:
-  - 2.0.0
+  global:
+    - DEPS=$HOME/deps
+    - PATH=$DEPS/bin:$PATH
+matrix:
+  include:
+    - env: ENV=nox
+      rvm: 1.8.7
+      addons: { apt: { packages: [vim-nox] } }
+    - env: ENV=python
+      rvm: 1.8.7
+      addons: { apt: { packages: [python2.7-dev] } }
+    - env: ENV=python3
+      rvm: 1.8.7
+      addons: { apt: { packages: [python3-dev] } }
+    - env: ENV=ruby
+      rvm: 1.8.7
+    - env: ENV=ruby
+      rvm: 2.0.0
+install: |
+  git config --global user.email "you@example.com"
+  git config --global user.name "Your Name"
 
-before_script: |
+  if [ "$ENV" == "nox" ]; then
-  hg clone https://code.google.com/p/vim/
+    mkdir -p ${DEPS}/bin
+    ln -s /usr/bin/vim.nox ${DEPS}/bin/vim
+    return
+  fi
+
+  C_OPTS="--prefix=$DEPS --with-features=huge --disable-gui "
+  case "$ENV" in
+    python)
+      C_OPTS+=--enable-pythoninterp
+      ;;
+    python3)
+      C_OPTS+=--enable-python3interp
+      ;;
+    ruby)
+      C_OPTS+=--enable-rubyinterp
+      ;;
+  esac
+
+  git clone --depth 1 https://github.com/vim/vim
   cd vim
-  ./configure --with-features=huge --enable-rubyinterp
+  ./configure $C_OPTS
   make
-  sudo make install
+  make install
   cd -
-
+script: test/run !
-script: |
-  test/run !

README.md

@@ -1,5 +1,5 @@
-<img src="https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.png" height="56" alt="vim-plug">
+<img src="https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.png" height="75" alt="vim-plug">[![travis-ci](https://travis-ci.org/junegunn/vim-plug.svg?branch=master)](https://travis-ci.org/junegunn/vim-plug)
-[![travis-ci](https://travis-ci.org/junegunn/vim-plug.svg?branch=master)](https://travis-ci.org/junegunn/vim-plug)
+===
 
 A minimalist Vim plugin manager.
 
@@ -9,28 +9,56 @@ A minimalist Vim plugin manager.
 
 - Easier to setup: Single file. No boilerplate code required.
 - Easier to use: Concise, intuitive syntax
-- [Super-fast](https://raw.githubusercontent.com/junegunn/i/master/vim-plug/40-in-4.gif)
+- [Super-fast][40/4] parallel installation/update
-  parallel installation/update (requires
+  (with any of `+python`, `+python3`, `+ruby`, or [Neovim][nv])
-  [+ruby](https://github.com/junegunn/vim-plug/wiki/ruby) or
+- Creates shallow clones to minimize disk space usage and download time
-  [Neovim](http://neovim.org/))
+- On-demand loading for [faster startup time][startup-time]
-- On-demand loading to achieve
+- Can review and rollback updates
-  [fast startup time](http://junegunn.kr/images/vim-startup-time.png)
+- Branch/tag/commit support
 - Post-update hooks
-- Can choose a specific branch or tag for each plugin
 - Support for externally managed plugins
 
-### Usage
+[40/4]: https://raw.githubusercontent.com/junegunn/i/master/vim-plug/40-in-4.gif
+[nv]: http://neovim.org/
+[startup-time]: http://junegunn.kr/images/vim-startup-time.png
+
+### Installation
 
 [Download plug.vim](https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim)
-and put it in ~/.vim/autoload
+and put it in the "autoload" directory.
+
+###### Unix
 
 ```sh
-mkdir -p ~/.vim/autoload
+curl -fLo ~/.vim/autoload/plug.vim --create-dirs \
-curl -fLo ~/.vim/autoload/plug.vim \
     https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
 ```
 
-Edit your .vimrc
+###### Neovim
+
+```sh
+curl -fLo ~/.config/nvim/autoload/plug.vim --create-dirs \
+    https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
+```
+
+###### Windows
+
+```powershell
+md ~\vimfiles\autoload
+
+$uri = 'https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
+(New-Object Net.WebClient).DownloadFile($uri, (Resolve-Path ~\vimfiles\autoload\plug.vim))
+```
+
+### Usage
+
+Add a vim-plug section to your .vimrc:
+
+1. Begin the section with `plug#begin()`
+1. List the plugins with `Plug` commands
+1. `plug#end()` to add the plugins to `&runtimepath`
+
+#### Example
 
 ```vim
 call plug#begin('~/.vim/plugged')
@@ -39,6 +67,9 @@ call plug#begin('~/.vim/plugged')
 Plug 'junegunn/seoul256.vim'
 Plug 'junegunn/vim-easy-align'
 
+" Group dependencies, vim-snippets depends on ultisnips
+Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets'
+
 " On-demand loading
 Plug 'scrooloose/nerdtree', { 'on':  'NERDTreeToggle' }
 Plug 'tpope/vim-fireplace', { 'for': 'clojure' }
@@ -46,15 +77,19 @@ Plug 'tpope/vim-fireplace', { 'for': 'clojure' }
 " Using git URL
 Plug 'https://github.com/junegunn/vim-github-dashboard.git'
 
+" Using a non-master branch
+Plug 'rdnetto/YCM-Generator', { 'branch': 'stable' }
+
 " Plugin options
-Plug 'nsf/gocode', { 'tag': 'go.weekly.2012-03-13', 'rtp': 'vim' }
+Plug 'nsf/gocode', { 'tag': 'v.20150303', 'rtp': 'vim' }
 
 " Plugin outside ~/.vim/plugged with post-update hook
-Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': 'yes \| ./install' }
+Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
 
 " Unmanaged plugin (manually installed and updated)
 Plug '~/my-prototype-plugin'
 
+" Add plugins to &runtimepath
 call plug#end()
 ```
 
@@ -69,30 +104,31 @@ Reload .vimrc and `:PlugInstall` to install plugins.
 | `PlugClean[!]`                      | Remove unused directories (bang version will clean without prompt) |
 | `PlugUpgrade`                       | Upgrade vim-plug itself                                            |
 | `PlugStatus`                        | Check the status of plugins                                        |
-| `PlugDiff`                          | See the updated changes from the previous PlugUpdate               |
+| `PlugDiff`                          | Examine changes from the previous update and the pending changes   |
-| `PlugSnapshot [output path]`        | Generate script for restoring the current snapshot of the plugins  |
+| `PlugSnapshot[!] [output path]`     | Generate script for restoring the current snapshot of the plugins  |
 
 ### `Plug` options
 
-| Option         | Description                                      |
+| Option                  | Description                                      |
-| -------------- | ------------------------------------------------ |
+| ----------------------- | ------------------------------------------------ |
-| `branch`/`tag` | Branch or tag of the repository to use           |
+| `branch`/`tag`/`commit` | Branch/tag/commit of the repository to use       |
-| `rtp`          | Subdirectory that contains Vim plugin            |
+| `rtp`                   | Subdirectory that contains Vim plugin            |
-| `dir`          | Custom directory for the plugin                  |
+| `dir`                   | Custom directory for the plugin                  |
-| `do`           | Post-update hook (string or funcref)             |
+| `do`                    | Post-update hook (string or funcref)             |
-| `on`           | On-demand loading: Commands or `<Plug>`-mappings |
+| `on`                    | On-demand loading: Commands or `<Plug>`-mappings |
-| `for`          | On-demand loading: File types                    |
+| `for`                   | On-demand loading: File types                    |
-| `frozen`       | Do not update unless explicitly specified        |
+| `frozen`                | Do not update unless explicitly specified        |
 
 ### Global options
 
-| Flag                | Default                           | Description                                                 |
+| Flag                | Default                           | Description                                            |
-| ------------------- | --------------------------------- | ----------------------------------------------------------- |
+| ------------------- | --------------------------------- | ------------------------------------------------------ |
-| `g:plug_threads`    | 16                                | Default number of threads to use                            |
+| `g:plug_threads`    | 16                                | Default number of threads to use                       |
-| `g:plug_timeout`    | 60                                | Time limit of each task in seconds (*for Ruby installer*)   |
+| `g:plug_timeout`    | 60                                | Time limit of each task in seconds (*Ruby & Python*)   |
-| `g:plug_retries`    | 2                                 | Number of retries in case of timeout (*for Ruby installer*) |
+| `g:plug_retries`    | 2                                 | Number of retries in case of timeout (*Ruby & Python*) |
-| `g:plug_window`     | `vertical topleft new`            | Command to open plug window                                 |
+| `g:plug_shallow`    | 1                                 | Use shallow clone                                      |
-| `g:plug_url_format` | `https://git::@github.com/%s.git` | `printf` format to build repo URL                           |
+| `g:plug_window`     | `vertical topleft new`            | Command to open plug window                            |
+| `g:plug_url_format` | `https://git::@github.com/%s.git` | `printf` format to build repo URL                      |
 
 ### Keybindings
 
@@ -131,6 +167,10 @@ Plug 'kovisoft/paredit', { 'for': ['clojure', 'scheme'] }
 
 " On-demand loading on both conditions
 Plug 'junegunn/vader.vim',  { 'on': 'Vader', 'for': 'vader' }
+
+" Code to execute when the plugin is loaded on demand
+Plug 'Valloric/YouCompleteMe', { 'for': 'cpp' }
+autocmd! User YouCompleteMe call youcompleteme#Enable()
 ```
 
 `for` option is generally not needed as most plugins for specific file types
@@ -143,7 +183,8 @@ There are some plugins that require extra steps after installation or update.
 In that case, use `do` option to describe the task to be performed.
 
 ```vim
-Plug 'Valloric/YouCompleteMe', { 'do': './install.sh' }
+Plug 'Shougo/vimproc.vim', { 'do': 'make' }
+Plug 'Valloric/YouCompleteMe', { 'do': './install.py' }
 ```
 
 If you need more control, you can pass a reference to a Vim function that
@@ -156,7 +197,7 @@ function! BuildYCM(info)
   " - status: 'installed', 'updated', or 'unchanged'
   " - force:  set on PlugInstall! or PlugUpdate!
   if a:info.status == 'installed' || a:info.force
-    !./install.sh
+    !./install.py
   endif
 endfunction
 

test/fixtures/.gitignore

@@ -1,5 +0,0 @@
-fzf*
-xxx
-yyy
-z1
-z2

test/fixtures/ftplugin-msg/ftplugin/c.vim

@@ -1 +0,0 @@
-echomsg 'ftplugin'

test/regressions.vader

@@ -0,0 +1,288 @@
+**********************************************************************
+Execute (#112 On-demand loading should not suppress messages from ftplugin):
+  call plug#begin('$PLUG_FIXTURES')
+  Plug '$PLUG_FIXTURES/ftplugin-msg', { 'for': 'c' }
+  call plug#end()
+
+  redir => out
+  tabnew a.c
+  redir END
+  Assert stridx(out, 'ftplugin') >= 0
+
+* The same applies to plug#load())
+  redir => out
+  call plug#load('ftplugin-msg')
+  redir END
+  Assert stridx(out, 'ftplugin') >= 0
+  q
+
+
+**********************************************************************
+Execute (#114 Should not contain empty path in &rtp):
+  call plug#begin('/tmp/plugged')
+  call plug#end()
+
+  Log &rtp
+  Assert &rtp !~ ',,', 'Commas'
+  Assert &rtp !~ '^,', 'Comma prefix'
+  Assert &rtp !~ ',$', 'Comma suffix'
+
+**********************************************************************
+Execute (#130 Proper cleanup of on-demand loading triggers):
+  augroup PlugLOD
+    autocmd!
+  augroup END
+
+  " Cleared on command
+  call ReloadPlug()
+  call plug#begin('/tmp/plugged')
+  Plug 'junegunn/vim-emoji', { 'on':  ['EmojiCommand', 'EmojiCommand2', '<Plug>(EmojiMapping)'] }
+  call plug#end()
+  PlugInstall | q
+
+  Assert exists(':EmojiCommand'), 'EmojiCommand not defined'
+  Assert exists(':EmojiCommand2'), 'EmojiCommand2 not defined'
+  Assert !empty(mapcheck('<Plug>(EmojiMapping)')), '<Plug>(EmojiMapping) not defined'
+
+  silent! EmojiCommand
+
+  Assert !exists(':EmojiCommand'), 'EmojiCommand defined'
+  Assert !exists(':EmojiCommand2'), 'EmojiCommand2 defined'
+  Assert empty(mapcheck('<Plug>(EmojiMapping)')), '<Plug>(EmojiMapping) defined'
+
+  " Cleared on FileType
+  call ReloadPlug()
+  call plug#begin('/tmp/plugged')
+  Plug 'junegunn/vim-emoji', { 'on': ['EmojiCommandExtra', '<Plug>(EmojiMappingExtra)'], 'for': ['emoji'] }
+  call plug#end()
+
+  Assert exists(':EmojiCommandExtra'), 'EmojiCommandExtra not defined'
+  Assert !empty(mapcheck('<Plug>(EmojiMappingExtra)')), '<Plug>(EmojiMappingExtra) not defined'
+
+  setf emoji
+
+  Assert !exists(':EmojiCommandExtra'), 'EmojiCommandExtra defined'
+  Assert empty(mapcheck('<Plug>(EmojiMappingExtra)')), '<Plug>(EmojiMappingExtra) defined'
+
+**********************************************************************
+Execute (#131 Syntax error):
+  call plug#begin('/proc/no-permission')
+  Plug 'junegunn/vim-emoji'
+  call plug#end()
+
+  redir => out
+  silent PlugInstall
+  redir END
+  Assert out =~ 'Invalid plug directory: /proc/no-permission', out
+
+**********************************************************************
+Execute (#139-1 Using new remote branch):
+  " Make sure to remove the clone
+  call plug#begin('/tmp/plugged')
+  call plug#end()
+  PlugClean!
+
+  " Install master branch
+  call plug#begin('/tmp/plugged')
+  Plug expand('file:////tmp/new-branch')
+  call plug#end()
+  PlugUpdate
+
+  unlet! g:foo g:bar g:baz
+  call plug#load('new-branch')
+  Assert exists('g:foo'),  'g:foo should be found'
+  Assert !exists('g:bar'), 'g:bar should not be found'
+  Assert !exists('g:baz'), 'g:baz should not be found'
+
+  " Create a new branch on origin
+  call system('cd /tmp/new-branch && git checkout -b new &&'
+      \. 'echo "let g:bar = 1" > plugin/bar.vim && git add plugin/bar.vim &&'
+      \. 'git commit -m second')
+
+  " We're setting up two plugins so that parallel installer is used
+  call plug#begin('/tmp/plugged')
+  Plug 'junegunn/seoul256.vim'
+  Plug expand('file:////tmp/new-branch'), { 'branch': 'new' }
+  call plug#end()
+  PlugUpdate
+  silent %y
+  Log @"
+  Assert @" !~? 'error', 'Should be able to use new remote branch: ' . @"
+
+  unlet! g:foo g:bar g:baz
+  call plug#load('new-branch')
+  Assert exists('g:foo'),  'g:foo should be found'
+  Assert exists('g:bar'),  'g:bar should be found'
+  Assert !exists('g:baz'), 'g:baz should not be found'
+
+  call PlugStatusSorted()
+
+Expect:
+  - new-branch: OK
+  - seoul256.vim: OK
+  Finished. 0 error(s).
+  [==]
+
+Execute (#139-2 Using yet another new remote branch):
+  " Create another branch on origin
+  call system('cd /tmp/new-branch && git checkout master &&'
+      \. 'git checkout -b brand-new &&'
+      \. 'echo "let g:baz = 1" > plugin/baz.vim && git add plugin/baz.vim &&'
+      \. 'git commit -m third')
+
+  " Test Vim installer here
+  call plug#begin('/tmp/plugged')
+  Plug expand('file:////tmp/new-branch'), { 'branch': 'brand-new' }
+  call plug#end()
+  PlugUpdate
+  silent %y
+  Log @"
+  Assert @" !~? 'error', 'Should be able to use new remote branch: ' . @"
+
+  unlet! g:foo g:bar g:baz
+  call plug#load('new-branch')
+  Assert exists('g:foo'),  'g:foo should be found'
+  Assert !exists('g:bar'), 'g:bar should not be found'
+  Assert exists('g:baz'),  'g:baz should be found'
+
+  call PlugStatusSorted()
+
+Expect:
+  - new-branch: OK
+  Finished. 0 error(s).
+  [=]
+
+Execute (#139-3 Should fail when not possible to fast-forward):
+  " Commit on cloned repo
+  call system('cd /tmp/plugged/new-branch && git checkout master &&'
+      \. 'touch foobar && git add foobar && git commit -m foobar')
+
+  " Different commit on remote
+  call system('cd /tmp/new-branch && git checkout master &&'
+      \. 'touch foobaz && git add foobaz && git commit -m foobaz')
+
+  for multi in [0, 1]
+    call plug#begin('/tmp/plugged')
+    if multi
+      Plug 'junegunn/seoul256.vim'
+    endif
+    Plug expand('file:////tmp/new-branch')
+    call plug#end()
+    PlugUpdate
+    silent %y
+    Assert @" =~ 'Not possible to fast-forward', @"
+  endfor
+  q
+
+**********************************************************************
+Execute (#145: Merging on-demand loading triggers - cmd):
+  unlet! g:xxx g:yyy
+  call plug#begin()
+  Plug '$PLUG_FIXTURES/xxx', { 'on': 'XXX' }
+  Plug '$PLUG_FIXTURES/yyy', { 'on': ['XXX', 'YYY'] }
+  call plug#end()
+
+  silent! XXX
+
+  Assert exists('g:xxx'), 'xxx is not loaded'
+  Assert exists('g:yyy'), 'yyy is not loaded'
+  Assert !exists(':YYY')
+
+Execute (#145: Merging on-demand loading triggers - map):
+  unlet! g:xxx g:yyy
+
+  call ReloadPlug()
+  call plug#begin()
+  Plug '$PLUG_FIXTURES/xxx', { 'on': '<Plug>(xxx)' }
+  Plug '$PLUG_FIXTURES/yyy', { 'on': ['<Plug>(xxx)' ,'<Plug>(yyy)' ] }
+  call plug#end()
+
+  Assert !empty(mapcheck("<Plug>(xxx)"))
+  Assert !empty(mapcheck("<Plug>(yyy)"))
+
+# FIXME feedkeys() cannot be tested with Vader
+  call plug#load('xxx', 'yyy')
+  Assert empty(mapcheck("<Plug>(xxx)"))
+  Assert empty(mapcheck("<Plug>(yyy)"))
+
+**********************************************************************
+Execute (#159: shell=/bin/tcsh):
+  let org = &shell
+  try
+    set shell=/bin/tcsh
+    call plug#begin('/tmp/plugged')
+    Plug 'junegunn/seoul256.vim'
+    call plug#end()
+
+    PlugStatus
+    Log getline(1, '$')
+    q
+    AssertEqual '/bin/tcsh', &shell
+  finally
+    let &shell = org
+  endtry
+
+**********************************************************************
+Execute (#154: Spaces in &rtp should not be escaped):
+  call plug#begin('/tmp/plug it')
+  Plug 'seoul256 vim'
+  call plug#end()
+  Log &rtp
+  Assert stridx(&rtp, 'plug it/seoul256 vim') >= 0
+
+**********************************************************************
+Execute (#184: Duplicate entries in &rtp):
+  call plug#begin('/tmp/plugged')
+  Plug 'plugin1'
+    \| Plug 'plugin0'
+
+  Plug 'plugin2'
+    \| Plug 'plugin0'
+    \| Plug 'plugin1'
+  call plug#end()
+
+  Log &rtp
+  AssertEqual 3, len(filter(split(&rtp, ','), 'stridx(v:val, "plugged") >= 0'))
+
+**********************************************************************
+Execute (#236: Plugin removed from &rtp when .vimrc is reloaded):
+  unlet! g:loaded_easy_align_plugin
+  silent! delc EasyAlign
+
+  call ReloadPlug()
+  call plug#begin('/tmp/plugged')
+  Plug 'junegunn/vim-easy-align', { 'on': 'EasyAlign' }
+  call plug#end()
+  PlugInstall | q
+
+  Assert &rtp !~ '/vim-easy-align', 'Plugin should not be in &rtp'
+  %EasyAlign=
+  Assert &rtp =~ '/vim-easy-align', 'Plugin should be in &rtp'
+
+  call plug#begin('/tmp/plugged')
+  Plug 'junegunn/vim-easy-align', { 'on': 'EasyAlign' }
+  call plug#end()
+  Assert &rtp =~ '/vim-easy-align', 'Plugin should still be in &rtp'
+
+**********************************************************************
+Execute (#350: Ruby installer failed to unshallow tagged plugin on update):
+  call plug#begin('/tmp/plugged')
+  call plug#end()
+  PlugClean!
+
+  " Shallow clone. We should have at least 2 plugins to enable parallel installer.
+  call plug#begin('/tmp/plugged')
+  Plug 'junegunn/vim-easy-align'
+  Plug 'junegunn/seoul256.vim'
+  call plug#end()
+  PlugUpdate
+  Assert filereadable(g:plugs['vim-easy-align'].dir.'/.git/shallow')
+
+  " Now unshallowed
+  call plug#begin('/tmp/plugged')
+  Plug 'junegunn/vim-easy-align', { 'tag': '2.9.0' }
+  Plug 'junegunn/seoul256.vim'
+  call plug#end()
+  PlugUpdate
+  Assert !filereadable(g:plugs['vim-easy-align'].dir.'/.git/shallow')
+  q

test/run

@@ -1,22 +1,40 @@
 #!/bin/bash
 
-cd $(dirname $BASH_SOURCE)
+cd $(dirname "${BASH_SOURCE[0]}")
-cd ..
-PLUG_SRC=$(pwd)/plug.vim
-cd - > /dev/null
 
-export PLUG_FIXTURES=$(pwd)/fixtures
+export BASE="$PWD"
+export PLUG_SRC="$PWD/../plug.vim"
+export PLUG_FIXTURES="$PWD/fixtures"
+mkdir -p "$PLUG_FIXTURES"
 
-if [ ! -d vader.vim ]; then
+cat > /tmp/mini-vimrc << VIMRC
-  git clone https://github.com/junegunn/vader.vim.git
+set rtp+=/tmp/junegunn/vader.vim
-fi
+set shell=/bin/bash
+VIMRC
 
-rm -rf $PLUG_FIXTURES/fzf
+clone() {
-if [ ! -d fzf-staged ]; then
+  if [ ! -d $2 ]; then
-  git clone https://github.com/junegunn/fzf.git $PLUG_FIXTURES/fzf-staged
+    git clone $1 $2
-fi
+  fi
+}
 
-make_dirs() {
+clone_repos() (
+  cd /tmp
+  mkdir -p junegunn vim-scripts jg
+  for repo in vader.vim goyo.vim rust.vim seoul256.vim vim-easy-align vim-fnr \
+              vim-oblique vim-pseudocl vim-redis vim-emoji; do
+    clone https://github.com/junegunn/${repo}.git junegunn/$repo &
+  done
+  clone https://github.com/vim-scripts/beauty256.git vim-scripts/beauty256 &
+  clone https://github.com/junegunn/fzf.git fzf &
+  wait
+
+  clone junegunn/vim-emoji jg/vim-emoji
+  cd junegunn/seoul256.vim && git checkout no-t_co && git checkout master
+)
+
+make_dirs() (
+  rm -rf "$PLUG_FIXTURES/$1"
   mkdir -p "$PLUG_FIXTURES/$1"
   cd "$PLUG_FIXTURES/$1"
   mkdir -p autoload colors ftdetect ftplugin indent plugin syntax
@@ -31,39 +49,66 @@ make_dirs() {
     call add(g:total_order, s:name)
 EOF
   done
-  cd - > /dev/null
+)
-}
 
-init() {
+gitinit() (
-  rm -rf $PLUG_FIXTURES/{xxx,yyy,z1,z2}
+  cd "$PLUG_FIXTURES/$1"
+  git init
+  git commit -m 'commit' --allow-empty
+)
 
+prepare() {
   make_dirs xxx/ xxx
   make_dirs xxx/after xxx
-  mkdir -p $PLUG_FIXTURES/xxx/doc
+  mkdir -p "$PLUG_FIXTURES/xxx/doc"
-  cat > $PLUG_FIXTURES/xxx/doc/xxx.txt << DOC
+  cat > "$PLUG_FIXTURES/xxx/doc/xxx.txt" << DOC
 hello *xxx*
 DOC
+  gitinit xxx
 
   make_dirs yyy/ yyy
   make_dirs yyy/after yyy
+  gitinit yyy
 
   make_dirs z1/ z1
   make_dirs z2/ z2
+
+  rm -rf "$PLUG_FIXTURES/ftplugin-msg"
+  mkdir -p "$PLUG_FIXTURES/ftplugin-msg/ftplugin"
+  echo "echomsg 'ftplugin'" > "$PLUG_FIXTURES/ftplugin-msg/ftplugin/c.vim"
+
+  rm -rf /tmp/new-branch
+  cd /tmp
+  git init new-branch
+  cd new-branch
+  mkdir plugin
+  echo 'let g:foo = 1' > plugin/foo.vim
+  git add plugin/foo.vim
+  git commit -m initial
+
+  cd "$BASE"
 }
 
-cat > /tmp/mini-vimrc << VIMRC
+select_vim() {
-set rtp+=vader.vim
+  local vim=/usr/bin/vim
-set shell=/bin/bash
+  if [ -n "$DEPS" ] && [ -e "${DEPS}/bin/vim" ]; then
-source $PLUG_SRC
+    vim="${DEPS}/bin/vim"
-VIMRC
+  elif [ -e "/usr/local/bin/vim" ]; then
+    vim=/usr/local/bin/vim
+  fi
+  echo $vim
+}
 
-[ -z "$TMPDIR" ] && export TMPDIR=/tmp/
+clone_repos
-init
+prepare
+
+VIM=$(select_vim)
+echo "Selected Vim: $VIM"
 if [ "$1" = '!' ]; then
-  /usr/local/bin/vim -Nu /tmp/mini-vimrc -c 'Vader! workflow.vader' > /dev/null &&
+  $VIM -Nu /tmp/mini-vimrc -c 'Vader! test.vader' > /dev/null &&
-  init &&
+  prepare &&
-  /usr/local/bin/vim -Nu /tmp/mini-vimrc -c 'let g:plug_threads = 1 | Vader! workflow.vader' > /dev/null
+  $VIM -Nu /tmp/mini-vimrc -c 'let g:plug_threads = 1 | Vader! test.vader' > /dev/null
 else
-  /usr/local/bin/vim -Nu /tmp/mini-vimrc -c 'Vader workflow.vader'
+  $VIM -Nu /tmp/mini-vimrc -c 'Vader test.vader'
 fi
 

test/test.vader

@@ -0,0 +1,86 @@
+Execute (Initialize test environment):
+  Save &rtp, g:plugs, g:plug_home, g:plug_window
+  unlet! g:plugs g:plug_home g:plug_window
+
+  let g:plug_url_format = 'file:///tmp/%s'
+  let g:base_rtp        = &rtp
+  let g:first_rtp       = split(&rtp, ',')[0]
+  let g:last_rtp        = split(&rtp, ',')[-1]
+  let g:temp_plugged    = tempname()
+  if !exists('$PLUG_SRC')
+    let $PLUG_SRC = globpath(&rtp, 'autoload/plug.vim')
+  endif
+
+  " Temporarily patch plug.vim
+  call system('cp $PLUG_SRC $PLUG_SRC.org')
+  call writefile(extend(readfile($PLUG_SRC),
+  \ ['function! ResetPlug()', 'let s:loaded = {}', 'endfunction']), $PLUG_SRC)
+
+  set t_Co=256
+  colo default
+  pclose
+
+  function! PlugStatusSorted()
+    PlugStatus
+    %y
+    q
+    normal! P
+    %sort
+    g/^$/d
+  endfunction
+
+  function! AssertExpect(bang, pat, cnt)
+    let op = a:bang ? '==#' : '=~#'
+    AssertEqual a:cnt, len(filter(getline(1, '$'), "v:val ".op." '".a:pat."'"))
+  endfunction
+  command! -nargs=+ -bang AssertExpect call AssertExpect('<bang>' == '!', <args>)
+
+  function! EnsureLoaded()
+    if has('vim_starting')
+      runtime! plugin/**/*.vim
+    endif
+  endfunction
+
+  function! RmRf(file)
+    call system(printf('rm -rf "%s"', a:file))
+  endfunction
+
+  function! ReloadPlug()
+    call ResetPlug()
+    source $PLUG_SRC
+    let &rtp = g:base_rtp
+  endfunction
+
+  source $PLUG_SRC
+
+Execute (Print Interpreter Version):
+  redir => out
+  if has('ruby')
+    silent ruby puts 'Ruby: ' + RUBY_VERSION
+  elseif has('python')
+    silent python import sys; svi = sys.version_info; print 'Python: {}.{}.{}'.format(svi[0], svi[1], svi[2])
+  elseif has('python3')
+    silent python3 import sys; svi = sys.version_info; print('Python: {}.{}.{}'.format(svi[0], svi[1], svi[2]))
+  endif
+  redir END
+  Log substitute(out, '\n', '', 'g')
+
+Include: workflow.vader
+Include: regressions.vader
+
+Execute (Cleanup):
+  silent! call RmRf(g:temp_plugged)
+  silent! unlet g:plugs g:plug_home g:plug_url_format
+  silent! unlet g:temp_plugged g:first_rtp g:last_rtp g:base_rtp out
+  silent! delf PlugStatusSorted
+  silent! delf AssertExpect
+  silent! delf PlugUpdated
+  silent! delf EnsureLoaded
+  silent! delf ReloadPlug
+  silent! delc AssertExpect
+  silent! unmap /
+  silent! unmap ?
+  call system('mv $PLUG_SRC.org $PLUG_SRC')
+
+  Restore
+

test/workflow.vader

@@ -1,52 +1,6 @@
-Execute (Initialize test environment):
-  Save &rtp, g:plugs, g:plug_home, g:plug_window
-
-  let first_rtp = split(&rtp, ',')[0]
-  let last_rtp  = split(&rtp, ',')[-1]
-
-  let vader = fnamemodify(globpath(&rtp, 'autoload/vader.vim'), ':h:h')
-  let plug  = fnamemodify(globpath(&rtp, 'autoload/plug.vim'), ':h:h')
-  set rtp=$HOME/.vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,$HOME/.vim/after
-  execute 'set rtp^='.vader
-  execute 'set rtp^='.plug
-  let basertp = &rtp
-
-  unlet! g:plugs g:plug_home g:plug_window
-
-  set t_Co=256
-  colo default
-  pclose
-
-  function! PlugStatusSorted()
-    PlugStatus
-    %y
-    q
-    normal! P
-    %sort
-    g/^$/d
-  endfunction
-
-  function! AssertExpect(bang, pat, cnt)
-    let op = a:bang ? '==#' : '=~#'
-    AssertEqual a:cnt, len(filter(getline(1, '$'), "v:val ".op." '".a:pat."'"))
-  endfunction
-  command! -nargs=+ -bang AssertExpect call AssertExpect('<bang>' == '!', <args>)
-
-  function! EnsureLoaded()
-    if has('vim_starting')
-      runtime! plugin/**/*.vim
-    endif
-  endfunction
-
-Execute (Print Ruby version):
-  redir => out
-  silent ruby puts RUBY_VERSION
-  redir END
-  Log substitute(out, '\n', '', 'g')
-
 Execute (plug#end() before plug#begin() should fail):
   redir => out
-  AssertEqual 0, plug#end()
+  silent! AssertEqual 0, plug#end()
   redir END
   Assert stridx(out, 'Call plug#begin() first') >= 0
 
@@ -63,48 +17,48 @@ Execute (plug#begin() without path argument with empty &rtp):
   redir END
   Assert stridx(out, 'Unable to determine plug home') >= 0
   let &rtp = save_rtp
+  unlet save_rtp
 
 Execute (plug#begin(path)):
-  let temp_plugged = tempname()
+  call plug#begin(g:temp_plugged.'/')
-  call plug#begin(temp_plugged.'/')
   Assert g:plug_home !~ '[/\\]$', 'Trailing / should be stripped from g:plug_home'
 
   AssertEqual 0, len(g:plugs)
-  AssertEqual temp_plugged, g:plug_home
+  AssertEqual g:temp_plugged, g:plug_home
-  AssertEqual basertp, &rtp
+  AssertEqual g:base_rtp, &rtp
 
 Execute (Subsequent plug#begin() calls will reuse g:plug_home):
   call plug#begin()
-  AssertEqual temp_plugged, g:plug_home
+  AssertEqual g:temp_plugged, g:plug_home
 
 Execute (Test Plug command):
-  " Git repo with branch
+^ Git repo with branch (DEPRECATED. USE BRANCH OPTION)
-  Plug 'junegunn/seoul256.vim', 'yes-t_co'
+  Plug 'junegunn/seoul256.vim', { 'branch': 'yes-t_co' }
-  AssertEqual 'https://git::@github.com/junegunn/seoul256.vim.git', g:plugs['seoul256.vim'].uri
+  AssertEqual 'file:///tmp/junegunn/seoul256.vim', g:plugs['seoul256.vim'].uri
-  AssertEqual join([temp_plugged, 'seoul256.vim/'], '/'), g:plugs['seoul256.vim'].dir
+  AssertEqual join([g:temp_plugged, 'seoul256.vim/'], '/'), g:plugs['seoul256.vim'].dir
   AssertEqual 'yes-t_co', g:plugs['seoul256.vim'].branch
 
   Plug 'junegunn/seoul256.vim', { 'branch': 'no-t_co' } " Using branch option
   AssertEqual 'no-t_co', g:plugs['seoul256.vim'].branch
 
-  " Git repo with tag
+^ Git repo with tag (DEPRECATED. USE TAG OPTION)
   Plug 'junegunn/goyo.vim', '1.5.2'
-  AssertEqual 'https://git::@github.com/junegunn/goyo.vim.git', g:plugs['goyo.vim'].uri
+  AssertEqual 'file:///tmp/junegunn/goyo.vim', g:plugs['goyo.vim'].uri
-  AssertEqual join([temp_plugged, 'goyo.vim/'], '/'), g:plugs['goyo.vim'].dir
+  AssertEqual join([g:temp_plugged, 'goyo.vim/'], '/'), g:plugs['goyo.vim'].dir
-  AssertEqual '1.5.2', g:plugs['goyo.vim'].branch
+  AssertEqual '1.5.2', g:plugs['goyo.vim'].tag
 
   Plug 'junegunn/goyo.vim', { 'tag': '1.5.3' } " Using tag option
-  AssertEqual '1.5.3', g:plugs['goyo.vim'].branch
+  AssertEqual '1.5.3', g:plugs['goyo.vim'].tag
 
   " Git URI
-  Plug 'https://bitbucket.org/junegunn/vim-emoji.git'
+  Plug 'file:///tmp/jg/vim-emoji'
-  AssertEqual 'https://bitbucket.org/junegunn/vim-emoji.git', g:plugs['vim-emoji'].uri
+  AssertEqual 'file:///tmp/jg/vim-emoji', g:plugs['vim-emoji'].uri
   AssertEqual 'master', g:plugs['vim-emoji'].branch
-  AssertEqual join([temp_plugged, 'vim-emoji/'], '/'), g:plugs['vim-emoji'].dir
+  AssertEqual join([g:temp_plugged, 'vim-emoji/'], '/'), g:plugs['vim-emoji'].dir
 
   " vim-scripts/
   Plug 'beauty256'
-  AssertEqual 'https://git::@github.com/vim-scripts/beauty256.git', g:plugs.beauty256.uri
+  AssertEqual 'file:///tmp/vim-scripts/beauty256', g:plugs.beauty256.uri
   AssertEqual 'master', g:plugs.beauty256.branch
 
   AssertEqual 4, len(g:plugs)
@@ -112,7 +66,7 @@ Execute (Test Plug command):
 Execute (Plug command with dictionary option):
   Log string(g:plugs)
   Plug 'junegunn/seoul256.vim', { 'branch': 'no-t_co', 'rtp': '././' }
-  AssertEqual join([temp_plugged, 'seoul256.vim/'], '/'), g:plugs['seoul256.vim'].dir
+  AssertEqual join([g:temp_plugged, 'seoul256.vim/'], '/'), g:plugs['seoul256.vim'].dir
   AssertEqual '././', g:plugs['seoul256.vim'].rtp
 
   Log string(g:plugs)
@@ -130,9 +84,9 @@ Execute (PlugClean before installation):
 
 Execute (plug#end() updates &rtp):
   call plug#end()
-  Assert len(&rtp) > len(basertp)
+  Assert len(&rtp) > len(g:base_rtp)
-  AssertEqual first_rtp, split(&rtp, ',')[0]
+  AssertEqual g:first_rtp, split(&rtp, ',')[0]
-  AssertEqual last_rtp, split(&rtp, ',')[-1]
+  AssertEqual g:last_rtp, split(&rtp, ',')[-1]
 
 Execute (Yet, plugins are not available):
   Assert empty(globpath(&rtp, 'autoload/emoji.vim'))
@@ -155,7 +109,27 @@ Execute (PlugStatus after installation):
   AssertExpect 'OK', 4
   q
 
+Execute (PlugUpdate - tagged plugin should not fail (#174)):
+  PlugUpdate goyo.vim
+  Log getline(1, '$')
+  AssertExpect '^- goyo.vim', 1
+  q
+
 Execute (Change tag of goyo.vim):
+  call plug#begin()
+  Plug 'junegunn/goyo.vim', { 'tag': '9.9.9' }
+  call plug#end()
+
+Execute (PlugStatus):
+  call PlugStatusSorted()
+
+Expect:
+      Invalid tag: 1.5.3 (expected: 9.9.9). Try PlugUpdate.
+  Finished. 1 error(s).
+  [=]
+  x goyo.vim:
+
+Execute (Remove tag of goyo.vim):
   call plug#begin()
   Plug 'junegunn/goyo.vim'
   call plug#end()
@@ -164,7 +138,7 @@ Execute (PlugStatus):
   call PlugStatusSorted()
 
 Expect:
-      Invalid branch/tag: 1.5.3 (expected: master). Try PlugUpdate.
+      Invalid branch: HEAD (expected: master). Try PlugUpdate.
   Finished. 1 error(s).
   [=]
   x goyo.vim:
@@ -181,31 +155,53 @@ Expect:
 Execute (Change branch of seoul256.vim):
   call plug#begin()
   Plug 'junegunn/seoul256.vim'
-  Plug 'https://bitbucket.org/junegunn/vim-emoji.git'
+  Plug 'file:///tmp/jg/vim-emoji'
   call plug#end()
 
 Execute (PlugStatus):
   call PlugStatusSorted()
 
 Expect:
-      Invalid branch/tag: no-t_co (expected: master). Try PlugUpdate.
+      Invalid branch: no-t_co (expected: master). Try PlugUpdate.
   - vim-emoji: OK
   Finished. 1 error(s).
   [==]
   x seoul256.vim:
 
+Execute (PlugUpdate to switch branch, then PlugStatus):
+  PlugUpdate
+  call PlugStatusSorted()
+
+Expect:
+  - seoul256.vim: OK
+  - vim-emoji: OK
+  Finished. 0 error(s).
+  [==]
+
+Execute (Change tag of seoul256.vim):
+  call plug#begin()
+  Plug 'junegunn/seoul256.vim', { 'tag': 'no-such-tag' }
+  call plug#end()
+  call PlugStatusSorted()
+
+Expect:
+      Invalid tag: N/A (expected: no-such-tag). Try PlugUpdate.
+  Finished. 1 error(s).
+  [=]
+  x seoul256.vim:
+
 Execute (Change URI of seoul256.vim):
   call plug#begin()
   Plug 'junegunn.choi/seoul256.vim'
-  Plug 'https://bitbucket.org/junegunn/vim-emoji.git'
+  Plug 'file:///tmp/jg/vim-emoji'
   call plug#end()
 
 Execute (PlugStatus):
   call PlugStatusSorted()
 
 Expect:
-      Expected:    https://git::@github.com/junegunn.choi/seoul256.vim.git
+      Expected:    file:///tmp/junegunn.choi/seoul256.vim
-      Invalid URI: https://git::@github.com/junegunn/seoul256.vim.git
+      Invalid URI: file:///tmp/junegunn/seoul256.vim
       PlugClean required.
   - vim-emoji: OK
   Finished. 1 error(s).
@@ -238,8 +234,8 @@ Execute (PlugStatus):
   call PlugStatusSorted()
 
 Expect:
-      Expected:    https://git::@github.com/junegunn/vim-emoji.git
+      Expected:    file:///tmp/junegunn/vim-emoji
-      Invalid URI: https://bitbucket.org/junegunn/vim-emoji.git
+      Invalid URI: file:///tmp/jg/vim-emoji
       Not found. Try PlugInstall.
       PlugClean required.
   Finished. 2 error(s).
@@ -266,23 +262,30 @@ Execute (PlugUpdate only to find out plugins are up-to-date, D key to check):
   PlugUpdate
   AssertExpect 'Already up-to-date', 2
   normal D
-  AssertEqual 'No updates.', getline(1)
+  AssertEqual '0 plugin(s) updated.', getline(1)
   q
 
 Execute (PlugDiff - 'No updates.'):
   PlugDiff
-  AssertEqual 'No updates.', getline(1)
+  Log getline(1, '$')
+  AssertEqual '0 plugin(s) updated.', getline(1)
+  Assert empty(mapcheck('o'))
+  Assert empty(mapcheck('X'))
+  Assert empty(mapcheck("\<cr>"))
   q
 
-Execute (Rollback recent updates, PlugUpdate, then PlugDiff):
+Execute (New commits on remote, PlugUpdate, then PlugDiff):
   for repo in ['seoul256.vim', 'vim-emoji']
-    call system(printf('cd %s/%s && git reset HEAD^^ --hard', g:plug_home, repo))
+    for _ in range(2)
+      call system(printf('cd /tmp/junegunn/%s && git commit --allow-empty -m "update"', repo))
+    endfor
   endfor
+  unlet repo
   PlugUpdate
 
   " Now we have updates
   normal D
-  AssertEqual 'Last update:', getline(1)
+  AssertEqual '2 plugin(s) updated.', getline(1)
 
   " Preview commit
   silent! wincmd P
@@ -304,13 +307,14 @@ Execute (Rollback recent updates, PlugUpdate, then PlugDiff):
 
   " ]] motion
   execute 'normal $]]'
-  Assert index([lnum + 4, lnum + 5], line('.')) >= 0
+  Assert line('.') >= 4
-   " +5 for merge commit
+    " 5+ for merge commit
   AssertEqual 3, col('.')
 
   " [[ motion
   execute 'normal 0[['
   AssertEqual lnum, line('.')
+  unlet lnum
   AssertEqual 3, col('.')
 
   " X key to revert the update
@@ -350,12 +354,83 @@ Execute (Reuse Plug window in another tab):
   AssertEqual tabnr, tabpagenr()
   normal! gt
   q
+  unlet tabnr
+
+Execute (contd. PlugDiff should not show inverted history):
+  " Additional PlugUpdate to clear diff
+  PlugUpdate
+  PlugDiff
+  Log getline(1, '$')
+
+  " Checking out older revisions
+  for repo in values(g:plugs)
+    call system(printf('cd %s && git reset HEAD^ --hard', shellescape(repo.dir)))
+  endfor
+  unlet repo
+
+  " PlugDiff should not report the changes i.e. git log --left-only
+  PlugDiff
+  Log getline(1, '$')
+  AssertEqual '0 plugin(s) updated.', getline(1)
+  q
+
+**********************************************************************
+~ PlugDiff to see the pending changes
+**********************************************************************
+
+Execute (PlugDiff):
+  call plug#begin()
+  call plug#end()
+  PlugClean!
+
+  call plug#begin()
+  Plug 'file://'.expand('$PLUG_FIXTURES').'/xxx'
+  Plug 'file://'.expand('$PLUG_FIXTURES').'/yyy'
+  call plug#end()
+  PlugInstall
+  Log getline(1, '$')
+
+  call system('cd "$PLUG_FIXTURES/xxx" && git commit --allow-empty -m update-xxx && git tag -f xxx')
+  call system('cd "$PLUG_FIXTURES/yyy" && git tag -f yyy && git commit --allow-empty -m update-yyy && git tag -f zzz')
+
+  let g:plugs.yyy.tag = 'yyy'
+  PlugUpdate
+  Log getline(1, '$')
+
+  PlugDiff
+  " 1 plugin(s) updated. 1 plugin(s) have pending updates.
+  " [==]
+  "
+  " Last update:
+  " ------------
+  "
+  " - xxx:
+  "   166cfff (tag: xxx) update-xxx (1 second ago)
+  "
+  " Pending updates:
+  " ----------------
+  "
+  " - yyy: (tag: yyy)
+  "   c0a064b (tag: zzz) update-yyy (1 second ago)
+  "
+  Log getline(1, '$')
+  AssertEqual 15, line('$')
+  AssertEqual '1 plugin(s) updated. 1 plugin(s) have pending updates.', getline(1)
+  AssertEqual '[==]', getline(2)
+  AssertEqual '- yyy: (tag: yyy)', getline(13)
+  Assert getline(8) =~ '(tag: xxx)'
+  Assert getline(14) =~ '(tag: zzz)'
+  Assert !empty(mapcheck('o'))
+  Assert !empty(mapcheck('X'))
+  Assert !empty(mapcheck("\<cr>"))
+  q
 
 **********************************************************************
 ~ On-demand loading / Partial installation/update ~
 **********************************************************************
 
 Execute (Trying to execute on-demand commands when plugin is not installed):
+  call ReloadPlug()
   call plug#begin()
   Plug 'junegunn/vim-easy-align', { 'on': ['EasyAlign', 'LiveEasyAlign'] }
   call plug#end()
@@ -368,16 +443,22 @@ Execute (Trying to execute on-demand commands when plugin is not installed):
   Assert !exists(':LiveEasyAlign')
 
 Execute (New set of plugins):
+  call ReloadPlug()
   call plug#begin()
   Plug 'junegunn/vim-fnr'
   Plug 'junegunn/vim-pseudocl'
   Plug 'junegunn/vim-easy-align', { 'on': 'EasyAlign' }
   Plug 'junegunn/vim-redis',      { 'for': 'redis' }
+  let user_autocmd = {}
+  autocmd! User vim-fnr let user_autocmd.fnr = 1
+  autocmd! User vim-easy-align let user_autocmd.easy_align = 1
+  autocmd! User vim-redis let user_autocmd.redis = 1
   call plug#end()
 
 Execute (Check commands):
   Assert !exists(':FNR'),          'FNR command should not be found'
   Assert !exists(':RedisExecute'), 'RedisExecute command should not be found'
+  Assert empty(user_autocmd)
 
 Execute (Partial PlugInstall):
   PlugInstall vim-fnr vim-easy-align
@@ -387,8 +468,8 @@ Execute (Partial PlugInstall):
   PlugInstall vim-fnr vim-easy-align 1
   AssertExpect 'vim-fnr', 1
   AssertExpect 'vim-easy-align', 1
-  AssertEqual first_rtp, split(&rtp, ',')[0]
+  AssertEqual g:first_rtp, split(&rtp, ',')[0]
-  AssertEqual last_rtp, split(&rtp, ',')[-1]
+  AssertEqual g:last_rtp, split(&rtp, ',')[-1]
   q
 
 Given (Unaligned code):
@@ -407,6 +488,10 @@ Expect (Aligned code):
   a  = 1
   aa = 2
 
+Then (autocmd executed):
+  Assert user_autocmd.easy_align
+  AssertEqual 1, len(user_autocmd)
+
 Given:
 Execute (Partial PlugUpdate):
   PlugUpdate vim-redis
@@ -416,6 +501,11 @@ Execute (On-demand loading based on filetypes):
   Assert !exists(':RedisExecute'), 'RedisExecute command still should not be found'
   set ft=redis
   Assert exists(':RedisExecute'), 'RedisExecute command is now found'
+  Assert user_autocmd.redis
+  AssertEqual 2, len(user_autocmd)
+
+  autocmd! User
+  unlet user_autocmd
 
 **********************************************************************
 ~ Local (unmanaged) plugins
@@ -423,6 +513,7 @@ Execute (On-demand loading based on filetypes):
 
 Execute (Add unmanaged plugin):
   let fzf = expand('$PLUG_FIXTURES/fzf')
+  call RmRf(fzf)
   Log fzf
 
   call plug#begin()
@@ -481,7 +572,8 @@ Execute (PlugStatus should point out that the plugin is missing):
 
 Execute (Deploy unmanaged plugin):
   Assert !exists(':FZF'), ':FZF command should not exist'
-  call rename(expand('$PLUG_FIXTURES/fzf-staged'), fzf)
+  call RmRf(fzf)
+  Log system(printf('cp -r "/tmp/fzf" "%s"', fzf))
 
 Execute (PlugUpdate still should not care):
   PlugUpdate
@@ -501,8 +593,8 @@ Execute (Check &rtp after SomeCommand):
   Assert &rtp !~ 'fzf'
   silent! SomeCommand
   Assert &rtp =~ 'fzf'
-  AssertEqual first_rtp, split(&rtp, ',')[0]
+  AssertEqual g:first_rtp, split(&rtp, ',')[0]
-  AssertEqual last_rtp, split(&rtp, ',')[-1]
+  AssertEqual g:last_rtp, split(&rtp, ',')[-1]
 
 Execute (Common parent):
   call plug#begin()
@@ -516,6 +608,8 @@ Execute (Common parent):
   AssertExpect! '[===]', 1
   q
 
+  unlet fzf
+
 **********************************************************************
 ~ Frozen plugins
 **********************************************************************
@@ -629,7 +723,7 @@ Execute (On install):
   Plug 'junegunn/vim-pseudocl'
   call plug#end()
 
-  PlugInstall
+  silent PlugInstall
   q
 
   Assert filereadable(g:plugs['vim-easy-align'].dir.'/installed'),
@@ -643,10 +737,10 @@ Execute (On update):
   Plug 'junegunn/vim-pseudocl', { 'do': 'touch updated' }
   call plug#end()
 
-  " Reset for updates
+  " New commits on remote
-  call system('cd '.g:plugs['vim-pseudocl'].dir.' && git reset --hard HEAD^')
+  call system('cd /tmp/junegunn/vim-pseudocl && git commit --allow-empty -m "update"')
 
-  PlugUpdate
+  silent PlugUpdate
   Log getline(1, '$')
   q
 
@@ -669,7 +763,7 @@ Execute (When already installed):
     \ 'vim-pseudocl/installed2 should not exist'
 
 Execute (PlugInstall!):
-  PlugInstall!
+  silent PlugInstall!
   q
   Assert filereadable(g:plugs['vim-easy-align'].dir.'/installed2'),
     \ 'vim-easy-align/installed2 should exist'
@@ -690,7 +784,7 @@ Execute (When already updated):
     \ 'vim-pseudocl/updated2 should not exist'
 
 Execute (PlugUpdate!):
-  PlugUpdate!
+  silent PlugUpdate!
   q
   Assert filereadable(g:plugs['vim-easy-align'].dir.'/updated2'),
     \ 'vim-easy-align/updated2 should exist'
@@ -707,8 +801,9 @@ Execute (Using Funcref):
   Plug 'junegunn/vim-pseudocl',   { 'do': function('PlugUpdated') }
   call plug#end()
 
+  call system('cd /tmp/junegunn/vim-easy-align && git commit --allow-empty -m "update"')
   call system('cd '.g:plugs['vim-easy-align'].dir.' && git reset --hard HEAD^')
-  call system('rm -rf '.g:plugs['vim-pseudocl'].dir)
+  call RmRf(g:plugs['vim-pseudocl'].dir)
 
   PlugUpdate
   Log getline(1, '$')
@@ -718,7 +813,7 @@ Execute (Using Funcref):
   Assert filereadable(g:plugs['vim-pseudocl'].dir.'/vim-pseudoclinstalled03'),
     \ 'vim-pseudocl/vim-pseudoclinstalled03 should exist'
 
-  call system('rm -rf '.g:plugs['vim-pseudocl'].dir)
+  call RmRf(g:plugs['vim-pseudocl'].dir)
   PlugInstall!
   q
   Assert filereadable(g:plugs['vim-easy-align'].dir.'/vim-easy-alignunchanged13'),
@@ -734,6 +829,50 @@ Execute (Using Funcref):
   Assert filereadable(g:plugs['vim-pseudocl'].dir.'/vim-pseudoclunchanged13'),
     \ 'vim-pseudocl/vim-pseudoclunchanged13 should exist'
 
+Execute (Post-update hook output; success and failure):
+  call plug#begin()
+  Plug 'junegunn/vim-easy-align', { 'do': 'xxx-non-existent-command-xxx' }
+  Plug 'junegunn/vim-pseudocl',   { 'do': 'true' }
+  call plug#end()
+
+  silent PlugInstall! 1
+  AssertEqual '- Post-update hook for vim-pseudocl ... OK', getline(5)
+  AssertEqual 'x Post-update hook for vim-easy-align ... Exit status: 127', getline(6)
+  q
+
+Execute (Post-update hook output; invalid type or funcref):
+  call plug#begin()
+  Plug 'junegunn/vim-easy-align', { 'do': 1 }
+  Plug 'junegunn/vim-pseudocl',   { 'do': function('call') }
+  call plug#end()
+
+  silent PlugInstall! 1
+  AssertEqual 'x Post-update hook for vim-pseudocl ... Vim(call):E119: Not enough arguments for function: call', getline(5)
+  AssertEqual 'x Post-update hook for vim-easy-align ... Invalid hook type', getline(6)
+  q
+
+Execute (Should not run when failed to update):
+  call plug#begin()
+  Plug 'junegunn/vim-easy-align', { 'do': 'touch failed'     }
+  Plug 'junegunn/vim-pseudocl',   { 'do': 'touch not-failed' }
+  call plug#end()
+
+  " Invalid remote URL
+  call system(printf('cd %s && git remote set-url origin xxx', g:plugs['vim-easy-align'].dir))
+
+  " New commits on remote
+  call system('cd /tmp/junegunn/vim-easy-align && git commit --allow-empty -m "update"')
+  call system('cd /tmp/junegunn/vim-pseudocl && git commit --allow-empty -m "update"')
+
+  silent PlugUpdate
+  Log getline(1, '$')
+  q
+
+  Assert !filereadable(g:plugs['vim-easy-align'].dir.'/failed'),
+    \ 'vim-easy-align/failed should not exist'
+  Assert filereadable(g:plugs['vim-pseudocl'].dir.'/not-failed'),
+    \ 'vim-pseudocl/not-failed should exist'
+
 **********************************************************************
 ~ Overriding `dir`
 **********************************************************************
@@ -741,11 +880,11 @@ Execute (Using Funcref):
 Execute (Using custom dir):
   Assert isdirectory(g:plugs['vim-easy-align'].dir)
 
-  call system('rm -rf '.$TMPDIR.'easy-align')
+  call RmRf('/tmp/easy-align')
   call plug#begin()
-  Plug 'junegunn/vim-easy-align', { 'dir': $TMPDIR.'easy-align' }
+  Plug 'junegunn/vim-easy-align', { 'dir': '/tmp/easy-align' }
   call plug#end()
-  AssertEqual $TMPDIR.'easy-align/', g:plugs['vim-easy-align'].dir
+  AssertEqual '/tmp/easy-align/', g:plugs['vim-easy-align'].dir
 
   PlugClean!
   Assert !isdirectory(g:plugs['vim-easy-align'].dir)
@@ -764,6 +903,7 @@ Before (Clear global vars):
   set rtp-=$PLUG_FIXTURES/xxx/after
 
 Execute (Immediate loading):
+  call ReloadPlug()
   call plug#begin()
   Plug '$PLUG_FIXTURES/xxx'
   call plug#end()
@@ -778,6 +918,7 @@ Execute (Immediate loading):
   endif
 
 Execute (Command-based on-demand loading):
+  call ReloadPlug()
   call plug#begin()
   Plug '$PLUG_FIXTURES/xxx', { 'on': 'XXX' }
   call plug#end()
@@ -791,6 +932,7 @@ Execute (Command-based on-demand loading):
   AssertEqual ['xxx/ftdetect', 'xxx/after/ftdetect', 'xxx/plugin', 'xxx/after/plugin', 'xxx/ftplugin', 'xxx/after/ftplugin', 'xxx/indent', 'xxx/after/indent', 'xxx/syntax', 'xxx/after/syntax'], g:xxx
 
 Execute (Filetype-based on-demand loading):
+  call ReloadPlug()
   call plug#begin()
   Plug '$PLUG_FIXTURES/xxx', { 'for': 'xxx' }
   call plug#end()
@@ -798,7 +940,7 @@ Execute (Filetype-based on-demand loading):
   AssertEqual ['xxx/ftdetect', 'xxx/after/ftdetect'], g:xxx
 
   setf xxx
-  AssertEqual ['xxx/ftdetect', 'xxx/after/ftdetect', 'xxx/plugin', 'xxx/after/plugin', 'xxx/ftplugin', 'xxx/after/ftplugin', 'xxx/indent', 'xxx/after/indent', 'xxx/syntax', 'xxx/after/syntax'], g:xxx
+  AssertEqual ['xxx/ftdetect', 'xxx/after/ftdetect', 'xxx/plugin', 'xxx/after/plugin', 'xxx/syntax', 'xxx/after/syntax', 'xxx/ftplugin', 'xxx/after/ftplugin', 'xxx/indent', 'xxx/after/indent', 'xxx/syntax', 'xxx/after/syntax'], g:xxx
 
 Before:
 
@@ -905,12 +1047,13 @@ Execute (Open plug window in a new tab):
   normal S
   AssertEqual tabnr, tabpagenr()
   q
-  unlet g:plug_window
+  unlet g:plug_window tabnr
 
 **********************************************************************
 ~ g:plug_url_format
 **********************************************************************
 Execute (Using g:plug_url_format):
+  let prev_plug_url_format = g:plug_url_format
   call plug#begin()
   let g:plug_url_format = 'git@bitbucket.org:%s.git'
   Plug 'junegunn/seoul256.vim'
@@ -918,7 +1061,7 @@ Execute (Using g:plug_url_format):
   Plug 'beauty256'
   AssertEqual 'git@bitbucket.org:junegunn/seoul256.vim.git', g:plugs['seoul256.vim'].uri
   AssertEqual 'git@bitsocket.org:vim-scripts/beauty256.git', g:plugs['beauty256'].uri
-  unlet g:plug_url_format
+  let g:plug_url_format = prev_plug_url_format
 
 **********************************************************************
 ~ U
@@ -950,7 +1093,7 @@ Execute (Update plugin with U key in normal mode):
   q
 
 Execute (Update plugins with U key in visual mode):
-  silent! call system('rm -rf '.g:plugs['vim-easy-align'].dir)
+  silent! call RmRf(g:plugs['vim-easy-align'].dir)
 
   PlugStatus
   normal VGU
@@ -977,7 +1120,7 @@ Execute (plug#begin should expand env vars):
 
 **********************************************************************
 Execute (Plug directory with comma):
-  call plug#begin(temp_plugged . '/p,l,u,g,g,e,d')
+  call plug#begin(g:temp_plugged . '/p,l,u,g,g,e,d')
   Plug 'junegunn/vim-emoji'
   call plug#end()
   Log &rtp
@@ -987,10 +1130,12 @@ Execute (Plug directory with comma):
   let found = filter(split(globpath(&rtp, 'README.md'), '\n'), 'v:val =~ ","')
   Log found
   AssertEqual 1, len(found)
+  unlet found
 
 **********************************************************************
 Execute (Strict load order):
   let g:total_order = []
+  call ReloadPlug()
   call plug#begin()
   Plug '$PLUG_FIXTURES/xxx'
   Plug '$PLUG_FIXTURES/yyy', { 'for': ['xxx'] }
@@ -1004,6 +1149,7 @@ Execute (Strict load order):
   let len = len(split(&rtp, ','))
 
   let g:total_order = []
+  call ReloadPlug()
   call plug#begin()
   Plug '$PLUG_FIXTURES/xxx', { 'for': ['xxx'] }
   Plug '$PLUG_FIXTURES/yyy'
@@ -1021,6 +1167,9 @@ Execute (Strict load order):
   AssertEqual len + 2, len(split(&rtp, ','))
 
   let g:total_order = []
+  call ReloadPlug()
+  set rtp^=manually-prepended
+  set rtp+=manually-appended
   call plug#begin()
   Plug '$PLUG_FIXTURES/xxx', { 'for': ['xxx'] }
   Plug '$PLUG_FIXTURES/yyy', { 'for': ['xxx'] }
@@ -1053,117 +1202,142 @@ Execute (PlugClean should not try to remove unmanaged plugins inside g:plug_home
   q
 
 **********************************************************************
-Execute (#112 On-demand loading should not suppress messages from ftplugin):
+Execute (PlugSnapshot / #154 issues with paths containing spaces):
-  call plug#begin('$PLUG_FIXTURES')
+  let $TMPDIR = '/tmp'
-  Plug '$PLUG_FIXTURES/ftplugin-msg', { 'for': 'c' }
+  call plug#begin('$TMPDIR/plug with spaces')
-  call plug#end()
+  Plug 'junegunn/vim-easy-align'
-
-  redir => out
-  tabnew a.c
-  redir END
-  Assert stridx(out, 'ftplugin') >= 0
-
-* The same applies to plug#load())
-  redir => out
-  call plug#load('ftplugin-msg')
-  redir END
-  Assert stridx(out, 'ftplugin') >= 0
-  q
-
-**********************************************************************
-Execute (PlugSnapshot):
-  call plug#begin('$TMPDIR/plugged')
-  Plug 'junegunn/vim-emoji'
   Plug 'junegunn/seoul256.vim'
   call plug#end()
 
   PlugClean!
   PlugInstall
+  call plug#load('vim-easy-align') " Should properly handle paths with spaces
   PlugSnapshot
-  AssertEqual '#!/bin/bash', getline(1)
+  AssertEqual '" Generated by vim-plug', getline(1)
-  AssertEqual '# Generated by vim-plug', getline(2)
+  AssertEqual 0, stridx(getline(6), "silent! let g:plugs['seoul256.vim'].commit = '")
-  AssertEqual 'vim +PlugUpdate +qa', getline(5)
+  AssertEqual 0, stridx(getline(7), "silent! let g:plugs['vim-easy-align'].commit = '")
-  AssertEqual 'PLUG_HOME=$TMPDIR/plugged', getline(7)
+  AssertEqual 'vim', &filetype
-  AssertEqual 0, stridx(getline(9), 'cd $PLUG_HOME/seoul256.vim/ && git reset --hard')
-  AssertEqual 0, stridx(getline(10), 'cd $PLUG_HOME/vim-emoji/ && git reset --hard')
-  AssertEqual 'sh', &filetype
 
-  execute 'PlugSnapshot' g:plug_home.'/snapshot.sh'
+  call delete(g:plug_home.'/snapshot.vim')
-  AssertEqual 'sh', &filetype
+  execute 'PlugSnapshot' escape(g:plug_home.'/snapshot.vim', ' ')
-  AssertEqual 'snapshot.sh', fnamemodify(expand('%'), ':t')
+  AssertEqual 'vim', &filetype
+  AssertEqual 'snapshot.vim', fnamemodify(expand('%'), ':t')
+  q
+
+Execute(PlugSnapshot! to overwrite existing file):
+  call writefile(['foobar'], g:plug_home.'/snapshot.vim')
+  AssertEqual 'foobar', readfile(g:plug_home.'/snapshot.vim')[0]
+  execute 'PlugSnapshot!' escape(g:plug_home.'/snapshot.vim', ' ')
+  AssertEqual '" Generated by vim-plug', readfile(g:plug_home.'/snapshot.vim')[0]
   q
 
 **********************************************************************
-Execute (#114 Should not contain empty path in &rtp):
+Execute (#221 Shallow-clone and tag option):
-  call plug#begin('$TMPDIR/plugged')
+  call plug#begin(g:temp_plugged)
+  Plug 'junegunn/goyo.vim'
   call plug#end()
+  PlugInstall
 
-  Log &rtp
+  execute 'cd' g:plugs['goyo.vim'].dir
-  Assert &rtp !~ ',,', 'Commas'
+  Assert len(split(system('git log --oneline'), '\n')) == 1
-  Assert &rtp !~ '^,', 'Comma prefix'
+  Assert filereadable('.git/shallow')
-  Assert &rtp !~ ',$', 'Comma suffix'
 
-**********************************************************************
+  Plug 'junegunn/goyo.vim', { 'tag': '1.5.3' }
-Execute (#130 Proper cleanup of on-demand loading triggers):
+  PlugUpdate
-  augroup PlugLOD
+  q
-    autocmd!
-  augroup END
 
-  " Cleared on command
+  Assert len(split(system('git log --oneline'), '\n')) > 1
-  call plug#begin('$TMPDIR/plugged')
+  Assert system('git describe --tag') =~ '^1.5.3'
-  Plug 'junegunn/vim-emoji', { 'on':  ['EmojiCommand', 'EmojiCommand2', '<Plug>(EmojiMapping)'] }
+  Assert !filereadable('.git/shallow')
+  cd -
+
+Execute (#221 Shallow-clone disabled by g:plug_shallow = 0):
+  call plug#begin(g:temp_plugged)
   call plug#end()
-  PlugInstall | q
+  PlugClean!
 
-  Assert exists(':EmojiCommand'), 'EmojiCommand not defined'
+  let g:plug_shallow = 0
-  Assert exists(':EmojiCommand2'), 'EmojiCommand2 not defined'
+  call plug#begin(g:temp_plugged)
-  Assert !empty(mapcheck('<Plug>(EmojiMapping)')), '<Plug>(EmojiMapping) not defined'
+  Plug 'junegunn/goyo.vim'
-
-  silent! EmojiCommand
-
-  Assert !exists(':EmojiCommand'), 'EmojiCommand defined'
-  Assert !exists(':EmojiCommand2'), 'EmojiCommand2 defined'
-  Assert empty(mapcheck('<Plug>(EmojiMapping)')), '<Plug>(EmojiMapping) defined'
-
-  " Cleared on FileType
-  call plug#begin('$TMPDIR/plugged')
-  Plug 'junegunn/vim-emoji', { 'on': ['EmojiCommandExtra', '<Plug>(EmojiMappingExtra)'], 'for': ['emoji'] }
   call plug#end()
+  PlugInstall
+  q
 
-  Assert exists(':EmojiCommandExtra'), 'EmojiCommandExtra not defined'
+  execute 'cd' g:plugs['goyo.vim'].dir
-  Assert !empty(mapcheck('<Plug>(EmojiMappingExtra)')), '<Plug>(EmojiMappingExtra) not defined'
+  Assert len(split(system('git log --oneline'), '\n')) > 1, 'not shallow'
+  Assert !filereadable('.git/shallow'), 'not shallow'
+  cd -
+  unlet g:plug_shallow
 
-  setf emoji
+Execute (#221 Shallow-clone disabled by tag):
+  call plug#begin(g:temp_plugged)
+  call plug#end()
+  PlugClean!
 
-  Assert !exists(':EmojiCommandExtra'), 'EmojiCommandExtra defined'
+  call plug#begin(g:temp_plugged)
-  Assert empty(mapcheck('<Plug>(EmojiMappingExtra)')), '<Plug>(EmojiMappingExtra) defined'
+  Plug 'junegunn/goyo.vim', { 'tag': '1.5.3' }
+  call plug#end()
+  Assert !isdirectory(g:plugs['goyo.vim'].dir)
+  PlugInstall
+  Assert isdirectory(g:plugs['goyo.vim'].dir)
+  q
 
-**********************************************************************
+  execute 'cd' g:plugs['goyo.vim'].dir
-Execute (#131 Syntax error):
+  Assert system('git describe --tag') =~ '^1.5.3'
-  call plug#begin('/no-permission')
+  Assert len(split(system('git log --oneline'), '\n')) > 1
+  Assert !filereadable('.git/shallow')
+  cd -
+
+Execute (Commit hash support):
+  call plug#begin(g:temp_plugged)
+  Plug 'junegunn/goyo.vim',  { 'commit': 'ffffffff' }
+  Plug 'junegunn/vim-emoji', { 'commit': '9db7fcfee0d90dafdbcb7a32090c0a9085eb054a' }
+  call plug#end()
+  PlugUpdate
+  Log getline(1, '$')
+  AssertEqual ['x Checking out fffffff of goyo.vim ... Error',
+              \'    error: pathspec ''ffffffff'' did not match any file(s) known to git.',
+              \'- Checking out 9db7fcf of vim-emoji ... OK'], getline(5, 7)
+
+  let hash = system(printf('cd %s && git rev-parse HEAD', g:plugs['vim-emoji'].dir))[:-2]
+  AssertEqual '9db7fcfee0d90dafdbcb7a32090c0a9085eb054a', hash
+
+  " Validate error formatting
+  PlugStatus
+  Log getline(1, '$')
+  AssertEqual ['Finished. 1 error(s).',
+              \'[==]',
+              \'',
+              \'x goyo.vim:'], getline(1, 4)
+  Assert getline(5) =~ '    Invalid HEAD (expected: fffffff, actual: [0-9a-f]\{7})'
+  AssertEqual ['    PlugUpdate required.',
+              \'- vim-emoji: OK'], getline(6, '$')
+
+  " PlugDiff should show pending updates for vim-emoji
+  PlugDiff
+  Log getline(1, '$')
+  AssertEqual '0 plugin(s) updated. 1 plugin(s) have pending updates.', getline(1)
+  Assert !empty(mapcheck('o'))
+  Assert empty(mapcheck('X'))
+  Assert !empty(mapcheck("\<cr>"))
+
+  " Nor in PlugSnapshot output
+  PlugSnapshot
+  Log getline(1, '$')
+  AssertEqual 8, line('$')
+  q
+
+Execute (Commit hash support - cleared):
+  call plug#begin(g:temp_plugged)
+  Plug 'junegunn/goyo.vim'
   Plug 'junegunn/vim-emoji'
   call plug#end()
 
-  redir => out
+  PlugInstall
-  silent PlugInstall
+  let hash = system(printf('cd %s && git rev-parse HEAD', g:plugs['vim-emoji'].dir))[:-2]
-  redir END
+  AssertEqual '9db7fcfee0d90dafdbcb7a32090c0a9085eb054a', hash
-  Assert out =~ 'Invalid plug directory: /no-permission'
-
-Execute (Cleanup):
-  silent! call system('rm -rf '.temp_plugged)
-  silent! call system('rm -rf '.temp_plugged)
-  silent! call rename(fzf, expand('$PLUG_FIXTURES/fzf-staged'))
-  silent! unlet g:plugs
-  silent! unlet g:plug_home
-  silent! unlet g:plug_url_format
-  silent! unlet temp_plugged vader plug basertp save_rtp repo lnum fzf out tabnr found len
-  silent! delf PlugStatusSorted
-  silent! delf AssertExpect
-  silent! delf PlugUpdated
-  silent! delf EnsureLoaded
-  silent! delc AssertExpect
-  silent! unmap /
-  silent! unmap ?
-
-  Restore
 
+  PlugUpdate
+  let hash = system(printf('cd %s && git rev-parse HEAD', g:plugs['vim-emoji'].dir))[:-2]
+  AssertNotEqual '9db7fcfee0d90dafdbcb7a32090c0a9085eb054a', hash
+  q