convert to vundle

.vim/bundle/Vundle.vim/autoload/vundle/config.vim

@@ -0,0 +1,278 @@
+" ---------------------------------------------------------------------------
+" Add a plugin to the runtimepath.
+"
+" arg    -- a string specifying the plugin
+" ...    -- a dictionary of options for the plugin
+" return -- the return value from vundle#config#init_bundle()
+" ---------------------------------------------------------------------------
+func! vundle#config#bundle(arg, ...)
+  let bundle = vundle#config#init_bundle(a:arg, a:000)
+  if !s:check_bundle_name(bundle)
+    return
+  endif
+  if exists('g:vundle_lazy_load') && g:vundle_lazy_load
+    call add(g:bundles, bundle)
+  else
+    call s:rtp_rm_a()
+    call add(g:bundles, bundle)
+    call s:rtp_add_a()
+    call s:rtp_add_defaults()
+  endif
+  return bundle
+endf
+
+
+" ---------------------------------------------------------------------------
+"  When lazy bundle load is used (begin/end functions), add all configured
+"  bundles to runtimepath and reorder appropriately.
+" ---------------------------------------------------------------------------
+func! vundle#config#activate_bundles()
+  call s:rtp_add_a()
+  call s:rtp_add_defaults()
+endf
+
+
+" ---------------------------------------------------------------------------
+" Initialize Vundle.
+"
+" Start a new bundles list and make sure the runtimepath does not contain
+" directories from a previous call. In theory, this should only be called
+" once.
+" ---------------------------------------------------------------------------
+func! vundle#config#init()
+  if !exists('g:bundles') | let g:bundles = [] | endif
+  call s:rtp_rm_a()
+  let g:bundles = []
+  let g:bundle_names = {}
+endf
+
+
+" ---------------------------------------------------------------------------
+" Add a list of bundles to the runtimepath and source them.
+"
+" bundles -- a list of bundle objects
+" ---------------------------------------------------------------------------
+func! vundle#config#require(bundles) abort
+  for b in a:bundles
+    call s:rtp_add(b.rtpath)
+    call s:rtp_add(g:bundle_dir)
+    " TODO: it has to be relative rtpath, not bundle.name
+    exec 'runtime! '.b.name.'/plugin/*.vim'
+    exec 'runtime! '.b.name.'/after/*.vim'
+    call s:rtp_rm(g:bundle_dir)
+  endfor
+  call s:rtp_add_defaults()
+endf
+
+
+" ---------------------------------------------------------------------------
+" Create a bundle object from a bundle specification.
+"
+" name   -- the bundle specification as a string
+" opts   -- the options dictionary from then bundle definition
+" return -- an initialized bundle object
+" ---------------------------------------------------------------------------
+func! vundle#config#init_bundle(name, opts)
+  if a:name != substitute(a:name, '^\s*\(.\{-}\)\s*$', '\1', '')
+    echo "Spurious leading and/or trailing whitespace found in plugin spec '" . a:name . "'"
+  endif
+  let opts = extend(s:parse_options(a:opts), s:parse_name(substitute(a:name,"['".'"]\+','','g')), 'keep')
+  let b = extend(opts, copy(s:bundle))
+  let b.rtpath = s:rtpath(opts)
+  return b
+endf
+
+
+" ---------------------------------------------------------------------------
+" Check if the current bundle name has already been used in this running
+" instance and show an error to that effect.
+"
+" bundle -- a bundle object whose name is to be checked
+" return -- 0 if the bundle's name has been seen before, 1 otherwise
+" ---------------------------------------------------------------------------
+funct! s:check_bundle_name(bundle)
+  if has_key(g:bundle_names, a:bundle.name)
+    echoerr 'Vundle error: Name collision for Plugin ' . a:bundle.name_spec .
+          \ '. Plugin ' . g:bundle_names[a:bundle.name] .
+          \ ' previously used the name "' . a:bundle.name . '"' .
+          \ '. Skipping Plugin ' . a:bundle.name_spec . '.'
+    return 0
+  endif
+  let g:bundle_names[a:bundle.name] = a:bundle.name_spec
+  return 1
+endf
+
+
+" ---------------------------------------------------------------------------
+" Parse the options which can be supplied with the bundle specification.
+" Corresponding documentation: vundle-plugins-configure
+"
+" opts   -- a dictionary with the user supplied options for the bundle
+" return -- a dictionary with the user supplied options for the bundle, this
+"           will be merged with a s:bundle object into one dictionary.
+" ---------------------------------------------------------------------------
+func! s:parse_options(opts)
+  " TODO: improve this
+  if len(a:opts) != 1 | return {} | endif
+
+  if type(a:opts[0]) == type({})
+    return a:opts[0]
+  else
+    return {'rev': a:opts[0]}
+  endif
+endf
+
+
+" ---------------------------------------------------------------------------
+" Parse the plugin specification.  Corresponding documentation:
+" vundle-plugins-uris
+"
+" arg    -- the string supplied to identify the plugin
+" return -- a dictionary with the folder name (key 'name') and the uri (key
+"           'uri') for cloning the plugin  and the original argument (key
+"           'name_spec')
+" ---------------------------------------------------------------------------
+func! s:parse_name(arg)
+  let arg = a:arg
+  let git_proto = exists('g:vundle_default_git_proto') ? g:vundle_default_git_proto : 'https'
+
+  if    arg =~? '^\s*\(gh\|github\):\S\+'
+  \  || arg =~? '^[a-z0-9][a-z0-9-]*/[^/]\+$'
+    let uri = git_proto.'://github.com/'.split(arg, ':')[-1]
+    if uri !~? '\.git$'
+      let uri .= '.git'
+    endif
+    let name = substitute(split(uri,'\/')[-1], '\.git\s*$','','i')
+  elseif arg =~? '^\s*\(git@\|git://\)\S\+'
+  \   || arg =~? '\(file\|https\?\)://'
+  \   || arg =~? '\.git\s*$'
+    let uri = arg
+    let name = split( substitute(uri,'/\?\.git\s*$','','i') ,'\/')[-1]
+  else
+    let name = arg
+    let uri  = git_proto.'://github.com/vim-scripts/'.name.'.git'
+  endif
+  return {'name': name, 'uri': uri, 'name_spec': arg }
+endf
+
+
+" ---------------------------------------------------------------------------
+"  Modify the runtimepath, after all bundles have been added, so that the
+"  directories that were in the default runtimepath appear first in the list
+"  (with their 'after' directories last).
+" ---------------------------------------------------------------------------
+func! s:rtp_add_defaults()
+  let current = &rtp
+  set rtp&vim
+  let default = &rtp
+  let &rtp = current
+  let default_rtp_items = split(default, ',')
+  if !empty(default_rtp_items)
+    let first_item = fnameescape(default_rtp_items[0])
+    exec 'set rtp-=' . first_item
+    exec 'set rtp^=' . first_item
+  endif
+endf
+
+
+" ---------------------------------------------------------------------------
+" Remove all paths for the plugins which are managed by Vundle from the
+" runtimepath.
+" ---------------------------------------------------------------------------
+func! s:rtp_rm_a()
+  let paths = map(copy(g:bundles), 'v:val.rtpath')
+  let prepends = join(paths, ',')
+  let appends = join(paths, '/after,').'/after'
+  exec 'set rtp-='.fnameescape(prepends)
+  exec 'set rtp-='.fnameescape(appends)
+endf
+
+
+" ---------------------------------------------------------------------------
+" Add all paths for the plugins which are managed by Vundle to the
+" runtimepath.
+" ---------------------------------------------------------------------------
+func! s:rtp_add_a()
+  let paths = map(copy(g:bundles), 'v:val.rtpath')
+  let prepends = join(paths, ',')
+  let appends = join(paths, '/after,').'/after'
+  exec 'set rtp^='.fnameescape(prepends)
+  exec 'set rtp+='.fnameescape(appends)
+endf
+
+
+" ---------------------------------------------------------------------------
+" Remove a directory and the corresponding 'after' directory from runtimepath.
+"
+" dir    -- the directory name to be removed as a string.  The corresponding
+"           'after' directory will also be removed.
+" ---------------------------------------------------------------------------
+func! s:rtp_rm(dir) abort
+  exec 'set rtp-='.fnameescape(expand(a:dir, 1))
+  exec 'set rtp-='.fnameescape(expand(a:dir.'/after', 1))
+endf
+
+
+" ---------------------------------------------------------------------------
+" Add a directory and the corresponding 'after' directory to runtimepath.
+"
+" dir    -- the directory name to be added as a string.  The corresponding
+"           'after' directory will also be added.
+" ---------------------------------------------------------------------------
+func! s:rtp_add(dir) abort
+  exec 'set rtp^='.fnameescape(expand(a:dir, 1))
+  exec 'set rtp+='.fnameescape(expand(a:dir.'/after', 1))
+endf
+
+
+" ---------------------------------------------------------------------------
+" Expand and simplify a path.
+"
+" path   -- the path to expand as a string
+" return -- the expanded and simplified path
+" ---------------------------------------------------------------------------
+func! s:expand_path(path) abort
+  return simplify(expand(a:path, 1))
+endf
+
+
+" ---------------------------------------------------------------------------
+" Find the actual path inside a bundle directory to be added to the
+" runtimepath.  It might be provided by the user with the 'rtp' option.
+" Corresponding documentation: vundle-plugins-configure
+"
+" opts   -- a bundle dict
+" return -- expanded path to the corresponding plugin directory
+" ---------------------------------------------------------------------------
+func! s:rtpath(opts)
+  return has_key(a:opts, 'rtp') ? s:expand_path(a:opts.path().'/'.a:opts.rtp) : a:opts.path()
+endf
+
+
+" ---------------------------------------------------------------------------
+" a bundle 'object'
+" ---------------------------------------------------------------------------
+let s:bundle = {}
+
+
+" ---------------------------------------------------------------------------
+" Return the absolute path to the directory inside the bundle directory
+" (prefix) where thr bundle will be cloned.
+"
+" return -- the target location to clone this bundle to
+" ---------------------------------------------------------------------------
+func! s:bundle.path()
+  return s:expand_path(g:bundle_dir.'/'.self.name)
+endf
+
+
+" ---------------------------------------------------------------------------
+"  Determine if the bundle has the pinned attribute set in the config
+"
+"  return -- 1 if the bundle is pinned, 0 otherwise
+" ---------------------------------------------------------------------------
+func! s:bundle.is_pinned()
+  return get(self, 'pinned')
+endf
+
+" vim: set expandtab sts=2 ts=2 sw=2 tw=78 norl:

.vim/bundle/Vundle.vim/autoload/vundle/scripts.vim

@@ -0,0 +1,257 @@
+" ---------------------------------------------------------------------------
+" Search the database from vim-script.org for a matching plugin.  If no
+" argument is given, list all plugins. This function is used by the :Plugins
+" and :PluginSearch commands.
+"
+" bang -- if 1 refresh the script name cache, if 0 don't
+" ...  -- a plugin name to search for
+" ---------------------------------------------------------------------------
+func! vundle#scripts#all(bang, ...)
+  let b:match = ''
+  let info = ['"Keymap: i - Install plugin; c - Cleanup; s - Search; R - Reload list']
+  let matches = s:load_scripts(a:bang)
+  if !empty(a:1)
+    let matches = filter(matches, 'v:val =~? "'.escape(a:1,'"').'"')
+    let info += ['"Search results for: '.a:1]
+    " TODO: highlight matches
+    let b:match = a:1
+  endif
+  call vundle#scripts#view('search',info, vundle#scripts#bundle_names(reverse(matches)))
+  redraw
+  echo len(matches).' plugins found'
+endf
+
+
+" ---------------------------------------------------------------------------
+" Repeat the search for bundles.
+" ---------------------------------------------------------------------------
+func! vundle#scripts#reload() abort
+  silent exec ':PluginSearch! '.(exists('b:match') ? b:match : '')
+  redraw
+endf
+
+
+" ---------------------------------------------------------------------------
+" Complete names for bundles in the command line.
+"
+" a, c, d -- see :h command-completion-custom
+" return  -- all valid plugin names from vim-scripts.org as completion
+"            candidates, see also :h command-completion-custom
+" ---------------------------------------------------------------------------
+func! vundle#scripts#complete(a,c,d)
+  return join(s:load_scripts(0),"\n")
+endf
+
+
+" ---------------------------------------------------------------------------
+" View the logfile after an update or installation.
+" ---------------------------------------------------------------------------
+func! s:view_log()
+  if !exists('g:vundle_log_file')
+    let g:vundle_log_file = tempname()
+  endif
+
+  call writefile(g:vundle_log, g:vundle_log_file)
+  execute 'silent pedit ' . g:vundle_log_file
+
+  wincmd P | wincmd H
+endf
+
+
+" ---------------------------------------------------------------------------
+" Parse the output from git log after an update to create a change log for the
+" user.
+" ---------------------------------------------------------------------------
+func! s:create_changelog() abort
+  for bundle_data in g:updated_bundles
+    let initial_sha = bundle_data[0]
+    let updated_sha = bundle_data[1]
+    let bundle      = bundle_data[2]
+
+    let cmd = 'cd '.vundle#installer#shellesc(bundle.path()).
+          \              ' && git log --pretty=format:"%s   %an, %ar" --graph '.
+          \               initial_sha.'..'.updated_sha
+
+    let cmd = vundle#installer#shellesc_cd(cmd)
+
+    let updates = system(cmd)
+
+    call add(g:vundle_changelog, '')
+    call add(g:vundle_changelog, 'Updated Plugin: '.bundle.name)
+
+    if bundle.uri =~ "https://github.com"
+      call add(g:vundle_changelog, 'Compare at: '.bundle.uri[0:-5].'/compare/'.initial_sha.'...'.updated_sha)
+    endif
+
+    for update in split(updates, '\n')
+      let update = substitute(update, '\s\+$', '', '')
+      call add(g:vundle_changelog, '  '.update)
+    endfor
+  endfor
+endf
+
+
+" ---------------------------------------------------------------------------
+" View the change log after an update or installation.
+" ---------------------------------------------------------------------------
+func! s:view_changelog()
+  call s:create_changelog()
+
+  if !exists('g:vundle_changelog_file')
+    let g:vundle_changelog_file = tempname()
+  endif
+
+  call writefile(g:vundle_changelog, g:vundle_changelog_file)
+  execute 'silent pedit ' . g:vundle_changelog_file
+
+  wincmd P | wincmd H
+endf
+
+
+" ---------------------------------------------------------------------------
+" Create a list of 'Plugin ...' lines from a list of bundle names.
+"
+" names  -- a list of names (strings) of plugins
+" return -- a list of 'Plugin ...' lines suitable to be written to a buffer
+" ---------------------------------------------------------------------------
+func! vundle#scripts#bundle_names(names)
+  return map(copy(a:names), ' printf("Plugin ' ."'%s'".'", v:val) ')
+endf
+
+
+" ---------------------------------------------------------------------------
+" Open a buffer to display information to the user.  Several special commands
+" are defined in the new buffer.
+"
+" title   -- a title for the new buffer
+" headers -- a list of header lines to be displayed at the top of the buffer
+" results -- the main information to be displayed in the buffer (list of
+"            strings)
+" ---------------------------------------------------------------------------
+func! vundle#scripts#view(title, headers, results)
+  if exists('g:vundle_view') && bufloaded(g:vundle_view)
+    exec g:vundle_view.'bd!'
+  endif
+
+  exec 'silent pedit [Vundle] '.a:title
+
+  wincmd P | wincmd H
+
+  let g:vundle_view = bufnr('%')
+  "
+  " make buffer modifiable
+  " to append without errors
+  set modifiable
+
+  call append(0, a:headers + a:results)
+
+  setl buftype=nofile
+  setl noswapfile
+
+  setl cursorline
+  setl nonu ro noma
+  if (exists('&relativenumber')) | setl norelativenumber | endif
+
+  setl ft=vundle
+  setl syntax=vim
+  syn keyword vimCommand Plugin
+  syn keyword vimCommand Bundle
+  syn keyword vimCommand Helptags
+
+  com! -buffer -bang -nargs=1 DeletePlugin
+    \ call vundle#installer#run('vundle#installer#delete', split(<q-args>,',')[0], ['!' == '<bang>', <args>])
+
+  com! -buffer -bang -nargs=? InstallAndRequirePlugin
+    \ call vundle#installer#run('vundle#installer#install_and_require', split(<q-args>,',')[0], ['!' == '<bang>', <q-args>])
+
+  com! -buffer -bang -nargs=? InstallPlugin
+    \ call vundle#installer#run('vundle#installer#install', split(<q-args>,',')[0], ['!' == '<bang>', <q-args>])
+
+  com! -buffer -bang -nargs=0 InstallHelptags
+    \ call vundle#installer#run('vundle#installer#docs', 'helptags', [])
+
+  com! -buffer -nargs=0 VundleLog call s:view_log()
+
+  com! -buffer -nargs=0 VundleChangelog call s:view_changelog()
+
+  nnoremap <buffer> q :silent bd!<CR>
+  nnoremap <buffer> D :exec 'Delete'.getline('.')<CR>
+
+  nnoremap <buffer> add  :exec 'Install'.getline('.')<CR>
+  nnoremap <buffer> add! :exec 'Install'.substitute(getline('.'), '^Plugin ', 'Plugin! ', '')<CR>
+
+  nnoremap <buffer> i :exec 'InstallAndRequire'.getline('.')<CR>
+  nnoremap <buffer> I :exec 'InstallAndRequire'.substitute(getline('.'), '^Plugin ', 'Plugin! ', '')<CR>
+
+  nnoremap <buffer> l :VundleLog<CR>
+  nnoremap <buffer> u :VundleChangelog<CR>
+  nnoremap <buffer> h :h vundle<CR>
+  nnoremap <buffer> ? :norm h<CR>
+
+  nnoremap <buffer> c :PluginClean<CR>
+  nnoremap <buffer> C :PluginClean!<CR>
+
+  nnoremap <buffer> s :PluginSearch
+  nnoremap <buffer> R :call vundle#scripts#reload()<CR>
+
+  " goto first line after headers
+  exec ':'.(len(a:headers) + 1)
+endf
+
+
+" ---------------------------------------------------------------------------
+" Load the plugin database from vim-scripts.org .
+"
+" to     -- the filename (string) to save the database to
+" return -- 0 on success, 1 if an error occurred
+" ---------------------------------------------------------------------------
+func! s:fetch_scripts(to)
+  let scripts_dir = fnamemodify(expand(a:to, 1), ":h")
+  if !isdirectory(scripts_dir)
+    call mkdir(scripts_dir, "p")
+  endif
+
+  let l:vim_scripts_json = 'http://vim-scripts.org/api/scripts.json'
+  if executable("curl")
+    let cmd = 'curl --fail -s -o '.vundle#installer#shellesc(a:to).' '.l:vim_scripts_json
+  elseif executable("wget")
+    let temp = vundle#installer#shellesc(tempname())
+    let cmd = 'wget -q -O '.temp.' '.l:vim_scripts_json. ' && mv -f '.temp.' '.vundle#installer#shellesc(a:to)
+    if (has('win32') || has('win64'))
+      let cmd = substitute(cmd, 'mv -f ', 'move /Y ', '') " change force flag
+      let cmd = vundle#installer#shellesc(cmd)
+    end
+  else
+    echoerr 'Error curl or wget is not available!'
+    return 1
+  endif
+
+  call system(cmd)
+
+  if (0 != v:shell_error)
+    echoerr 'Error fetching scripts!'
+    return v:shell_error
+  endif
+  return 0
+endf
+
+
+" ---------------------------------------------------------------------------
+" Load the plugin database and return a list of all plugins.
+"
+" bang   -- if 1 download the redatabase, else only download if it is not
+"           readable on disk (i.e. does not exist)
+" return -- a list of strings, these are the names (valid bundle
+"           specifications) of all plugins from vim-scripts.org
+" ---------------------------------------------------------------------------
+func! s:load_scripts(bang)
+  let f = expand(g:bundle_dir.'/.vundle/script-names.vim-scripts.org.json', 1)
+  if a:bang || !filereadable(f)
+    if 0 != s:fetch_scripts(f)
+      return []
+    end
+  endif
+  return eval(readfile(f, 'b')[0])
+endf
+
+" vim: set expandtab sts=2 ts=2 sw=2 tw=78 norl: