From 9bf12db6f4ccbd7401d4769369a5ff132af37884 Mon Sep 17 00:00:00 2001
From: Haak Saxberg <haak@zenpayroll.com>
Date: Thu, 3 Dec 2015 17:12:39 -0800
Subject: [PATCH] vimtest and remove cruft

---
 vim-files/vim/ftplugin/ruby.vim |  8 --------
 vim-files/vimrc                 | 21 ++++++++++++++++-----
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/vim-files/vim/ftplugin/ruby.vim b/vim-files/vim/ftplugin/ruby.vim
index 0e61f29..17355c1 100644
--- a/vim-files/vim/ftplugin/ruby.vim
+++ b/vim-files/vim/ftplugin/ruby.vim
@@ -1,10 +1,2 @@
 " Neomake
 let g:neomake_ruby_enabled_makers = ['rubocop']
-let g:neomake_ruby_rubocop_maker = {
-  \ 'args': ['--except', 'Style/TrailingComma,Style/Documentation,Metrics/ClassLength,Metrics/ModuleLength,Metrics/MethodLength,Style/SignalException'],
-  \}
-
-" vim-rspec mappings
-nnoremap <Leader>t :call RunCurrentSpecFile()<CR>
-nnoremap <Leader>s :call RunNearestSpec()<CR>
-nnoremap <Leader>l :call RunLastSpec()<CR>
diff --git a/vim-files/vimrc b/vim-files/vimrc
index 9af3bf1..3fa88a5 100644
--- a/vim-files/vimrc
+++ b/vim-files/vimrc
@@ -29,12 +29,12 @@ Plug 'SirVer/ultisnips'
 
 Plug 'tpope/vim-fugitive'
 Plug 'gregsexton/gitv'
-Plug 'scrooloose/nerdtree'
 Plug 'tpope/vim-vinegar'
 Plug 'ctrlpvim/ctrlp.vim'
 Plug 'simnalamburt/vim-mundo'
 Plug 'vim-ruby/vim-ruby'
 Plug 'tpope/vim-rails'
+Plug 'janko-m/vim-test'
 
 Plug 'tpope/vim-endwise'
 
@@ -92,9 +92,14 @@ autocmd! BufWritePost * Neomake
 
 " NERDTree
 let NERDTreeHijackNetrw = 1
-map \q :q<CR>
-map \w :w<CR>
-noremap Q <nop>
+let g:netrw_liststyle = 3 " let netrw look like NERDTree
+
+" Vim-Test
+nmap <silent> <leader>t :TestNearest<CR>
+nmap <silent> <leader>T :TestFile<CR>
+nmap <silent> <leader>a :TestSuite<CR>
+nmap <silent> <leader>l :TestLast<CR>
+nmap <silent> <leader>g :TestVisit<CR>
 """" END PLUGIN SETTINGS
 
 let mapleader=","
@@ -190,8 +195,14 @@ endfunction
 noremap ; :
 inoremap jj <Esc>
 map <silent> <leader>V :source ~/.vimrc<CR>:filetype detect<CR>:exe ":echo 'vimrc reloaded'"<CR>
+map \q :q<CR>
+map \w :w<CR>
+noremap Q <nop>
+
 "terminal remaps
-tnoremap <Esc> <C-\><C-n>
+if has('nvim')
+  tnoremap <Esc> <C-\><C-n>
+endif
 
 " Quicker window movement
 nnoremap <C-j> <C-w>j