Ignore occasional error from Ruby 1.8.7

Related: https://bugs.ruby-lang.org/issues/1471

.travis.yml

@@ -0,0 +1,12 @@
+language: vim
+
+before_script: |
+  hg clone https://code.google.com/p/vim/
+  cd vim
+  ./configure --with-features=huge --enable-rubyinterp
+  make
+  sudo make install
+  cd -
+
+script: |
+  test/run !

README.md

@@ -1,11 +1,12 @@
 ![vim-plug](https://raw.github.com/junegunn/vim-plug/master/plug.png)
+![travis-ci](https://travis-ci.org/junegunn/vim-plug.svg?branch=master)
 
 A single-file 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/vim-plug/master/gif/vim-plug.gif)
+![](https://raw.github.com/junegunn/i/master/vim-plug/installer.gif)
 
 ### Pros.
 

plug.vim

@@ -141,16 +141,17 @@ function! plug#end()
       for cmd in commands
         if cmd =~ '^<Plug>.\+'
           if empty(mapcheck(cmd)) && empty(mapcheck(cmd, 'i'))
-            for [mode, prefix] in [['i', "<C-O>"], ['', '']]
+            for [mode, map_prefix, key_prefix] in
+                  \ [['i', "<C-O>", ''], ['n', '', ''], ['v', '', 'gv'], ['o', '', '']]
               execute printf(
-              \ "%snoremap <silent> %s %s:call <SID>lod_map(%s, %s)<CR>",
-              \ mode, cmd, prefix, string(cmd), string(plug))
+              \ "%snoremap <silent> %s %s:<C-U>call <SID>lod_map(%s, %s, '%s')<CR>",
+              \ mode, cmd, map_prefix, string(cmd), string(name), key_prefix)
             endfor
           endif
         elseif !exists(':'.cmd)
           execute printf(
           \ "command! -nargs=* -range -bang %s call s:lod_cmd(%s, '<bang>', <line1>, <line2>, <q-args>, %s)",
-          \ cmd, string(cmd), string(plug))
+          \ cmd, string(cmd), string(name))
         endif
       endfor
     endif
@@ -178,13 +179,32 @@ function! plug#end()
   syntax on
 endfunction
 
-function! s:rtp(spec)
-  let rtp = s:dirpath(a:spec.dir . get(a:spec, 'rtp', ''))
-  if s:is_win
-    let rtp = substitute(rtp, '\\*$', '', '')
-  endif
-  return rtp
-endfunction
+if s:is_win
+  function! s:rtp(spec)
+    let rtp = s:dirpath(a:spec.dir . get(a:spec, 'rtp', ''))
+    return substitute(rtp, '\\*$', '', '')
+  endfunction
+
+  function! s:path(path)
+    return substitute(substitute(a:path, '/', '\', 'g'), '[/\\]*$', '', '')
+  endfunction
+
+  function! s:dirpath(path)
+    return s:path(a:path) . '\'
+  endfunction
+else
+  function! s:rtp(spec)
+    return s:dirpath(a:spec.dir . get(a:spec, 'rtp', ''))
+  endfunction
+
+  function! s:path(path)
+    return substitute(a:path, '[/\\]*$', '', '')
+  endfunction
+
+  function! s:dirpath(path)
+    return s:path(a:path) . '/'
+  endfunction
+endif
 
 function! s:esc(path)
   return substitute(a:path, ' ', '\\ ', 'g')
@@ -192,8 +212,9 @@ endfunction
 
 function! s:add_rtp(rtp)
   execute "set rtp^=".s:esc(a:rtp)
-  if isdirectory(a:rtp.'after')
-    execute "set rtp+=".s:esc(a:rtp.'after')
+  let after = globpath(a:rtp, 'after')
+  if isdirectory(after)
+    execute "set rtp+=".s:esc(after)
   endif
 endfunction
 
@@ -212,19 +233,19 @@ function! s:lod_ft(pat, names)
     call s:lod(g:plugs[name], ['plugin', 'after'])
   endfor
   execute 'autocmd! PlugLOD FileType ' . a:pat
-  let &l:filetype = &l:filetype
+  silent! doautocmd filetypeplugin FileType
 endfunction
 
-function! s:lod_cmd(cmd, bang, l1, l2, args, plug)
+function! s:lod_cmd(cmd, bang, l1, l2, args, name)
   execute 'delc '.a:cmd
-  call s:lod(a:plug, ['plugin', 'ftdetect', 'after'])
+  call s:lod(g:plugs[a:name], ['plugin', 'ftdetect', 'after'])
   execute printf("%s%s%s %s", (a:l1 == a:l2 ? '' : (a:l1.','.a:l2)), a:cmd, a:bang, a:args)
 endfunction
 
-function! s:lod_map(map, plug)
+function! s:lod_map(map, name, prefix)
   execute 'unmap '.a:map
   execute 'iunmap '.a:map
-  call s:lod(a:plug, ['plugin', 'ftdetect', 'after'])
+  call s:lod(g:plugs[a:name], ['plugin', 'ftdetect', 'after'])
   let extra = ''
   while 1
     let c = getchar(0)
@@ -233,7 +254,7 @@ function! s:lod_map(map, plug)
     endif
     let extra .= nr2char(c)
   endwhile
-  call feedkeys(substitute(a:map, '^<Plug>', "\<Plug>", '') . extra)
+  call feedkeys(a:prefix . substitute(a:map, '^<Plug>', "\<Plug>", '') . extra)
 endfunction
 
 function! s:add(...)
@@ -256,6 +277,9 @@ function! s:add(...)
     return
   endif
 
+  let name = substitute(split(plugin, '/')[-1], '\.git$', '', '')
+  if !force && has_key(g:plugs, name) | return | endif
+
   if plugin =~ ':'
     let uri = plugin
   else
@@ -265,9 +289,6 @@ function! s:add(...)
     let uri = 'https://git:@github.com/' . plugin . '.git'
   endif
 
-  let name = substitute(split(plugin, '/')[-1], '\.git$', '', '')
-  if !force && has_key(g:plugs, name) | return | endif
-
   let dir  = s:dirpath( fnamemodify(join([g:plug_home, name], '/'), ':p') )
   let spec = extend(opts, { 'dir': dir, 'uri': uri })
   let g:plugs[name] = spec
@@ -302,7 +323,11 @@ function! s:syntax()
   syn match plugBracket /[[\]]/ contained
   syn match plugX /x/ contained
   syn match plugDash /^-/
+  syn match plugPlus /^+/
+  syn match plugStar /^*/
   syn match plugName /\(^- \)\@<=[^:]*/
+  syn match plugInstall /\(^+ \)\@<=[^:]*/
+  syn match plugUpdate /\(^* \)\@<=[^:]*/
   syn match plugCommit /^  [0-9a-z]\{7} .*/ contains=plugRelDate,plugSha
   syn match plugSha /\(^  \)\@<=[0-9a-z]\{7}/ contained
   syn match plugRelDate /([^)]*)$/ contained
@@ -313,8 +338,15 @@ function! s:syntax()
   hi def link plugX       Exception
   hi def link plugBracket Structure
   hi def link plugNumber  Number
+
   hi def link plugDash    Special
+  hi def link plugPlus    Constant
+  hi def link plugStar    Boolean
+
   hi def link plugName    Label
+  hi def link plugInstall Function
+  hi def link plugUpdate  Type
+
   hi def link plugError   Error
   hi def link plugRelDate Comment
   hi def link plugSha     Identifier
@@ -406,11 +438,29 @@ function! s:update_impl(pull, args) abort
   normal! 2G
   redraw
 
+  let len = len(g:plugs)
   if has('ruby') && threads > 1
-    call s:update_parallel(a:pull, todo, threads)
+    try
+      call s:update_parallel(a:pull, todo, threads)
+    catch
+      let lines = getline(4, '$')
+      let printed = {}
+      silent 4,$d
+      for line in lines
+        let name = get(matchlist(line, '^. \([^:]\+\):'), 1, '')
+        if empty(name) || !has_key(printed, name)
+          let printed[name] = 1
+          call append('$', line)
+        endif
+      endfor
+      echoerr v:exception
+    endtry
   else
     call s:update_serial(a:pull, todo)
   endif
+  if len(g:plugs) > len
+    call plug#end()
+  endif
   call s:finish(a:pull)
 endfunction
 
@@ -419,7 +469,7 @@ function! s:extend(names)
   try
     command! -nargs=+ Plug call s:add(0, <args>)
     for name in a:names
-      let plugfile = s:rtp(g:plugs[name]) . s:plug_file
+      let plugfile = globpath(s:rtp(g:plugs[name]), s:plug_file)
       if filereadable(plugfile)
         execute "source ". s:esc(plugfile)
       endif
@@ -466,7 +516,6 @@ function! s:update_serial(pull, todo)
         if !isdirectory(base)
           call mkdir(base, 'p')
         endif
-        execute 'cd '.base
         let result = s:system(
               \ printf('git clone --recursive %s -b %s %s 2>&1 && cd %s && git submodule update --init --recursive 2>&1',
               \ s:shellesc(spec.uri),
@@ -495,6 +544,23 @@ endfunction
 
 function! s:update_parallel(pull, todo, threads)
   ruby << EOF
+  module PlugStream
+    SEP = ["\r", "\n", nil]
+    def get_line
+      buffer = ''
+      loop do
+        char = readchar rescue return
+        if SEP.include? char.chr
+          buffer << $/
+          break
+        else
+          buffer << char
+        end
+      end
+      buffer
+    end
+  end unless defined?(PlugStream)
+
   def esc arg
     %["#{arg.gsub('"', '\"')}"]
   end
@@ -510,55 +576,70 @@ function! s:update_parallel(pull, todo, threads)
   all   = VIM::evaluate('copy(a:todo)')
   limit = VIM::evaluate('get(g:, "plug_timeout", 60)')
   nthr  = VIM::evaluate('a:threads').to_i
+  maxy  = VIM::evaluate('winheight(".")').to_i
   cd    = iswin ? 'cd /d' : 'cd'
-  done  = {}
   tot   = 0
   bar   = ''
   skip  = 'Already installed'
   mtx   = Mutex.new
   take1 = proc { mtx.synchronize { running && all.shift } }
   logh  = proc {
-    cnt = done.length
+    cnt = $curbuf[2][1...-1].strip.length
     tot = VIM::evaluate('len(a:todo)') || tot
     $curbuf[1] = "#{pull ? 'Updating' : 'Installing'} plugins (#{cnt}/#{tot})"
     $curbuf[2] = '[' + bar.ljust(tot) + ']'
     VIM::command('normal! 2G')
     VIM::command('redraw') unless iswin
   }
-  log = proc { |name, result, ok|
+  where = proc { |name| (1..($curbuf.length)).find { |l| $curbuf[l] =~ /^[-+x*] #{name}:/ } }
+  log   = proc { |name, result, type|
     mtx.synchronize do
-      bar += ok ? '=' : 'x'
-      done[name] = true
+      ing  = ![true, false].include?(type)
+      bar += type ? '=' : 'x' unless ing
+      b = case type
+          when :install  then '+' when :update then '*'
+          when true, nil then '-' else 'x' end
       result =
-        if ok
-          ["- #{name}: #{result.lines.to_a.last.strip}"]
+        if type || type.nil?
+          ["#{b} #{name}: #{result.lines.to_a.last}"]
         elsif result =~ /^Interrupted|^Timeout/
-          ["x #{name}: #{result}"]
+          ["#{b} #{name}: #{result}"]
         else
-          ["x #{name}"] + result.lines.map { |l| "    " << l }
+          ["#{b} #{name}"] + result.lines.map { |l| "    " << l }
         end
+      if lnum = where.call(name)
+        $curbuf.delete lnum
+        lnum = 4 if ing && lnum > maxy
+      end
       result.each_with_index do |line, offset|
-        $curbuf.append 3 + offset, line.chomp
+        $curbuf.append((lnum || 4) - 1 + offset, line.gsub(/\e\[./, '').chomp)
       end
       logh.call
     end
   }
-  bt = proc { |cmd|
+  bt = proc { |cmd, name, type|
     begin
       fd = nil
-      Timeout::timeout(limit) do
-        if iswin
+      data = ''
+      if iswin
+        Timeout::timeout(limit) do
           tmp = VIM::evaluate('tempname()')
           system("#{cmd} > #{tmp}")
           data = File.read(tmp).chomp
           File.unlink tmp rescue nil
-        else
-          fd = IO.popen(cmd)
-          data = fd.read.chomp
-          fd.close
         end
-        [$? == 0, data]
+      else
+        fd = IO.popen(cmd).extend(PlugStream)
+        first_line = true
+        log_prob = 1.0 / nthr
+        while line = Timeout::timeout(limit) { fd.get_line }
+          data << line
+          log.call name, line.chomp, type if name && (first_line || rand < log_prob)
+          first_line = false
+        end
+        fd.close
       end
+      [$? == 0, data.chomp]
     rescue Timeout::Error, Interrupt => e
       if fd && !fd.closed?
         pids = [fd.pid]
@@ -566,7 +647,7 @@ function! s:update_parallel(pull, todo, threads)
           children = pids
           until children.empty?
             children = children.map { |pid|
-              `pgrep -P #{pid}`.lines.map(&:chomp)
+              `pgrep -P #{pid}`.lines.map { |l| l.chomp }
             }.flatten
             pids += children
           end
@@ -591,6 +672,7 @@ function! s:update_parallel(pull, todo, threads)
     main.kill
   }
 
+  progress = iswin ? '' : '--progress'
   until all.empty?
     names = all.keys
     [names.length, nthr].min.times do
@@ -600,10 +682,11 @@ function! s:update_parallel(pull, todo, threads)
             name = pair.first
             dir, uri, branch = pair.last.values_at *%w[dir uri branch]
             branch = esc branch
+            subm = "git submodule update --init --recursive 2>&1"
             ok, result =
               if File.directory? dir
                 dir = esc dir
-                ret, data = bt.call "#{cd} #{dir} && git rev-parse --abbrev-ref HEAD 2>&1 && git config remote.origin.url"
+                ret, data = bt.call "#{cd} #{dir} && git rev-parse --abbrev-ref HEAD 2>&1 && git config remote.origin.url", nil, nil
                 current_uri = data.lines.to_a.last
                 if !ret
                   if data =~ /^Interrupted|^Timeout/
@@ -617,7 +700,8 @@ function! s:update_parallel(pull, todo, threads)
                            "PlugClean required."].join($/)]
                 else
                   if pull
-                    bt.call "#{cd} #{dir} && git checkout -q #{branch} 2>&1 && git pull origin #{branch} 2>&1 && git submodule update --init --recursive 2>&1"
+                    log.call name, 'Updating ...', :update
+                    bt.call "#{cd} #{dir} && git checkout -q #{branch} 2>&1 && (git pull origin #{branch} #{progress} 2>&1 && #{subm})", name, :update
                   else
                     [true, skip]
                   end
@@ -625,14 +709,15 @@ function! s:update_parallel(pull, todo, threads)
               else
                 FileUtils.mkdir_p(base)
                 d = esc dir.sub(%r{[\\/]+$}, '')
-                bt.call "#{cd} #{base} && git clone --recursive #{uri} -b #{branch} #{d} 2>&1 && cd #{esc dir} && git submodule update --init --recursive 2>&1"
+                log.call name, 'Installing ...', :install
+                bt.call "(git clone #{progress} --recursive #{uri} -b #{branch} #{d} 2>&1 && cd #{esc dir} && #{subm})", name, :install
               end
             log.call name, result, ok
           end
         } if running
       end
     end
-    threads.each(&:join)
+    threads.each { |t| t.join rescue nil }
     mtx.synchronize { threads.clear }
     all.merge!(VIM::evaluate("s:extend(#{names.inspect})") || {})
     logh.call
@@ -642,20 +727,6 @@ function! s:update_parallel(pull, todo, threads)
 EOF
 endfunction
 
-function! s:path(path)
-  return substitute(s:is_win ? substitute(a:path, '/', '\', 'g') : a:path,
-        \ '[/\\]*$', '', '')
-endfunction
-
-function! s:dirpath(path)
-  let path = s:path(a:path)
-  if s:is_win
-    return path !~ '\\$' ? path.'\' : path
-  else
-    return path !~ '/$' ? path.'/' : path
-  endif
-endfunction
-
 function! s:shellesc(arg)
   return '"'.substitute(a:arg, '"', '\\"', 'g').'"'
 endfunction
@@ -687,6 +758,11 @@ function! s:system(cmd)
   return system(s:is_win ? '('.a:cmd.')' : a:cmd)
 endfunction
 
+function! s:system_chomp(str)
+  let ret = s:system(a:str)
+  return v:shell_error ? '' : substitute(ret, '\n$', '', '')
+endfunction
+
 function! s:git_valid(spec, check_branch, cd)
   let ret = 1
   let msg = 'OK'
@@ -694,7 +770,7 @@ function! s:git_valid(spec, check_branch, cd)
     if a:cd | execute "cd " . s:esc(a:spec.dir) | endif
     let result = split(s:system("git rev-parse --abbrev-ref HEAD 2>&1 && git config remote.origin.url"), '\n')
     let remote = result[-1]
-    if v:shell_error != 0
+    if v:shell_error
       let msg = join([remote, "PlugClean required."], "\n")
       let ret = 0
     elseif !s:compare_git_uri(remote, a:spec.uri)
@@ -704,9 +780,13 @@ function! s:git_valid(spec, check_branch, cd)
       let ret = 0
     elseif a:check_branch
       let branch = result[0]
-      if a:spec.branch != branch
-        let msg = 'Invalid branch: '.branch.'. Try PlugUpdate.'
-        let ret = 0
+      if a:spec.branch !=# branch
+        let tag = s:system_chomp('git describe --exact-match --tags HEAD 2>&1')
+        if a:spec.branch !=# tag
+          let msg = printf('Invalid branch/tag: %s (expected: %s). Try PlugUpdate.',
+                \ (empty(tag) ? branch : tag), a:spec.branch)
+          let ret = 0
+        endif
       endif
     endif
     if a:cd | cd - | endif

test/README.md

@@ -7,8 +7,10 @@ Test cases for vim-plug
 
 ### Run
 
-```vim
-:e workflow.vader | Vader
+```
+./run
+
+./run !
 ```
 
 ### TODO
@@ -18,7 +20,6 @@ Test cases for the following features are currently missing:
 - Output formatting
 - Timeout or interrupt cleaning up git processes
 - User prompt in PlugClean command
-- Automatic dependency resolution using Plugfile
 - Single-threaded installer
 - Windows support
 

test/run

@@ -5,15 +5,18 @@ cd ..
 PLUG_SRC=$(pwd)/plug.vim
 cd - > /dev/null
 
-export VADER_RTP=$TMPDIR/vader-rtp
-vim -e +Vader -c ':call writefile([fnamemodify(globpath(&rtp, "autoload/vader.vim"), ":h:h")], $VADER_RTP)' +q
+if [ ! -d vader.vim ]; then
+  git clone https://github.com/junegunn/vader.vim.git
+fi
 
-MINI_VIMRC=$TMPDIR/mini-vimrc
-cat > $MINI_VIMRC << EOF
-let \$MYVIMRC = '$MINI_VIMRC'
-set nocompatible
-set rtp=$(cat $VADER_RTP)
+cat > /tmp/mini-vimrc << VIMRC
+set rtp+=vader.vim
 source $PLUG_SRC
-EOF
+VIMRC
+
+if [ "$1" = '!' ]; then
+  /usr/local/bin/vim -Nu /tmp/mini-vimrc -c 'Vader! workflow.vader' > /dev/null
+else
+  /usr/local/bin/vim -Nu /tmp/mini-vimrc -c 'Vader workflow.vader'
+fi
 
-vim -u $MINI_VIMRC +Vader*

test/workflow.vader

@@ -1,5 +1,5 @@
 Execute (Initialize test environment):
-  Save &rtp, g:plug_home, $MYVIMRC
+  Save &rtp, g:plugs, g:plug_home, $MYVIMRC
 
   let vader = fnamemodify(globpath(&rtp, 'autoload/vader.vim'), ':h:h')
   let plug  = fnamemodify(globpath(&rtp, 'autoload/plug.vim'), ':h:h')
@@ -15,6 +15,15 @@ Execute (Initialize test environment):
   colo default
   pclose
 
+  function! PlugStatusSorted()
+    PlugStatus
+    %y
+    q
+    normal! P
+    %sort
+    g/^$/d
+  endfunction
+
   let g:vimrc_reloaded = 0
   let vimrc    = tempname()
   call writefile(['let g:vimrc_reloaded += 1'], vimrc)
@@ -64,9 +73,15 @@ Execute (Test Plug command):
   AssertEqual join([temp_plugged, 'seoul256.vim/'], '/'), g:plugs['seoul256.vim'].dir
   AssertEqual 'no-t_co', g:plugs['seoul256.vim'].branch
 
+  " Git repo with tag
+  Plug 'junegunn/goyo.vim', '1.5.3'
+  AssertEqual 'https://git:@github.com/junegunn/goyo.vim.git', g:plugs['goyo.vim'].uri
+  AssertEqual join([temp_plugged, 'goyo.vim/'], '/'), g:plugs['goyo.vim'].dir
+  AssertEqual '1.5.3', g:plugs['goyo.vim'].branch
+
   " Git URI
-  Plug 'git@github.com:junegunn/vim-emoji.git'
-  AssertEqual 'git@github.com:junegunn/vim-emoji.git', g:plugs['vim-emoji'].uri
+  Plug 'https://bitbucket.org/junegunn/vim-emoji.git'
+  AssertEqual 'https://bitbucket.org/junegunn/vim-emoji.git', g:plugs['vim-emoji'].uri
   AssertEqual 'master', g:plugs['vim-emoji'].branch
   AssertEqual join([temp_plugged, 'vim-emoji/'], '/'), g:plugs['vim-emoji'].dir
 
@@ -75,18 +90,20 @@ Execute (Test Plug command):
   AssertEqual 'https://git:@github.com/vim-scripts/beauty256.git', g:plugs.beauty256.uri
   AssertEqual 'master', g:plugs.beauty256.branch
 
-  AssertEqual 3, len(g:plugs)
+  AssertEqual 4, len(g:plugs)
 
 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 '././', g:plugs['seoul256.vim'].rtp
 
-  AssertEqual 3, len(g:plugs)
+  Log string(g:plugs)
+  AssertEqual 4, len(g:plugs)
 
 Execute (PlugStatus before installation):
   PlugStatus
-  AssertEqual 3, len(filter(getline(1, line('$')), 'v:val =~ "Not found"'))
+  AssertEqual 4, len(filter(getline(1, line('$')), 'v:val =~ "Not found"'))
   q
 
 Execute (PlugClean before installation):
@@ -116,25 +133,44 @@ Execute (PlugClean after installation):
 
 Execute (PlugStatus after installation):
   PlugStatus
-  AssertEqual 3, len(filter(getline(1, line('$')), 'v:val =~ "OK"'))
+  AssertEqual 4, len(filter(getline(1, line('$')), 'v:val =~ "OK"'))
   q
 
+Execute (Change tag of goyo.vim):
+  call plug#begin()
+  Plug 'junegunn/goyo.vim'
+  call plug#end()
+
+Execute (PlugStatus):
+  call PlugStatusSorted()
+
+Expect:
+      Invalid branch/tag: 1.5.3 (expected: master). Try PlugUpdate.
+  Finished. 1 error(s).
+  [=]
+  x goyo.vim:
+
+Execute (PlugUpdate to set the right branch):
+  PlugUpdate
+  call PlugStatusSorted()
+  AssertEqual 2, g:vimrc_reloaded
+
+Expect:
+  - goyo.vim: OK
+  Finished. 0 error(s).
+  [=]
+
 Execute (Change branch of seoul256.vim):
   call plug#begin()
   Plug 'junegunn/seoul256.vim'
-  Plug 'git@github.com:junegunn/vim-emoji.git'
+  Plug 'https://bitbucket.org/junegunn/vim-emoji.git'
   call plug#end()
 
 Execute (PlugStatus):
-  PlugStatus
-  %y
-  q
-  normal! P
-  %sort
-  g/^$/d
+  call PlugStatusSorted()
 
 Expect:
-      Invalid branch: no-t_co. Try PlugUpdate.
+      Invalid branch/tag: no-t_co (expected: master). Try PlugUpdate.
   - vim-emoji: OK
   Finished. 1 error(s).
   [==]
@@ -143,16 +179,11 @@ Expect:
 Execute (Change URI of seoul256.vim):
   call plug#begin()
   Plug 'junegunn.choi/seoul256.vim'
-  Plug 'git@github.com:junegunn/vim-emoji.git'
+  Plug 'https://bitbucket.org/junegunn/vim-emoji.git'
   call plug#end()
 
 Execute (PlugStatus):
-  PlugStatus
-  %y
-  q
-  normal! P
-  %sort
-  g/^$/d
+  call PlugStatusSorted()
 
 Expect:
       Expected:    https://git:@github.com/junegunn.choi/seoul256.vim.git
@@ -172,6 +203,8 @@ Expect:
 
 Execute (PlugClean! to remove seoul256.vim):
   PlugClean!
+  " Three removed, emoji left
+  AssertEqual 3, len(filter(getline(1, line('$')), 'v:val =~ "^- "'))
   AssertEqual 1, len(filter(getline(1, line('$')), 'v:val =~ "Removed"'))
   Assert empty(globpath(&rtp, 'colors/seoul256.vim'))
   Assert !empty(globpath(&rtp, 'autoload/emoji.vim'))
@@ -184,16 +217,11 @@ Execute (Change GIT URI of vim-emoji):
   call plug#end()
 
 Execute (PlugStatus):
-  PlugStatus
-  %y
-  q
-  normal! P
-  %sort
-  g/^$/d
+  call PlugStatusSorted()
 
 Expect:
       Expected:    https://git:@github.com/junegunn/vim-emoji.git
-      Invalid URI: git@github.com:junegunn/vim-emoji.git
+      Invalid URI: https://bitbucket.org/junegunn/vim-emoji.git
       Not found. Try PlugInstall.
       PlugClean required.
   Finished. 2 error(s).
@@ -203,6 +231,7 @@ Expect:
 
 Execute (PlugClean! to remove vim-emoji):
   PlugClean!
+  AssertEqual 1, len(filter(getline(1, line('$')), 'v:val =~ "^- "'))
   AssertEqual 1, len(filter(getline(1, line('$')), 'v:val =~ "Removed"'))
   Assert empty(globpath(&rtp, 'colors/seoul256.vim'))
   Assert empty(globpath(&rtp, 'autoload/emoji.vim'))
@@ -210,8 +239,8 @@ Execute (PlugClean! to remove vim-emoji):
 
 Execute (PlugUpdate to install both again):
   PlugUpdate
-  AssertEqual 2, len(filter(getline(1, line('$')), 'v:val =~ "Cloning into"'))
-  AssertEqual 2, g:vimrc_reloaded
+  AssertEqual 2, len(filter(getline(1, line('$')), 'v:val =~ "^- [^:]*:"'))
+  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
@@ -219,7 +248,7 @@ Execute (PlugUpdate to install both again):
 Execute (PlugUpdate only to find out plugins are up-to-date, D key to check):
   PlugUpdate
   AssertEqual 2, len(filter(getline(1, line('$')), 'v:val =~ "Already up-to-date"'))
-  AssertEqual 3, g:vimrc_reloaded
+  AssertEqual 4, g:vimrc_reloaded
   normal D
   AssertEqual 'No updates.', getline(1)
   q
@@ -328,11 +357,7 @@ Execute (Partial PlugInstall):
   PlugInstall vim-fnr vim-easy-align 1
   q
 
-Execute (TODO Check dependent plugin):
-^ It is a known issue that when a dependent plugin is installed, it is not
-^ immediately added to runtimepath. It only becomes available when
-^ plug#end() is called.
-
+Execute (Check dependent plugin):
   Assert &rtp =~ 'pseudocl', &rtp
 
 Given (Unaligned code):
@@ -366,6 +391,6 @@ Execute (Cleanup):
   unlet g:plug_home
   unlet g:vimrc_reloaded
   unlet temp_plugged vader plug basertp save_rtp repo lnum
+  delf PlugStatusSorted
 
   Restore
-  source $MYVIMRC