dotfiles.old: vim/autoload/plug.vim annotate

annotate vim/autoload/plug.vim @ 247:5199030e3e2c

Update vimplug

author	zegervdv <zegervdv@me.com>
date	Sun, 22 Feb 2015 22:38:06 +0100
parents	0994a5f99432
children	f0d3b37101c0

rev	line source
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1 " vim-plug: Vim plugin manager
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	2 " ============================
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	3 "
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	4 " Download plug.vim and put it in ~/.vim/autoload
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	5 "
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	6 " mkdir -p ~/.vim/autoload
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	7 " curl -fLo ~/.vim/autoload/plug.vim \
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	8 " https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	9 "
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	10 " Edit your .vimrc
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	11 "
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	12 " call plug#begin('~/.vim/plugged')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	13 "
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	14 " " Make sure you use single quotes
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	15 " Plug 'junegunn/seoul256.vim'
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	16 " Plug 'junegunn/vim-easy-align'
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	17 "
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	18 " " On-demand loading
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	19 " Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' }
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	20 " Plug 'tpope/vim-fireplace', { 'for': 'clojure' }
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	21 "
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	22 " " Using git URL
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	23 " Plug 'https://github.com/junegunn/vim-github-dashboard.git'
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	24 "
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	25 " " Plugin options
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	26 " Plug 'nsf/gocode', { 'tag': 'go.weekly.2012-03-13', 'rtp': 'vim' }
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	27 "
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	28 " " Plugin outside ~/.vim/plugged with post-update hook
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	29 " Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': 'yes \\| ./install' }
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	30 "
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	31 " " Unmanaged plugin (manually installed and updated)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	32 " Plug '~/my-prototype-plugin'
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	33 "
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	34 " call plug#end()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	35 "
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	36 " Then reload .vimrc and :PlugInstall to install plugins.
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	37 " Visit https://github.com/junegunn/vim-plug for more information.
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	38 "
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	39 "
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	40 " Copyright (c) 2014 Junegunn Choi
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	41 "
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	42 " MIT License
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	43 "
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	44 " Permission is hereby granted, free of charge, to any person obtaining
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	45 " a copy of this software and associated documentation files (the
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	46 " "Software"), to deal in the Software without restriction, including
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	47 " without limitation the rights to use, copy, modify, merge, publish,
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	48 " distribute, sublicense, and/or sell copies of the Software, and to
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	49 " permit persons to whom the Software is furnished to do so, subject to
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	50 " the following conditions:
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	51 "
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	52 " The above copyright notice and this permission notice shall be
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	53 " included in all copies or substantial portions of the Software.
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	54 "
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	55 " THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	56 " EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	57 " MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	58 " NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	59 " LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	60 " OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	61 " WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	62
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	63 if exists('g:loaded_plug')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	64 finish
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	65 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	66 let g:loaded_plug = 1
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	67
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	68 let s:cpo_save = &cpo
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	69 set cpo&vim
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	70
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	71 let s:plug_src = 'https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	72 let s:plug_tab = get(s:, 'plug_tab', -1)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	73 let s:plug_buf = get(s:, 'plug_buf', -1)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	74 let s:mac_gui = has('gui_macvim') && has('gui_running')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	75 let s:is_win = has('win32') \|\| has('win64')
247 5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	76 let s:py2 = has('python') && !s:is_win
242 0994a5f99432 Update vimplug zegervdv <zegervdv@me.com> parents: 240 diff changeset	77 let s:ruby = has('ruby') && (v:version >= 703 \|\| v:version == 702 && has('patch374'))
226 55ff9bb3ea22 Clean up vimrc zegervdv <zegervdv@me.com> parents: 223 diff changeset	78 let s:nvim = has('nvim') && !s:is_win
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	79 let s:me = resolve(expand('<sfile>:p'))
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	80 let s:base_spec = { 'branch': 'master', 'frozen': 0 }
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	81 let s:TYPE = {
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	82 \ 'string': type(''),
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	83 \ 'list': type([]),
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	84 \ 'dict': type({}),
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	85 \ 'funcref': type(function('call'))
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	86 \ }
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	87 let s:loaded = get(s:, 'loaded', {})
216 d216f4d5508e Setup latex compiler for dispatch zegervdv <zegervdv@me.com> parents: 213 diff changeset	88 let s:triggers = get(s:, 'triggers', {})
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	89
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	90 function! plug#begin(...)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	91 if a:0 > 0
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	92 let s:plug_home_org = a:1
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	93 let home = s:path(fnamemodify(expand(a:1), ':p'))
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	94 elseif exists('g:plug_home')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	95 let home = s:path(g:plug_home)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	96 elseif !empty(&rtp)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	97 let home = s:path(split(&rtp, ',')[0]) . '/plugged'
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	98 else
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	99 return s:err('Unable to determine plug home. Try calling plug#begin() with a path argument.')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	100 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	101
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	102 let g:plug_home = home
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	103 let g:plugs = {}
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	104 let g:plugs_order = []
216 d216f4d5508e Setup latex compiler for dispatch zegervdv <zegervdv@me.com> parents: 213 diff changeset	105 let s:triggers = {}
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	106
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	107 call s:define_commands()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	108 return 1
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	109 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	110
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	111 function! s:define_commands()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	112 command! -nargs=+ -bar Plug call s:add(<args>)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	113 if !executable('git')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	114 return s:err('`git` executable not found. vim-plug requires git.')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	115 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	116 command! -nargs=* -bar -bang -complete=customlist,s:names PlugInstall call s:install('<bang>' == '!', [<f-args>])
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	117 command! -nargs=* -bar -bang -complete=customlist,s:names PlugUpdate call s:update('<bang>' == '!', [<f-args>])
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	118 command! -nargs=0 -bar -bang PlugClean call s:clean('<bang>' == '!')
242 0994a5f99432 Update vimplug zegervdv <zegervdv@me.com> parents: 240 diff changeset	119 command! -nargs=0 -bar PlugUpgrade if s:upgrade() \| execute 'source' s:esc(s:me) \| endif
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	120 command! -nargs=0 -bar PlugStatus call s:status()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	121 command! -nargs=0 -bar PlugDiff call s:diff()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	122 command! -nargs=? -bar PlugSnapshot call s:snapshot(<f-args>)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	123 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	124
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	125 function! s:to_a(v)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	126 return type(a:v) == s:TYPE.list ? a:v : [a:v]
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	127 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	128
197 757b5e22e2ea Update vim-plug zegervdv <zegervdv@me.com> parents: 187 diff changeset	129 function! s:to_s(v)
757b5e22e2ea Update vim-plug zegervdv <zegervdv@me.com> parents: 187 diff changeset	130 return type(a:v) == s:TYPE.string ? a:v : join(a:v, "\n") . "\n"
757b5e22e2ea Update vim-plug zegervdv <zegervdv@me.com> parents: 187 diff changeset	131 endfunction
757b5e22e2ea Update vim-plug zegervdv <zegervdv@me.com> parents: 187 diff changeset	132
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	133 function! s:source(from, ...)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	134 for pattern in a:000
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	135 for vim in s:lines(globpath(a:from, pattern))
242 0994a5f99432 Update vimplug zegervdv <zegervdv@me.com> parents: 240 diff changeset	136 execute 'source' s:esc(vim)
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	137 endfor
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	138 endfor
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	139 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	140
226 55ff9bb3ea22 Clean up vimrc zegervdv <zegervdv@me.com> parents: 223 diff changeset	141 function! s:assoc(dict, key, val)
55ff9bb3ea22 Clean up vimrc zegervdv <zegervdv@me.com> parents: 223 diff changeset	142 let a:dict[a:key] = add(get(a:dict, a:key, []), a:val)
55ff9bb3ea22 Clean up vimrc zegervdv <zegervdv@me.com> parents: 223 diff changeset	143 endfunction
55ff9bb3ea22 Clean up vimrc zegervdv <zegervdv@me.com> parents: 223 diff changeset	144
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	145 function! plug#end()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	146 if !exists('g:plugs')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	147 return s:err('Call plug#begin() first')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	148 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	149
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	150 if exists('#PlugLOD')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	151 augroup PlugLOD
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	152 autocmd!
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	153 augroup END
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	154 augroup! PlugLOD
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	155 endif
226 55ff9bb3ea22 Clean up vimrc zegervdv <zegervdv@me.com> parents: 223 diff changeset	156 let lod = { 'ft': {}, 'map': {}, 'cmd': {} }
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	157
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	158 filetype off
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	159 for name in g:plugs_order
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	160 let plug = g:plugs[name]
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	161 if get(s:loaded, name, 0) \|\| !has_key(plug, 'on') && !has_key(plug, 'for')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	162 let s:loaded[name] = 1
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	163 continue
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	164 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	165
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	166 if has_key(plug, 'on')
216 d216f4d5508e Setup latex compiler for dispatch zegervdv <zegervdv@me.com> parents: 213 diff changeset	167 let s:triggers[name] = { 'map': [], 'cmd': [] }
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	168 for cmd in s:to_a(plug.on)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	169 if cmd =~ '^<Plug>.\+'
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	170 if empty(mapcheck(cmd)) && empty(mapcheck(cmd, 'i'))
226 55ff9bb3ea22 Clean up vimrc zegervdv <zegervdv@me.com> parents: 223 diff changeset	171 call s:assoc(lod.map, cmd, name)
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	172 endif
216 d216f4d5508e Setup latex compiler for dispatch zegervdv <zegervdv@me.com> parents: 213 diff changeset	173 call add(s:triggers[name].map, cmd)
d216f4d5508e Setup latex compiler for dispatch zegervdv <zegervdv@me.com> parents: 213 diff changeset	174 elseif cmd =~ '^[A-Z]'
d216f4d5508e Setup latex compiler for dispatch zegervdv <zegervdv@me.com> parents: 213 diff changeset	175 if exists(':'.cmd) != 2
226 55ff9bb3ea22 Clean up vimrc zegervdv <zegervdv@me.com> parents: 223 diff changeset	176 call s:assoc(lod.cmd, cmd, name)
216 d216f4d5508e Setup latex compiler for dispatch zegervdv <zegervdv@me.com> parents: 213 diff changeset	177 endif
d216f4d5508e Setup latex compiler for dispatch zegervdv <zegervdv@me.com> parents: 213 diff changeset	178 call add(s:triggers[name].cmd, cmd)
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	179 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	180 endfor
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	181 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	182
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	183 if has_key(plug, 'for')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	184 let types = s:to_a(plug.for)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	185 if !empty(types)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	186 call s:source(s:rtp(plug), 'ftdetect/*/.vim', 'after/ftdetect/*/.vim')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	187 endif
226 55ff9bb3ea22 Clean up vimrc zegervdv <zegervdv@me.com> parents: 223 diff changeset	188 for type in types
55ff9bb3ea22 Clean up vimrc zegervdv <zegervdv@me.com> parents: 223 diff changeset	189 call s:assoc(lod.ft, type, name)
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	190 endfor
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	191 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	192 endfor
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	193
226 55ff9bb3ea22 Clean up vimrc zegervdv <zegervdv@me.com> parents: 223 diff changeset	194 for [cmd, names] in items(lod.cmd)
55ff9bb3ea22 Clean up vimrc zegervdv <zegervdv@me.com> parents: 223 diff changeset	195 execute printf(
55ff9bb3ea22 Clean up vimrc zegervdv <zegervdv@me.com> parents: 223 diff changeset	196 \ 'command! -nargs=* -range -bang %s call s:lod_cmd(%s, "<bang>", <line1>, <line2>, <q-args>, %s)',
55ff9bb3ea22 Clean up vimrc zegervdv <zegervdv@me.com> parents: 223 diff changeset	197 \ cmd, string(cmd), string(names))
55ff9bb3ea22 Clean up vimrc zegervdv <zegervdv@me.com> parents: 223 diff changeset	198 endfor
55ff9bb3ea22 Clean up vimrc zegervdv <zegervdv@me.com> parents: 223 diff changeset	199
55ff9bb3ea22 Clean up vimrc zegervdv <zegervdv@me.com> parents: 223 diff changeset	200 for [map, names] in items(lod.map)
55ff9bb3ea22 Clean up vimrc zegervdv <zegervdv@me.com> parents: 223 diff changeset	201 for [mode, map_prefix, key_prefix] in
55ff9bb3ea22 Clean up vimrc zegervdv <zegervdv@me.com> parents: 223 diff changeset	202 \ [['i', '<C-O>', ''], ['n', '', ''], ['v', '', 'gv'], ['o', '', '']]
55ff9bb3ea22 Clean up vimrc zegervdv <zegervdv@me.com> parents: 223 diff changeset	203 execute printf(
55ff9bb3ea22 Clean up vimrc zegervdv <zegervdv@me.com> parents: 223 diff changeset	204 \ '%snoremap <silent> %s %s:<C-U>call <SID>lod_map(%s, %s, "%s")<CR>',
55ff9bb3ea22 Clean up vimrc zegervdv <zegervdv@me.com> parents: 223 diff changeset	205 \ mode, map, map_prefix, string(map), string(names), key_prefix)
55ff9bb3ea22 Clean up vimrc zegervdv <zegervdv@me.com> parents: 223 diff changeset	206 endfor
55ff9bb3ea22 Clean up vimrc zegervdv <zegervdv@me.com> parents: 223 diff changeset	207 endfor
55ff9bb3ea22 Clean up vimrc zegervdv <zegervdv@me.com> parents: 223 diff changeset	208
55ff9bb3ea22 Clean up vimrc zegervdv <zegervdv@me.com> parents: 223 diff changeset	209 for [ft, names] in items(lod.ft)
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	210 augroup PlugLOD
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	211 execute printf('autocmd FileType %s call <SID>lod_ft(%s, %s)',
226 55ff9bb3ea22 Clean up vimrc zegervdv <zegervdv@me.com> parents: 223 diff changeset	212 \ ft, string(ft), string(names))
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	213 augroup END
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	214 endfor
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	215
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	216 call s:reorg_rtp()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	217 filetype plugin indent on
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	218 if has('vim_starting')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	219 syntax enable
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	220 else
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	221 call s:reload()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	222 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	223 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	224
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	225 function! s:loaded_names()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	226 return filter(copy(g:plugs_order), 'get(s:loaded, v:val, 0)')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	227 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	228
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	229 function! s:reload()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	230 for name in s:loaded_names()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	231 call s:source(s:rtp(g:plugs[name]), 'plugin/*/.vim', 'after/plugin/*/.vim')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	232 endfor
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	233 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	234
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	235 function! s:trim(str)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	236 return substitute(a:str, '[\/]\+$', '', '')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	237 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	238
247 5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	239 function! s:version_requirement(val, min)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	240 for idx in range(0, len(a:min) - 1)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	241 let v = get(a:val, idx, 0)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	242 if v < a:min[idx] \| return 0
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	243 elseif v > a:min[idx] \| return 1
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	244 endif
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	245 endfor
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	246 return 1
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	247 endfunction
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	248
240 1d4692adfc1c Upgrade vimplug zegervdv <zegervdv@me.com> parents: 237 diff changeset	249 function! s:git_version_requirement(...)
1d4692adfc1c Upgrade vimplug zegervdv <zegervdv@me.com> parents: 237 diff changeset	250 let s:git_version = get(s:, 'git_version',
1d4692adfc1c Upgrade vimplug zegervdv <zegervdv@me.com> parents: 237 diff changeset	251 \ map(split(split(s:system('git --version'))[-1], '\.'), 'str2nr(v:val)'))
247 5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	252 return s:version_requirement(s:git_version, a:000)
240 1d4692adfc1c Upgrade vimplug zegervdv <zegervdv@me.com> parents: 237 diff changeset	253 endfunction
1d4692adfc1c Upgrade vimplug zegervdv <zegervdv@me.com> parents: 237 diff changeset	254
1d4692adfc1c Upgrade vimplug zegervdv <zegervdv@me.com> parents: 237 diff changeset	255 function! s:progress_opt(base)
1d4692adfc1c Upgrade vimplug zegervdv <zegervdv@me.com> parents: 237 diff changeset	256 return a:base && !s:is_win &&
1d4692adfc1c Upgrade vimplug zegervdv <zegervdv@me.com> parents: 237 diff changeset	257 \ s:git_version_requirement(1, 7, 1) ? '--progress' : ''
1d4692adfc1c Upgrade vimplug zegervdv <zegervdv@me.com> parents: 237 diff changeset	258 endfunction
1d4692adfc1c Upgrade vimplug zegervdv <zegervdv@me.com> parents: 237 diff changeset	259
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	260 if s:is_win
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	261 function! s:rtp(spec)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	262 return s:path(a:spec.dir . get(a:spec, 'rtp', ''))
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	263 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	264
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	265 function! s:path(path)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	266 return s:trim(substitute(a:path, '/', '\', 'g'))
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	267 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	268
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	269 function! s:dirpath(path)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	270 return s:path(a:path) . '\'
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	271 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	272
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	273 function! s:is_local_plug(repo)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	274 return a:repo =~? '^[a-z]:'
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	275 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	276 else
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	277 function! s:rtp(spec)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	278 return s:dirpath(a:spec.dir . get(a:spec, 'rtp', ''))
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	279 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	280
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	281 function! s:path(path)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	282 return s:trim(a:path)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	283 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	284
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	285 function! s:dirpath(path)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	286 return substitute(a:path, '[/\\]*$', '/', '')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	287 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	288
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	289 function! s:is_local_plug(repo)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	290 return a:repo[0] =~ '[/$~]'
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	291 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	292 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	293
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	294 function! s:err(msg)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	295 echohl ErrorMsg
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	296 echom a:msg
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	297 echohl None
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	298 return 0
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	299 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	300
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	301 function! s:esc(path)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	302 return escape(a:path, ' ')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	303 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	304
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	305 function! s:escrtp(path)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	306 return escape(a:path, ' ,')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	307 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	308
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	309 function! s:remove_rtp()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	310 for name in s:loaded_names()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	311 let rtp = s:rtp(g:plugs[name])
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	312 execute 'set rtp-='.s:escrtp(rtp)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	313 let after = globpath(rtp, 'after')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	314 if isdirectory(after)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	315 execute 'set rtp-='.s:escrtp(after)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	316 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	317 endfor
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	318 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	319
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	320 function! s:reorg_rtp()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	321 if !empty(s:first_rtp)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	322 execute 'set rtp-='.s:first_rtp
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	323 execute 'set rtp-='.s:last_rtp
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	324 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	325
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	326 " &rtp is modified from outside
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	327 if exists('s:prtp') && s:prtp !=# &rtp
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	328 call s:remove_rtp()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	329 unlet! s:middle
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	330 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	331
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	332 let s:middle = get(s:, 'middle', &rtp)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	333 let rtps = map(s:loaded_names(), 's:rtp(g:plugs[v:val])')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	334 let afters = filter(map(copy(rtps), 'globpath(v:val, "after")'), 'isdirectory(v:val)')
242 0994a5f99432 Update vimplug zegervdv <zegervdv@me.com> parents: 240 diff changeset	335 let rtp = join(map(rtps, 'escape(v:val, ",")'), ',')
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	336 \ . ','.s:middle.','
242 0994a5f99432 Update vimplug zegervdv <zegervdv@me.com> parents: 240 diff changeset	337 \ . join(map(afters, 'escape(v:val, ",")'), ',')
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	338 let &rtp = substitute(substitute(rtp, ',,*', ',', 'g'), '^,\\|,$', '', 'g')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	339 let s:prtp = &rtp
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	340
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	341 if !empty(s:first_rtp)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	342 execute 'set rtp^='.s:first_rtp
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	343 execute 'set rtp+='.s:last_rtp
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	344 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	345 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	346
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	347 function! plug#load(...)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	348 if a:0 == 0
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	349 return s:err('Argument missing: plugin name(s) required')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	350 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	351 if !exists('g:plugs')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	352 return s:err('plug#begin was not called')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	353 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	354 let unknowns = filter(copy(a:000), '!has_key(g:plugs, v:val)')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	355 if !empty(unknowns)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	356 let s = len(unknowns) > 1 ? 's' : ''
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	357 return s:err(printf('Unknown plugin%s: %s', s, join(unknowns, ', ')))
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	358 end
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	359 for name in a:000
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	360 call s:lod([name], ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin'])
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	361 endfor
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	362 doautocmd BufRead
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	363 return 1
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	364 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	365
216 d216f4d5508e Setup latex compiler for dispatch zegervdv <zegervdv@me.com> parents: 213 diff changeset	366 function! s:remove_triggers(name)
d216f4d5508e Setup latex compiler for dispatch zegervdv <zegervdv@me.com> parents: 213 diff changeset	367 if !has_key(s:triggers, a:name)
d216f4d5508e Setup latex compiler for dispatch zegervdv <zegervdv@me.com> parents: 213 diff changeset	368 return
d216f4d5508e Setup latex compiler for dispatch zegervdv <zegervdv@me.com> parents: 213 diff changeset	369 endif
d216f4d5508e Setup latex compiler for dispatch zegervdv <zegervdv@me.com> parents: 213 diff changeset	370 for cmd in s:triggers[a:name].cmd
226 55ff9bb3ea22 Clean up vimrc zegervdv <zegervdv@me.com> parents: 223 diff changeset	371 execute 'silent! delc' cmd
216 d216f4d5508e Setup latex compiler for dispatch zegervdv <zegervdv@me.com> parents: 213 diff changeset	372 endfor
d216f4d5508e Setup latex compiler for dispatch zegervdv <zegervdv@me.com> parents: 213 diff changeset	373 for map in s:triggers[a:name].map
226 55ff9bb3ea22 Clean up vimrc zegervdv <zegervdv@me.com> parents: 223 diff changeset	374 execute 'silent! unmap' map
55ff9bb3ea22 Clean up vimrc zegervdv <zegervdv@me.com> parents: 223 diff changeset	375 execute 'silent! iunmap' map
216 d216f4d5508e Setup latex compiler for dispatch zegervdv <zegervdv@me.com> parents: 213 diff changeset	376 endfor
d216f4d5508e Setup latex compiler for dispatch zegervdv <zegervdv@me.com> parents: 213 diff changeset	377 call remove(s:triggers, a:name)
d216f4d5508e Setup latex compiler for dispatch zegervdv <zegervdv@me.com> parents: 213 diff changeset	378 endfunction
d216f4d5508e Setup latex compiler for dispatch zegervdv <zegervdv@me.com> parents: 213 diff changeset	379
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	380 function! s:lod(names, types)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	381 for name in a:names
216 d216f4d5508e Setup latex compiler for dispatch zegervdv <zegervdv@me.com> parents: 213 diff changeset	382 call s:remove_triggers(name)
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	383 let s:loaded[name] = 1
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	384 endfor
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	385 call s:reorg_rtp()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	386
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	387 for name in a:names
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	388 let rtp = s:rtp(g:plugs[name])
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	389 for dir in a:types
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	390 call s:source(rtp, dir.'/*/.vim')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	391 endfor
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	392 endfor
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	393 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	394
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	395 function! s:lod_ft(pat, names)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	396 call s:lod(a:names, ['plugin', 'after/plugin'])
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	397 execute 'autocmd! PlugLOD FileType' a:pat
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	398 doautocmd filetypeplugin FileType
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	399 doautocmd filetypeindent FileType
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	400 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	401
226 55ff9bb3ea22 Clean up vimrc zegervdv <zegervdv@me.com> parents: 223 diff changeset	402 function! s:lod_cmd(cmd, bang, l1, l2, args, names)
55ff9bb3ea22 Clean up vimrc zegervdv <zegervdv@me.com> parents: 223 diff changeset	403 call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin'])
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	404 execute printf('%s%s%s %s', (a:l1 == a:l2 ? '' : (a:l1.','.a:l2)), a:cmd, a:bang, a:args)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	405 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	406
226 55ff9bb3ea22 Clean up vimrc zegervdv <zegervdv@me.com> parents: 223 diff changeset	407 function! s:lod_map(map, names, prefix)
55ff9bb3ea22 Clean up vimrc zegervdv <zegervdv@me.com> parents: 223 diff changeset	408 call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin'])
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	409 let extra = ''
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	410 while 1
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	411 let c = getchar(0)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	412 if c == 0
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	413 break
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	414 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	415 let extra .= nr2char(c)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	416 endwhile
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	417 call feedkeys(a:prefix . substitute(a:map, '^<Plug>', "\<Plug>", '') . extra)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	418 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	419
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	420 function! s:add(repo, ...)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	421 if a:0 > 1
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	422 return s:err('Invalid number of arguments (1..2)')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	423 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	424
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	425 try
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	426 let repo = s:trim(a:repo)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	427 let name = fnamemodify(repo, ':t:s?\.git$??')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	428 let spec = extend(s:infer_properties(name, repo),
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	429 \ a:0 == 1 ? s:parse_options(a:1) : s:base_spec)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	430 let g:plugs[name] = spec
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	431 let g:plugs_order += [name]
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	432 let s:loaded[name] = 0
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	433 catch
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	434 return s:err(v:exception)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	435 endtry
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	436 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	437
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	438 function! s:parse_options(arg)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	439 let opts = copy(s:base_spec)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	440 let type = type(a:arg)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	441 if type == s:TYPE.string
247 5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	442 let opts.tag = a:arg
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	443 elseif type == s:TYPE.dict
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	444 call extend(opts, a:arg)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	445 if has_key(opts, 'dir')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	446 let opts.dir = s:dirpath(expand(opts.dir))
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	447 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	448 else
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	449 throw 'Invalid argument type (expected: string or dictionary)'
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	450 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	451 return opts
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	452 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	453
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	454 function! s:infer_properties(name, repo)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	455 let repo = a:repo
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	456 if s:is_local_plug(repo)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	457 return { 'dir': s:dirpath(expand(repo)) }
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	458 else
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	459 if repo =~ ':'
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	460 let uri = repo
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	461 else
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	462 if repo !~ '/'
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	463 let repo = 'vim-scripts/'. repo
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	464 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	465 let fmt = get(g:, 'plug_url_format', 'https://git::@github.com/%s.git')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	466 let uri = printf(fmt, repo)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	467 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	468 let dir = s:dirpath( fnamemodify(join([g:plug_home, a:name], '/'), ':p') )
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	469 return { 'dir': dir, 'uri': uri }
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	470 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	471 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	472
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	473 function! s:install(force, names)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	474 call s:update_impl(0, a:force, a:names)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	475 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	476
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	477 function! s:update(force, names)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	478 call s:update_impl(1, a:force, a:names)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	479 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	480
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	481 function! plug#helptags()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	482 if !exists('g:plugs')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	483 return s:err('plug#begin was not called')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	484 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	485 for spec in values(g:plugs)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	486 let docd = join([spec.dir, 'doc'], '/')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	487 if isdirectory(docd)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	488 silent! execute 'helptags' s:esc(docd)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	489 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	490 endfor
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	491 return 1
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	492 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	493
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	494 function! s:syntax()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	495 syntax clear
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	496 syntax region plug1 start=/\%1l/ end=/\%2l/ contains=plugNumber
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	497 syntax region plug2 start=/\%2l/ end=/\%3l/ contains=plugBracket,plugX
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	498 syn match plugNumber /[0-9]\+[0-9.]*/ contained
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	499 syn match plugBracket /[[\]]/ contained
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	500 syn match plugX /x/ contained
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	501 syn match plugDash /^-/
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	502 syn match plugPlus /^+/
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	503 syn match plugStar /^*/
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	504 syn match plugMessage /$^- $\@<=.*/
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	505 syn match plugName /$^- $\@<=[^ ]*:/
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	506 syn match plugInstall /$^+ $\@<=[^:]*/
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	507 syn match plugUpdate /$^* $\@<=[^:]*/
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	508 syn match plugCommit /^ [0-9a-z]\{7} .*/ contains=plugRelDate,plugSha
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	509 syn match plugSha /$^ $\@<=[0-9a-z]\{7}/ contained
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	510 syn match plugRelDate /([^)]*)$/ contained
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	511 syn match plugNotLoaded /(not loaded)$/
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	512 syn match plugError /^x.*/
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	513 syn keyword Function PlugInstall PlugStatus PlugUpdate PlugClean
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	514 hi def link plug1 Title
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	515 hi def link plug2 Repeat
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	516 hi def link plugX Exception
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	517 hi def link plugBracket Structure
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	518 hi def link plugNumber Number
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	519
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	520 hi def link plugDash Special
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	521 hi def link plugPlus Constant
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	522 hi def link plugStar Boolean
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	523
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	524 hi def link plugMessage Function
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	525 hi def link plugName Label
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	526 hi def link plugInstall Function
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	527 hi def link plugUpdate Type
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	528
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	529 hi def link plugError Error
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	530 hi def link plugRelDate Comment
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	531 hi def link plugSha Identifier
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	532
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	533 hi def link plugNotLoaded Comment
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	534 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	535
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	536 function! s:lpad(str, len)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	537 return a:str . repeat(' ', a:len - len(a:str))
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	538 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	539
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	540 function! s:lines(msg)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	541 return split(a:msg, "[\r\n]")
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	542 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	543
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	544 function! s:lastline(msg)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	545 return get(s:lines(a:msg), -1, '')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	546 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	547
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	548 function! s:new_window()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	549 execute get(g:, 'plug_window', 'vertical topleft new')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	550 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	551
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	552 function! s:plug_window_exists()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	553 let buflist = tabpagebuflist(s:plug_tab)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	554 return !empty(buflist) && index(buflist, s:plug_buf) >= 0
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	555 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	556
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	557 function! s:switch_in()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	558 if !s:plug_window_exists()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	559 return 0
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	560 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	561
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	562 if winbufnr(0) != s:plug_buf
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	563 let s:pos = [tabpagenr(), winnr(), winsaveview()]
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	564 execute 'normal!' s:plug_tab.'gt'
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	565 let winnr = bufwinnr(s:plug_buf)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	566 execute winnr.'wincmd w'
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	567 call add(s:pos, winsaveview())
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	568 else
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	569 let s:pos = [winsaveview()]
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	570 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	571
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	572 setlocal modifiable
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	573 return 1
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	574 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	575
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	576 function! s:switch_out(...)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	577 call winrestview(s:pos[-1])
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	578 setlocal nomodifiable
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	579 if a:0 > 0
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	580 execute a:1
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	581 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	582
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	583 if len(s:pos) > 1
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	584 execute 'normal!' s:pos[0].'gt'
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	585 execute s:pos[1] 'wincmd w'
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	586 call winrestview(s:pos[2])
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	587 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	588 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	589
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	590 function! s:prepare()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	591 call s:job_abort()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	592 if s:switch_in()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	593 silent %d _
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	594 else
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	595 call s:new_window()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	596 nnoremap <silent> <buffer> q :if b:plug_preview==1<bar>pc<bar>endif<bar>echo<bar>q<cr>
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	597 nnoremap <silent> <buffer> R :silent! call <SID>retry()<cr>
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	598 nnoremap <silent> <buffer> D :PlugDiff<cr>
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	599 nnoremap <silent> <buffer> S :PlugStatus<cr>
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	600 nnoremap <silent> <buffer> U :call <SID>status_update()<cr>
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	601 xnoremap <silent> <buffer> U :call <SID>status_update()<cr>
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	602 nnoremap <silent> <buffer> ]] :silent! call <SID>section('')<cr>
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	603 nnoremap <silent> <buffer> [[ :silent! call <SID>section('b')<cr>
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	604 let b:plug_preview = -1
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	605 let s:plug_tab = tabpagenr()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	606 let s:plug_buf = winbufnr(0)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	607 call s:assign_name()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	608 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	609 silent! unmap <buffer> <cr>
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	610 silent! unmap <buffer> L
247 5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	611 silent! unmap <buffer> o
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	612 silent! unmap <buffer> X
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	613 setlocal buftype=nofile bufhidden=wipe nobuflisted noswapfile nowrap cursorline modifiable
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	614 setf vim-plug
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	615 call s:syntax()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	616 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	617
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	618 function! s:assign_name()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	619 " Assign buffer name
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	620 let prefix = '[Plugins]'
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	621 let name = prefix
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	622 let idx = 2
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	623 while bufexists(name)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	624 let name = printf('%s (%s)', prefix, idx)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	625 let idx = idx + 1
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	626 endwhile
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	627 silent! execute 'f' fnameescape(name)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	628 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	629
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	630 function! s:do(pull, force, todo)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	631 for [name, spec] in items(a:todo)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	632 if !isdirectory(spec.dir)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	633 continue
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	634 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	635 let installed = has_key(s:update.new, name)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	636 let updated = installed ? 0 :
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	637 \ (a:pull && !empty(s:system_chomp('git log --pretty=format:"%h" "HEAD...HEAD@{1}"', spec.dir)))
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	638 if a:force \|\| installed \|\| updated
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	639 execute 'cd' s:esc(spec.dir)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	640 call append(3, '- Post-update hook for '. name .' ... ')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	641 let type = type(spec.do)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	642 if type == s:TYPE.string
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	643 try
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	644 " FIXME: Escaping is incomplete. We could use shellescape with eval,
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	645 " but it won't work on Windows.
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	646 let g:_plug_do = '!'.escape(spec.do, '#!%')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	647 execute "normal! :execute g:_plug_do\<cr>\<cr>"
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	648 finally
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	649 let result = v:shell_error ? ('Exit status: '.v:shell_error) : 'Done!'
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	650 unlet g:_plug_do
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	651 endtry
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	652 elseif type == s:TYPE.funcref
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	653 try
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	654 let status = installed ? 'installed' : (updated ? 'updated' : 'unchanged')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	655 call spec.do({ 'name': name, 'status': status, 'force': a:force })
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	656 let result = 'Done!'
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	657 catch
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	658 let result = 'Error: ' . v:exception
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	659 endtry
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	660 else
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	661 let result = 'Error: Invalid type!'
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	662 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	663 call setline(4, getline(4) . result)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	664 cd -
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	665 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	666 endfor
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	667 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	668
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	669 function! s:finish(pull)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	670 let new_frozen = len(filter(keys(s:update.new), 'g:plugs[v:val].frozen'))
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	671 if new_frozen
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	672 let s = new_frozen > 1 ? 's' : ''
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	673 call append(3, printf('- Installed %d frozen plugin%s', new_frozen, s))
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	674 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	675 call append(3, '- Finishing ... ')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	676 redraw
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	677 call plug#helptags()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	678 call plug#end()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	679 call setline(4, getline(4) . 'Done!')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	680 redraw
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	681 let msgs = []
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	682 if !empty(s:update.errors)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	683 call add(msgs, "Press 'R' to retry.")
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	684 endif
207 e519bf689316 Update Vim-Plug zegervdv <zegervdv@me.com> parents: 197 diff changeset	685 if a:pull && len(s:update.new) < len(filter(getline(5, '$'),
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	686 \ "v:val =~ '^- ' && stridx(v:val, 'Already up-to-date') < 0"))
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	687 call add(msgs, "Press 'D' to see the updated changes.")
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	688 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	689 echo join(msgs, ' ')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	690 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	691
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	692 function! s:retry()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	693 if empty(s:update.errors)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	694 return
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	695 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	696 call s:update_impl(s:update.pull, s:update.force,
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	697 \ extend(copy(s:update.errors), [s:update.threads]))
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	698 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	699
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	700 function! s:is_managed(name)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	701 return has_key(g:plugs[a:name], 'uri')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	702 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	703
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	704 function! s:names(...)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	705 return sort(filter(keys(g:plugs), 'stridx(v:val, a:1) == 0 && s:is_managed(v:val)'))
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	706 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	707
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	708 function! s:update_impl(pull, force, args) abort
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	709 let args = copy(a:args)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	710 let threads = (len(args) > 0 && args[-1] =~ '^[1-9][0-9]*$') ?
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	711 \ remove(args, -1) : get(g:, 'plug_threads', 16)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	712
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	713 let managed = filter(copy(g:plugs), 's:is_managed(v:key)')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	714 let todo = empty(args) ? filter(managed, '!v:val.frozen \|\| !isdirectory(v:val.dir)') :
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	715 \ filter(managed, 'index(args, v:key) >= 0')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	716
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	717 if empty(todo)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	718 echohl WarningMsg
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	719 echo 'No plugin to '. (a:pull ? 'update' : 'install') . '.'
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	720 echohl None
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	721 return
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	722 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	723
242 0994a5f99432 Update vimplug zegervdv <zegervdv@me.com> parents: 240 diff changeset	724 if !s:is_win && s:git_version_requirement(2, 3)
0994a5f99432 Update vimplug zegervdv <zegervdv@me.com> parents: 240 diff changeset	725 let s:git_terminal_prompt = exists('$GIT_TERMINAL_PROMPT') ? $GIT_TERMINAL_PROMPT : ''
0994a5f99432 Update vimplug zegervdv <zegervdv@me.com> parents: 240 diff changeset	726 let $GIT_TERMINAL_PROMPT = 0
0994a5f99432 Update vimplug zegervdv <zegervdv@me.com> parents: 240 diff changeset	727 for plug in values(todo)
0994a5f99432 Update vimplug zegervdv <zegervdv@me.com> parents: 240 diff changeset	728 let plug.uri = substitute(plug.uri,
0994a5f99432 Update vimplug zegervdv <zegervdv@me.com> parents: 240 diff changeset	729 \ '^https://git::@github\.com', 'https://github.com', '')
0994a5f99432 Update vimplug zegervdv <zegervdv@me.com> parents: 240 diff changeset	730 endfor
0994a5f99432 Update vimplug zegervdv <zegervdv@me.com> parents: 240 diff changeset	731 endif
0994a5f99432 Update vimplug zegervdv <zegervdv@me.com> parents: 240 diff changeset	732
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	733 if !isdirectory(g:plug_home)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	734 try
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	735 call mkdir(g:plug_home, 'p')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	736 catch
216 d216f4d5508e Setup latex compiler for dispatch zegervdv <zegervdv@me.com> parents: 213 diff changeset	737 return s:err(printf('Invalid plug directory: %s. '.
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	738 \ 'Try to call plug#begin with a valid directory', g:plug_home))
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	739 endtry
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	740 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	741
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	742 let s:update = {
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	743 \ 'start': reltime(),
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	744 \ 'all': todo,
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	745 \ 'todo': copy(todo),
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	746 \ 'errors': [],
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	747 \ 'pull': a:pull,
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	748 \ 'force': a:force,
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	749 \ 'new': {},
247 5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	750 \ 'threads': (s:py2 \|\| s:ruby \|\| s:nvim) ? min([len(todo), threads]) : 1,
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	751 \ 'bar': '',
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	752 \ 'fin': 0
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	753 \ }
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	754
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	755 call s:prepare()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	756 call append(0, ['', ''])
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	757 normal! 2G
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	758
247 5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	759 " Python version requirement (>= 2.7)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	760 if s:py2 && !s:ruby && !s:nvim && s:update.threads > 1
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	761 redir => pyv
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	762 silent python import platform; print(platform.python_version())
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	763 redir END
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	764 let s:py2 = s:version_requirement(
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	765 \ map(split(split(pyv)[0], '\.'), 'str2nr(v:val)'), [2, 7])
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	766 endif
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	767 if (s:py2 \|\| s:ruby) && !s:nvim && s:update.threads > 1
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	768 try
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	769 let imd = &imd
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	770 if s:mac_gui
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	771 set noimd
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	772 endif
247 5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	773 if s:ruby
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	774 call s:update_ruby()
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	775 else
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	776 call s:update_python()
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	777 endif
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	778 catch
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	779 let lines = getline(4, '$')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	780 let printed = {}
237 6f3eb83613bf Update vimplug zegervdv <zegervdv@me.com> parents: 235 diff changeset	781 silent! 4,$d _
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	782 for line in lines
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	783 let name = s:extract_name(line, '.', '')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	784 if empty(name) \|\| !has_key(printed, name)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	785 call append('$', line)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	786 if !empty(name)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	787 let printed[name] = 1
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	788 if line[0] == 'x' && index(s:update.errors, name) < 0
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	789 call add(s:update.errors, name)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	790 end
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	791 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	792 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	793 endfor
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	794 finally
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	795 let &imd = imd
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	796 call s:update_finish()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	797 endtry
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	798 else
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	799 call s:update_vim()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	800 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	801 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	802
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	803 function! s:update_finish()
242 0994a5f99432 Update vimplug zegervdv <zegervdv@me.com> parents: 240 diff changeset	804 if exists('s:git_terminal_prompt')
0994a5f99432 Update vimplug zegervdv <zegervdv@me.com> parents: 240 diff changeset	805 let $GIT_TERMINAL_PROMPT = s:git_terminal_prompt
0994a5f99432 Update vimplug zegervdv <zegervdv@me.com> parents: 240 diff changeset	806 endif
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	807 if s:switch_in()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	808 call s:do(s:update.pull, s:update.force, filter(copy(s:update.all), 'has_key(v:val, "do")'))
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	809 call s:finish(s:update.pull)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	810 call setline(1, 'Updated. Elapsed time: ' . split(reltimestr(reltime(s:update.start)))[0] . ' sec.')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	811 call s:switch_out('normal! gg')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	812 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	813 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	814
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	815 function! s:job_abort()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	816 if !s:nvim \|\| !exists('s:jobs')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	817 return
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	818 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	819 augroup PlugJobControl
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	820 autocmd!
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	821 augroup END
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	822 for [name, j] in items(s:jobs)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	823 silent! call jobstop(j.jobid)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	824 if j.new
237 6f3eb83613bf Update vimplug zegervdv <zegervdv@me.com> parents: 235 diff changeset	825 call s:system('rm -rf ' . s:shellesc(g:plugs[name].dir))
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	826 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	827 endfor
213 4e723feac624 Update vimplug zegervdv <zegervdv@me.com> parents: 207 diff changeset	828 let s:jobs = {}
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	829 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	830
213 4e723feac624 Update vimplug zegervdv <zegervdv@me.com> parents: 207 diff changeset	831 function! s:job_handler(name) abort
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	832 if !s:plug_window_exists() " plug window closed
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	833 return s:job_abort()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	834 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	835
213 4e723feac624 Update vimplug zegervdv <zegervdv@me.com> parents: 207 diff changeset	836 if !has_key(s:jobs, a:name)
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	837 return
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	838 endif
213 4e723feac624 Update vimplug zegervdv <zegervdv@me.com> parents: 207 diff changeset	839 let job = s:jobs[a:name]
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	840
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	841 if v:job_data[1] == 'exit'
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	842 let job.running = 0
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	843 if s:lastline(job.result) ==# 'Error'
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	844 let job.error = 1
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	845 let job.result = substitute(job.result, "Error[\r\n]$", '', '')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	846 endif
213 4e723feac624 Update vimplug zegervdv <zegervdv@me.com> parents: 207 diff changeset	847 call s:reap(a:name)
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	848 call s:tick()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	849 else
197 757b5e22e2ea Update vim-plug zegervdv <zegervdv@me.com> parents: 187 diff changeset	850 let job.result .= s:to_s(v:job_data[2])
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	851 " To reduce the number of buffer updates
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	852 let job.tick = get(job, 'tick', -1) + 1
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	853 if job.tick % len(s:jobs) == 0
213 4e723feac624 Update vimplug zegervdv <zegervdv@me.com> parents: 207 diff changeset	854 call s:log(job.new ? '+' : '*', a:name, job.result)
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	855 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	856 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	857 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	858
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	859 function! s:spawn(name, cmd, opts)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	860 let job = { 'running': 1, 'new': get(a:opts, 'new', 0),
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	861 \ 'error': 0, 'result': '' }
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	862 let s:jobs[a:name] = job
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	863
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	864 if s:nvim
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	865 let x = jobstart(a:name, 'sh', ['-c',
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	866 \ (has_key(a:opts, 'dir') ? s:with_cd(a:cmd, a:opts.dir) : a:cmd)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	867 \ . ' \|\| echo Error'])
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	868 if x > 0
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	869 let job.jobid = x
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	870 augroup PlugJobControl
213 4e723feac624 Update vimplug zegervdv <zegervdv@me.com> parents: 207 diff changeset	871 execute 'autocmd JobActivity' a:name printf('call s:job_handler(%s)', string(a:name))
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	872 augroup END
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	873 else
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	874 let job.running = 0
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	875 let job.error = 1
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	876 let job.result = x < 0 ? 'sh is not executable' :
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	877 \ 'Invalid arguments (or job table is full)'
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	878 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	879 else
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	880 let params = has_key(a:opts, 'dir') ? [a:cmd, a:opts.dir] : [a:cmd]
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	881 let job.result = call('s:system', params)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	882 let job.error = v:shell_error != 0
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	883 let job.running = 0
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	884 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	885 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	886
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	887 function! s:reap(name)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	888 if s:nvim
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	889 silent! execute 'autocmd! PlugJobControl JobActivity' a:name
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	890 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	891
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	892 let job = s:jobs[a:name]
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	893 if job.error
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	894 call add(s:update.errors, a:name)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	895 elseif get(job, 'new', 0)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	896 let s:update.new[a:name] = 1
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	897 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	898 let s:update.bar .= job.error ? 'x' : '='
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	899
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	900 call s:log(job.error ? 'x' : '-', a:name, job.result)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	901 call s:bar()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	902
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	903 call remove(s:jobs, a:name)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	904 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	905
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	906 function! s:bar()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	907 if s:switch_in()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	908 let total = len(s:update.all)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	909 call setline(1, (s:update.pull ? 'Updating' : 'Installing').
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	910 \ ' plugins ('.len(s:update.bar).'/'.total.')')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	911 call s:progress_bar(2, s:update.bar, total)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	912 call s:switch_out()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	913 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	914 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	915
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	916 function! s:logpos(name)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	917 for i in range(1, line('$'))
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	918 if getline(i) =~# '^[-+x*] '.a:name.':'
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	919 return i
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	920 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	921 endfor
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	922 return 0
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	923 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	924
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	925 function! s:log(bullet, name, lines)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	926 if s:switch_in()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	927 let pos = s:logpos(a:name)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	928 if pos > 0
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	929 execute pos 'd _'
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	930 if pos > winheight('.')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	931 let pos = 4
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	932 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	933 else
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	934 let pos = 4
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	935 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	936 call append(pos - 1, s:format_message(a:bullet, a:name, a:lines))
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	937 call s:switch_out()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	938 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	939 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	940
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	941 function! s:update_vim()
213 4e723feac624 Update vimplug zegervdv <zegervdv@me.com> parents: 207 diff changeset	942 let s:jobs = {}
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	943
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	944 call s:bar()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	945 call s:tick()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	946 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	947
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	948 function! s:tick()
240 1d4692adfc1c Upgrade vimplug zegervdv <zegervdv@me.com> parents: 237 diff changeset	949 let pull = s:update.pull
1d4692adfc1c Upgrade vimplug zegervdv <zegervdv@me.com> parents: 237 diff changeset	950 let prog = s:progress_opt(s:nvim)
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	951 while 1 " Without TCO, Vim stack is bound to explode
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	952 if empty(s:update.todo)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	953 if empty(s:jobs) && !s:update.fin
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	954 let s:update.fin = 1
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	955 call s:update_finish()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	956 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	957 return
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	958 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	959
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	960 let name = keys(s:update.todo)[0]
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	961 let spec = remove(s:update.todo, name)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	962 let new = !isdirectory(spec.dir)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	963
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	964 call s:log(new ? '+' : '*', name, pull ? 'Updating ...' : 'Installing ...')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	965 redraw
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	966
247 5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	967 let checkout = s:shellesc(has_key(spec, 'tag') ? spec.tag : spec.branch)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	968 let merge = s:shellesc(has_key(spec, 'tag') ? spec.tag : 'origin/'.spec.branch)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	969
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	970 if !new
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	971 let [valid, msg] = s:git_valid(spec, 0)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	972 if valid
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	973 if pull
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	974 call s:spawn(name,
247 5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	975 \ printf('(git fetch %s 2>&1 && git checkout -q %s 2>&1 && git merge --ff-only %s 2>&1 && git submodule update --init --recursive 2>&1)',
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	976 \ prog, checkout, merge), { 'dir': spec.dir })
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	977 else
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	978 let s:jobs[name] = { 'running': 0, 'result': 'Already installed', 'error': 0 }
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	979 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	980 else
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	981 let s:jobs[name] = { 'running': 0, 'result': msg, 'error': 1 }
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	982 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	983 else
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	984 call s:spawn(name,
237 6f3eb83613bf Update vimplug zegervdv <zegervdv@me.com> parents: 235 diff changeset	985 \ printf('git clone %s --recursive %s -b %s %s 2>&1',
6f3eb83613bf Update vimplug zegervdv <zegervdv@me.com> parents: 235 diff changeset	986 \ prog,
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	987 \ s:shellesc(spec.uri),
247 5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	988 \ checkout,
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	989 \ s:shellesc(s:trim(spec.dir))), { 'new': 1 })
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	990 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	991
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	992 if !s:jobs[name].running
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	993 call s:reap(name)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	994 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	995 if len(s:jobs) >= s:update.threads
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	996 break
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	997 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	998 endwhile
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	999 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1000
247 5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1001 function! s:update_python()
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1002 python << EOF
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1003 """ Due to use of signals this function is POSIX only. """
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1004 import datetime
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1005 import functools
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1006 import os
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1007 import Queue
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1008 import random
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1009 import re
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1010 import shutil
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1011 import signal
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1012 import subprocess
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1013 import tempfile
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1014 import threading as thr
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1015 import time
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1016 import traceback
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1017 import vim
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1018
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1019 G_PULL = vim.eval('s:update.pull') == '1'
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1020 G_RETRIES = int(vim.eval('get(g:, "plug_retries", 2)')) + 1
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1021 G_TIMEOUT = int(vim.eval('get(g:, "plug_timeout", 60)'))
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1022 G_PROGRESS = vim.eval('s:progress_opt(1)')
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1023 G_LOG_PROB = 1.0 / int(vim.eval('s:update.threads'))
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1024 G_STOP = thr.Event()
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1025
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1026 class CmdTimedOut(Exception):
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1027 pass
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1028 class CmdFailed(Exception):
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1029 pass
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1030 class InvalidURI(Exception):
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1031 pass
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1032 class Action(object):
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1033 INSTALL, UPDATE, ERROR, DONE = ['+', '*', 'x', '-']
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1034
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1035 class GLog(object):
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1036 ON = None
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1037 LOGDIR = None
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1038 @classmethod
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1039 def write(cls, msg):
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1040 if cls.ON is None:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1041 cls.ON = int(vim.eval('get(g:, "plug_log_on", 0)'))
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1042 cls.LOGDIR = os.path.expanduser(vim.eval('get(g:, "plug_logs", "~/plug_logs")'))
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1043 if cls.ON:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1044 if not os.path.exists(cls.LOGDIR):
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1045 os.makedirs(cls.LOGDIR)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1046 cls._write(msg)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1047 @classmethod
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1048 def _write(cls, msg):
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1049 name = thr.current_thread().name
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1050 fname = cls.LOGDIR + os.path.sep + name
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1051 with open(fname, 'ab') as flog:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1052 ltime = datetime.datetime.now().strftime("%H:%M:%S.%f")
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1053 msg = '[{},{}] {}{}'.format(name, ltime, msg, '\n')
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1054 flog.write(msg)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1055
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1056 class Buffer(object):
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1057 def __init__(self, lock, num_plugs):
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1058 self.bar = ''
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1059 self.event = 'Updating' if vim.eval('s:update.pull') == '1' else 'Installing'
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1060 self.is_win = vim.eval('s:is_win') == '1'
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1061 self.lock = lock
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1062 self.maxy = int(vim.eval('winheight(".")'))
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1063 self.num_plugs = num_plugs
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1064
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1065 def _where(self, name):
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1066 """ Find first line with name in current buffer. Return line num. """
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1067 found, lnum = False, 0
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1068 matcher = re.compile('^[-+x*] {}:'.format(name))
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1069 for line in vim.current.buffer:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1070 if matcher.search(line) is not None:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1071 found = True
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1072 break
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1073 lnum += 1
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1074
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1075 if not found:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1076 lnum = -1
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1077 return lnum
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1078
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1079 def header(self):
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1080 curbuf = vim.current.buffer
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1081 curbuf[0] = self.event + ' plugins ({}/{})'.format(len(self.bar), self.num_plugs)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1082
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1083 num_spaces = self.num_plugs - len(self.bar)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1084 curbuf[1] = '[{}{}]'.format(self.bar, num_spaces * ' ')
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1085
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1086 vim.command('normal! 2G')
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1087 if not self.is_win:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1088 vim.command('redraw')
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1089
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1090 def write(self, args, *kwargs):
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1091 with self.lock:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1092 self._write(args, *kwargs)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1093
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1094 def _write(self, action, name, lines):
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1095 first, rest = lines[0], lines[1:]
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1096 msg = ['{} {}{}{}'.format(action, name, ': ' if first else '', first)]
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1097 padded_rest = [' ' + line for line in rest]
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1098 msg.extend(padded_rest)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1099
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1100 try:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1101 if action == Action.ERROR:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1102 self.bar += 'x'
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1103 vim.command("call add(s:update.errors, '{}')".format(name))
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1104 elif action == Action.DONE:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1105 self.bar += '='
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1106
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1107 curbuf = vim.current.buffer
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1108 lnum = self._where(name)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1109 if lnum != -1: # Found matching line num
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1110 del curbuf[lnum]
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1111 if lnum > self.maxy and action in {Action.INSTALL, Action.UPDATE}:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1112 lnum = 3
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1113 else:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1114 lnum = 3
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1115 curbuf.append(msg, lnum)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1116
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1117 self.header()
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1118 except vim.error:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1119 GLog.write('Buffer Update FAILED.')
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1120
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1121 class Command(object):
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1122 def __init__(self, cmd, cmd_dir=None, timeout=60, ntries=3, cb=None, clean=None):
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1123 self.cmd = cmd
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1124 self.cmd_dir = cmd_dir
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1125 self.timeout = timeout
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1126 self.ntries = ntries
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1127 self.callback = cb if cb else (lambda msg: None)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1128 self.clean = clean
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1129
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1130 def attempt_cmd(self):
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1131 """ Tries to run the command, returns result if no exceptions. """
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1132 attempt = 0
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1133 finished = False
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1134 limit = self.timeout
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1135
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1136 while not finished:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1137 try:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1138 attempt += 1
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1139 result = self.timeout_cmd()
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1140 finished = True
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1141 except CmdTimedOut:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1142 if attempt != self.ntries:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1143 for count in range(3, 0, -1):
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1144 if G_STOP.is_set():
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1145 raise KeyboardInterrupt
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1146 msg = 'Timeout. Will retry in {} second{} ...'.format(
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1147 count, 's' if count != 1 else '')
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1148 self.callback([msg])
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1149 time.sleep(1)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1150 self.timeout += limit
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1151 self.callback(['Retrying ...'])
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1152 else:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1153 raise
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1154
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1155 return result
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1156
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1157 def timeout_cmd(self):
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1158 """ Execute a cmd & poll for callback. Returns list of output.
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1159 Raises CmdFailed -> return code for Popen isn't 0
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1160 Raises CmdTimedOut -> command exceeded timeout without new output
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1161 """
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1162 proc = None
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1163 first_line = True
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1164 try:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1165 tfile = tempfile.NamedTemporaryFile()
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1166 proc = subprocess.Popen(self.cmd, cwd=self.cmd_dir, stdout=tfile,
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1167 stderr=subprocess.STDOUT, shell=True, preexec_fn=os.setsid)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1168 while proc.poll() is None:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1169 # Yield this thread
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1170 time.sleep(0.2)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1171
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1172 if G_STOP.is_set():
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1173 raise KeyboardInterrupt
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1174
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1175 if first_line or random.random() < G_LOG_PROB:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1176 first_line = False
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1177 line = nonblock_read(tfile.name)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1178 if line:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1179 self.callback([line])
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1180
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1181 time_diff = time.time() - os.path.getmtime(tfile.name)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1182 if time_diff > self.timeout:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1183 raise CmdTimedOut(['Timeout!'])
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1184
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1185 tfile.seek(0)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1186 result = [line.rstrip() for line in tfile]
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1187
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1188 if proc.returncode != 0:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1189 msg = ['']
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1190 msg.extend(result)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1191 raise CmdFailed(msg)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1192 except:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1193 if proc and proc.poll() is None:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1194 os.killpg(proc.pid, signal.SIGTERM)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1195 if self.clean:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1196 self.clean()
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1197 raise
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1198
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1199 return result
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1200
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1201 class Plugin(object):
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1202 def __init__(self, name, args, buf, lock):
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1203 self.name = name
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1204 self.args = args
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1205 self.buf = buf
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1206 self.lock = lock
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1207 tag = args.get('tag', 0)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1208 self.checkout = esc(tag if tag else args['branch'])
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1209 self.merge = esc(tag if tag else 'origin/' + args['branch'])
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1210
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1211 def manage(self):
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1212 try:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1213 if os.path.exists(self.args['dir']):
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1214 self.update()
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1215 else:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1216 self.install()
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1217 with self.lock:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1218 vim.command("let s:update.new['{}'] = 1".format(self.name))
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1219 except (CmdTimedOut, CmdFailed, InvalidURI) as exc:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1220 self.write(Action.ERROR, self.name, exc.message)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1221 except KeyboardInterrupt:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1222 G_STOP.set()
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1223 self.write(Action.ERROR, self.name, ['Interrupted!'])
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1224 except:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1225 # Any exception except those above print stack trace
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1226 msg = 'Trace:\n{}'.format(traceback.format_exc().rstrip())
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1227 self.write(Action.ERROR, self.name, msg.split('\n'))
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1228 raise
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1229
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1230 def install(self):
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1231 target = self.args['dir']
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1232
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1233 def clean(target):
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1234 def _clean():
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1235 try:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1236 shutil.rmtree(target)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1237 except OSError:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1238 pass
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1239 return _clean
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1240
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1241 self.write(Action.INSTALL, self.name, ['Installing ...'])
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1242 callback = functools.partial(self.buf.write, Action.INSTALL, self.name)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1243 cmd = 'git clone {} --recursive {} -b {} {} 2>&1'.format(
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1244 G_PROGRESS, self.args['uri'], self.checkout, esc(target))
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1245 com = Command(cmd, None, G_TIMEOUT, G_RETRIES, callback, clean(target))
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1246 result = com.attempt_cmd()
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1247 self.write(Action.DONE, self.name, result[-1:])
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1248
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1249 def update(self):
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1250 match = re.compile(r'git::?@')
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1251 actual_uri = re.sub(match, '', self.repo_uri())
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1252 expect_uri = re.sub(match, '', self.args['uri'])
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1253 if actual_uri != expect_uri:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1254 msg = ['',
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1255 'Invalid URI: {}'.format(actual_uri),
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1256 'Expected {}'.format(expect_uri),
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1257 'PlugClean required.']
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1258 raise InvalidURI(msg)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1259
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1260 if G_PULL:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1261 self.write(Action.UPDATE, self.name, ['Updating ...'])
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1262 callback = functools.partial(self.buf.write, Action.UPDATE, self.name)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1263 cmds = ['git fetch {}'.format(G_PROGRESS),
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1264 'git checkout -q {}'.format(self.checkout),
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1265 'git merge --ff-only {}'.format(self.merge),
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1266 'git submodule update --init --recursive']
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1267 cmd = ' 2>&1 && '.join(cmds)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1268 GLog.write(cmd)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1269 com = Command(cmd, self.args['dir'], G_TIMEOUT, G_RETRIES, callback)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1270 result = com.attempt_cmd()
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1271 GLog.write(result)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1272 self.write(Action.DONE, self.name, result[-1:])
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1273 else:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1274 self.write(Action.DONE, self.name, ['Already installed'])
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1275
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1276 def repo_uri(self):
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1277 cmd = 'git rev-parse --abbrev-ref HEAD 2>&1 && git config remote.origin.url'
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1278 command = Command(cmd, self.args['dir'], G_TIMEOUT, G_RETRIES)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1279 result = command.attempt_cmd()
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1280 return result[-1]
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1281
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1282 def write(self, action, name, msg):
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1283 GLog.write('{} {}: {}'.format(action, name, '\n'.join(msg)))
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1284 self.buf.write(action, name, msg)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1285
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1286 class PlugThread(thr.Thread):
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1287 def __init__(self, tname, args):
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1288 super(PlugThread, self).__init__()
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1289 self.tname = tname
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1290 self.args = args
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1291
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1292 def run(self):
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1293 thr.current_thread().name = self.tname
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1294 work_q, lock, buf = self.args
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1295
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1296 try:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1297 while not G_STOP.is_set():
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1298 name, args = work_q.get_nowait()
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1299 GLog.write('{}: Dir {}'.format(name, args['dir']))
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1300 plug = Plugin(name, args, buf, lock)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1301 plug.manage()
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1302 work_q.task_done()
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1303 except Queue.Empty:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1304 GLog.write('Queue now empty.')
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1305
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1306 class RefreshThread(thr.Thread):
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1307 def __init__(self, lock):
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1308 super(RefreshThread, self).__init__()
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1309 self.lock = lock
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1310 self.running = True
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1311
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1312 def run(self):
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1313 while self.running:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1314 with self.lock:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1315 vim.command('noautocmd normal! a')
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1316 time.sleep(0.2)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1317
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1318 def stop(self):
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1319 self.running = False
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1320
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1321 def esc(name):
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1322 return '"' + name.replace('"', '\"') + '"'
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1323
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1324 def nonblock_read(fname):
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1325 """ Read a file with nonblock flag. Return the last line. """
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1326 fread = os.open(fname, os.O_RDONLY \| os.O_NONBLOCK)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1327 buf = os.read(fread, 100000)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1328 os.close(fread)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1329
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1330 line = buf.rstrip('\r\n')
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1331 left = max(line.rfind('\r'), line.rfind('\n'))
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1332 if left != -1:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1333 left += 1
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1334 line = line[left:]
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1335
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1336 return line
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1337
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1338 def main():
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1339 thr.current_thread().name = 'main'
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1340 GLog.write('')
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1341 if GLog.ON and os.path.exists(GLog.LOGDIR):
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1342 shutil.rmtree(GLog.LOGDIR)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1343
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1344 threads = []
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1345 nthreads = int(vim.eval('s:update.threads'))
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1346 plugs = vim.eval('s:update.todo')
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1347 mac_gui = vim.eval('s:mac_gui') == '1'
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1348 is_win = vim.eval('s:is_win') == '1'
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1349 GLog.write('Plugs: {}'.format(plugs))
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1350 GLog.write('PULL: {}, WIN: {}, MAC: {}'.format(G_PULL, is_win, mac_gui))
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1351 GLog.write('Num Threads: {}'.format(nthreads))
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1352
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1353 lock = thr.Lock()
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1354 buf = Buffer(lock, len(plugs))
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1355 work_q = Queue.Queue()
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1356 for work in plugs.items():
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1357 work_q.put(work)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1358
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1359 GLog.write('Starting Threads')
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1360 for num in range(nthreads):
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1361 tname = 'PlugT-{0:02}'.format(num)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1362 thread = PlugThread(tname, (work_q, lock, buf))
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1363 thread.start()
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1364 threads.append(thread)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1365 if mac_gui:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1366 rthread = RefreshThread(lock)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1367 rthread.start()
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1368
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1369 GLog.write('Joining Live Threads')
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1370 for thread in threads:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1371 thread.join()
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1372 if mac_gui:
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1373 rthread.stop()
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1374 rthread.join()
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1375 GLog.write('Cleanly Exited Main')
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1376
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1377 main()
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1378 EOF
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1379 endfunction
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1380
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1381 function! s:update_ruby()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1382 ruby << EOF
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1383 module PlugStream
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1384 SEP = ["\r", "\n", nil]
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1385 def get_line
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1386 buffer = ''
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1387 loop do
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1388 char = readchar rescue return
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1389 if SEP.include? char.chr
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1390 buffer << $/
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1391 break
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1392 else
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1393 buffer << char
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1394 end
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1395 end
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1396 buffer
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1397 end
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1398 end unless defined?(PlugStream)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1399
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1400 def esc arg
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1401 %["#{arg.gsub('"', '\"')}"]
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1402 end
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1403
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1404 def killall pid
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1405 pids = [pid]
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1406 unless `which pgrep 2> /dev/null`.empty?
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1407 children = pids
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1408 until children.empty?
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1409 children = children.map { \|pid\|
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1410 `pgrep -P #{pid}`.lines.map { \|l\| l.chomp }
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1411 }.flatten
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1412 pids += children
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1413 end
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1414 end
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1415 pids.each { \|pid\| Process.kill 'TERM', pid.to_i rescue nil }
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1416 end
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1417
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1418 require 'thread'
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1419 require 'fileutils'
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1420 require 'timeout'
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1421 running = true
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1422 iswin = VIM::evaluate('s:is_win').to_i == 1
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1423 pull = VIM::evaluate('s:update.pull').to_i == 1
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1424 base = VIM::evaluate('g:plug_home')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1425 all = VIM::evaluate('s:update.todo')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1426 limit = VIM::evaluate('get(g:, "plug_timeout", 60)')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1427 tries = VIM::evaluate('get(g:, "plug_retries", 2)') + 1
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1428 nthr = VIM::evaluate('s:update.threads').to_i
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1429 maxy = VIM::evaluate('winheight(".")').to_i
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1430 cd = iswin ? 'cd /d' : 'cd'
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1431 tot = VIM::evaluate('len(s:update.todo)') \|\| 0
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1432 bar = ''
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1433 skip = 'Already installed'
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1434 mtx = Mutex.new
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1435 take1 = proc { mtx.synchronize { running && all.shift } }
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1436 logh = proc {
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1437 cnt = bar.length
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1438 $curbuf[1] = "#{pull ? 'Updating' : 'Installing'} plugins (#{cnt}/#{tot})"
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1439 $curbuf[2] = '[' + bar.ljust(tot) + ']'
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1440 VIM::command('normal! 2G')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1441 VIM::command('redraw') unless iswin
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1442 }
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1443 where = proc { \|name\| (1..($curbuf.length)).find { \|l\| $curbuf[l] =~ /^[-+x*] #{name}:/ } }
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1444 log = proc { \|name, result, type\|
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1445 mtx.synchronize do
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1446 ing = ![true, false].include?(type)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1447 bar += type ? '=' : 'x' unless ing
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1448 b = case type
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1449 when :install then '+' when :update then '*'
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1450 when true, nil then '-' else
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1451 VIM::command("call add(s:update.errors, '#{name}')")
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1452 'x'
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1453 end
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1454 result =
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1455 if type \|\| type.nil?
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1456 ["#{b} #{name}: #{result.lines.to_a.last}"]
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1457 elsif result =~ /^Interrupted\|^Timeout/
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1458 ["#{b} #{name}: #{result}"]
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1459 else
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1460 ["#{b} #{name}"] + result.lines.map { \|l\| " " << l }
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1461 end
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1462 if lnum = where.call(name)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1463 $curbuf.delete lnum
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1464 lnum = 4 if ing && lnum > maxy
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1465 end
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1466 result.each_with_index do \|line, offset\|
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1467 $curbuf.append((lnum \|\| 4) - 1 + offset, line.gsub(/\e\[./, '').chomp)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1468 end
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1469 logh.call
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1470 end
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1471 }
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1472 bt = proc { \|cmd, name, type, cleanup\|
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1473 tried = timeout = 0
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1474 begin
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1475 tried += 1
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1476 timeout += limit
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1477 fd = nil
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1478 data = ''
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1479 if iswin
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1480 Timeout::timeout(timeout) do
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1481 tmp = VIM::evaluate('tempname()')
247 5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1482 system("(#{cmd}) > #{tmp}")
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1483 data = File.read(tmp).chomp
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1484 File.unlink tmp rescue nil
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1485 end
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1486 else
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1487 fd = IO.popen(cmd).extend(PlugStream)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1488 first_line = true
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1489 log_prob = 1.0 / nthr
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1490 while line = Timeout::timeout(timeout) { fd.get_line }
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1491 data << line
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1492 log.call name, line.chomp, type if name && (first_line \|\| rand < log_prob)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1493 first_line = false
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1494 end
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1495 fd.close
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1496 end
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1497 [$? == 0, data.chomp]
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1498 rescue Timeout::Error, Interrupt => e
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1499 if fd && !fd.closed?
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1500 killall fd.pid
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1501 fd.close
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1502 end
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1503 cleanup.call if cleanup
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1504 if e.is_a?(Timeout::Error) && tried < tries
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1505 3.downto(1) do \|countdown\|
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1506 s = countdown > 1 ? 's' : ''
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1507 log.call name, "Timeout. Will retry in #{countdown} second#{s} ...", type
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1508 sleep 1
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1509 end
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1510 log.call name, 'Retrying ...', type
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1511 retry
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1512 end
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1513 [false, e.is_a?(Interrupt) ? "Interrupted!" : "Timeout!"]
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1514 end
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1515 }
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1516 main = Thread.current
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1517 threads = []
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1518 watcher = Thread.new {
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1519 while VIM::evaluate('getchar(1)')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1520 sleep 0.1
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1521 end
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1522 mtx.synchronize do
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1523 running = false
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1524 threads.each { \|t\| t.raise Interrupt }
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1525 end
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1526 threads.each { \|t\| t.join rescue nil }
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1527 main.kill
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1528 }
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1529 refresh = Thread.new {
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1530 while true
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1531 mtx.synchronize do
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1532 break unless running
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1533 VIM::command('noautocmd normal! a')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1534 end
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1535 sleep 0.2
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1536 end
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1537 } if VIM::evaluate('s:mac_gui') == 1
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1538
240 1d4692adfc1c Upgrade vimplug zegervdv <zegervdv@me.com> parents: 237 diff changeset	1539 progress = VIM::evaluate('s:progress_opt(1)')
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1540 nthr.times do
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1541 mtx.synchronize do
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1542 threads << Thread.new {
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1543 while pair = take1.call
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1544 name = pair.first
247 5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1545 dir, uri, branch, tag = pair.last.values_at *%w[dir uri branch tag]
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1546 checkout = esc(tag ? tag : branch)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1547 merge = esc(tag ? tag : "origin/#{branch}")
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1548 subm = "git submodule update --init --recursive 2>&1"
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1549 exists = File.directory? dir
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1550 ok, result =
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1551 if exists
247 5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1552 dir = iswin ? dir : esc(dir)
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1553 ret, data = bt.call "#{cd} #{dir} && git rev-parse --abbrev-ref HEAD 2>&1 && git config remote.origin.url", nil, nil, nil
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1554 current_uri = data.lines.to_a.last
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1555 if !ret
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1556 if data =~ /^Interrupted\|^Timeout/
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1557 [false, data]
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1558 else
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1559 [false, [data.chomp, "PlugClean required."].join($/)]
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1560 end
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1561 elsif current_uri.sub(/git::?@/, '') != uri.sub(/git::?@/, '')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1562 [false, ["Invalid URI: #{current_uri}",
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1563 "Expected: #{uri}",
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1564 "PlugClean required."].join($/)]
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1565 else
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1566 if pull
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1567 log.call name, 'Updating ...', :update
247 5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1568 bt.call "#{cd} #{dir} && git fetch #{progress} 2>&1 && git checkout -q #{checkout} 2>&1 && git merge --ff-only #{merge} 2>&1 && #{subm}", name, :update, nil
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1569 else
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1570 [true, skip]
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1571 end
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1572 end
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1573 else
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1574 d = esc dir.sub(%r{[\\/]+$}, '')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1575 log.call name, 'Installing ...', :install
247 5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1576 bt.call "git clone #{progress} --recursive #{uri} -b #{checkout} #{d} 2>&1", name, :install, proc {
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1577 FileUtils.rm_rf dir
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1578 }
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1579 end
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1580 mtx.synchronize { VIM::command("let s:update.new['#{name}'] = 1") } if !exists && ok
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1581 log.call name, result, ok
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1582 end
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1583 } if running
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1584 end
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1585 end
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1586 threads.each { \|t\| t.join rescue nil }
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1587 logh.call
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1588 refresh.kill if refresh
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1589 watcher.kill
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1590 EOF
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1591 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1592
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1593 function! s:shellesc(arg)
247 5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1594 return '"'.escape(a:arg, '"').'"'
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1595 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1596
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1597 function! s:glob_dir(path)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1598 return map(filter(s:lines(globpath(a:path, '**')), 'isdirectory(v:val)'), 's:dirpath(v:val)')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1599 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1600
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1601 function! s:progress_bar(line, bar, total)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1602 call setline(a:line, '[' . s:lpad(a:bar, a:total) . ']')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1603 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1604
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1605 function! s:compare_git_uri(a, b)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1606 let a = substitute(a:a, 'git:\{1,2}@', '', '')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1607 let b = substitute(a:b, 'git:\{1,2}@', '', '')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1608 return a ==# b
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1609 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1610
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1611 function! s:format_message(bullet, name, message)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1612 if a:bullet != 'x'
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1613 return [printf('%s %s: %s', a:bullet, a:name, s:lastline(a:message))]
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1614 else
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1615 let lines = map(s:lines(a:message), '" ".v:val')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1616 return extend([printf('x %s:', a:name)], lines)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1617 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1618 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1619
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1620 function! s:with_cd(cmd, dir)
247 5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1621 return printf('cd%s %s && %s', s:is_win ? ' /d' : '', s:shellesc(a:dir), a:cmd)
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1622 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1623
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1624 function! s:system(cmd, ...)
237 6f3eb83613bf Update vimplug zegervdv <zegervdv@me.com> parents: 235 diff changeset	1625 try
6f3eb83613bf Update vimplug zegervdv <zegervdv@me.com> parents: 235 diff changeset	1626 let sh = &shell
6f3eb83613bf Update vimplug zegervdv <zegervdv@me.com> parents: 235 diff changeset	1627 if !s:is_win
6f3eb83613bf Update vimplug zegervdv <zegervdv@me.com> parents: 235 diff changeset	1628 set shell=sh
6f3eb83613bf Update vimplug zegervdv <zegervdv@me.com> parents: 235 diff changeset	1629 endif
6f3eb83613bf Update vimplug zegervdv <zegervdv@me.com> parents: 235 diff changeset	1630 let cmd = a:0 > 0 ? s:with_cd(a:cmd, a:1) : a:cmd
6f3eb83613bf Update vimplug zegervdv <zegervdv@me.com> parents: 235 diff changeset	1631 return system(s:is_win ? '('.cmd.')' : cmd)
6f3eb83613bf Update vimplug zegervdv <zegervdv@me.com> parents: 235 diff changeset	1632 finally
6f3eb83613bf Update vimplug zegervdv <zegervdv@me.com> parents: 235 diff changeset	1633 let &shell = sh
6f3eb83613bf Update vimplug zegervdv <zegervdv@me.com> parents: 235 diff changeset	1634 endtry
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1635 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1636
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1637 function! s:system_chomp(...)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1638 let ret = call('s:system', a:000)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1639 return v:shell_error ? '' : substitute(ret, '\n$', '', '')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1640 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1641
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1642 function! s:git_valid(spec, check_branch)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1643 let ret = 1
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1644 let msg = 'OK'
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1645 if isdirectory(a:spec.dir)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1646 let result = s:lines(s:system('git rev-parse --abbrev-ref HEAD 2>&1 && git config remote.origin.url', a:spec.dir))
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1647 let remote = result[-1]
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1648 if v:shell_error
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1649 let msg = join([remote, 'PlugClean required.'], "\n")
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1650 let ret = 0
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1651 elseif !s:compare_git_uri(remote, a:spec.uri)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1652 let msg = join(['Invalid URI: '.remote,
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1653 \ 'Expected: '.a:spec.uri,
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1654 \ 'PlugClean required.'], "\n")
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1655 let ret = 0
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1656 elseif a:check_branch
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1657 let branch = result[0]
247 5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1658 " Check tag
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1659 if has_key(a:spec, 'tag')
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1660 let tag = s:system_chomp('git describe --exact-match --tags HEAD 2>&1', a:spec.dir)
247 5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1661 if a:spec.tag !=# tag
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1662 let msg = printf('Invalid tag: %s (expected: %s). Try PlugUpdate.',
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1663 \ (empty(tag) ? 'N/A' : tag), a:spec.tag)
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1664 let ret = 0
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1665 endif
247 5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1666 " Check branch
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1667 elseif a:spec.branch !=# branch
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1668 let msg = printf('Invalid branch: %s (expected: %s). Try PlugUpdate.',
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1669 \ branch, a:spec.branch)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1670 let ret = 0
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1671 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1672 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1673 else
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1674 let msg = 'Not found'
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1675 let ret = 0
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1676 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1677 return [ret, msg]
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1678 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1679
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1680 function! s:clean(force)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1681 call s:prepare()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1682 call append(0, 'Searching for unused plugins in '.g:plug_home)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1683 call append(1, '')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1684
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1685 " List of valid directories
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1686 let dirs = []
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1687 let [cnt, total] = [0, len(g:plugs)]
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1688 for [name, spec] in items(g:plugs)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1689 if !s:is_managed(name) \|\| s:git_valid(spec, 0)[0]
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1690 call add(dirs, spec.dir)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1691 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1692 let cnt += 1
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1693 call s:progress_bar(2, repeat('=', cnt), total)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1694 normal! 2G
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1695 redraw
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1696 endfor
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1697
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1698 let allowed = {}
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1699 for dir in dirs
237 6f3eb83613bf Update vimplug zegervdv <zegervdv@me.com> parents: 235 diff changeset	1700 let allowed[s:dirpath(fnamemodify(dir, ':h:h'))] = 1
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1701 let allowed[dir] = 1
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1702 for child in s:glob_dir(dir)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1703 let allowed[child] = 1
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1704 endfor
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1705 endfor
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1706
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1707 let todo = []
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1708 let found = sort(s:glob_dir(g:plug_home))
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1709 while !empty(found)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1710 let f = remove(found, 0)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1711 if !has_key(allowed, f) && isdirectory(f)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1712 call add(todo, f)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1713 call append(line('$'), '- ' . f)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1714 let found = filter(found, 'stridx(v:val, f) != 0')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1715 end
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1716 endwhile
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1717
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1718 normal! G
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1719 redraw
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1720 if empty(todo)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1721 call append(line('$'), 'Already clean.')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1722 else
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1723 call inputsave()
216 d216f4d5508e Setup latex compiler for dispatch zegervdv <zegervdv@me.com> parents: 213 diff changeset	1724 let yes = a:force \|\| (input('Proceed? (y/N) ') =~? '^y')
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1725 call inputrestore()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1726 if yes
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1727 for dir in todo
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1728 if isdirectory(dir)
237 6f3eb83613bf Update vimplug zegervdv <zegervdv@me.com> parents: 235 diff changeset	1729 call s:system((s:is_win ? 'rmdir /S /Q ' : 'rm -rf ') . s:shellesc(dir))
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1730 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1731 endfor
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1732 call append(line('$'), 'Removed.')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1733 else
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1734 call append(line('$'), 'Cancelled.')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1735 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1736 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1737 normal! G
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1738 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1739
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1740 function! s:upgrade()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1741 let new = s:me . '.new'
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1742 echo 'Downloading '. s:plug_src
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1743 redraw
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1744 try
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1745 if executable('curl')
237 6f3eb83613bf Update vimplug zegervdv <zegervdv@me.com> parents: 235 diff changeset	1746 let output = s:system(printf('curl -fLo %s %s', s:shellesc(new), s:plug_src))
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1747 if v:shell_error
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1748 throw get(s:lines(output), -1, v:shell_error)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1749 endif
240 1d4692adfc1c Upgrade vimplug zegervdv <zegervdv@me.com> parents: 237 diff changeset	1750 elseif s:ruby
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1751 call s:upgrade_using_ruby(new)
247 5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1752 elseif s:py2
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1753 call s:upgrade_using_python(new)
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1754 else
247 5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1755 return s:err('Missing: curl executable, ruby support or python support')
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1756 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1757 catch
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1758 return s:err('Error upgrading vim-plug: '. v:exception)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1759 endtry
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1760
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1761 if readfile(s:me) ==# readfile(new)
235 d29157c632c0 Update vim-plug zegervdv <zegervdv@me.com> parents: 226 diff changeset	1762 echo 'vim-plug is already up-to-date'
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1763 silent! call delete(new)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1764 return 0
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1765 else
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1766 call rename(s:me, s:me . '.old')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1767 call rename(new, s:me)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1768 unlet g:loaded_plug
235 d29157c632c0 Update vim-plug zegervdv <zegervdv@me.com> parents: 226 diff changeset	1769 echo 'vim-plug has been upgraded'
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1770 return 1
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1771 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1772 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1773
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1774 function! s:upgrade_using_ruby(new)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1775 ruby << EOF
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1776 require 'open-uri'
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1777 File.open(VIM::evaluate('a:new'), 'w') do \|f\|
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1778 f << open(VIM::evaluate('s:plug_src')).read
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1779 end
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1780 EOF
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1781 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1782
247 5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1783 function! s:upgrade_using_python(new)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1784 python << EOF
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1785 import urllib
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1786 import vim
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1787 psrc, dest = vim.eval('s:plug_src'), vim.eval('a:new')
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1788 urllib.urlretrieve(psrc, dest)
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1789 EOF
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1790 endfunction
5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1791
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1792 function! s:upgrade_specs()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1793 for spec in values(g:plugs)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1794 let spec.frozen = get(spec, 'frozen', 0)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1795 endfor
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1796 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1797
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1798 function! s:status()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1799 call s:prepare()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1800 call append(0, 'Checking plugins')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1801 call append(1, '')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1802
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1803 let ecnt = 0
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1804 let unloaded = 0
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1805 let [cnt, total] = [0, len(g:plugs)]
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1806 for [name, spec] in items(g:plugs)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1807 if has_key(spec, 'uri')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1808 if isdirectory(spec.dir)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1809 let [valid, msg] = s:git_valid(spec, 1)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1810 else
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1811 let [valid, msg] = [0, 'Not found. Try PlugInstall.']
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1812 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1813 else
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1814 if isdirectory(spec.dir)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1815 let [valid, msg] = [1, 'OK']
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1816 else
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1817 let [valid, msg] = [0, 'Not found.']
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1818 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1819 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1820 let cnt += 1
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1821 let ecnt += !valid
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1822 " `s:loaded` entry can be missing if PlugUpgraded
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1823 if valid && get(s:loaded, name, -1) == 0
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1824 let unloaded = 1
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1825 let msg .= ' (not loaded)'
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1826 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1827 call s:progress_bar(2, repeat('=', cnt), total)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1828 call append(3, s:format_message(valid ? '-' : 'x', name, msg))
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1829 normal! 2G
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1830 redraw
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1831 endfor
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1832 call setline(1, 'Finished. '.ecnt.' error(s).')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1833 normal! gg
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1834 setlocal nomodifiable
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1835 if unloaded
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1836 echo "Press 'L' on each line to load plugin, or 'U' to update"
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1837 nnoremap <silent> <buffer> L :call <SID>status_load(line('.'))<cr>
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1838 xnoremap <silent> <buffer> L :call <SID>status_load(line('.'))<cr>
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1839 end
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1840 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1841
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1842 function! s:extract_name(str, prefix, suffix)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1843 return matchstr(a:str, '^'.a:prefix.' \zs[^:]\+\ze:.*'.a:suffix.'$')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1844 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1845
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1846 function! s:status_load(lnum)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1847 let line = getline(a:lnum)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1848 let name = s:extract_name(line, '-', '(not loaded)')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1849 if !empty(name)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1850 call plug#load(name)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1851 setlocal modifiable
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1852 call setline(a:lnum, substitute(line, ' (not loaded)$', '', ''))
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1853 setlocal nomodifiable
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1854 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1855 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1856
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1857 function! s:status_update() range
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1858 let lines = getline(a:firstline, a:lastline)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1859 let names = filter(map(lines, 's:extract_name(v:val, "[x-]", "")'), '!empty(v:val)')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1860 if !empty(names)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1861 echo
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1862 execute 'PlugUpdate' join(names)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1863 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1864 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1865
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1866 function! s:is_preview_window_open()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1867 silent! wincmd P
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1868 if &previewwindow
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1869 wincmd p
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1870 return 1
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1871 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1872 return 0
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1873 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1874
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1875 function! s:find_name(lnum)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1876 for lnum in reverse(range(1, a:lnum))
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1877 let line = getline(lnum)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1878 if empty(line)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1879 return ''
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1880 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1881 let name = s:extract_name(line, '-', '')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1882 if !empty(name)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1883 return name
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1884 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1885 endfor
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1886 return ''
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1887 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1888
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1889 function! s:preview_commit()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1890 if b:plug_preview < 0
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1891 let b:plug_preview = !s:is_preview_window_open()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1892 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1893
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1894 let sha = matchstr(getline('.'), '$^ $\@<=[0-9a-z]\{7}')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1895 if empty(sha)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1896 return
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1897 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1898
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1899 let name = s:find_name(line('.'))
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1900 if empty(name) \|\| !has_key(g:plugs, name) \|\| !isdirectory(g:plugs[name].dir)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1901 return
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1902 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1903
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1904 execute 'pedit' sha
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1905 wincmd P
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1906 setlocal filetype=git buftype=nofile nobuflisted
247 5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1907 execute 'silent read !cd' s:shellesc(g:plugs[name].dir) '&& git show' sha
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1908 normal! gg"_dd
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1909 wincmd p
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1910 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1911
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1912 function! s:section(flags)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1913 call search('$^[x-] $\@<=[^:]\+:', a:flags)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1914 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1915
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1916 function! s:diff()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1917 call s:prepare()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1918 call append(0, 'Collecting updated changes ...')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1919 normal! gg
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1920 redraw
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1921
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1922 let cnt = 0
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1923 for [k, v] in items(g:plugs)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1924 if !isdirectory(v.dir) \|\| !s:is_managed(k)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1925 continue
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1926 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1927
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1928 let diff = s:system_chomp('git log --pretty=format:"%h %s (%cr)" "HEAD...HEAD@{1}"', v.dir)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1929 if !empty(diff)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1930 call append(1, '')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1931 call append(2, '- '.k.':')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1932 call append(3, map(s:lines(diff), '" ". v:val'))
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1933 let cnt += 1
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1934 normal! gg
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1935 redraw
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1936 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1937 endfor
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1938
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1939 call setline(1, cnt == 0 ? 'No updates.' : 'Last update:')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1940 nnoremap <silent> <buffer> <cr> :silent! call <SID>preview_commit()<cr>
247 5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1941 nnoremap <silent> <buffer> o :silent! call <SID>preview_commit()<cr>
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1942 nnoremap <silent> <buffer> X :call <SID>revert()<cr>
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1943 normal! gg
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1944 setlocal nomodifiable
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1945 if cnt > 0
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1946 echo "Press 'X' on each block to revert the update"
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1947 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1948 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1949
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1950 function! s:revert()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1951 let name = s:find_name(line('.'))
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1952 if empty(name) \|\| !has_key(g:plugs, name) \|\|
216 d216f4d5508e Setup latex compiler for dispatch zegervdv <zegervdv@me.com> parents: 213 diff changeset	1953 \ input(printf('Revert the update of %s? (y/N) ', name)) !~? '^y'
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1954 return
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1955 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1956
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1957 call s:system('git reset --hard HEAD@{1} && git checkout '.s:esc(g:plugs[name].branch), g:plugs[name].dir)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1958 setlocal modifiable
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1959 normal! "_dap
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1960 setlocal nomodifiable
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1961 echo 'Reverted.'
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1962 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1963
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1964 function! s:snapshot(...) abort
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1965 let home = get(s:, 'plug_home_org', g:plug_home)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1966 let [type, var, header] = s:is_win ?
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1967 \ ['dosbatch', '%PLUG_HOME%',
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1968 \ ['@echo off', ':: Generated by vim-plug', ':: '.strftime("%c"), '',
247 5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1969 \ ':: Make sure to PlugUpdate first', '', 'set PLUG_HOME='.home]] :
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1970 \ ['sh', '$PLUG_HOME',
237 6f3eb83613bf Update vimplug zegervdv <zegervdv@me.com> parents: 235 diff changeset	1971 \ ['#!/bin/sh', '# Generated by vim-plug', '# '.strftime("%c"), '',
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1972 \ 'vim +PlugUpdate +qa', '', 'PLUG_HOME='.s:esc(home)]]
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1973
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1974 call s:prepare()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1975 execute 'setf' type
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1976 call append(0, header)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1977 call append('$', '')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1978 1
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1979 redraw
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1980
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1981 let dirs = sort(map(values(filter(copy(g:plugs),
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1982 \'has_key(v:val, "uri") && isdirectory(v:val.dir)')), 'v:val.dir'))
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1983 let anchor = line('$') - 1
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1984 for dir in reverse(dirs)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1985 let sha = s:system_chomp('git rev-parse --short HEAD', dir)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1986 if !empty(sha)
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1987 call append(anchor, printf('cd %s && git reset --hard %s',
247 5199030e3e2c Update vimplug zegervdv <zegervdv@me.com> parents: 242 diff changeset	1988 \ substitute(dir, '^\V'.escape(g:plug_home, '\'), var, ''), sha))
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1989 redraw
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1990 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1991 endfor
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1992
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1993 if a:0 > 0
242 0994a5f99432 Update vimplug zegervdv <zegervdv@me.com> parents: 240 diff changeset	1994 let fn = expand(a:1)
0994a5f99432 Update vimplug zegervdv <zegervdv@me.com> parents: 240 diff changeset	1995 let fne = s:esc(fn)
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1996 call writefile(getline(1, '$'), fn)
242 0994a5f99432 Update vimplug zegervdv <zegervdv@me.com> parents: 240 diff changeset	1997 if !s:is_win \| call s:system('chmod +x ' . fne) \| endif
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	1998 echo 'Saved to '.a:1
242 0994a5f99432 Update vimplug zegervdv <zegervdv@me.com> parents: 240 diff changeset	1999 silent execute 'e' fne
187 e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	2000 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	2001 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	2002
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	2003 function! s:split_rtp()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	2004 return split(&rtp, '\\\@<!,')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	2005 endfunction
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	2006
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	2007 let s:first_rtp = s:escrtp(get(s:split_rtp(), 0, ''))
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	2008 let s:last_rtp = s:escrtp(get(s:split_rtp(), -1, ''))
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	2009
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	2010 if exists('g:plugs')
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	2011 let g:plugs_order = get(g:, 'plugs_order', keys(g:plugs))
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	2012 call s:upgrade_specs()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	2013 call s:define_commands()
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	2014 endif
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	2015
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	2016 let &cpo = s:cpo_save
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	2017 unlet s:cpo_save
e3639166a8ab Remove pathogen in favour of Vim-plug zegervdv <zegervdv@me.com> parents: diff changeset	2018

Mercurial > dotfiles.old

annotate vim/autoload/plug.vim @ 247:5199030e3e2c