Github/vim-plug
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove support for experiemental dependency resolution (#43)

Browse Source 
🎉
This commit is contained in:
Junegunn Choi 2014-07-30 19:52:19 +09:00
parent f58d090bb2
commit 30ef53d832
3 changed files with 79 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
README.md
View File

@ -16,7 +16,6 @@ Somewhere between [Pathogen](https://github.com/tpope/vim-pathogen) and
- Smallest possible feature set - Smallest possible feature set
- Branch/tag support - Branch/tag support
- On-demand loading - On-demand loading
- Dependency resolution using `Plugfile` (experimental)
### Cons. ### Cons.
@ -163,15 +162,11 @@ let g:fzf_install = 'yes | ./install'
Plug 'junegunn/fzf', { 'do': g:fzf_install } Plug 'junegunn/fzf', { 'do': g:fzf_install }
``` ```
### Dependency resolution
See [Dependency
Resolution](https://github.com/junegunn/vim-plug/wiki/Dependency-Resolution).
### Articles ### Articles
- [Writing my own Vim plugin manager](http://junegunn.kr/2013/09/writing-my-own-vim-plugin-manager) - [Writing my own Vim plugin manager](http://junegunn.kr/2013/09/writing-my-own-vim-plugin-manager)
- [Thoughts on Vim plugin dependency](http://junegunn.kr/2013/09/thoughts-on-vim-plugin-dependency) - [Thoughts on Vim plugin dependency](http://junegunn.kr/2013/09/thoughts-on-vim-plugin-dependency)
- *Support for Plugfile has been removed since 0.5.0*
- [Vim plugins and startup time](http://junegunn.kr/2014/07/vim-plugins-and-startup-time) - [Vim plugins and startup time](http://junegunn.kr/2014/07/vim-plugins-and-startup-time)
### FAQ/Troubleshooting ### FAQ/Troubleshooting

209
plug.vim
View File

@ -66,7 +66,6 @@ let s:cpo_save = &cpo
set cpo&vim set cpo&vim
let s:plug_source = 'https://raw.github.com/junegunn/vim-plug/master/plug.vim' let s:plug_source = 'https://raw.github.com/junegunn/vim-plug/master/plug.vim'
let s:plug_file = 'Plugfile'
let s:plug_buf = -1 let s:plug_buf = -1
let s:mac_gui = has('gui_macvim') && has('gui_running') let s:mac_gui = has('gui_macvim') && has('gui_running')
let s:is_win = has('win32') || has('win64') let s:is_win = has('win32') || has('win64')
@ -106,7 +105,7 @@ function! plug#begin(...)
" we want to keep track of the order plugins where registered. " we want to keep track of the order plugins where registered.
let g:plugs_order = [] let g:plugs_order = []
command! -nargs=+ -bar Plug call s:add(1, <args>) command! -nargs=+ -bar Plug call s:add(<args>)
command! -nargs=* -complete=customlist,s:names PlugInstall call s:install(<f-args>) command! -nargs=* -complete=customlist,s:names PlugInstall call s:install(<f-args>)
command! -nargs=* -complete=customlist,s:names PlugUpdate call s:update(<f-args>) command! -nargs=* -complete=customlist,s:names PlugUpdate call s:update(<f-args>)
command! -nargs=0 -bang PlugClean call s:clean('<bang>' == '!') command! -nargs=0 -bang PlugClean call s:clean('<bang>' == '!')
@ -125,12 +124,6 @@ function! plug#end()
if !exists('g:plugs') if !exists('g:plugs')
return s:err('Call plug#begin() first') return s:err('Call plug#begin() first')
endif endif
let keys = keys(g:plugs)
let plugfiles = s:find_plugfiles()
while !empty(keys)
" No need to look for Plugfiles more than once
let keys = keys(s:extend(keys, plugfiles))
endwhile
if exists('#PlugLOD') if exists('#PlugLOD')
augroup PlugLOD augroup PlugLOD
@ -306,7 +299,7 @@ function! s:lod_map(map, name, prefix)
call feedkeys(a:prefix . substitute(a:map, '^<Plug>', "\<Plug>", '') . extra) call feedkeys(a:prefix . substitute(a:map, '^<Plug>', "\<Plug>", '') . extra)
endfunction endfunction
function! s:add(force, repo, ...) function! s:add(repo, ...)
if a:0 > 1 if a:0 > 1
return s:err('Invalid number of arguments (1..2)') return s:err('Invalid number of arguments (1..2)')
endif endif
@ -314,17 +307,8 @@ function! s:add(force, repo, ...)
try try
let repo = s:trim(a:repo) let repo = s:trim(a:repo)
let name = fnamemodify(repo, ':t:s?\.git$??') let name = fnamemodify(repo, ':t:s?\.git$??')
if !a:force && has_key(g:plugs, name)
let s:extended[name] = g:plugs[name]
return
endif
let spec = extend(s:infer_properties(name, repo), let spec = extend(s:infer_properties(name, repo),
\ a:0 == 1 ? s:parse_options(a:1) : copy(s:base_spec)) \ a:0 == 1 ? s:parse_options(a:1) : copy(s:base_spec))
if !a:force
let s:extended[name] = spec
endif
let g:plugs[name] = spec let g:plugs[name] = spec
let g:plugs_order += [name] let g:plugs_order += [name]
catch catch
@ -614,36 +598,6 @@ function! s:update_impl(pull, args) abort
call setline(1, 'Updated. Elapsed time: ' . split(reltimestr(reltime(st)))[0] . ' sec.') call setline(1, 'Updated. Elapsed time: ' . split(reltimestr(reltime(st)))[0] . ' sec.')
endfunction endfunction
function! s:find_plugfiles()
let plugfiles = {}
for pf in split(globpath(g:plug_home, '*/'.s:plug_file), '\n')
let plugfiles[fnamemodify(pf, ':h:t')] = pf
endfor
return plugfiles
endfunction
function! s:extend(names, ...)
let s:extended = {}
let plugfiles = a:0 > 0 ? a:1 : s:find_plugfiles()
try
command! -nargs=+ Plug call s:add(0, <args>)
for name in a:names
let spec = g:plugs[name]
if spec.local
let plugfile = globpath(s:rtp(spec), s:plug_file)
if filereadable(plugfile)
execute 'source '. s:esc(plugfile)
endif
elseif has_key(plugfiles, name)
execute 'source '. s:esc(plugfiles[name])
endif
endfor
finally
command! -nargs=+ Plug call s:add(1, <args>)
endtry
return s:extended
endfunction
function! s:update_progress(pull, cnt, bar, total) function! s:update_progress(pull, cnt, bar, total)
call setline(1, (a:pull ? 'Updating' : 'Installing'). call setline(1, (a:pull ? 'Updating' : 'Installing').
\ ' plugins ('.a:cnt.'/'.a:total.')') \ ' plugins ('.a:cnt.'/'.a:total.')')
@ -659,50 +613,39 @@ function! s:update_serial(pull, todo)
let done = {} let done = {}
let bar = '' let bar = ''
while !empty(todo) for [name, spec] in items(todo)
for [name, spec] in items(todo) let done[name] = 1
let done[name] = 1 if isdirectory(spec.dir)
if isdirectory(spec.dir) execute 'cd '.s:esc(spec.dir)
execute 'cd '.s:esc(spec.dir) let [valid, msg] = s:git_valid(spec, 0, 0)
let [valid, msg] = s:git_valid(spec, 0, 0) if valid
if valid let result = a:pull ?
let result = a:pull ? \ s:system(
\ s:system( \ printf('git checkout -q %s 2>&1 && git pull origin %s 2>&1 && git submodule update --init --recursive 2>&1',
\ printf('git checkout -q %s 2>&1 && git pull origin %s 2>&1 && git submodule update --init --recursive 2>&1', \ s:shellesc(spec.branch), s:shellesc(spec.branch))) : 'Already installed'
\ s:shellesc(spec.branch), s:shellesc(spec.branch))) : 'Already installed' let error = a:pull ? v:shell_error != 0 : 0
let error = a:pull ? v:shell_error != 0 : 0
else
let result = msg
let error = 1
endif
cd -
else else
let result = s:system( let result = msg
\ printf('git clone --recursive %s -b %s %s 2>&1 && cd %s && git submodule update --init --recursive 2>&1', let error = 1
\ s:shellesc(spec.uri),
\ s:shellesc(spec.branch),
\ s:shellesc(s:trim(spec.dir)),
\ s:shellesc(spec.dir)))
let error = v:shell_error != 0
if !error | let s:prev_update.new[name] = 1 | endif
endif endif
let bar .= error ? 'x' : '=' cd -
if error
call add(s:prev_update.errors, name)
endif
call append(3, s:format_message(!error, name, result))
call s:update_progress(a:pull, len(done), bar, total)
endfor
let extended = s:extend(keys(todo))
if !empty(extended)
let todo = filter(extended, '!has_key(done, v:key)')
let total += len(todo)
call s:update_progress(a:pull, len(done), bar, total)
else else
break let result = s:system(
\ printf('git clone --recursive %s -b %s %s 2>&1 && cd %s && git submodule update --init --recursive 2>&1',
\ s:shellesc(spec.uri),
\ s:shellesc(spec.branch),
\ s:shellesc(s:trim(spec.dir)),
\ s:shellesc(spec.dir)))
let error = v:shell_error != 0
if !error | let s:prev_update.new[name] = 1 | endif
endif endif
endwhile let bar .= error ? 'x' : '='
if error
call add(s:prev_update.errors, name)
endif
call append(3, s:format_message(!error, name, result))
call s:update_progress(a:pull, len(done), bar, total)
endfor
endfunction endfunction
function! s:update_parallel(pull, todo, threads) function! s:update_parallel(pull, todo, threads)
@ -728,7 +671,6 @@ function! s:update_parallel(pull, todo, threads)
%["#{arg.gsub('"', '\"')}"] %["#{arg.gsub('"', '\"')}"]
end end
require 'set'
require 'thread' require 'thread'
require 'fileutils' require 'fileutils'
require 'timeout' require 'timeout'
@ -859,63 +801,52 @@ function! s:update_parallel(pull, todo, threads)
end end
} if VIM::evaluate('s:mac_gui') == 1 } if VIM::evaluate('s:mac_gui') == 1
processed = Set.new
progress = iswin ? '' : '--progress' progress = iswin ? '' : '--progress'
until all.empty? [all.length, nthr].min.times do
names = all.keys mtx.synchronize do
processed.merge names threads << Thread.new {
[names.length, nthr].min.times do while pair = take1.call
mtx.synchronize do name = pair.first
threads << Thread.new { dir, uri, branch = pair.last.values_at *%w[dir uri branch]
while pair = take1.call branch = esc branch
name = pair.first subm = "git submodule update --init --recursive 2>&1"
dir, uri, branch = pair.last.values_at *%w[dir uri branch] exists = File.directory? dir
branch = esc branch ok, result =
subm = "git submodule update --init --recursive 2>&1" if exists
exists = File.directory? dir dir = esc dir
ok, result = ret, data = bt.call "#{cd} #{dir} && git rev-parse --abbrev-ref HEAD 2>&1 && git config remote.origin.url", nil, nil
if exists current_uri = data.lines.to_a.last
dir = esc dir if !ret
ret, data = bt.call "#{cd} #{dir} && git rev-parse --abbrev-ref HEAD 2>&1 && git config remote.origin.url", nil, nil if data =~ /^Interrupted|^Timeout/
current_uri = data.lines.to_a.last [false, data]
if !ret
if data =~ /^Interrupted|^Timeout/
[false, data]
else
[false, [data.chomp, "PlugClean required."].join($/)]
end
elsif current_uri.sub(/git:@/, '') != uri.sub(/git:@/, '')
[false, ["Invalid URI: #{current_uri}",
"Expected: #{uri}",
"PlugClean required."].join($/)]
else else
if pull [false, [data.chomp, "PlugClean required."].join($/)]
log.call name, 'Updating ...', :update
bt.call "#{cd} #{dir} && git checkout -q #{branch} 2>&1 && (git pull origin #{branch} #{progress} 2>&1 && #{subm})", name, :update
else
[true, skip]
end
end end
elsif current_uri.sub(/git:@/, '') != uri.sub(/git:@/, '')
[false, ["Invalid URI: #{current_uri}",
"Expected: #{uri}",
"PlugClean required."].join($/)]
else else
d = esc dir.sub(%r{[\\/]+$}, '') if pull
log.call name, 'Installing ...', :install log.call name, 'Updating ...', :update
bt.call "(git clone #{progress} --recursive #{uri} -b #{branch} #{d} 2>&1 && cd #{esc dir} && #{subm})", name, :install bt.call "#{cd} #{dir} && git checkout -q #{branch} 2>&1 && (git pull origin #{branch} #{progress} 2>&1 && #{subm})", name, :update
else
[true, skip]
end
end end
mtx.synchronize { VIM::command("let s:prev_update.new['#{name}'] = 1") } if !exists && ok else
log.call name, result, ok d = esc dir.sub(%r{[\\/]+$}, '')
end log.call name, 'Installing ...', :install
} if running bt.call "(git clone #{progress} --recursive #{uri} -b #{branch} #{d} 2>&1 && cd #{esc dir} && #{subm})", name, :install
end end
mtx.synchronize { VIM::command("let s:prev_update.new['#{name}'] = 1") } if !exists && ok
log.call name, result, ok
end
} if running
end end
threads.each { |t| t.join rescue nil }
mtx.synchronize { threads.clear }
extended = Hash[(VIM::evaluate("s:extend(#{names.inspect})") || {}).reject { |k, _|
processed.include? k
}]
tot += extended.length
all.merge!(extended)
logh.call
end end
threads.each { |t| t.join rescue nil }
logh.call
refresh.kill if refresh refresh.kill if refresh
watcher.kill watcher.kill
EOF EOF

14
test/workflow.vader
View File

@ -357,7 +357,8 @@ Execute (Trying to execute on-demand commands when plugin is not installed):
Execute (New set of plugins): Execute (New set of plugins):
call plug#begin() call plug#begin()
Plug 'junegunn/vim-fnr' " Depends on vim-pseudocl Plug 'junegunn/vim-fnr'
Plug 'junegunn/vim-pseudocl'
Plug 'junegunn/vim-easy-align', { 'on': 'EasyAlign' } Plug 'junegunn/vim-easy-align', { 'on': 'EasyAlign' }
Plug 'junegunn/vim-redis', { 'for': 'redis' } Plug 'junegunn/vim-redis', { 'for': 'redis' }
call plug#end() call plug#end()
@ -368,15 +369,15 @@ Execute (Check commands):
Execute (Partial PlugInstall): Execute (Partial PlugInstall):
PlugInstall vim-fnr vim-easy-align PlugInstall vim-fnr vim-easy-align
AssertExpect 'vim-pseudocl', 1 AssertExpect 'vim-fnr', 1
PlugInstall vim-fnr vim-easy-align 1
AssertExpect 'vim-pseudocl', 1
q q
Execute (Check dependent plugin): PlugInstall vim-fnr vim-easy-align 1
Assert &rtp =~ 'pseudocl', &rtp AssertExpect 'vim-fnr', 1
AssertExpect 'vim-easy-align', 1
AssertEqual first_rtp, split(&rtp, ',')[0] AssertEqual first_rtp, split(&rtp, ',')[0]
AssertEqual last_rtp, split(&rtp, ',')[-1] AssertEqual last_rtp, split(&rtp, ',')[-1]
q
Given (Unaligned code): Given (Unaligned code):
a=1 a=1
@ -668,6 +669,7 @@ Execute (Using Funcref):
Execute (Using custom dir): Execute (Using custom dir):
Assert isdirectory(g:plugs['vim-easy-align'].dir) Assert isdirectory(g:plugs['vim-easy-align'].dir)
call system('rm -rf '.$TMPDIR.'easy-align')
call plug#begin() call plug#begin()
Plug 'junegunn/vim-easy-align', { 'dir': $TMPDIR.'easy-align' } Plug 'junegunn/vim-easy-align', { 'dir': $TMPDIR.'easy-align' }
call plug#end() call plug#end()