more plugins and stuff

ohmyvim/scripts.py

@@ -1,15 +1,13 @@
 from os.path import join
 from os.path import isdir
 from os.path import isfile
-from os.path import abspath
 from os.path import basename
 from os.path import expanduser
 from urllib import urlopen
 from subprocess import Popen
 from subprocess import PIPE
 from glob import glob
 import webbrowser
-import subprocess
 import shutil
 import sys
 import os
@@ -25,6 +23,7 @@
 source %(ohmyvim)s
 '''
 
+
 class Manager(object):
 
     runtime = expanduser('~/.vim/bundle')
@@ -37,7 +36,8 @@ class Manager(object):
       }
 
     def __init__(self):
-        for dirname in (self.runtime, self.autoload, self.ohmyvim):
+        for dirname in (self.runtime, self.autoload,
+                        self.ohmyvim, expanduser('~/.vim/swp')):
             if not isdir(dirname):
                 os.makedirs(dirname)
         for name, url in self.dependencies.items():
@@ -53,7 +53,6 @@ def __init__(self):
                                                    'autoload', 'pathogen.vim'))
                 fd.write('call pathogen#runtime_append_all_bundles()\n')
                 fd.write('source %s\n' % join(self.ohmyvim, 'theme.vim'))
-        ohmyvim = join(self.ohmyvim, 'ohmyvim.vim')
         binary = os.path.abspath(sys.argv[0])
         if not isfile(expanduser('~/.vimrc')):
             with open(expanduser('~/.vimrc'), 'w') as fd:
@@ -137,13 +136,14 @@ def install(self, args):
                     fd = urlopen(url)
                     dependencies = [d for d in fd.readlines()]
             else:
-                for _, d in self.install_url(url):
+                _, deps = self.install_url(url)
+                for d in deps:
                     if d.strip():
                         dependencies.add(d)
         if dependencies:
             print 'Processing dependencies...'
             for url in dependencies:
-                 self.install_url(url)
+                self.install_url(url)
 
     def upgrade(self, args):
         if not args.bundle:
@@ -156,7 +156,6 @@ def upgrade(self, args):
             elif args.raw:
                 print plugin
 
-
     def remove(self, args):
         for plugin, dirname, themes in self.get_plugins():
             if not args.bundle:
@@ -264,5 +263,3 @@ def main(*args):
     else:
         args = parser.parse_args()
     args.action(args)
-
-

profiles/defaults.vim

@@ -10,7 +10,9 @@ set expandtab
 set tabstop=4
 set noerrorbells
 set shiftwidth=4
+filetype plugin on
 set visualbell t_vb=
 set ignorecase smartcase
 set statusline=%F%m%r%h%w\ format=%{&ff}\ type=%Y\ x=%l\ y=%v\ %p%%\ %{strftime(\"%d/%m/%y\ -\%H:%M\")}
 
+set directory=~/.vim/swp/

profiles/git.vim

@@ -0,0 +1,5 @@
+" git helpers
+
+au FileType gitcommit map <buffer> <C-D> :DiffGitCached<CR>
+au FileType gitcommit imap <buffer> <C-D> <Esc>:DiffGitCached<CR>
+

profiles/python.vim

@@ -1,11 +1,12 @@
 " fix tabulation. enable long lines highlighting
 
 augroup python
+    au BufNewFile,BufRead *.?py,*.py,*.py_tmpl set filetype=python
     au BufNewFile,BufRead *.?py,*.py,*.py_tmpl setlocal fileformat=unix
     au BufNewFile,BufRead *.?py,*.py,*.py_tmpl setlocal tabstop=4
     au BufNewFile,BufRead *.?py,*.py,*.py_tmpl setlocal shiftwidth=4
     au BufNewFile,BufRead *.?py,*.py,*.py_tmpl setlocal shiftwidth=4
-    au BufNewFile,BufRead *.?py,*.py,*.py_tmpl call PythonBinding
+    au BufNewFile,BufRead *.?py,*.py,*.py_tmpl call PythonBinding()
     au BufWinEnter *.?py,*.py,*.py_tmpl let w:m1=matchadd('Search', '\%<81v.\%>77v', -1)
     au BufWinEnter *.?py,*.py,*.py_tmpl let w:m2=matchadd('ErrorMsg', '\%>80v.\+', -1)
 augroup END

setup.py

@@ -1,8 +1,10 @@
 from setuptools import setup, find_packages
-import sys, os
+import sys
+import os
 
 version = '0.2'
 
+
 def read(*args):
     path = os.path.join(*args)
     try:
@@ -42,8 +44,10 @@ def read(*args):
       """,
       )
 
+
 def upgrade():
     sys.path.insert(0, os.path.dirname(__file__))
+
     class Args(object):
         def __init__(self, dependencies):
             self.bundle = dependencies
@@ -52,7 +56,7 @@ def __init__(self, dependencies):
         manager = Manager()
         manager.upgrade(Args(manager.dependencies.keys()))
     except Exception:
-        sys.stderr.write('Auto upgrade failed. Please run:\n')
+        sys.stderr.write('\nAuto upgrade failed. Please run:\n')
         sys.stderr.write('    $ oh-my-vim upgrade\n')
 
 if 'install' in sys.argv or 'bdist_egg' in sys.argv: