dff6333b6dfeed247ef52b119f016b78d8b75323

Author
Robby Russell <robby@planetargon.com>
Committer
Robby Russell <robby@planetargon.com>
Date

Message

Merge branch 'master' of github.com:robbyrussell/oh-my-zsh

Diff

 1diff --git a/plugins/git-flow/git-flow.plugin.zsh b/plugins/git-flow/git-flow.plugin.zsh
 2index ec21019e65c24ad21351dba73044952f687434e8..ab9c0c848959b332ce241f07d8bf6040bf631548 100644
 3--- a/plugins/git-flow/git-flow.plugin.zsh
 4+++ b/plugins/git-flow/git-flow.plugin.zsh
 5@@ -88,6 +88,8 @@ __git-flow-release ()
 6 				'start:Start a new release branch.'
 7 				'finish:Finish a release branch.'
 8 				'list:List all your release branches. (Alias to `git flow release`)'
 9+				'publish: public'
10+				'track: track'
11 			)
12 			_describe -t commands 'git flow release' subcommands
13 			_arguments \
14@@ -115,6 +117,16 @@ __git-flow-release ()
15 						':version:__git_flow_version_list'
16 				;;
17 
18+				(publish)
19+					_arguments \
20+						':version:__git_flow_version_list'\
21+				;;
22+
23+				(track)
24+					_arguments \
25+						':version:__git_flow_version_list'\
26+				;;
27+
28 				*)
29 					_arguments \
30 						-v'[Verbose (more) output]'
31diff --git a/plugins/rails4/rails4.plugin.zsh b/plugins/rails4/rails4.plugin.zsh
32new file mode 100644
33index 0000000000000000000000000000000000000000..fce827ee3b459b6ccb2a408d5af6e8e7ce13fae1
34--- /dev/null
35+++ b/plugins/rails4/rails4.plugin.zsh
36@@ -0,0 +1,30 @@
37+# Rails 4 aliases
38+
39+function _rails_command () {
40+  if [ -e "script/server" ]; then
41+    ruby script/$@
42+  elif [ -e "script/rails" ]; then
43+    ruby script/rails $@
44+  else
45+    ruby bin/rails $@  
46+  fi
47+}
48+
49+alias rc='_rails_command console'
50+alias rd='_rails_command destroy'
51+alias rdb='_rails_command dbconsole'
52+alias rdbm='rake db:migrate db:test:clone'
53+alias rg='_rails_command generate'
54+alias rgm='_rails_command generate migration'
55+alias rp='_rails_command plugin'
56+alias ru='_rails_command runner'
57+alias rs='_rails_command server'
58+alias rsd='_rails_command server --debugger'
59+alias devlog='tail -f log/development.log'
60+alias rdm='rake db:migrate'
61+alias rdc='rake db:create'
62+alias rdr='rake db:rollback'
63+alias rds='rake db:seed'
64+alias rlc='rake log:clear'
65+alias rn='rake notes'
66+alias rr='rake routes'