summaryrefslogtreecommitdiff
path: root/plugins/rails/rails.plugin.zsh
diff options
context:
space:
mode:
authorAndrew vonderLuft <avonderluft@avlux.net>2014-03-14 13:17:43 -0700
committerAndrew vonderLuft <avonderluft@avlux.net>2014-03-14 13:17:43 -0700
commitbf4d4db72b065bff57d75355f49192175364b8a5 (patch)
tree4ffa98f99c0919fda9418693d049a4bf7bf290f2 /plugins/rails/rails.plugin.zsh
parent8f7971349b653706071bc41e2fdb953bb6f22678 (diff)
parentee21fe94473404b58cbaea5b2c279f7a07c34ce1 (diff)
downloadzsh-bf4d4db72b065bff57d75355f49192175364b8a5.tar.gz
zsh-bf4d4db72b065bff57d75355f49192175364b8a5.tar.bz2
zsh-bf4d4db72b065bff57d75355f49192175364b8a5.zip
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh into dev
Diffstat (limited to 'plugins/rails/rails.plugin.zsh')
-rw-r--r--plugins/rails/rails.plugin.zsh9
1 files changed, 5 insertions, 4 deletions
diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
index 23d15a9a1..fb46cdcf0 100644
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
@@ -1,10 +1,10 @@
function _rails_command () {
- if [ -e "script/server" ]; then
- ruby script/$@
+ if [ -e "bin/rails" ]; then
+ bin/rails $@
elif [ -e "script/rails" ]; then
ruby script/rails $@
- elif [ -e "bin/rails" ]; then
- bin/rails $@
+ elif [ -e "script/server" ]; then
+ ruby script/$@
else
rails $@
fi
@@ -51,6 +51,7 @@ alias rds='rake db:seed'
alias rdd='rake db:drop'
alias rdtc='rake db:test:clone'
alias rdtp='rake db:test:prepare'
+alias rdmtc='rake db:migrate db:test:clone'
alias rlc='rake log:clear'
alias rn='rake notes'