diff --git a/autoload/vundle/installer.vim b/autoload/vundle/installer.vim index 3edbccf..a226092 100644 --- a/autoload/vundle/installer.vim +++ b/autoload/vundle/installer.vim @@ -4,14 +4,16 @@ func! vundle#installer#install(bang, ...) abort \ s:reload_bundles() : \ map(copy(a:000), 'vundle#config#init_bundle(v:val, {})') - let installed = s:install(a:bang, bundles) - redraw! + let [installed, errors] = s:install(a:bang, bundles) + if empty(errors) | redraw! | end " TODO: handle error: let user know hen they need to restart Vim call vundle#config#require(bundles) - call s:log("Installed bundles:\n".join((empty(installed) ? - \ ['no new bundles installed'] : - \ map(installed, 'v:val.name')),"\n")) + let msg = 'No new bundles were installed' + if (!empty(installed)) + let msg = "Installed bundles:\n".join(map(installed, 'v:val.name'),"\n") + endif + call s:log(msg) call vundle#installer#helptags(bundles) endf @@ -21,7 +23,7 @@ func! vundle#installer#helptags(bundles) abort let help_dirs = filter(bundle_dirs, 's:has_doc(v:val)') call map(copy(help_dirs), 's:helptags(v:val)') if !empty(help_dirs) - call s:log('Helptags: done. '.len(help_dirs).' bundles processed') + call s:log('Helptags: '.len(help_dirs).' bundles processed') endif return help_dirs endf @@ -68,7 +70,7 @@ endf func! s:sync(bang, bundle) abort let git_dir = expand(a:bundle.path().'/.git/') if isdirectory(git_dir) - if !(a:bang) | return 0 | endif + if !(a:bang) | return [0, 'skip'] | endif let cmd = 'cd '.shellescape(a:bundle.path()).' && git pull' if (has('win32') || has('win64')) @@ -78,12 +80,28 @@ func! s:sync(bang, bundle) abort else let cmd = 'git clone '.a:bundle.uri.' '.shellescape(a:bundle.path()) endif + silent exec '!'.cmd - return 1 + + if 0 != v:shell_error + echohl Error | echo 'Error installing "'.a:bundle.name.'". Failed cmd: '.cmd | echohl None + return [v:shell_error, 'error'] + end + return [0, 'ok'] endf func! s:install(bang, bundles) abort - return filter(copy(a:bundles), 's:sync(a:bang, v:val)') + let [installed, errors] = [[],[]] + + for b in a:bundles + let [err_code, status] = s:sync(a:bang, b) + if 0 == err_code + if 'ok' == status | call add(installed, b) | endif + else + call add(errors, b) + endif + endfor + return [installed, errors] endf " TODO: make it pause after output in console mode diff --git a/autoload/vundle/scripts.vim b/autoload/vundle/scripts.vim index d949c91..93a98ca 100644 --- a/autoload/vundle/scripts.vim +++ b/autoload/vundle/scripts.vim @@ -12,6 +12,7 @@ func! vundle#scripts#all(bang, ...) setl hls let b:match = a:1 endif + redraw! echo len(matches).' bundles found' endf @@ -60,24 +61,26 @@ func! s:display(headers, results) endf func! s:fetch_scripts(to) - let temp = shellescape(tempname()) - if has('win32') || has('win64') - let scripts_dir = fnamemodify(expand(a:to), ":h") - if !isdirectory(scripts_dir) - call mkdir(scripts_dir, "p") - endif - exec '!curl http://vim-scripts.org/api/scripts.json > '.temp. - \ '&& move /Y '.temp.' '.shellescape(a:to) - else - exec '!curl http://vim-scripts.org/api/scripts.json > '.temp. - \ '&& mkdir -p $(dirname '.shellescape(a:to).') && mv -f '.temp.' '.shellescape(a:to) + let scripts_dir = fnamemodify(expand(a:to), ":h") + if !isdirectory(scripts_dir) + call mkdir(scripts_dir, "p") endif + + silent exec '!curl --fail -s -o '.shellescape(a:to).' http://vim-scripts.org/api/scripts.json' + + if (0 != v:shell_error) + echoerr 'Error fetching scripts!' + return v:shell_error + endif + return 0 endf func! s:load_scripts(bang) let f = expand('$HOME/.vim-vundle/vim-scripts.org.json') if a:bang || !filereadable(f) - call s:fetch_scripts(f) + if 0 != s:fetch_scripts(f) + return [] + end endif return eval(readfile(f, 'b')[0]) endf diff --git a/test/vimrc b/test/vimrc index ac33de1..d0ff49c 100644 --- a/test/vimrc +++ b/test/vimrc @@ -30,6 +30,9 @@ Bundle 'vim-scripts/ragtag.vim' Bundle 'altercation/vim-colors-solarized' " with extension Bundle 'nelstrom/vim-mac-classic-theme.git' +" +" invalid uri +Bundle 'nonexistinguser/yupppierepo.git' " full uri Bundle 'https://github.com/vim-scripts/vim-game-of-life'