Merge pull request #187 from junegunn/python-2.6

Python 2.6 compatibility

.travis.yml

@@ -1,12 +1,32 @@
-language: vim
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2 # Test with vim-nox package on ubuntu
+  - 1.9.3 # Test against python installer
+  - 2.0.0
 
 before_script: |
-  hg clone https://code.google.com/p/vim/
-  cd vim
-  ./configure --with-features=huge --enable-rubyinterp
-  make
-  sudo make install
-  cd -
+  if [ $(ruby -e 'puts RUBY_VERSION') = 1.9.2 ]; then
+    sudo apt-get update -y
+    sudo apt-get install -y vim-nox
+    sudo ln -s /usr/bin/vim /usr/local/bin/vim
+  else
+    hg clone https://code.google.com/p/vim/
+    cd vim
+    if [ $(ruby -e 'puts RUBY_VERSION') = 1.9.3 ]; then
+      sudo apt-get update -y
+      sudo apt-get install -y python2.7-dev
+      ./configure --with-features=huge --enable-pythoninterp
+    else
+      ./configure --with-features=huge --enable-rubyinterp
+    fi
+    make
+    sudo make install
+    cd -
+  fi
+
+  git config --global user.email "you@example.com"
+  git config --global user.name "Your Name"
 
 script: |
   test/run !

README.md

@@ -1,35 +1,36 @@
-![vim-plug](https://raw.github.com/junegunn/vim-plug/master/plug.png)
-![travis-ci](https://travis-ci.org/junegunn/vim-plug.svg?branch=master)
+<img src="https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.png" height="56" alt="vim-plug">
+[![travis-ci](https://travis-ci.org/junegunn/vim-plug.svg?branch=master)](https://travis-ci.org/junegunn/vim-plug)
 
-A single-file Vim plugin manager.
+A minimalist Vim plugin manager.
 
-Somewhere between [Pathogen](https://github.com/tpope/vim-pathogen) and
-[Vundle](https://github.com/gmarik/vundle), but with faster parallel installer.
-
-![](https://raw.github.com/junegunn/i/master/vim-plug/installer.gif)
+<img src="https://raw.githubusercontent.com/junegunn/i/master/vim-plug/installer.gif" height="450">
 
 ### Pros.
 
-- Easier to setup
-- Parallel installation/update (requires
-  [+ruby](http://junegunn.kr/2013/09/installing-vim-with-ruby-support/))
-- Smallest possible feature set
+- Easier to setup: Single file. No boilerplate code required.
+- Easier to use: Concise, intuitive syntax
+- [Super-fast][40/4] parallel installation/update
+  (with [+python][py] or [+ruby][rb] or [Neovim][nv])
+- On-demand loading for [faster startup time][startup-time]
+- Can review and rollback updates
 - Branch/tag support
-- On-demand loading
-- Dependency resolution using `Plugfile` (experimental)
+- Post-update hooks
+- Support for externally managed plugins
 
-### Cons.
-
-- Everything else
+[40/4]: https://raw.githubusercontent.com/junegunn/i/master/vim-plug/40-in-4.gif
+[py]: https://github.com/junegunn/vim-plug/wiki/python
+[rb]: https://github.com/junegunn/vim-plug/wiki/ruby
+[nv]: http://neovim.org/
+[startup-time]: http://junegunn.kr/images/vim-startup-time.png
 
 ### Usage
 
-[Download plug.vim](https://raw.github.com/junegunn/vim-plug/master/plug.vim)
+[Download plug.vim](https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim)
 and put it in ~/.vim/autoload
 
 ```sh
-mkdir -p ~/.vim/autoload
-curl -fLo ~/.vim/autoload/plug.vim https://raw.github.com/junegunn/vim-plug/master/plug.vim
+curl -fLo ~/.vim/autoload/plug.vim --create-dirs \
+    https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
 ```
 
 Edit your .vimrc
@@ -51,8 +52,11 @@ Plug 'https://github.com/junegunn/vim-github-dashboard.git'
 " Plugin options
 Plug 'nsf/gocode', { 'tag': 'go.weekly.2012-03-13', 'rtp': 'vim' }
 
-" Locally-managed plugin
-Plug '~/.fzf'
+" Plugin outside ~/.vim/plugged with post-update hook
+Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': 'yes \| ./install' }
+
+" Unmanaged plugin (manually installed and updated)
+Plug '~/my-prototype-plugin'
 
 call plug#end()
 ```
@@ -61,39 +65,49 @@ Reload .vimrc and `:PlugInstall` to install plugins.
 
 ### Commands
 
-| Command                           | Description                                                        |
-| --------------------------------- | ------------------------------------------------------------------ |
-| PlugInstall [name ...] [#threads] | Install plugins                                                    |
-| PlugUpdate [name ...] [#threads]  | Install or update 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               |
+| Command                             | Description                                                        |
+| ----------------------------------- | ------------------------------------------------------------------ |
+| `PlugInstall [name ...] [#threads]` | Install plugins                                                    |
+| `PlugUpdate [name ...] [#threads]`  | Install or update 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               |
+| `PlugSnapshot [output path]`        | Generate script for restoring the current snapshot of the plugins  |
 
 ### `Plug` options
 
-| Option         | Description                                                          |
-| -------------- | -------------------------------------------------------------------- |
-| `branch`/`tag` | Branch or tag of the repository to use                               |
-| `rtp`          | Subdirectory that contains Vim plugin                                |
-| `on`           | On-demand loading: Commands or <Plug>-mappings                       |
-| `for`          | On-demand loading: File types                                        |
-| `frozen`       | Do not install/update plugin unless explicitly given as the argument |
+| Option         | Description                                      |
+| -------------- | ------------------------------------------------ |
+| `branch`/`tag` | Branch or tag of the repository to use           |
+| `rtp`          | Subdirectory that contains Vim plugin            |
+| `dir`          | Custom directory for the plugin                  |
+| `do`           | Post-update hook (string or funcref)             |
+| `on`           | On-demand loading: Commands or `<Plug>`-mappings |
+| `for`          | On-demand loading: File types                    |
+| `frozen`       | Do not update unless explicitly specified        |
 
-### Options for parallel installer
+### Global options
 
-| Flag             | Default | Description                          |
-| ---------------- | ------- | ------------------------------------ |
-| `g:plug_threads` | 16      | Default number of threads to use     |
-| `g:plug_timeout` | 60      | Time limit of each task in seconds   |
-| `g:plug_retries` | 2       | Number of retries in case of timeout |
+| Flag                | Default                           | Description                                            |
+| ------------------- | --------------------------------- | ------------------------------------------------------ |
+| `g:plug_threads`    | 16                                | Default number of threads to use                       |
+| `g:plug_timeout`    | 60                                | Time limit of each task in seconds (*Ruby & Python*)   |
+| `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_url_format` | `https://git::@github.com/%s.git` | `printf` format to build repo URL                      |
 
 ### Keybindings
 
 - `D` - `PlugDiff`
 - `S` - `PlugStatus`
 - `R` - Retry failed update or installation tasks
+- `U` - Update plugins in the selected range
 - `q` - Close the window
+- `:PlugStatus`
+    - `L` - Load plugin
+- `:PlugDiff`
+    - `X` - Revert the update
 
 ### Example: A small [sensible](https://github.com/tpope/vim-sensible) Vim configuration
 
@@ -115,75 +129,75 @@ Plug 'junegunn/vim-github-dashboard', { 'on': ['GHDashboard', 'GHActivity'] }
 " Loaded when clojure file is opened
 Plug 'tpope/vim-fireplace', { 'for': 'clojure' }
 
+" Multiple file types
+Plug 'kovisoft/paredit', { 'for': ['clojure', 'scheme'] }
+
 " On-demand loading on both conditions
 Plug 'junegunn/vader.vim',  { 'on': 'Vader', 'for': 'vader' }
 ```
 
-### Dependency resolution
+`for` option is generally not needed as most plugins for specific file types
+usually don't have too much code in `plugin` directory. You might want to
+examine the output of `vim --startuptime` before applying the option.
 
-See [Dependency
-Resolution](https://github.com/junegunn/vim-plug/wiki/Dependency-Resolution).
+### Post-update hooks
+
+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 'Shougo/vimproc.vim', { 'do': 'make' }
+Plug 'Valloric/YouCompleteMe', { 'do': './install.sh' }
+```
+
+If you need more control, you can pass a reference to a Vim function that
+takes a single argument.
+
+```vim
+function! BuildYCM(info)
+  " info is a dictionary with 3 fields
+  " - name:   name of the plugin
+  " - status: 'installed', 'updated', or 'unchanged'
+  " - force:  set on PlugInstall! or PlugUpdate!
+  if a:info.status == 'installed' || a:info.force
+    !./install.sh
+  endif
+endfunction
+
+Plug 'Valloric/YouCompleteMe', { 'do': function('BuildYCM') }
+```
+
+Both forms of post-update hook are executed inside the directory of the plugin
+and only run when the repository has changed, but you can force it to run
+unconditionally with the bang-versions of the commands: `PlugInstall!` and
+`PlugUpdate!`.
+
+Make sure to escape BARs and double-quotes when you write `do` option inline
+as they are mistakenly recognized as command separator or the start of the
+trailing comment.
+
+```vim
+Plug 'junegunn/fzf', { 'do': 'yes \| ./install' }
+```
+
+But you can avoid the escaping if you extract the inline specification using a
+variable (or any Vimscript expression) as follows:
+
+```vim
+let g:fzf_install = 'yes | ./install'
+Plug 'junegunn/fzf', { 'do': g:fzf_install }
+```
+
+### FAQ/Troubleshooting
+
+See [FAQ/Troubleshooting](https://github.com/junegunn/vim-plug/wiki/faq).
 
 ### Articles
 
 - [Writing my own Vim plugin manager](http://junegunn.kr/2013/09/writing-my-own-vim-plugin-manager)
-- [Thoughts on Vim plugin dependency](http://junegunn.kr/2013/09/thoughts-on-vim-plugin-dependency)
-
-### FAQ/Troubleshooting
-
-#### Plugins are not installed/updated in parallel
-
-Your Vim does not support Ruby interface. `:echo has('ruby')` should print 1.
-In order to setup Vim with Ruby support, you may refer to [this
-article](http://junegunn.kr/2013/09/installing-vim-with-ruby-support).
-
-#### *Vim: Caught deadly signal SEGV*
-
-If your Vim crashes with the above message, first check if its Ruby interface is
-working correctly with the following command:
-
-```vim
-:ruby puts RUBY_VERSION
-```
-
-If Vim crashes even with this command, it is likely that Ruby interface is
-broken, and you have to rebuild Vim with a working version of Ruby.
-(`brew remove vim && brew install vim` or `./configure && make ...`)
-
-If you're on OS X, one possibility is that you had installed Vim with
-[Homebrew](http://brew.sh/) while using a Ruby installed with
-[RVM](http://rvm.io/) or [rbenv](https://github.com/sstephenson/rbenv) and later
-removed that version of Ruby.
-
-[Please let me know](https://github.com/junegunn/vim-plug/issues) if you can't
-resolve the problem. In the meantime, you can set `g:plug_threads` to 1, so that
-Ruby installer is not used at all.
-
-#### Errors on fish shell
-
-If vim-plug doesn't work correctly on fish shell, you might need to add `set
-shell=/bin/sh` to your .vimrc.
-
-Refer to the following links for the details:
-- http://badsimplicity.com/vim-fish-e484-cant-open-file-tmpvrdnvqe0-error/
-- https://github.com/junegunn/vim-plug/issues/12
-
-#### Freezing plugin version with commit hash
-
-vim-plug does not allow you to freeze the version of a plugin with its commit
-hash. This is by design. I don't believe a user of a plugin should be looking
-at its individual commits. Instead, one should be choosing the right version
-using release tags or versioned branches (e.g. 1.2.3, stable, devel, etc.)
-
-```vim
-Plug 'junegunn/vim-easy-align', '2.9.2'
-```
-
-If the repository doesn't come with such tags or branches, you should think of
-it as "unstable" or "in development", and always use its latest revision.
-
-If you really must choose a certain untagged revision, consider forking the
-repository.
+- [Vim plugins and startup time](http://junegunn.kr/2014/07/vim-plugins-and-startup-time)
+- ~~[Thoughts on Vim plugin dependency](http://junegunn.kr/2013/09/thoughts-on-vim-plugin-dependency)~~
+    - *Support for Plugfile has been removed since 0.5.0*
 
 ### License
 

test/fixtures/.gitignore

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

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

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

test/regressions.vader

@@ -0,0 +1,242 @@
+**********************************************************************
+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('$TMPDIR/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 plug#begin('$TMPDIR/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 plug#begin('$TMPDIR/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('/no-permission')
+  Plug 'junegunn/vim-emoji'
+  call plug#end()
+
+  redir => out
+  silent PlugInstall
+  redir END
+  Assert out =~ 'Invalid plug directory: /no-permission'
+
+**********************************************************************
+Execute (#139-1 Using new remote branch):
+  " Make sure to remove the clone
+  call plug#begin('$TMPDIR/plugged')
+  call plug#end()
+  PlugClean!
+
+  " Install master branch
+  call plug#begin('$TMPDIR/plugged')
+  Plug expand('file:///$TMPDIR/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 $TMPDIR/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('$TMPDIR/plugged')
+  Plug 'junegunn/seoul256.vim'
+  Plug expand('file:///$TMPDIR/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 $TMPDIR/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('$TMPDIR/plugged')
+  Plug expand('file:///$TMPDIR/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 $TMPDIR/plugged/new-branch && git checkout master &&'
+      \. 'touch foobar && git add foobar && git commit -m foobar')
+
+  " Different commit on remote
+  call system('cd $TMPDIR/new-branch && git checkout master &&'
+      \. 'touch foobaz && git add foobaz && git commit -m foobaz')
+
+  for multi in [0, 1]
+    call plug#begin('$TMPDIR/plugged')
+    if multi
+      Plug 'junegunn/seoul256.vim'
+    endif
+    Plug expand('file:///$TMPDIR/new-branch')
+    call plug#end()
+    PlugUpdate
+    silent %y
+    Assert @" =~ 'Not possible to fast-forward', @"
+  endfor
+
+**********************************************************************
+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 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('$TMPDIR/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('$TMPDIR/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('$TMPDIR/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'))
+

test/run

@@ -5,24 +5,91 @@ cd ..
 PLUG_SRC=$(pwd)/plug.vim
 cd - > /dev/null
 
-if [ ! -d vader.vim ]; then
-  git clone https://github.com/junegunn/vader.vim.git
-fi
+export PLUG_FIXTURES=$(pwd)/fixtures
 
-rm -rf fzf
-if [ ! -d fzf-staged ]; then
-  git clone https://github.com/junegunn/fzf.git fzf-staged
-fi
+clone() {
+  if [ ! -d $2 ]; then
+    git clone $1 $2
+  fi
+}
+
+# Clone
+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 &
+
+rm -rf $PLUG_FIXTURES/fzf
+clone https://github.com/junegunn/fzf.git $PLUG_FIXTURES/fzf-staged &
+wait
+
+(cd junegunn/seoul256.vim &&
+  git checkout no-t_co && git checkout master) > /dev/null 2>&1
+clone junegunn/vim-emoji jg/vim-emoji
+cd - > /dev/null
+
+make_dirs() {
+  mkdir -p "$PLUG_FIXTURES/$1"
+  cd "$PLUG_FIXTURES/$1"
+  mkdir -p autoload colors ftdetect ftplugin indent plugin syntax
+  for d in *; do
+    [ -d $d ] || continue
+    cat > $d/xxx.vim << EOF
+    " echom expand('<sfile>')
+    let g:total_order = get(g:, 'total_order', [])
+    let g:$2 = get(g:, '$2', [])
+    let s:name = join(filter(['$2', '${1:4}', '$d'], '!empty(v:val)'), '/')
+    call add(g:$2, s:name)
+    call add(g:total_order, s:name)
+EOF
+  done
+  cd - > /dev/null
+}
+
+init() {
+  rm -rf $PLUG_FIXTURES/{xxx,yyy,z1,z2}
+  rm -rf $TMPDIR/new-branch
+
+  make_dirs xxx/ xxx
+  make_dirs xxx/after xxx
+  mkdir -p $PLUG_FIXTURES/xxx/doc
+  cat > $PLUG_FIXTURES/xxx/doc/xxx.txt << DOC
+hello *xxx*
+DOC
+
+  make_dirs yyy/ yyy
+  make_dirs yyy/after yyy
+
+  make_dirs z1/ z1
+  make_dirs z2/ z2
+
+  (
+    cd $TMPDIR
+    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
+  )
+}
 
 cat > /tmp/mini-vimrc << VIMRC
-set rtp+=vader.vim
+set rtp+=/tmp/junegunn/vader.vim
+set shell=/bin/bash
 source $PLUG_SRC
 VIMRC
 
+[ -z "$TMPDIR" ] && export TMPDIR=/tmp/
+init
 if [ "$1" = '!' ]; then
-  /usr/local/bin/vim -Nu /tmp/mini-vimrc -c 'Vader! workflow.vader' > /dev/null &&
-  /usr/local/bin/vim -Nu /tmp/mini-vimrc -c 'let g:plug_threads = 1 | Vader! workflow.vader' > /dev/null
+  /usr/local/bin/vim -Nu /tmp/mini-vimrc -c 'Vader! test.vader' > /dev/null &&
+  init &&
+  /usr/local/bin/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'
+  /usr/local/bin/vim -Nu /tmp/mini-vimrc -c 'Vader test.vader'
 fi
 

test/test.vader

@@ -0,0 +1,72 @@
+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
+  let g:plug_url_format = 'file:///tmp/%s'
+
+  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 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])
+  endif
+  redir END
+  Log substitute(out, '\n', '', 'g')
+
+Include: workflow.vader
+Include: regressions.vader
+
+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
+

test/workflow.vader

@@ -1,50 +1,8 @@
-Execute (Initialize test environment):
-  Save &rtp, g:plugs, g:plug_home, $MYVIMRC
-
-  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
-  unlet! g:plug_home
-
-  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>)
-
-  let g:vimrc_reloaded = 0
-  let vimrc    = tempname()
-  call writefile(['let g:vimrc_reloaded += 1'], vimrc)
-  let $MYVIMRC = vimrc
-
 Execute (plug#end() before plug#begin() should fail):
-  try
-    call plug#end()
-    Assert 0, 'should not reach here'
-  catch
-    Assert stridx(v:exception, 'Call plug#begin() first') >= 0
-  endtry
+  redir => out
+  silent! AssertEqual 0, plug#end()
+  redir END
+  Assert stridx(out, 'Call plug#begin() first') >= 0
 
 Execute (plug#begin() without path argument):
   call plug#begin()
@@ -54,12 +12,10 @@ Execute (plug#begin() without path argument):
 Execute (plug#begin() without path argument with empty &rtp):
   let save_rtp = &rtp
   set rtp=
-  try
-    call plug#begin()
-    Assert 0, 'should not reach here'
-  catch
-    Assert stridx(v:exception, 'Unable to determine plug home') >= 0, 'Got: '.v:exception
-  endtry
+  redir => out
+  AssertEqual 0, plug#begin()
+  redir END
+  Assert stridx(out, 'Unable to determine plug home') >= 0
   let &rtp = save_rtp
 
 Execute (plug#begin(path)):
@@ -76,33 +32,33 @@ Execute (Subsequent plug#begin() calls will reuse g:plug_home):
   AssertEqual temp_plugged, g:plug_home
 
 Execute (Test Plug command):
-  " Git repo with branch
-  Plug 'junegunn/seoul256.vim', 'yes-t_co'
-  AssertEqual 'https://git:@github.com/junegunn/seoul256.vim.git', g:plugs['seoul256.vim'].uri
+^ Git repo with branch (DEPRECATED. USE BRANCH OPTION)
+  Plug 'junegunn/seoul256.vim', { 'branch': 'yes-t_co' }
+  AssertEqual 'file:///tmp/junegunn/seoul256.vim', g:plugs['seoul256.vim'].uri
   AssertEqual join([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 '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'
-  AssertEqual 'https://bitbucket.org/junegunn/vim-emoji.git', g:plugs['vim-emoji'].uri
+  Plug 'file:///tmp/jg/vim-emoji'
+  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
 
   " 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)
@@ -137,7 +93,6 @@ Execute (Yet, plugins are not available):
 
 Execute (PlugInstall):
   PlugInstall
-  AssertEqual 1, g:vimrc_reloaded
   q
 
 Execute (Plugin available after installation):
@@ -154,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()
@@ -163,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:
@@ -171,7 +146,6 @@ Expect:
 Execute (PlugUpdate to set the right branch):
   PlugUpdate
   call PlugStatusSorted()
-  AssertEqual 2, g:vimrc_reloaded
 
 Expect:
   - goyo.vim: OK
@@ -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
-      Invalid URI: https://git:@github.com/junegunn/seoul256.vim.git
+      Expected:    file:///tmp/junegunn.choi/seoul256.vim
+      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
-      Invalid URI: https://bitbucket.org/junegunn/vim-emoji.git
+      Expected:    file:///tmp/junegunn/vim-emoji
+      Invalid URI: file:///tmp/jg/vim-emoji
       Not found. Try PlugInstall.
       PlugClean required.
   Finished. 2 error(s).
@@ -258,7 +254,6 @@ Execute (PlugClean! to remove vim-emoji):
 Execute (PlugUpdate to install both again):
   PlugUpdate
   AssertExpect '^- [^:]*:', 2
-  AssertEqual 3, g:vimrc_reloaded
   Assert !empty(globpath(&rtp, 'colors/seoul256.vim')), 'seoul256.vim should be found'
   Assert !empty(globpath(&rtp, 'autoload/emoji.vim')), 'vim-emoji should be found'
   q
@@ -266,7 +261,6 @@ Execute (PlugUpdate to install both again):
 Execute (PlugUpdate only to find out plugins are up-to-date, D key to check):
   PlugUpdate
   AssertExpect 'Already up-to-date', 2
-  AssertEqual 4, g:vimrc_reloaded
   normal D
   AssertEqual 'No updates.', getline(1)
   q
@@ -306,7 +300,8 @@ Execute (Rollback recent updates, PlugUpdate, then PlugDiff):
 
   " ]] motion
   execute 'normal $]]'
-  AssertEqual lnum + 4, line('.')
+  Assert line('.') >= 4
+    " 5+ for merge commit
   AssertEqual 3, col('.')
 
   " [[ motion
@@ -314,6 +309,13 @@ Execute (Rollback recent updates, PlugUpdate, then PlugDiff):
   AssertEqual lnum, line('.')
   AssertEqual 3, col('.')
 
+  " X key to revert the update
+  AssertExpect '^- ', 2
+  execute "normal Xn\<cr>"
+  AssertExpect '^- ', 2
+  execute "normal Xy\<cr>"
+  AssertExpect '^- ', 1
+
   " q will close preview window as well
   normal q
 
@@ -324,6 +326,7 @@ Execute (Rollback recent updates, PlugUpdate, then PlugDiff):
   " q should not close preview window if it's already open
   pedit
   PlugDiff
+  AssertExpect '^- ', 1
   execute "normal ]]j\<cr>"
   normal q
 
@@ -331,16 +334,17 @@ Execute (Rollback recent updates, PlugUpdate, then PlugDiff):
   AssertEqual 1, &previewwindow
   pclose
 
-Execute (Plug window in a new tab):
+Execute (Reuse Plug window in another tab):
+  let tabnr = tabpagenr()
   PlugDiff
   tab new new-tab
   set buftype=nofile
   PlugUpdate
   normal D
-  AssertEqual 'No updates.', getline(1)
-  q
-  AssertEqual 'new-tab', expand('%')
-  q
+  AssertExpect '^- ', 1
+  normal q
+  AssertEqual tabnr, tabpagenr()
+  normal! gt
   q
 
 **********************************************************************
@@ -361,7 +365,8 @@ Execute (Trying to execute on-demand commands when plugin is not installed):
 
 Execute (New set of plugins):
   call plug#begin()
-  Plug 'junegunn/vim-fnr' " Depends on vim-pseudocl
+  Plug 'junegunn/vim-fnr'
+  Plug 'junegunn/vim-pseudocl'
   Plug 'junegunn/vim-easy-align', { 'on': 'EasyAlign' }
   Plug 'junegunn/vim-redis',      { 'for': 'redis' }
   call plug#end()
@@ -372,31 +377,33 @@ Execute (Check commands):
 
 Execute (Partial PlugInstall):
   PlugInstall vim-fnr vim-easy-align
-  AssertExpect 'vim-pseudocl', 1
-  PlugInstall vim-fnr vim-easy-align 1
-  AssertExpect 'vim-pseudocl', 1
+  AssertExpect 'vim-fnr', 1
   q
 
-Execute (Check dependent plugin):
-  Assert &rtp =~ 'pseudocl', &rtp
+  PlugInstall vim-fnr vim-easy-align 1
+  AssertExpect 'vim-fnr', 1
+  AssertExpect 'vim-easy-align', 1
   AssertEqual first_rtp, split(&rtp, ',')[0]
   AssertEqual last_rtp, split(&rtp, ',')[-1]
+  q
 
 Given (Unaligned code):
   a=1
   aa=2
 
 Execute (Check installed plugins):
+  call EnsureLoaded()
   Assert exists(':FNR'),           'FNR command should be found'
-  Assert exists(':EasyAlign'),     'EasyAlign command should be found'
   Assert !exists(':RedisExecute'), 'RedisExecute command still should not be found'
+
+  Assert exists(':EasyAlign'), 'EasyAlign command should be found'
   %EasyAlign=
 
 Expect (Aligned code):
   a  = 1
   aa = 2
 
-Given (nothing):
+Given:
 Execute (Partial PlugUpdate):
   PlugUpdate vim-redis
   q
@@ -411,7 +418,7 @@ Execute (On-demand loading based on filetypes):
 **********************************************************************
 
 Execute (Add unmanaged plugin):
-  let fzf = fnamemodify(g:vader_file, ':h') . '/fzf'
+  let fzf = expand('$PLUG_FIXTURES/fzf')
   Log fzf
 
   call plug#begin()
@@ -441,6 +448,7 @@ Execute (Plug block for following tests):
   call plug#end()
   " Remove plugins from previous tests
   PlugClean!
+  q
 
 Execute (PlugInstall will only install vim-easy-align):
   PlugInstall
@@ -469,7 +477,7 @@ Execute (PlugStatus should point out that the plugin is missing):
 
 Execute (Deploy unmanaged plugin):
   Assert !exists(':FZF'), ':FZF command should not exist'
-  call rename('fzf-staged', 'fzf')
+  call rename(expand('$PLUG_FIXTURES/fzf-staged'), fzf)
 
 Execute (PlugUpdate still should not care):
   PlugUpdate
@@ -507,21 +515,46 @@ Execute (Common parent):
 **********************************************************************
 ~ Frozen plugins
 **********************************************************************
+- We've decided to install plugins that are frozen: see #113
+Execute (Frozen plugin are not ~~installed nor~~ updated):
+  " Remove plugins
+  call plug#begin()
+  call plug#end()
+  PlugClean!
+  q
 
-Execute (Frozen plugin are not installed nor updated):
+  " vim-easy-align is not found, so it will be installed even though it's frozen
   call plug#begin()
   Plug 'junegunn/vim-easy-align', { 'frozen': 1 }
   call plug#end()
+  PlugInstall
+  AssertEqual 1, len(filter(getline(1, '$'), 'v:val =~ "vim-easy-align"'))
+  q
 
-  redir => output
+  " Remove plugins again
+  call plug#begin()
+  call plug#end()
+  PlugClean!
+  q
+
+  " PlugUpdate will do the same
+  call plug#begin()
+  Plug 'junegunn/vim-easy-align', { 'frozen': 1 }
+  call plug#end()
+  PlugInstall
+  AssertEqual 1, len(filter(getline(1, '$'), 'v:val =~ "vim-easy-align"'))
+  q
+
+  " Since vim-easy-align already exists, PlugInstall or PlugUpdate will skip it
+  redir => out
   silent PlugInstall
   redir END
-  Assert output =~ 'No plugin to install'
+  Assert out =~ 'No plugin to install'
 
-  redir => output
+  redir => out
   silent PlugUpdate
   redir END
-  Assert output =~ 'No plugin to update'
+  Assert out =~ 'No plugin to update'
 
 Execute (But you can still install it if the name is given as the argument):
   PlugInstall vim-easy-align
@@ -576,16 +609,467 @@ Execute (Retry failed tasks):
   AssertExpect! '[xxx]', 1
   q
 
+**********************************************************************
+~ Post-update hook (`do` option)
+**********************************************************************
+
 Execute (Cleanup):
-  call system('rm -rf '.temp_plugged)
-  call rename('fzf', 'fzf-staged')
+  call plug#begin()
+  call plug#end()
+  PlugClean!
+  q
 
-  unlet g:plugs
-  unlet g:plug_home
-  unlet g:vimrc_reloaded
-  unlet temp_plugged vader plug basertp save_rtp repo lnum fzf
-  delf PlugStatusSorted
-  delf AssertExpect
-  delc AssertExpect
+Execute (On install):
+  call plug#begin()
+  Plug 'junegunn/vim-easy-align', { 'do': 'touch installed' }
+  Plug 'junegunn/vim-pseudocl'
+  call plug#end()
+
+  silent PlugInstall
+  q
+
+  Assert filereadable(g:plugs['vim-easy-align'].dir.'/installed'),
+    \ 'vim-easy-align/installed should exist'
+  Assert !filereadable(g:plugs['vim-pseudocl'].dir.'/installed'),
+    \ 'vim-pseudocl/installed should not exist'
+
+Execute (On update):
+  call plug#begin()
+  Plug 'junegunn/vim-easy-align', { 'do': 'touch updated' }
+  Plug 'junegunn/vim-pseudocl', { 'do': 'touch updated' }
+  call plug#end()
+
+  " Reset for updates
+  call system('cd '.g:plugs['vim-pseudocl'].dir.' && git reset --hard HEAD^')
+
+  silent PlugUpdate
+  Log getline(1, '$')
+  q
+
+  Assert !filereadable(g:plugs['vim-easy-align'].dir.'/updated'),
+    \ 'vim-easy-align/updated should not exist'
+  Assert filereadable(g:plugs['vim-pseudocl'].dir.'/updated'),
+    \ 'vim-pseudocl/updated should exist'
+
+Execute (When already installed):
+  call plug#begin()
+  Plug 'junegunn/vim-easy-align', { 'do': 'touch installed2' }
+  Plug 'junegunn/vim-pseudocl', { 'do': 'touch installed2' }
+  call plug#end()
+
+  PlugInstall
+  q
+  Assert !filereadable(g:plugs['vim-easy-align'].dir.'/installed2'),
+    \ 'vim-easy-align/installed2 should not exist'
+  Assert !filereadable(g:plugs['vim-pseudocl'].dir.'/installed2'),
+    \ 'vim-pseudocl/installed2 should not exist'
+
+Execute (PlugInstall!):
+  silent PlugInstall!
+  q
+  Assert filereadable(g:plugs['vim-easy-align'].dir.'/installed2'),
+    \ 'vim-easy-align/installed2 should exist'
+  Assert filereadable(g:plugs['vim-pseudocl'].dir.'/installed2'),
+    \ 'vim-pseudocl/installed2 should exist'
+
+Execute (When already updated):
+  call plug#begin()
+  Plug 'junegunn/vim-easy-align', { 'do': 'touch updated2' }
+  Plug 'junegunn/vim-pseudocl', { 'do': 'touch updated2' }
+  call plug#end()
+
+  PlugUpdate
+  q
+  Assert !filereadable(g:plugs['vim-easy-align'].dir.'/updated2'),
+    \ 'vim-easy-align/updated2 should not exist'
+  Assert !filereadable(g:plugs['vim-pseudocl'].dir.'/updated2'),
+    \ 'vim-pseudocl/updated2 should not exist'
+
+Execute (PlugUpdate!):
+  silent PlugUpdate!
+  q
+  Assert filereadable(g:plugs['vim-easy-align'].dir.'/updated2'),
+    \ 'vim-easy-align/updated2 should exist'
+  Assert filereadable(g:plugs['vim-pseudocl'].dir.'/updated2'),
+    \ 'vim-pseudocl/updated2 should exist'
+
+Execute (Using Funcref):
+  function! PlugUpdated(info)
+    call system('touch '. a:info.name . a:info.status . a:info.force . len(a:info))
+  endfunction
+
+  call plug#begin()
+  Plug 'junegunn/vim-easy-align', { 'do': function('PlugUpdated') }
+  Plug 'junegunn/vim-pseudocl',   { 'do': function('PlugUpdated') }
+  call plug#end()
+
+  call system('cd '.g:plugs['vim-easy-align'].dir.' && git reset --hard HEAD^')
+  call system('rm -rf '.g:plugs['vim-pseudocl'].dir)
+
+  PlugUpdate
+  Log getline(1, '$')
+  q
+  Assert filereadable(g:plugs['vim-easy-align'].dir.'/vim-easy-alignupdated03'),
+    \ 'vim-easy-align/vim-easy-alignupdated03 should exist'
+  Assert filereadable(g:plugs['vim-pseudocl'].dir.'/vim-pseudoclinstalled03'),
+    \ 'vim-pseudocl/vim-pseudoclinstalled03 should exist'
+
+  call system('rm -rf '.g:plugs['vim-pseudocl'].dir)
+  PlugInstall!
+  q
+  Assert filereadable(g:plugs['vim-easy-align'].dir.'/vim-easy-alignunchanged13'),
+    \ 'vim-easy-align/vim-easy-alignunchanged13 should exist'
+  Assert filereadable(g:plugs['vim-pseudocl'].dir.'/vim-pseudoclinstalled13'),
+    \ 'vim-pseudocl/vim-pseudoclinstalled13 should exist'
+
+  call system('cd '.g:plugs['vim-easy-align'].dir.' && git reset --hard HEAD^')
+  PlugUpdate!
+  q
+  Assert filereadable(g:plugs['vim-easy-align'].dir.'/vim-easy-alignupdated13'),
+    \ 'vim-easy-align/vim-easy-alignupdated13 should exist'
+  Assert filereadable(g:plugs['vim-pseudocl'].dir.'/vim-pseudoclunchanged13'),
+    \ 'vim-pseudocl/vim-pseudoclunchanged13 should exist'
+
+**********************************************************************
+~ Overriding `dir`
+**********************************************************************
+
+Execute (Using custom dir):
+  Assert isdirectory(g:plugs['vim-easy-align'].dir)
+
+  call system('rm -rf '.$TMPDIR.'easy-align')
+  call plug#begin()
+  Plug 'junegunn/vim-easy-align', { 'dir': $TMPDIR.'easy-align' }
+  call plug#end()
+  AssertEqual $TMPDIR.'easy-align/', g:plugs['vim-easy-align'].dir
+
+  PlugClean!
+  Assert !isdirectory(g:plugs['vim-easy-align'].dir)
+  q
+
+  PlugInstall
+  q
+  Assert isdirectory(g:plugs['vim-easy-align'].dir)
+
+**********************************************************************
+~ On-demand loading load order
+**********************************************************************
+Before (Clear global vars):
+  let g:xxx = []
+  set rtp-=$PLUG_FIXTURES/xxx/
+  set rtp-=$PLUG_FIXTURES/xxx/after
+
+Execute (Immediate loading):
+  call plug#begin()
+  Plug '$PLUG_FIXTURES/xxx'
+  call plug#end()
+
+  " FIXME:
+  " Different result when Vader is run from commandline with `-c` option
+  Log g:xxx
+  if has('vim_starting')
+    AssertEqual ['xxx/ftdetect', 'xxx/after/ftdetect'], g:xxx
+  else
+    AssertEqual ['xxx/plugin', 'xxx/after/plugin', 'xxx/ftdetect', 'xxx/after/ftdetect'], g:xxx
+  endif
+
+Execute (Command-based on-demand loading):
+  call plug#begin()
+  Plug '$PLUG_FIXTURES/xxx', { 'on': 'XXX' }
+  call plug#end()
+
+  AssertEqual [], g:xxx
+
+  silent! XXX
+  AssertEqual ['xxx/ftdetect', 'xxx/after/ftdetect', 'xxx/plugin', 'xxx/after/plugin'], 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
+
+Execute (Filetype-based on-demand loading):
+  call plug#begin()
+  Plug '$PLUG_FIXTURES/xxx', { 'for': 'xxx' }
+  call plug#end()
+
+  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
+
+Before:
+
+**********************************************************************
+~ plug#helptags()
+**********************************************************************
+
+Execute (plug#helptags):
+  silent! call delete(expand('$PLUG_FIXTURES/xxx/doc/tags'))
+  Assert !filereadable(expand('$PLUG_FIXTURES/xxx/doc/tags'))
+  AssertEqual 1, plug#helptags()
+  Assert filereadable(expand('$PLUG_FIXTURES/xxx/doc/tags'))
+
+**********************************************************************
+~ Manual loading
+**********************************************************************
+
+Execute (plug#load - invalid arguments):
+  AssertEqual 0, plug#load()
+  AssertEqual 0, plug#load('non-existent-plugin')
+  AssertEqual 0, plug#load('non-existent-plugin', 'another-non-existent-plugin')
+  AssertEqual 1, plug#load('xxx')
+  AssertEqual 0, plug#load('xxx', 'non-existent-plugin')
+  AssertEqual 0, plug#load('non-existent-plugin', 'xxx')
+
+Execute (on: []):
+  call plug#begin()
+  Plug 'junegunn/rust.vim', { 'on': [] }
+  call plug#end()
+  PlugInstall
+  q
+
+Execute (PlugStatus reports (not loaded)):
+  PlugStatus
+  AssertExpect 'not loaded', 1
+  q
+
+Execute (plug#load to load it):
+  tabnew test.rs
+  " Vader will switch tab to [Vader-workbench] after Log
+  " Log &filetype
+  AssertEqual 1, plug#load('rust.vim')
+  AssertEqual 'rust', &filetype
+  q
+
+Execute (PlugStatus should not contain (not loaded)):
+  PlugStatus
+  AssertExpect 'not loaded', 0
+  q
+
+Execute (Load plugin from PlugStatus screen with L key in normal mode):
+  call plug#begin()
+  Plug '$PLUG_FIXTURES/yyy', { 'on': [] }
+  call plug#end()
+
+  PlugStatus
+  AssertExpect 'not loaded', 1
+  Assert !exists('g:yyy'), 'yyy not loaded'
+  /not loaded
+  normal L
+  AssertExpect 'not loaded', 0
+  Assert exists('g:yyy'), 'yyy loaded'
+  q
+
+Execute (Load plugin from PlugStatus screen with L key in visual mode):
+  call plug#begin()
+  Plug '$PLUG_FIXTURES/z1', { 'on':  [] }
+  Plug '$PLUG_FIXTURES/z2', { 'for': [] }
+  call plug#end()
+
+  PlugStatus
+  AssertExpect 'not loaded', 2
+  Assert !exists('g:z1'), 'z1 not loaded'
+  Assert !exists('g:z2'), 'z2 not loaded'
+  normal ggVGL
+  AssertExpect 'not loaded', 0
+  Assert exists('g:z1'), 'z1 loaded'
+  Assert exists('g:z2'), 'z2 loaded'
+  q
+
+**********************************************************************
+~ g:plug_window
+**********************************************************************
+Execute (Open plug window in a new tab):
+  " Without g:plug_window, plug window is open on the left split
+  let tabnr = tabpagenr()
+  PlugStatus
+  AssertEqual tabnr, tabpagenr()
+  AssertEqual 1, winnr()
+
+  " PlugStatus again inside the window should not change the view
+  normal S
+  AssertEqual tabnr, tabpagenr()
+  AssertEqual 1, winnr()
+  q
+
+  " Define g:plug_window so that plug window is open in a new tab
+  let g:plug_window = 'tabnew'
+  PlugStatus
+  AssertNotEqual tabnr, tabpagenr()
+
+  " PlugStatus again inside the window should not change the view
+  let tabnr = tabpagenr()
+  normal S
+  AssertEqual tabnr, tabpagenr()
+  q
+  unlet g:plug_window
+
+**********************************************************************
+~ 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'
+  let g:plug_url_format = 'git@bitsocket.org:%s.git'
+  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
+  let g:plug_url_format = prev_plug_url_format
+
+**********************************************************************
+~ U
+**********************************************************************
+Execute (Plug block):
+  call plug#begin()
+  Plug 'junegunn/vim-easy-align'
+  Plug 'junegunn/vim-emoji'
+  call plug#end()
+
+Execute (Update plugin with U key in normal mode):
+  PlugStatus
+  /emoji
+  normal U
+  Log getline(1, '$')
+  AssertExpect 'Updated', 1
+  AssertExpect 'vim-emoji', 1
+  AssertExpect 'vim-easy-align', 0
+  AssertExpect! '[=]', 1
+
+  " From PlugInstall screen
+  PlugInstall
+  /easy-align
+  normal U
+  AssertExpect 'Updated', 1
+  AssertExpect 'vim-emoji', 0
+  AssertExpect 'vim-easy-align', 1
+  AssertExpect! '[=]', 1
+  q
+
+Execute (Update plugins with U key in visual mode):
+  silent! call system('rm -rf '.g:plugs['vim-easy-align'].dir)
+
+  PlugStatus
+  normal VGU
+  Log getline(1, '$')
+  AssertExpect 'Updated', 1
+  AssertExpect 'vim-emoji', 1
+  AssertExpect 'vim-easy-align', 1
+  AssertExpect! '[==]', 1
+
+  " From PlugUpdate screen
+  normal VGU
+  Log getline(1, '$')
+  AssertExpect 'Updated', 1
+  AssertExpect 'vim-emoji', 1
+  AssertExpect 'vim-easy-align', 1
+  AssertExpect! '[==]', 1
+  q
+
+**********************************************************************
+Execute (plug#begin should expand env vars):
+  AssertNotEqual '$HOME/.emacs/plugged', expand('$HOME/.emacs/plugged')
+  call plug#begin('$HOME/.emacs/plugged')
+  AssertEqual expand('$HOME/.emacs/plugged'), g:plug_home
+
+**********************************************************************
+Execute (Plug directory with comma):
+  call plug#begin(temp_plugged . '/p,l,u,g,g,e,d')
+  Plug 'junegunn/vim-emoji'
+  call plug#end()
+  Log &rtp
+
+  PlugInstall
+  q
+  let found = filter(split(globpath(&rtp, 'README.md'), '\n'), 'v:val =~ ","')
+  Log found
+  AssertEqual 1, len(found)
+
+**********************************************************************
+Execute (Strict load order):
+  let g:total_order = []
+  call plug#begin()
+  Plug '$PLUG_FIXTURES/xxx'
+  Plug '$PLUG_FIXTURES/yyy', { 'for': ['xxx'] }
+  call plug#end()
+  call EnsureLoaded()
+  setf xxx
+  Log 'Case 1: ' . &rtp
+  AssertEqual ['yyy/ftdetect', 'yyy/after/ftdetect', 'xxx/ftdetect', 'xxx/after/ftdetect'], g:total_order[0:3]
+  Assert index(g:total_order, 'xxx/plugin') < index(g:total_order, 'yyy/plugin')
+  Assert index(g:total_order, 'xxx/after/plugin') < index(g:total_order, 'yyy/after/plugin')
+  let len = len(split(&rtp, ','))
+
+  let g:total_order = []
+  call plug#begin()
+  Plug '$PLUG_FIXTURES/xxx', { 'for': ['xxx'] }
+  Plug '$PLUG_FIXTURES/yyy'
+  call plug#end()
+  call EnsureLoaded()
+  set rtp^=manually-prepended
+  set rtp+=manually-appended
+  setf xxx
+  Log 'Case 2: ' . &rtp
+  AssertEqual 'manually-prepended', split(&rtp, ',')[3]
+  AssertEqual 'manually-appended',  split(&rtp, ',')[-4]
+  AssertEqual ['xxx/ftdetect', 'xxx/after/ftdetect', 'yyy/ftdetect', 'yyy/after/ftdetect'], g:total_order[0:3]
+  Assert index(g:total_order, 'yyy/plugin') < index(g:total_order, 'xxx/plugin')
+  Assert index(g:total_order, 'yyy/after/plugin') < index(g:total_order, 'xxx/after/plugin')
+  AssertEqual len + 2, len(split(&rtp, ','))
+
+  let g:total_order = []
+  call plug#begin()
+  Plug '$PLUG_FIXTURES/xxx', { 'for': ['xxx'] }
+  Plug '$PLUG_FIXTURES/yyy', { 'for': ['xxx'] }
+  call plug#end()
+  call EnsureLoaded()
+  setf xxx
+  Log 'Case 3: ' . &rtp
+  AssertEqual ['xxx/ftdetect', 'xxx/after/ftdetect', 'yyy/ftdetect', 'yyy/after/ftdetect'], g:total_order[0:3]
+  Assert index(g:total_order, 'xxx/plugin') < index(g:total_order, 'yyy/plugin')
+  Assert index(g:total_order, 'xxx/after/plugin') < index(g:total_order, 'yyy/after/plugin')
+  AssertEqual len + 2, len(split(&rtp, ','))
+
+**********************************************************************
+Execute (PlugClean should not try to remove unmanaged plugins inside g:plug_home):
+  call plug#begin('$PLUG_FIXTURES')
+  Plug '$PLUG_FIXTURES/ftplugin-msg', { 'for': [] }
+  Plug '$PLUG_FIXTURES/fzf'
+  Plug '$PLUG_FIXTURES/xxx'
+  Plug '$PLUG_FIXTURES/yyy'
+  call plug#end()
+
+  " Remove z1, z2
+  PlugClean!
+  AssertExpect '^- ', 2
+  AssertExpect 'Already clean', 0
+
+  PlugClean!
+  AssertExpect '^- ', 0
+  AssertExpect 'Already clean', 1
+  q
+
+**********************************************************************
+Execute (PlugSnapshot / #154 issues with paths containing spaces):
+  call plug#begin('$TMPDIR/plug with spaces')
+  Plug 'junegunn/vim-easy-align'
+  Plug 'junegunn/seoul256.vim'
+  call plug#end()
+
+  PlugClean!
+  PlugInstall
+  call plug#load('vim-easy-align') " Should properly handle paths with spaces
+  PlugSnapshot
+  AssertEqual '#!/bin/sh', getline(1)
+  AssertEqual '# Generated by vim-plug', getline(2)
+  AssertEqual 'vim +PlugUpdate +qa', getline(5)
+  AssertEqual 'PLUG_HOME=$TMPDIR/plug\ with\ spaces', getline(7)
+  AssertEqual 0, stridx(getline(9), 'cd $PLUG_HOME/seoul256.vim/ && git reset --hard')
+  AssertEqual 0, stridx(getline(10), 'cd $PLUG_HOME/vim-easy-align/ && git reset --hard')
+  AssertEqual 'sh', &filetype
+
+  execute 'PlugSnapshot' g:plug_home.'/snapshot.sh'
+  AssertEqual 'sh', &filetype
+  AssertEqual 'snapshot.sh', fnamemodify(expand('%'), ':t')
+  q
 
-  Restore