Skip to content

Commit 506600d

Browse files
committed
Add global options for rake tasks and generators
1 parent 8ea9d44 commit 506600d

File tree

1 file changed

+7
-13
lines changed

1 file changed

+7
-13
lines changed

plugin/rails.vim

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -604,6 +604,8 @@ function! s:InitConfig()
604604
call s:SetOptDefault("rails_gnu_screen",1)
605605
call s:SetOptDefault("rails_history_size",5)
606606
call s:SetOptDefault("rails_debug",0)
607+
call s:SetOptDefault("rails_generators","controller\nintegration_test\nmailer\nmigration\nmodel\nobserver\nplugin\nresource\nscaffold\nsession_migration")
608+
call s:SetOptDefault("rails_rake_tasks","db:charset\ndb:collation\ndb:create\ndb:create:all\ndb:drop\ndb:drop:all\ndb:fixtures:identify\ndb:fixtures:load\ndb:migrate\ndb:reset\ndb:rollback\ndb:schema:dump\ndb:schema:load\ndb:sessions:clear\ndb:sessions:create\ndb:structure:dump\ndb:test:clone\ndb:test:clone_structure\ndb:test:prepare\ndb:test:purge\ndb:version\ndoc:app\ndoc:clobber_app\ndoc:clobber_plugins\ndoc:clobber_rails\ndoc:plugins\ndoc:rails\ndoc:reapp\ndoc:rerails\nlog:clear\nnotes\nnotes:fixme\nnotes:optimize\nnotes:todo\nrails:freeze:edge\nrails:freeze:gems\nrails:unfreeze\nrails:update\nrails:update:configs\nrails:update:javascripts\nrails:update:scripts\nroutes\nstats\ntest\ntest:functionals\ntest:integration\ntest:plugins\ntest:recent\ntest:uncommitted\ntest:units\ntmp:cache:clear\ntmp:clear\ntmp:create\ntmp:pids:clear\ntmp:sessions:clear\ntmp:sockets:clear")
607609
if g:rails_dbext
608610
if exists("g:loaded_dbext") && executable("sqlite3") && ! executable("sqlite")
609611
" Since dbext can't find it by itself
@@ -972,12 +974,8 @@ function! s:Rake(bang,arg)
972974
endif
973975
endfunction
974976

975-
function! s:raketasks()
976-
return "db:charset\ndb:collation\ndb:create\ndb:create:all\ndb:drop\ndb:drop:all\ndb:fixtures:identify\ndb:fixtures:load\ndb:migrate\ndb:reset\ndb:rollback\ndb:schema:dump\ndb:schema:load\ndb:sessions:clear\ndb:sessions:create\ndb:structure:dump\ndb:test:clone\ndb:test:clone_structure\ndb:test:prepare\ndb:test:purge\ndb:version\ndoc:app\ndoc:clobber_app\ndoc:clobber_plugins\ndoc:clobber_rails\ndoc:plugins\ndoc:rails\ndoc:reapp\ndoc:rerails\nlog:clear\nnotes\nnotes:fixme\nnotes:optimize\nnotes:todo\nrails:freeze:edge\nrails:freeze:gems\nrails:unfreeze\nrails:update\nrails:update:configs\nrails:update:javascripts\nrails:update:scripts\nroutes\nstats\ntest\ntest:functionals\ntest:integration\ntest:plugins\ntest:recent\ntest:uncommitted\ntest:units\ntmp:cache:clear\ntmp:clear\ntmp:create\ntmp:pids:clear\ntmp:sessions:clear\ntmp:sockets:clear"
977-
endfunction
978-
979977
function! s:RakeComplete(A,L,P)
980-
return s:raketasks()
978+
return g:rails_rake_tasks
981979
endfunction
982980

983981
" }}}1
@@ -1247,10 +1245,6 @@ function! s:Generate(bang,...)
12471245
endif
12481246
endfunction
12491247

1250-
function! s:generators()
1251-
return "controller\nintegration_test\nmailer\nmigration\nmodel\nobserver\nplugin\nresource\nscaffold\nsession_migration"
1252-
endfunction
1253-
12541248
function! s:ScriptComplete(ArgLead,CmdLine,P)
12551249
let cmd = s:sub(a:CmdLine,'^\u\w*\s+','')
12561250
let P = a:P - strlen(a:CmdLine)+strlen(cmd)
@@ -1264,7 +1258,7 @@ function! s:ScriptComplete(ArgLead,CmdLine,P)
12641258
elseif cmd =~ '\%(plugin\)\s\+\%(install\|remove\)\s\+'.a:ArgLead.'$' || cmd =~ '\%(generate\|destroy\)\s\+plugin\s\+'.a:ArgLead.'$'
12651259
return s:pluginList(a:ArgLead,a:CmdLine,a:P)
12661260
elseif cmd =~ '^\%(generate\|destroy\)\s\+'.a:ArgLead.'$'
1267-
return s:generators()
1261+
return g:rails_generators
12681262
elseif cmd =~ '^\%(generate\|destroy\)\s\+\w\+\s\+'.a:ArgLead.'$'
12691263
let target = matchstr(cmd,'^\w\+\s\+\zs\w\+\ze\s\+')
12701264
let pattern = "" " TODO
@@ -3432,7 +3426,7 @@ endfunction
34323426
" }}}1
34333427
" Menus {{{1
34343428

3435-
" Depends: s:gsub, s:sub, s:raketasks, s:generators, s:error
3429+
" Depends: s:gsub, s:sub, s:error
34363430
" Provides: s:prephelp
34373431

34383432
function! s:CreateMenus() abort
@@ -3473,13 +3467,13 @@ function! s:CreateMenus() abort
34733467
exe menucmd.g:rails_installed_menu.'.&Other\ files.&Test\ Helper :find test/test_helper.rb<CR>'
34743468
exe menucmd.g:rails_installed_menu.'.-FSep- :'
34753469
exe menucmd.g:rails_installed_menu.'.Ra&ke\ :Rake :Rake<CR>'
3476-
let tasks = s:raketasks()
3470+
let tasks = g:rails_rake_tasks
34773471
while tasks != ''
34783472
let task = matchstr(tasks,'.\{-\}\ze\%(\n\|$\)')
34793473
let tasks = s:sub(tasks,'.{-}%(\n|$)','')
34803474
exe menucmd.g:rails_installed_menu.'.Rake\ &tasks\ :Rake.'.s:sub(s:sub(task,'^[^:]*$','&:all'),':','.').' :Rake '.task.'<CR>'
34813475
endwhile
3482-
let tasks = s:generators()
3476+
let tasks = g:rails_generators
34833477
while tasks != ''
34843478
let task = matchstr(tasks,'.\{-\}\ze\%(\n\|$\)')
34853479
let tasks = s:sub(tasks,'.{-}%(\n|$)','')

0 commit comments

Comments
 (0)