Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
...
  • 3 commits
  • 48 files changed
  • 0 commit comments
  • 1 contributor
Showing with 322 additions and 171 deletions.
  1. +4 −0 gitconfig
  2. +6 −0 irbrc
  3. +1 −1 oh-my-zsh
  4. +5 −24 vim/UltiSnips/coffee.snippets
  5. +31 −0 vim/UltiSnips/coffee_sinon.snippets
  6. +0 −38 vim/UltiSnips/cucumber.snippets
  7. +34 −0 vim/UltiSnips/gherkin.snippets
  8. +0 −44 vim/UltiSnips/minispec.snippets
  9. +37 −0 vim/UltiSnips/mocha.snippets
  10. +32 −0 vim/UltiSnips/mocha_chai.snippets
  11. +51 −0 vim/UltiSnips/mocha_chai_jquery.snippets
  12. +28 −0 vim/UltiSnips/mocha_sinon.snippets
  13. +16 −20 vim/UltiSnips/rspec.snippets
  14. +1 −1 vim/bundle/abolish
  15. +1 −1 vim/bundle/ack
  16. +1 −1 vim/bundle/bundler
  17. +1 −1 vim/bundle/coffee-script
  18. +1 −1 vim/bundle/ctrlp
  19. +1 −1 vim/bundle/dbext
  20. +1 −1 vim/bundle/endwise
  21. +1 −1 vim/bundle/fugitive
  22. +1 −1 vim/bundle/hammer
  23. +1 −1 vim/bundle/nerdtree
  24. +1 −1 vim/bundle/qargs
  25. +1 −1 vim/bundle/ragtag
  26. +1 −1 vim/bundle/rails
  27. +1 −1 vim/bundle/rake
  28. +1 −1 vim/bundle/repeat
  29. +1 −1 vim/bundle/rooter
  30. +1 −1 vim/bundle/ruby
  31. +1 −1 vim/bundle/ruby-minitest
  32. +1 −1 vim/bundle/surround
  33. +1 −1 vim/bundle/tabular
  34. +1 −1 vim/bundle/tagbar
  35. +1 −1 vim/bundle/tcomment
  36. +1 −1 vim/bundle/textobj-entire
  37. +1 −1 vim/bundle/textobj-indent
  38. +1 −1 vim/bundle/textobj-lastpat
  39. +1 −1 vim/bundle/textobj-line
  40. +1 −1 vim/bundle/textobj-syntax
  41. +1 −1 vim/bundle/textobj-user
  42. +1 −1 vim/bundle/ultisnips
  43. +1 −1 vim/bundle/unimpaired
  44. +1 −1 vim/bundle/visual-star-search
  45. +1 −1 vim/bundle/zencoding
  46. +37 −9 vimrc
  47. +4 −2 zshenv
  48. +4 −1 zshrc
View
4 gitconfig
@@ -34,3 +34,7 @@
templatedir = ~/.git_template
[credential]
helper = osxkeychain
+#[push]
+# default = simple
+[push]
+ default = simple
View
6 irbrc
@@ -0,0 +1,6 @@
+require 'irb/completion'
+require 'irb/ext/save-history'
+require 'pp'
+IRB.conf[:AUTO_INDENT] = true
+IRB.conf[:SAVE_HISTORY] = 100
+IRB.conf[:HISTORY_FILE] = "#{ENV['HOME']}/.irb-history"
2 oh-my-zsh
@@ -1 +1 @@
-Subproject commit d165a84dc0e8d2eb0774ed26995e7046c0aff41f
+Subproject commit fce68bbba0be99cfd49f9e46572b2d12d0a86d45
View
29 vim/UltiSnips/coffee.snippets
@@ -1,28 +1,9 @@
-snippet l "console.log"
-console.log ${1:"${2:output}"}
-endsnippet
-
-snippet d "descibe" b
-describe "${1:context}", ->
-
- $0
-endsnippet
-
-snippet b "before" b
-beforeEach ->
- $0
-endsnippet
-
-snippet a "after" b
-afterEach ->
- $0
-endsnippet
+clearsnippets
-snippet i "it" b
-it "${1:example}", ->
- $0
+snippet l "console.log" b
+console.log ${1:output}
endsnippet
-snippet e "expect" b
-expect( ${1:actual} ).$0
+snippet #= "require" b
+#= require ${1:script}
endsnippet
View
31 vim/UltiSnips/coffee_sinon.snippets
@@ -0,0 +1,31 @@
+snippet =spy "= sinon.spy()" i
+= sinon.spy()
+endsnippet
+
+snippet =stub "= sinon.stub()" i
+= sinon.stub()
+endsnippet
+
+snippet :spy ": sinon.spy()" i
+: sinon.spy()
+endsnippet
+
+snippet :stub ": sinon.stub()" i
+: sinon.stub()
+endsnippet
+
+snippet spy "sinon.spy" b
+sinon.spy ${1:target}, "${2:method}"
+endsnippet
+
+snippet stub "sinon.stub"
+sinon.stub ${1:target}, "${2:method}"
+endsnippet
+
+snippet .war "withArgs returns" i
+.withArgs(${1:arguments}).returns ${2:value}
+endsnippet
+
+snippet .r "restore()" i
+.restore()
+endsnippet
View
38 vim/UltiSnips/cucumber.snippets
@@ -1,38 +0,0 @@
-snippet f "description" b
-@wip
-Feature: ${1:`!p snip.rv = ' '.join(snip.basename.split('_')).capitalize() or "Title"`}
- In order to ${2:value}
- As a ${3:role}
- I want ${4:feature}
-
- $0
-endsnippet
-
-snippet b "background" b
-Background:
- Given ${1:I am logged in}
-endsnippet
-
-snippet s "scenario" b
-Scenario: ${1:title}
- When $0
-endsnippet
-
-snippet o "scenario outline" b
-Scenario Outline: ${1:title}
- Given $0
-
- Examples:
-endsnippet
-
-snippet g "given step" b
-Given $0
-endsnippet
-
-snippet w "when step" b
-When $0
-endsnippet
-
-snippet t "then step" b
-Then $0
-endsnippet
View
34 vim/UltiSnips/gherkin.snippets
@@ -0,0 +1,34 @@
+snippet fea "Feature" b
+Feature: ${1:`!p snip.rv = re.sub("_", " ", snip.basename)`}
+ In order to ${2:value}
+ As a ${3:role}
+ I want to ${4:feature}
+
+ $0
+endsnippet
+
+snippet b "Background" b
+Background:
+ Given ${1:context}
+endsnippet
+
+snippet s "Scenario" b
+Scenario: ${1:title}
+ $0
+endsnippet
+
+snippet g "Given" b
+Given ${1:context}
+endsnippet
+
+snippet w "When" b
+When ${1:action}
+endsnippet
+
+snippet t "Then" b
+Then ${1:outcome}
+endsnippet
+
+snippet a "And" b
+And ${1:supplement}
+endsnippet
View
44 vim/UltiSnips/minispec.snippets
@@ -1,44 +0,0 @@
-snippet rqh "require helper" b
-require "spec_helper"
-
-$0
-endsnippet
-
-snippet d "describe" b
-describe ${1:"${2:subject}"} do
- $0
-end
-endsnippet
-
-snippet c "context" b
-context ${1:"${2:context}"} do
- $0
-end
-endsnippet
-
-snippet b "before block" b
-before do
- $0
-end
-endsnippet
-
-snippet a "after block" b
-after do
- $0
-end
-endsnippet
-
-snippet i "spec" b
-it "${1:description}" do
- $0
-end
-endsnippet
-
-snippet .me "must_equal" i
-.must_equal ${1:expected}
-endsnippet
-
-
-snippet .we "wont_equal" i
-.wont_equal ${1:expected}
-endsnippet
View
37 vim/UltiSnips/mocha.snippets
@@ -0,0 +1,37 @@
+snippet d "describe" b
+describe "${1:context}", ->
+
+ $0
+endsnippet
+
+snippet c "context" b
+context "${1:context}", ->
+
+ $0
+endsnippet
+
+snippet b "before" b
+beforeEach ->
+ $0
+endsnippet
+
+snippet a "after" b
+afterEach ->
+ $0
+endsnippet
+
+snippet i "it" b
+it "${1:example}", ->
+ $0
+endsnippet
+
+snippet e "expect" b
+expect( ${1:actual} ).$0
+endsnippet
+
+snippet rsh "require spec_helper" b
+#= require spec_helper
+#= require ${1:`!p snip.rv = re.sub("_?spec/?(\..*)?", "", path)`}
+
+$0
+endsnippet
View
32 vim/UltiSnips/mocha_chai.snippets
@@ -0,0 +1,32 @@
+snippet .s "should" i
+.should
+endsnippet
+
+snippet .h "have" i
+.have
+endsnippet
+
+snippet .n "not" i
+.not
+endsnippet
+
+snippet .e "eql" i
+.eql ${1:value}
+endsnippet
+
+snippet .se "should eql" i
+.should.eql ${1:value}
+endsnippet
+
+snippet .= "equal" i
+.equal ${1:value}
+endsnippet
+
+snippet .s= "should equal" i
+.should.equal ${1:value}
+endsnippet
+
+snippet .sbai "should be an instanceof" i
+.should.be.an.instanceof ${1:Class}
+endsnippet
+
View
51 vim/UltiSnips/mocha_chai_jquery.snippets
@@ -0,0 +1,51 @@
+snippet .sh "should have" i
+.should.have "${1:selector}"
+endsnippet
+
+snippet .snh "should not have" i
+.should.not.have "${1:selector}"
+endsnippet
+
+snippet .shc "should have class" i
+.should.have.class "${1:class}"
+endsnippet
+
+snippet .sht "should have text" i
+.should.have.text "${1:class}"
+endsnippet
+
+snippet .sm "should match" i
+.should.match "${1:selector}"
+endsnippet
+
+snippet .shl "should have length" i
+.should.have.length ${1:0}
+endsnippet
+
+snippet .shp "should have property" i
+.should.have.property "${1:prop}"${2:, ${3:value}}
+endsnippet
+
+snippet .shdp "should have deep property" i
+.should.have.deep.property "${1:prop}"${2:, ${3:value}}
+endsnippet
+
+snippet .sne "should exist" i
+.should.exist
+endsnippet
+
+snippet .sne "should not exist" i
+.should.not.exist
+endsnippet
+
+snippet .sbt "should be true" i
+.should.be.true
+endsnippet
+
+snippet .sbf "should be false" i
+.should.be.false
+endsnippet
+
+snippet .sbn "should be null" i
+.should.be.null
+endsnippet
View
28 vim/UltiSnips/mocha_sinon.snippets
@@ -0,0 +1,28 @@
+snippet .b "been" i
+.been
+endsnippet
+
+snippet .co "calledOnce" i
+.calledOnce
+endsnippet
+
+snippet .cw "calledWith" i
+.calledWith
+endsnippet
+
+snippet .shbco "should.have.been.calledOnce" i
+.should.have.been.calledOnce
+endsnippet
+
+snippet .shbcw "should.have.been.calledWith" i
+.should.have.been.calledWith ${1:arguments}
+endsnippet
+
+snippet .snhbc "should not have been called" i
+.should.not.have.been.called
+endsnippet
+
+snippet xhr "use XMLHttpFakeRequest" b
+@xhr = sinon.useFakeXMLHttpRequest()
+@xhr.onCreate = (@request) =>
+endsnippet
View
36 vim/UltiSnips/rspec.snippets
@@ -1,17 +1,17 @@
snippet sh "require spec_helper" b
-require 'spec_helper'
+require "spec_helper"
$0
endsnippet
snippet d "describe" b
-describe '${1:context}' do
+describe ${1:"${2:context}"} do
$0
end
endsnippet
snippet c "context" b
-context '${1:context}' do
+context "${1:context}" do
$0
end
endsnippet
@@ -22,28 +22,24 @@ before do
end
endsnippet
-snippet ba "before all block" b
-before(:all) do
- $0
-end
-endsnippet
-
snippet a "after block" b
after do
$0
end
endsnippet
-snippet aa "after all block" b
-after(:all) do
+snippet i "test" b
+it "${1:description}" do
$0
end
endsnippet
-snippet it "test" b
-it '${1:description}' do
- $0
-end
+snippet s "should" b
+${1:actual}.should ${2:==} ${3:expected}
+endsnippet
+
+snippet .s "should" i
+.should ${1:==} ${2:expected}
endsnippet
snippet .s= "should ==" i
@@ -55,23 +51,23 @@ ${1:actual}.should == ${2:expected}
endsnippet
snippet .shs "should have_selector" i
-.should have_selector('${1:expected}')
+.should have_selector("${1:expected}")
endsnippet
snippet shs "should have_selector" b
-${1:rendered}.should have_selector('${2:expected}')
+${1:rendered}.should have_selector("${2:expected}")
endsnippet
snippet .snhs "should_not have_selector" i
-.should_not have_selector('${1:expected}')
+.should_not have_selector("${1:expected}")
endsnippet
snippet snhs "should_not have_selector" b
-${1:rendered}.should_not have_selector('${2:expected}')
+${1:rendered}.should_not have_selector("${2:expected}")
endsnippet
snippet .srt "should route_to" i
-.should route_to(controller: '${1:controller}', action: '${2:action}'${3:, ${4:param}: '${5:value}'})
+.should route_to(controller: "${1:controller}", action: "${2:action}"${3:, ${4:param}: "${5:value}"})
endsnippet
snippet .sbat "should be_able_to" i
2 vim/bundle/abolish
@@ -1 +1 @@
-Subproject commit f8829a5f3e5a2a9c5e8a17f322aa9296a0cdb622
+Subproject commit d64ce06650cf9b098b5a01c0db53864965d9310b
2 vim/bundle/ack
@@ -1 +1 @@
-Subproject commit 9895285042a2fd5691b2f6582aa979e4d1bdffea
+Subproject commit 34d0b2fbc182b31d926632d170bc07d6a6fc3f9b
2 vim/bundle/bundler
@@ -1 +1 @@
-Subproject commit f2abc73969de37ef68e1cd47a4e3b2507c79495a
+Subproject commit 78a149d2029c624e26a412b3b91e54903430add1
2 vim/bundle/coffee-script
@@ -1 +1 @@
-Subproject commit d6dcb9b0fb5beac9e84cfb84c1917b7e0df5850f
+Subproject commit 089506ed89da1849485fdfcca002a42111759fab
2 vim/bundle/ctrlp
@@ -1 +1 @@
-Subproject commit f7561810bf259a1b44c409095e4af1ca7cec1288
+Subproject commit c1646e3c28d75bcc834af4836f4c6e12296ba891
2 vim/bundle/dbext
@@ -1 +1 @@
-Subproject commit f539f2f9f3b71f77b2cfa8b9743cc626ba00da41
+Subproject commit 794c9a181078d0f39ac2656d398ed93fcebdb1bc
2 vim/bundle/endwise
@@ -1 +1 @@
-Subproject commit 74306aa18c03ee2fdb044609e6f0bc866872711d
+Subproject commit fd869a756bba01ce2768980a48e8fce51a14f117
2 vim/bundle/fugitive
@@ -1 +1 @@
-Subproject commit a8d450fcfe198d1a09676da0f98b47096db6d3fd
+Subproject commit 6462bdb4b936d27ecfc056d1f9c026acc40743d4
2 vim/bundle/hammer
@@ -1 +1 @@
-Subproject commit 2fb938980f1526c5393ed54e37dbd03205264125
+Subproject commit 0d842bffad7b7a1ceba56d1ab7fda7ff816a37a3
2 vim/bundle/nerdtree
@@ -1 +1 @@
-Subproject commit 2cb0fc78fb4c7a1db5f51c042a447cc50f09983d
+Subproject commit 40d05ace57fb51cc2c2b2e9eb81c4832ed291630
2 vim/bundle/qargs
@@ -1 +1 @@
-Subproject commit bb7b669a49737e006476786f4773879f3de0ea87
+Subproject commit 70c92e799cb855f5b9044e7c1b9747a799a85f96
2 vim/bundle/ragtag
@@ -1 +1 @@
-Subproject commit 22b8dbe92df63ba546960f288fc1551699b9410f
+Subproject commit da5a0b4671e87f8c8c3743fd3efd2858a895f583
2 vim/bundle/rails
@@ -1 +1 @@
-Subproject commit 04c7b18f66963e3bdb6307052c2dbeb89aad7ead
+Subproject commit 39af56513467daec6dbf0a933b7a0377c13bde1c
2 vim/bundle/rake
@@ -1 +1 @@
-Subproject commit af98f573714d0a3c2bec5ca8003762a32dafa925
+Subproject commit db1bc0adbd3e7a2322ee5c4d73a169399adfde6a
2 vim/bundle/repeat
@@ -1 +1 @@
-Subproject commit d75a544b786710705f0db0d8d8fd66ca4a5a7239
+Subproject commit a81bef76031ca1c71766b516417480caeb01c932
2 vim/bundle/rooter
@@ -1 +1 @@
-Subproject commit c5b3e0052b2e074f8f490cb421fe75d482621077
+Subproject commit 88772f73847e5e34f0979aebd48292471a68009e
2 vim/bundle/ruby
@@ -1 +1 @@
-Subproject commit 4cf6a00a1e9cc0c5404fc2c11447716b5abc1ce7
+Subproject commit 1a2075d90992901436bb88391ed52dfbebc5088a
2 vim/bundle/ruby-minitest
@@ -1 +1 @@
-Subproject commit f6759f22b25411996f05a8b56a68c8d91889e567
+Subproject commit e5a2d27808b636a4fc1da8bb3e84e38493c1cbef
2 vim/bundle/surround
@@ -1 +1 @@
-Subproject commit 489a1e8c676ad47dd358dbf883bfaf492148d38b
+Subproject commit 02199ea0080d744ec76b79d74ce56d51d25cf7ae
2 vim/bundle/tabular
@@ -1 +1 @@
-Subproject commit ad2a5a1d54443ab27f1282c5617f55b8e0819623
+Subproject commit 0c856ba0a9e2d6118ef3139227873a70f7dd9f80
2 vim/bundle/tagbar
@@ -1 +1 @@
-Subproject commit ee1c4e137e33c64c787df68efcca7e9af4c5f790
+Subproject commit 852c6dac690b315a611875698122564bda852b63
2 vim/bundle/tcomment
@@ -1 +1 @@
-Subproject commit 4a88c09abb4944bfe48e0be3a37a52d3b3cb2bc0
+Subproject commit bac346f4958b1abb4ad268754d8ef0d75febe465
2 vim/bundle/textobj-entire
@@ -1 +1 @@
-Subproject commit 6eadc96df0c0a94a05b92e1b1ad83bb9cfab6340
+Subproject commit 8085ed1472c9a21b6eeb2f6ad142b866db51f9f4
2 vim/bundle/textobj-indent
@@ -1 +1 @@
-Subproject commit a17bd5448aa538b5b2ec71d09d3875a31ea0a91a
+Subproject commit deb76867c302f933c8f21753806cbf2d8461b548
2 vim/bundle/textobj-lastpat
@@ -1 +1 @@
-Subproject commit 9ba6ab4341bedc810e989f1ad3949bf66593fbaf
+Subproject commit 686aa837e3aa649b16572d5d55eb2d8c7fc6c78a
2 vim/bundle/textobj-line
@@ -1 +1 @@
-Subproject commit 90664f47bfc40710b19323024b50ee0c2a90b135
+Subproject commit f8ab33c017f329248773e92968a7a3497b48d287
2 vim/bundle/textobj-syntax
@@ -1 +1 @@
-Subproject commit 6a9bde8b168c027e322903b4fbf9fe81f31db53d
+Subproject commit a0167c2680f8a35d9ca1f47ddf31070492893175
2 vim/bundle/textobj-user
@@ -1 +1 @@
-Subproject commit 1b738334952a7944d3591253dcc3576b1ccb2c9d
+Subproject commit 03afa6cd7bd8d27d078bfc3cc29eb891d2c2dc98
2 vim/bundle/ultisnips
@@ -1 +1 @@
-Subproject commit e9a783857b293124e867e27114b29e6f192cf4bf
+Subproject commit 7cbf73e7290b2a8efdc13bd0f44c7981e3082d11
2 vim/bundle/unimpaired
@@ -1 +1 @@
-Subproject commit e8013727a008a68664a789fe0d2b5c2ab2ecf657
+Subproject commit 728535be8d2a689f2d83de09ac36e0c73a5053c9
2 vim/bundle/visual-star-search
@@ -1 +1 @@
-Subproject commit 95db0557db792de04ec55d8ff4023c7889fba983
+Subproject commit 59d5f09fc6137c9c38af1682103c4698e82916bc
2 vim/bundle/zencoding
@@ -1 +1 @@
-Subproject commit c492fc64f04518913f9f6a457f659d086a603a14
+Subproject commit 0e4fe621382c85f4673e79c8331786223bb0d22d
View
46 vimrc
@@ -51,6 +51,7 @@ nmap ,nmp :NoMatchParen<cr>
nmap ,dmp :DoMatchParen<cr>
""" File handling
+set noswapfile
set backupdir=$HOME/.vim.bak//,.
set directory=$HOME/.vim.swp//,.
syntax enable
@@ -63,6 +64,9 @@ set softtabstop=2
set shiftwidth=2
set expandtab
+""" Clipboard
+" set clipboard=unnamed
+
""" Mappings
let mapleader=","
@@ -77,6 +81,7 @@ map ä ]
" remember: <c-ü> behaves like <c-]>
" remember: <c-ä> behaves like <esc>
+" remember: <c-6> behaves like <c-^>
map <leader>q :cclose<cr>
@@ -154,19 +159,20 @@ autocmd User Rails Rnavcommand sass app/assets/stylesheets -glob=**/* -suffix=.s
autocmd User Rails Rnavcommand feature features -suffix=.feature
autocmd User Rails Rnavcommand fabricator spec/fabricators -suffix=_fabricator.rb -default=model()
autocmd User Rails map <leader>r :Rake<cr>
-autocmd User Rails/**/*.rb setlocal filetype=ruby.rails
-autocmd User Rails/spec/**/*_spec.rb setlocal filetype=ruby.rails.minispec
+autocmd User Rails/**/*.rb UltiSnipsAddFiletypes rails.ruby
+autocmd User Rails/spec/**/*_spec.rb UltiSnipsAddFiletypes rspec.rails.ruby
" Rake
autocmd User Rake map <leader>r :Rake<cr>
" CoffeScript
autocmd BufNewFile,BufReadPost *.coffee setl foldmethod=indent nofoldenable
autocmd BufNewFile,BufReadPost *.coffee setl shiftwidth=2 expandtab
+autocmd BufNewFile,BufReadPost *_spec.js.coffee UltiSnipsAddFiletypes mocha.coffee
" Smartinput
call smartinput#map_to_trigger('i', '#', '#', '#')
-call smartinput#define_rule({'at': '\%#', 'char': '#', 'input': '#{}<left>', 'filetype': ['ruby', 'coffee'], 'syntax': ['Constant', 'Special']})
+call smartinput#define_rule({'at': '\%#', 'char': '#', 'input': '#{}<left>', 'filetype': ['ruby'], 'syntax': ['Constant', 'Special']})
call smartinput#map_to_trigger('i', '<bar>', '<bar>', '<bar>')
call smartinput#define_rule({'at': '\({\|\<do\>\)\s*\%#', 'char': '<bar>', 'input': '<bar><bar><left>', 'filetype': ['ruby']})
@@ -185,18 +191,40 @@ let g:ragtag_global_maps = 1
"" Scripts & commands
-" bdd
-autocmd BufNewFile,BufReadPost *.coffee map <leader>b :wa<bar>:silent !rake browser<cr>
-
" processing
let processing_doc_path="/Applications/Processing.app/Contents/Resources/Java/modes/java/reference"
autocmd BufNewFile,BufReadPost *.pde map <leader>r :w<bar>silent execute "!osascript $PROCESSING_HOME/scripts/run.applescript"<bar>redraw!<cr>
-" ruby specs
-" autocmd BufNewFile,BufReadPost *_spec.rb set filetype=ruby.spec
-
" ctags
map <leader>ü !ctags -R --exclude=.git --languages=-javascript,sql<cr>
" tagbar
nmap <f8> :TagbarToggle<cr>
+
+" HAML assets
+autocmd BufNewFile,BufReadPost *.hamlc set filetype=haml
+
+" Spinach
+autocmd User Rails/features/*.feature let b:rails_alternate = substitute(rails#buffer().path() , 'features/\(.*\)\.feature' , 'features/steps/\1.rb' , '')
+autocmd User Rails/features/steps/*.rb let b:rails_alternate = substitute(rails#buffer().path() , 'features/steps/\(.*\)\.rb' , 'features/\1.feature' , '')
+autocmd User Rails/features/* let b:rails_related = b:rails_root . '/features/support/env.rb'
+autocmd User Rails/features/*.feature nmap <buffer> <leader>sc :execute '!spinach' rails#buffer().path()<cr>
+autocmd User Rails/features/steps/*.rb nmap <buffer> <leader>sc :execute '!spinach' b:rails_alternate<cr>
+autocmd User Rails/features/* nmap <buffer> <leader>sw :execute '!rake' 'spinach:wip'<cr>
+autocmd User Rails/features/*.feature let b:rails_alternate = substitute(rails#buffer().path() , 'features/\(.*\)\.feature' , 'features/steps/\1.rb' , '')
+autocmd User Rails/features/*.feature UltiSnipsAddFiletypes gherkin
+
+" Backbone development
+autocmd User Rails/app/*.js.coffee let b:rails_alternate = substitute(rails#buffer().path() , 'app/\(.*\)\.js\.coffee' , 'spec/\1_spec.js.coffee' , '')
+autocmd User Rails/spec/*_spec.js.coffee let b:rails_alternate = substitute(rails#buffer().path() , 'spec/\(.*\)_spec\.js\.coffee' , 'app/\1.js.coffee' , '')
+autocmd User Rails/app/*_view.js.coffee let b:rails_related = substitute(rails#buffer().path() , 'app/views/\(.*\)_view\.js\.coffee' , 'app/templates/\1.hamlc' , '')
+
+" Konacha
+autocmd User Rails/spec/*_spec.js.coffee let b:konacha_url = substitute( rails#buffer().path() , b:rails_root . '/spec/\(.*\)_spec\.js\.coffee' , 'http://localhost:3500/\1' , '' )
+autocmd User Rails/app/*.js.coffee let b:konacha_url = substitute( rails#buffer().path() , b:rails_root . '/app/\(.*\)\.js\.coffee' , 'http://localhost:3500/\1' , '' )
+autocmd User Rails/*.js.coffee nmap <buffer> <leader>kr :execute '!open' '-a "Google Chrome"' b:konacha_url<bar>!osascript -e 'tell application "iTerm" to activate'<cr>:redraw!<cr>
+autocmd User Rails/*.js.coffee nmap <buffer> <leader>ko :execute '!open' '-a "Google Chrome"' b:konacha_url<cr><cr>
+autocmd User Rails/*.js.coffee nmap <buffer> <leader>ka :!open http://localhost:3500<cr><cr>
+
+" disable automatic linebreaks
+autocmd FileType vim set textwidth=0
View
6 zshenv
@@ -1,5 +1,7 @@
-export PATH=$HOME/.rbenv/bin:/Users/tc/bin:/usr/local/bin:/usr/local/sbin:$PATH
-export NODE_PATH=/usr/local/lib/jsctags/:/usr/local/lib/node_modules
+export PATH=$HOME/.rbenv/bin:/Users/tc/bin:/usr/local/bin:/usr/local/sbin:/usr/local/share/npm/bin:$PATH
export PROCESSING_HOME=$HOME/lab/processing
+export MAVEN_OPTS="-Xmx1024m"
+export HOMEBREW_NO_EMOJI=1
+# export CC=/usr/local/bin/gcc-4.2
eval "$(rbenv init -)"
View
5 zshrc
@@ -31,7 +31,10 @@ plugins=(git git-flow osx ruby bundler brew pow powder rails3 vi-mode node npm)
source $ZSH/oh-my-zsh.sh
source $ZSH_CUSTOM/themes/codebeige.zsh-theme # source theme ourselves until themes in custom folder are fully supported
-export EDITOR='/usr/local/bin/vim'
+unsetopt correct_all
+setopt correct
+
+export EDITOR='vim'
export PSQL_EDITOR='vim -c"set syntax=pgsql"'
alias cdd='cd ~/dev'

No commit comments for this range

Something went wrong with that request. Please try again.