Revert bundle syntax update that may have caused pain for upgraders [Fix #588]

bin/yadr/vundle.rb

@@ -6,15 +6,15 @@ module Vundle
     return if contains_vundle? plugin_repo
 
     vundles = vundles_from_file
-    last_bundle_dir = vundles.rindex{ |line| line =~ /^Plugin / }
+    last_bundle_dir = vundles.rindex{ |line| line =~ /^Bundle / }
     last_bundle_dir = last_bundle_dir ? last_bundle_dir+1 : 0
-    vundles.insert last_bundle_dir, "Plugin \"#{plugin_repo}\""
+    vundles.insert last_bundle_dir, "Bundle \"#{plugin_repo}\""
     write_vundles_to_file vundles
   end
 
   def self.remove_plugin_from_vundle(plugin_repo)
     vundles = vundles_from_file
-    deleted_value = vundles.reject!{ |line| line =~ /Plugin "#{plugin_repo}"/ }
+    deleted_value = vundles.reject!{ |line| line =~ /Bundle "#{plugin_repo}"/ }
 
     write_vundles_to_file vundles
 
@@ -22,11 +22,11 @@ module Vundle
   end
 
   def self.vundle_list
-    vundles_from_file.select{ |line| line =~ /^Plugin .*/ }.map{ |line| line.gsub(/Plugin "(.*)"/, '\1')}
+    vundles_from_file.select{ |line| line =~ /^Bundle .*/ }.map{ |line| line.gsub(/Bundle "(.*)"/, '\1')}
   end
 
   def self.update_vundle
-    system "vim --noplugin -u #{ENV['HOME']}/.vim/vundles.vim -N \"+set hidden\" \"+syntax on\" +PluginClean +PluginInstall +qall"
+    system "vim --noplugin -u #{ENV['HOME']}/.vim/vundles.vim -N \"+set hidden\" \"+syntax on\" +BundleClean +BundleInstall +qall"
   end
 
 

vim/vundles.vim

@@ -4,18 +4,18 @@
 "
 " This file contains the list of plugin installed using vundle plugin manager.
 " Once you've updated the list of plugin, you can run vundle update by issuing
-" the command :PluginInstall from within vim or directly invoking it from the
+" the command :BundleInstall from within vim or directly invoking it from the
 " command line with the following syntax:
-" vim --noplugin -u vim/vundles.vim -N "+set hidden" "+syntax on" +PluginClean! +PluginInstall +qall
+" vim --noplugin -u vim/vundles.vim -N "+set hidden" "+syntax on" +BundleClean! +BundleInstall +qall
 " Filetype off is required by vundle
 filetype off
 
 set rtp+=~/.vim/bundle/vundle/
 set rtp+=~/.vim/vundles/ "Submodules
-call vundle#begin()
+call vundle#rc()
 
 " let Vundle manage Vundle (required)
-Plugin 'gmarik/vundle'
+Bundle "gmarik/vundle"
 
 " YADR's vundles are split up by category into smaller files
 " This reduces churn and makes it easier to fork. See
@@ -35,7 +35,5 @@ if filereadable(expand("~/.yadr/vim/.vundles.local"))
   source ~/.yadr/vim/.vundles.local
 endif
 
-call vundle#end()
-
 "Filetype plugin indent on is required by vundle
 filetype plugin indent on

vim/vundles/appearance.vundle

@@ -1,10 +1,10 @@
-Plugin 'chrisbra/color_highlight.git'
+Bundle "chrisbra/color_highlight.git"
-Plugin 'skwp/vim-colors-solarized'
+Bundle "skwp/vim-colors-solarized"
-Plugin 'itchyny/lightline.vim'
+Bundle "itchyny/lightline.vim"
-Plugin 'jby/tmux.vim.git'
+Bundle "jby/tmux.vim.git"
-Plugin 'morhetz/gruvbox'
+Bundle "morhetz/gruvbox"
-Plugin 'xsunsmile/showmarks.git'
+Bundle "xsunsmile/showmarks.git"
-Plugin 'chriskempson/base16-vim'
+Bundle "chriskempson/base16-vim"
 
 " Required for Gblame in terminal vim
-Plugin 'godlygeek/csapprox.git' 
+Bundle "godlygeek/csapprox.git" 

vim/vundles/git.vundle

@@ -1,4 +1,4 @@
-Plugin 'gregsexton/gitv'
+Bundle "gregsexton/gitv"
-Plugin 'mattn/gist-vim'
+Bundle "mattn/gist-vim"
-Plugin 'tpope/vim-fugitive'
+Bundle "tpope/vim-fugitive"
-Plugin 'tpope/vim-git'
+Bundle "tpope/vim-git"

vim/vundles/languages.vundle

@@ -1,7 +1,7 @@
-Plugin 'sheerun/vim-polyglot'
+Bundle 'sheerun/vim-polyglot'
-Plugin 'garbas/vim-snipmate.git'
+Bundle 'garbas/vim-snipmate.git'
-Plugin 'honza/vim-snippets'
+Bundle 'honza/vim-snippets'
-Plugin 'jtratner/vim-flavored-markdown.git'
+Bundle 'jtratner/vim-flavored-markdown.git'
-Plugin 'scrooloose/syntastic.git'
+Bundle 'scrooloose/syntastic.git'
-Plugin 'nelstrom/vim-markdown-preview'
+Bundle 'nelstrom/vim-markdown-preview'
-Plugin 'skwp/vim-html-escape'
+Bundle 'skwp/vim-html-escape'

vim/vundles/project.vundle

@@ -1,5 +1,5 @@
-Plugin 'jistr/vim-nerdtree-tabs.git'
+Bundle "jistr/vim-nerdtree-tabs.git"
-Plugin 'scrooloose/nerdtree.git'
+Bundle "scrooloose/nerdtree.git"
-Plugin 'kien/ctrlp.vim'
+Bundle "kien/ctrlp.vim"
-Plugin 'xolox/vim-misc'
+Bundle "xolox/vim-misc"
-Plugin 'xolox/vim-session'
+Bundle "xolox/vim-session"

vim/vundles/ruby.vundle

@@ -1,10 +1,10 @@
-Plugin 'ecomba/vim-ruby-refactoring'
+Bundle "ecomba/vim-ruby-refactoring"
-Plugin 'tpope/vim-rails.git'
+Bundle "tpope/vim-rails.git"
-Plugin 'tpope/vim-rake.git'
+Bundle "tpope/vim-rake.git"
-Plugin 'tpope/vim-rvm.git'
+Bundle "tpope/vim-rvm.git"
-Plugin 'vim-ruby/vim-ruby.git'
+Bundle "vim-ruby/vim-ruby.git"
-Plugin 'Keithbsmiley/rspec.vim'
+Bundle "Keithbsmiley/rspec.vim"
-Plugin 'skwp/vim-iterm-rspec'
+Bundle "skwp/vim-iterm-rspec"
-Plugin 'skwp/vim-spec-finder'
+Bundle "skwp/vim-spec-finder"
-Plugin 'ck3g/vim-change-hash-syntax'
+Bundle "ck3g/vim-change-hash-syntax"
-Plugin 'tpope/vim-bundler'
+Bundle "tpope/vim-bundler"

vim/vundles/search.vundle

@@ -1,6 +1,6 @@
-Plugin 'justinmk/vim-sneak'
+Bundle "justinmk/vim-sneak"
-Plugin 'rking/ag.vim'
+Bundle "rking/ag.vim"
-Plugin 'vim-scripts/IndexedSearch'
+Bundle "vim-scripts/IndexedSearch"
-Plugin 'nelstrom/vim-visual-star-search'
+Bundle "nelstrom/vim-visual-star-search"
-Plugin 'skwp/greplace.vim'
+Bundle "skwp/greplace.vim"
-Plugin 'Lokaltog/vim-easymotion'
+Bundle "Lokaltog/vim-easymotion"

vim/vundles/textobjects.vundle

@@ -1,15 +1,15 @@
 " These bundles introduce new textobjects into vim,
 " For example the Ruby one introduces the 'r' text object
 " such that 'var' gives you Visual Around Ruby
-Plugin 'austintaylor/vim-indentobject'
+Bundle "austintaylor/vim-indentobject"
-Plugin 'bootleq/vim-textobj-rubysymbol'
+Bundle "bootleq/vim-textobj-rubysymbol"
-Plugin 'coderifous/textobj-word-column.vim'
+Bundle "coderifous/textobj-word-column.vim"
-Plugin 'kana/vim-textobj-datetime'
+Bundle "kana/vim-textobj-datetime"
-Plugin 'kana/vim-textobj-entire'
+Bundle "kana/vim-textobj-entire"
-Plugin 'kana/vim-textobj-function'
+Bundle "kana/vim-textobj-function"
-Plugin 'kana/vim-textobj-user'
+Bundle "kana/vim-textobj-user"
-Plugin 'lucapette/vim-textobj-underscore'
+Bundle "lucapette/vim-textobj-underscore"
-Plugin 'nathanaelkane/vim-indent-guides'
+Bundle "nathanaelkane/vim-indent-guides"
-Plugin 'nelstrom/vim-textobj-rubyblock'
+Bundle "nelstrom/vim-textobj-rubyblock"
-Plugin 'thinca/vim-textobj-function-javascript'
+Bundle "thinca/vim-textobj-function-javascript"
-Plugin 'vim-scripts/argtextobj.vim'
+Bundle "vim-scripts/argtextobj.vim"

vim/vundles/vim-improvements.vundle

@@ -1,29 +1,29 @@
-Plugin 'AndrewRadev/splitjoin.vim'
+Bundle "AndrewRadev/splitjoin.vim"
-Plugin 'Raimondi/delimitMate'
+Bundle "Raimondi/delimitMate"
-Plugin 'Shougo/neocomplete.git'
+Bundle "Shougo/neocomplete.git"
-Plugin 'briandoll/change-inside-surroundings.vim.git'
+Bundle "briandoll/change-inside-surroundings.vim.git"
-Plugin 'godlygeek/tabular'
+Bundle "godlygeek/tabular"
-Plugin 'tomtom/tcomment_vim.git'
+Bundle "tomtom/tcomment_vim.git"
-Plugin 'vim-scripts/camelcasemotion.git'
+Bundle "vim-scripts/camelcasemotion.git"
-Plugin 'vim-scripts/matchit.zip.git'
+Bundle "vim-scripts/matchit.zip.git"
-Plugin 'kristijanhusak/vim-multiple-cursors'
+Bundle "kristijanhusak/vim-multiple-cursors"
-Plugin 'Keithbsmiley/investigate.vim'
+Bundle "Keithbsmiley/investigate.vim"
-Plugin 'chrisbra/NrrwRgn'
+Bundle "chrisbra/NrrwRgn"
-Plugin 'christoomey/vim-tmux-navigator'
+Bundle "christoomey/vim-tmux-navigator"
-Plugin 'MarcWeber/vim-addon-mw-utils.git'
+Bundle "MarcWeber/vim-addon-mw-utils.git"
-Plugin 'bogado/file-line.git'
+Bundle "bogado/file-line.git"
-Plugin 'mattn/webapi-vim.git'
+Bundle "mattn/webapi-vim.git"
-Plugin 'sjl/gundo.vim'
+Bundle "sjl/gundo.vim"
-Plugin 'skwp/YankRing.vim'
+Bundle "skwp/YankRing.vim"
-Plugin 'tomtom/tlib_vim.git'
+Bundle "tomtom/tlib_vim.git"
-Plugin 'tpope/vim-abolish'
+Bundle "tpope/vim-abolish"
-Plugin 'tpope/vim-endwise.git'
+Bundle "tpope/vim-endwise.git"
-Plugin 'tpope/vim-ragtag'
+Bundle "tpope/vim-ragtag"
-Plugin 'tpope/vim-repeat.git'
+Bundle "tpope/vim-repeat.git"
-Plugin 'tpope/vim-surround.git'
+Bundle "tpope/vim-surround.git"
-Plugin 'tpope/vim-unimpaired'
+Bundle "tpope/vim-unimpaired"
-Plugin 'vim-scripts/AnsiEsc.vim.git'
+Bundle "vim-scripts/AnsiEsc.vim.git"
-Plugin 'vim-scripts/AutoTag.git'
+Bundle "vim-scripts/AutoTag.git"
-Plugin 'vim-scripts/lastpos.vim'
+Bundle "vim-scripts/lastpos.vim"
-Plugin 'vim-scripts/sudo.vim'
+Bundle "vim-scripts/sudo.vim"
-Plugin 'goldfeld/ctrlr.vim'
+Bundle "goldfeld/ctrlr.vim"