Skip to content

Commit

Permalink
Updates from Benny
Browse files Browse the repository at this point in the history
  • Loading branch information
rdeshpande committed Feb 1, 2012
1 parent ae6d552 commit 06a80f1
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 240 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -2,3 +2,4 @@ vim/doc/*
.netrwhist .netrwhist
vim/bundle vim/bundle
zsh/work.sh zsh/work.sh
vim/autoload
230 changes: 0 additions & 230 deletions vim/autoload/pathogen.vim

This file was deleted.

24 changes: 24 additions & 0 deletions vim/snippets/ruby.snippets
@@ -0,0 +1,24 @@
snippet desc Describe subject
describe "${1:subject}" do
${2}
end
snippet cont Context
context "${1:subject}" do
${2}
end
snippet it it block
it "${1:should do something}" do
${2}
end
snippet bef Before each test
before do
${1}
end
snippet aft After each test
after do
${1}
end
snippet let
let(:${1}) { ${2} }
snippet its
its(:${1}) { ${2} }
17 changes: 7 additions & 10 deletions vim/update_bundles.rb
Expand Up @@ -3,26 +3,29 @@
git_bundles = [ git_bundles = [
"git://github.com/tpope/vim-fugitive.git", "git://github.com/tpope/vim-fugitive.git",
"https://github.com/sickill/vim-pasta.git", "https://github.com/sickill/vim-pasta.git",
"https://github.com/kien/ctrlp.vim.git",
"git://github.com/tpope/vim-haml.git", "git://github.com/tpope/vim-haml.git",
"git://github.com/kchmck/vim-coffee-script.git", "git://github.com/kchmck/vim-coffee-script.git",
"git://github.com/Raimondi/delimitMate", "git://github.com/Raimondi/delimitMate",
"https://github.com/tpope/vim-endwise.git",
"https://github.com/kchmck/vim-coffee-script.git", "https://github.com/kchmck/vim-coffee-script.git",
"git://github.com/tpope/vim-rails.git", "git://github.com/tpope/vim-rails.git",
"git://github.com/tpope/vim-repeat.git", "git://github.com/tpope/vim-repeat.git",
"git://github.com/tpope/vim-surround.git", "git://github.com/tpope/vim-surround.git",
"https://github.com/msanders/snipmate.vim.git",
"https://github.com/scrooloose/syntastic.git", "https://github.com/scrooloose/syntastic.git",
"git://github.com/tsaleh/vim-align.git", "git://github.com/tsaleh/vim-align.git",
"git://github.com/vim-ruby/vim-ruby.git",
"git://github.com/edsono/vim-matchit.git",
"git://github.com/pangloss/vim-javascript", "git://github.com/pangloss/vim-javascript",
] ]


require 'fileutils' require 'fileutils'
require 'open-uri' require 'open-uri'


bundles_dir = File.join(File.dirname(__FILE__), "bundle") bundles_dir = File.join(File.dirname(__FILE__), "bundle")
autoload_dir = File.join(File.dirname(__FILE__), "autoload")


FileUtils.mkdir_p(bundles_dir) FileUtils.mkdir_p(bundles_dir)
FileUtils.mkdir_p(autoload_dir)


Dir.chdir(bundles_dir) do Dir.chdir(bundles_dir) do


Expand All @@ -36,12 +39,6 @@
FileUtils.rm_rf(File.join(dir, ".git")) FileUtils.rm_rf(File.join(dir, ".git"))
end end


vim_org_scripts.each do |name, script_id, script_type| puts "installing pathogen"
puts " Downloading #{name}" `curl -so ~/.vim/autoload/pathogen.vim https://raw.github.com/tpope/vim-pathogen/HEAD/autoload/pathogen.vim`
local_file = File.join(name, script_type, "#{name}.vim")
FileUtils.mkdir_p(File.dirname(local_file))
File.open(local_file, "w") do |file|
file << open("http://www.vim.org/scripts/download_script.php?src_id=#{script_id}").read
end
end
end end
3 changes: 3 additions & 0 deletions vim/vimrc
Expand Up @@ -78,3 +78,6 @@ let g:pasta_enabled_filetypes = ['ruby', 'javascript', 'css', 'sh']
" Consider question/exclamation marks to be part of a Vim word. " Consider question/exclamation marks to be part of a Vim word.
autocmd FileType ruby set iskeyword=@,48-57,_,?,!,192-255 autocmd FileType ruby set iskeyword=@,48-57,_,?,!,192-255
autocmd FileType scss set iskeyword=@,48-57,_,-,?,!,192-255 autocmd FileType scss set iskeyword=@,48-57,_,-,?,!,192-255

" Reload Vimrc
map <leader>rv :source ~/.vimrc<CR>

0 comments on commit 06a80f1

Please sign in to comment.