Splitting out testing and templates from vimrc file

1 files changed, 49 insertions, 337 deletions

diff --git a/.vimrc b/.vimrc
index 95df7e7..31a9783 100644
--- a/.vimrc
+++ b/.vimrc
@@ -11,7 +11,8 @@ source ~/.vim/author_info.vim
 
 " Syntax Highlighting {{{
 syntax on
-colorscheme mcrute_slate
+"colorscheme mcrute_slate
+colorscheme fruity
 set background=dark
 
 " MacVim gets its transparency settings all horked up if we don't
@@ -25,7 +26,7 @@ if has("gui_macvim") && has("gui_running")
     set transparency=10
     set lines=65
     set columns=100
-    set guifont=Monaco:h10.00
+    set guifont=Monaco,bold:h10.00
     set go-=T
     colorscheme mcrute
 endif
@@ -39,6 +40,25 @@ if has("gui_gtk") && has("gui_running")
     set guifont=Monospace\ 8
     set guioptions=aegimrLt
 endif
+
+" AGI PD Template Files
+autocmd BufNewFile,BufRead,BufReadPost *.pd 
+    \ set syntax=pyfusion
+
+" Apache Files in Apache dirs
+autocmd BufNewFile,BufRead,BufReadPost /*apache*
+    \ set syntax=apache
+
+" Jinja2 Templates
+autocmd BufNewFile,BufRead,BufReadPost *.tmpl
+    \ set syntax=jinja
+
+" Python Files
+autocmd BufNewFile,BufRead *.py 
+    \ setlocal foldmarker=#{,#}
+
+autocmd Filetype html,xml,xsl
+    \ source ~/.vim/scripts/scripts/closetag.vim
 " }}}
 " General Settings {{{
 set backspace=indent,eol,start
@@ -53,6 +73,7 @@ set backup
 set directory=~/.vim/tmp,~/.tmp,~/tmp,/var/tmp,/tmp
 set backupdir=~/.vim/tmp,~/.tmp,~/tmp,/var/tmp,/tmp
 set vb t_vb=
+let mapleader=","
 " }}}
 " Search Settings {{{
 set hlsearch
@@ -65,14 +86,12 @@ set smartcase
 set autoindent
 set expandtab
 set shiftwidth=4
-"set smartindent     " Screws up python indenting
 set smarttab
 set softtabstop=4
 set tabstop=4
 " }}}
 " Visual Display {{{
 set laststatus=2
-"set list
 set noequalalways
 set nowrap
 set number
@@ -96,24 +115,16 @@ filetype indent on
 
 " Use verital splits for file explorer
 let g:explVertical=1
-" }}}
-" File Type -> Highlighting Maps {{{
-" AGI PD Template Files
-autocmd BufNewFile,BufRead,BufReadPost *.pd 
-    \ set syntax=pyfusion
-
-" Apache Files in Apache dirs
-autocmd BufNewFile,BufRead,BufReadPost /*apache*
-    \ set syntax=apache
 
-" Python Files
-autocmd BufNewFile,BufRead *.py 
-    \ setlocal foldmarker=#{,#}
+" Set closing tag style for closetag.vim
+let g:closetag_html=1
 " }}}
 " Custom Commands {{{
 " Cleanup windows crap from line endings
+command TrimSpaces %s/\s\+$//e
 command FixLineEnd %s/
//gi
 command PEP8 call IsPEP8()
+command W write
 " }}}
 " Folding Settings {{{
 set foldenable
@@ -123,47 +134,16 @@ set foldmethod=marker
 " Striving for Python Zen {{{
 let python_highlight_all=1
 
-" Code completion!
-autocmd FileType python set omnifunc=pythoncomplete#Complete
-inoremap <Nul> <C-x><C-o>
-
-" Remove trailing spaces from *.py files for PEP8 compliance
-function! TrimSpaces()
-    :%s/\s\+$//e
-endfunction
-
-"autocmd BufWritePre *.py call TrimSpaces
+autocmd FileType python 
+    \ set omnifunc=pythoncomplete#Complete
 
-" Run pep8 checks if we can
-function! IsPEP8()
-    if executable("agi-pep8.py")
+function! CheckIt()
+    if executable("pylint")
+        !pylint %
+    elseif executable("agi-pep8.py")
         !agi-pep8.py %
     endif
 endfunction
-
-" Run pylint on the file
-if executable("pylint")
-"    autocmd BufWritePost *.py !pylint -rn %
-"    autocmd BufRead *.py set makeprg=pylint\ -rn\ %
-elseif executable("agi-pep8.py")
-"    autocmd BufWritePost *.py !agi-pep8.py %
-"    autocmd BufRead *.py set makeprg=agi-pep8.py\ %
-endif
-
-" Allow us to gf into import statements
-if has("python")
-python << EOF
-import os, sys, vim
-for p in sys.path:
-    if os.path.isdir(p):
-        vim.command(r"set path+=%s" % (p.replace(" ", r"\ ")))
-EOF
-endif
-" }}}
-" Automatic Commands {{{
-"autocmd BufWinLeave * silent! mkview
-"autocmd BufWinEnter * silent! loadview
-"autocmd FileType python compiler nose
 " }}}
 " Line and Column Highlighting {{{
 "autocmd BufEnter * call SetColumnHighlighting(1)
@@ -286,300 +266,32 @@ function! Cream_listchars_init()
 endfunction
 call Cream_listchars_init()
 " }}}
-" Template Support {{{
-let s:Template_Directory = $HOME . '/.vim/templates/'
-
-function! SubstituteTag(pos1, pos2, tag, replacement)
-    let linenumber = a:pos1
-
-    while linenumber <= a:pos2
-        let line = getline(linenumber)
-        let start = 0
-
-        while match(line,a:tag,start) >= 0
-            let frst = match(line, a:tag, start)
-            let last = matchend(line, a:tag, start)
-
-            if frst !=- 1
-                let part1 = strpart(line, 0, frst)
-                let part2 = strpart(line, last)
-                let line = part1 . a:replacement.part2
-                let start = strlen(part1) + strlen(a:replacement)
-            endif
-        endwhile
-
-        call setline(linenumber, line)
-        let linenumber = linenumber + 1
-    endwhile
-endfunction
+" {{{ Mercurial Support
+nnoremap <leader>qs :!hg qseries
+nnoremap <leader>qS :!hg status
 
-function! InsertTemplate(template, header)
-    let templatefile = s:Template_Directory
+function! HGNewPatch()
+    let dirty_copy = system(join(["hg st", "wc -l", "awk '{print $1}'"], '|')) > 0
 
-    if exists("b:current_syntax")
-        let templatefile = templatefile . b:current_syntax . '/' . a:template
-    else
-        let templatefile = templatefile . 'default/' . a:template
-    endif
+    let patch_name = input('Patch name: ')
+    let commit_message = input('Commit message: ')
 
-    if filereadable(templatefile)
-        let length = line("$")
-        let pos1 = line(".") + 1
-        let l:old_cpoptions = &cpoptions
-        setlocal cpoptions-=a
-
-        if  a:header
-            :goto 1
-            let pos1 = 1
-            exe '0read ' . templatefile
-        else
-            exe 'read ' . templatefile
-        endif
-
-        let &cpoptions = l:old_cpoptions
-        let length = line("$") - length
-        let pos2 = pos1 + length - 1
-
-        call SubstituteTag(pos1, pos2, '|FILENAME|', expand("%:t"))
-        call SubstituteTag(pos1, pos2, '|DATE|', strftime('%x'))
-        call SubstituteTag(pos1, pos2, '|TEXTDATE|', strftime('%B %d, %Y'))
-        call SubstituteTag(pos1, pos2, '|DATETIME|', strftime('%x %X %Z'))
-        call SubstituteTag(pos1, pos2, '|TIME|', strftime('%X %Z'))
-        call SubstituteTag(pos1, pos2, '|YEAR|', strftime('%Y'))
-        call SubstituteTag(pos1, pos2, '|AUTHOR|', g:AuthorName)
-        call SubstituteTag(pos1, pos2, '|EMAIL|', g:Email)
-        call SubstituteTag(pos1, pos2, '|AUTHORREF|', g:AuthorRef)
-        call SubstituteTag(pos1, pos2, '|PROJECT|', g:Project)
-        call SubstituteTag(pos1, pos2, '|COMPANY|', g:Company)
-        call SubstituteTag(pos1, pos2, '|COPYRIGHTHOLDER|', g:CopyrightHolder)
-
-        exe ':' . pos1
-        normal 0
-
-        let linenumber = search('|CURSOR|')
-        
-        if linenumber >= pos1 && linenumber <= pos2
-            let pos1 = match(getline(linenumber), "|CURSOR|")
-
-            if matchend(getline(linenumber), "|CURSOR|") == match(getline(linenumber), "$")
-                silent! s/|CURSOR|//
-                :startinsert!
-            else
-                silent  s/|CURSOR|//
-                call cursor(linenumber, pos1 + 1)
-                :startinsert
-            endif
-        endif
+    if dirty_copy && input('Force create patch (y/n)? ') == 'y'
+        let messages = system("hg qnew -f -m '".commit_message."' ".patch_name)
     else
-        echohl WarningMsg | echo 'template file '.templatefile.' does not exist or is not readable'| echohl None
-    endif
-    
-    return
-endfunction
-" }}}
-" Snippet Support {{{
-let s:CodeSnippets = $HOME . "/.vim/snippets/"
-
-function! InsertSnippet()
-    let l:snippet_file = GetSnippetFile()
-    
-    if l:snippet_file != "" && filereadable(l:snippet_file)
-        let linesread = line("$")
-        let l:old_cpoptions = &cpoptions
-        setlocal cpoptions-=a
-        execute "read " . l:snippet_file
-        let &cpoptions = l:old_cpoptions
-        
-        let linesread = line("$") - linesread - 1
-        if linesread >= 0 && match(l:snippet_file, '\.\(ni\|noindent\)$') < 0
-            silent exe "normal =" . linesread . "+"
-        endif
+        let messages = system("hg qnew -m '".commit_message."' ".patch_name)
     endif
-endfunction
-
-function! EditSnippet()
-    let l:snippet_file = GetSnippetFile()
     
-    if l:snippet_file != "" && filereadable(l:snippet_file)
-        execute "update! | split | edit " . l:snippet_file
-    endif
-endfunction
-
-function! WriteSnippet()
-    let l:snippet_file = GetSnippetFile()
-
-    let @z = ""
-    normal! gv"zy
-    let l:snippet_text = split(@z, "\n")
-
-    if l:snippet_file != ""
-        call writefile(l:snippet_text, l:snippet_file)
-    endif
-endfunction
-
-function! GetSnippetFile()
-    if exists("b:current_syntax")
-        let l:snippet_dir = s:CodeSnippets . b:current_syntax
-    else
-        let l:snippet_dir = s:CodeSnippets . "default"
-    endif
-
-    if isdirectory(l:snippet_dir)
-        let l:snippet_file = input("choose snippet: ", l:snippet_dir, "file" )
-        return l:snippet_file
-    else
-        return ""
-    endif
-endfunction
-" }}}
-" Subversion Support {{{
-function! SVNDiff()
-    let fn = bufname("%")
-    let newfn = fn . ".HEAD"
-    let catstat = system("svn cat -r HEAD " . fn . " > " . newfn)
-    if stridx(catstat, "is not a working copy") > 0
-        echo "*** ERROR ***\n" . catstat
+    if v:shell_error != 0
+        hi RedBar ctermfg=white ctermbg=red guibg=red
+        echohl RedBar
+        echo messages
+        echohl
     else
-        execute "vert diffsplit " . newfn
+        echo
     endif
-    let rmstat = system("rm " . newfn)
 endfunction
 " }}}
-" Unit Test Functions {{{
-" This should get move out of here eventually ~mcrute
-set errorformat=%f:%l:\ fail:\ %m,%f:%l:\ error:\ %m
-set makeprg=nosetests\ --machine-out
-
-function! RedBar()
-    hi RedBar ctermfg=white ctermbg=red guibg=red
-    echohl RedBar
-    echon repeat(" ",&columns - 1)
-    echohl
-endfunction
-
-function! GreenBar()
-    hi GreenBar ctermfg=white ctermbg=green guibg=green
-    echohl GreenBar
-    echon repeat(" ",&columns - 1)
-    echohl
-endfunction
-" }}}
-" {{{ Tab Completion
-function! InsertTabWrapper()
-    let col = col('.') - 1
-    if !col || getline('.')[col - 1] !~ '\k'
-        return "\<tab>"
-    else
-        return "\<c-p>"
-    endif
-endfunction
-
-inoremap <tab> <c-r>=InsertTabWrapper()<cr>
-inoremap <s-tab> <c-n>
-" }}}
-" {{{ Testing Support 
-" Shamelessly ripped off of Gary Bernhart
-let g:show_tests = 0
-
-function! ClassToFilename(class_name)
-    let understored_class_name = substitute(a:class_name, '\(.\)\(\u\)', '\1_\U\2', 'g')
-    let file_name = substitute(understored_class_name, '\(\u\)', '\L\1', 'g')
-    return 'test_' . file_name . '.py'
-endfunction
-
-function! NameOfCurrentClass()
-    let save_cursor = getpos(".")
-    normal $<cr>
-    call PythonDec('class', -1)
-    let line = getline('.')
-    call setpos('.', save_cursor)
-    let match_result = matchlist(line, ' *class \+\(\w\+\)')
-    return match_result[1]
-endfunction
-
-function! ModuleTestPath()
-    let file_path = @%
-    let components = split(file_path, '/')
-    let filename = remove(components, -1)
-    let components = add(components, 'tests')
-    let test_path = join(components, '/')
-    return test_path
-endfunction
-
-function! TestFileForCurrentClass()
-    let class_name = NameOfCurrentClass()
-    let test_file_name = ModuleTestPath() . '/' . ClassToFilename(class_name)
-    return test_file_name
-endfunction
-
-function! TestFileForCurrentFile()
-    let filename = split(@%, '/')[-1]
-    let module_path = ModuleTestPath()
-    let components = split(module_path, '/')
-    let components = add(components, 'test_' . filename)
-    return join(components, '/')
-endfunction
-
-function! RunTests(target, args)
-    silent ! echo
-    exec 'silent ! echo -e "\033[1;36mRunning tests in ' . a:target . '\033[0m"'
-    set makeprg=nosetests
-    silent w
-    exec "make! " . a:target . " " . a:args
-endfunction
-
-function! RunTestsForFile(args)
-    if @% =~ 'test_'
-        call RunTests('%', a:args)
-    else
-        let test_file_name = TestFileForCurrentFile()
-        call RunTests(test_file_name, a:args)
-    endif
-endfunction
-
-function! RunAllTests(args)
-    silent ! echo
-    silent ! echo -e "\033[1;36mRunning all unit tests\033[0m"
-    set makeprg=nosetests
-    silent w
-    exec "make! tests.unit " . a:args
-endfunction
-
-function! JumpToError()
-    if getqflist() != []
-        for error in getqflist()
-            if error['valid']
-                break
-            endif
-        endfor
-        let error_message = substitute(error['text'], '^ *', '', 'g')
-        " silent cc!
-        let error_buffer = error['bufnr']
-        if g:show_tests == 1
-            exec ":vs"
-            exec ":buffer " . error_buffer
-        endif
-        exec "normal ".error['lnum']."G"
-        call RedBar()
-        echo error_message
-    else
-        call GreenBar()
-        echo "All tests passed"
-    endif
-endfunction
-
-function! JumpToTestsForClass()
-    exec 'e ' . TestFileForCurrentClass()
-endfunction
-
-let mapleader=","
-nnoremap <leader>m :call RunTestsForFile('--machine-out')<cr>:redraw<cr>:call JumpToError()<cr>
-nnoremap <leader>M :call RunTestsForFile('')<cr>
-nnoremap <leader>a :call RunAllTests('--machine-out')<cr>:redraw<cr>:call JumpToError()<cr>
-nnoremap <leader>A :call RunAllTests('')<cr>
-nnoremap <leader>t :call JumpToTestsForClass()<cr>
-nnoremap <leader><leader> <c-^>
-" }}}
 " Key Bindings {{{
 set pastetoggle=<F12>