Merge branch 'master' of http://github.com/zerobearing2/bash-it into zerobearing2-master
diff --git a/plugins/git.plugin.bash b/plugins/git.plugin.bash
index 13ce234..909a90e 100644
--- a/plugins/git.plugin.bash
+++ b/plugins/git.plugin.bash
@@ -14,6 +14,8 @@
alias gba='git branch -a'
alias gcount='git shortlog -sn'
alias gcp='git cherry-pick'
+alias gco='git checkout'
+alias gexport='git archive --format zip --output'
case $OSTYPE in
linux*)
@@ -45,5 +47,7 @@
echo " gba = git branch -a"
echo " gcount = git shortlog -sn"
echo " gcp = git cherry-pick"
+ echo " gco = git checkout"
+ echo " gexport = git git archive --format zip --output"
echo
}
\ No newline at end of file
diff --git a/plugins/heroku.plugin.bash b/plugins/heroku.plugin.bash
new file mode 100644
index 0000000..a393754
--- /dev/null
+++ b/plugins/heroku.plugin.bash
@@ -0,0 +1,56 @@
+#!/bin/bash
+
+# heroku
+alias h='heroku'
+alias hl='heroku list'
+alias hi='heroku info'
+alias ho='heroku open'
+
+# dynos and workers
+alias hd='heroku dynos'
+alias hw='heroku workers'
+
+# rake console
+alias hr='heroku rake'
+alias hcon='heroku console'
+
+# new and restart
+alias hnew='heroku create'
+alias hrestart='heroku restart'
+
+# logs
+alias hlog='heroku logs'
+alias hlogs='heroku logs'
+
+# maint
+alias hon='heroku maintenance:on'
+alias hoff='heroku maintenance:off'
+
+# heroku configs
+alias hc='heroku config'
+alias hca='heroku config:add'
+alias hcr='heroku config:remove'
+alias hcc='heroku config:clear'
+
+function heroku-help() {
+ echo "Heroku Aliases Usage"
+ echo
+ echo " h = heroku"
+ echo " hl = heroku list"
+ echo " hi = heroku info"
+ echo " ho = heroku open"
+ echo " hd = heroku dynos"
+ echo " hw = heroku workers"
+ echo " hr = heroku rake"
+ echo " hcon = heroku console"
+ echo " hnew = heroku create"
+ echo " hrestart = heroku restart"
+ echo " hlog = heroku logs"
+ echo " hon = heroku maintenance:on"
+ echo " hoff = heroku maintenance:off"
+ echo " hc = heroku config"
+ echo " hca = heroku config:add"
+ echo " hcr = heroku config:remove"
+ echo " hcc = heroku config:clear"
+ echo
+}
diff --git a/plugins/rails.plugin.bash b/plugins/rails.plugin.bash
index a80aca8..d4415f6 100644
--- a/plugins/rails.plugin.bash
+++ b/plugins/rails.plugin.bash
@@ -12,10 +12,12 @@
alias rd='rails destroy'
alias ss='script/server'
+alias ts="thin start" # thin server
alias sc='script/console'
alias restartapp='touch tmp/restart.txt'
+alias restart='touch tmp/restart.txt' # restart passenger
alias devlog='tail -f log/development.log'
-
+alias taild='tail -f log/development.log' # tail dev log
function rails-help() {
echo "Rails Aliases Usage"
@@ -23,6 +25,7 @@
echo " r = rails"
echo " rg = rails generate"
echo " rs/ss = rails server"
+ echo " ts = thin server"
echo " rc/sc = rails console"
echo " rn = rails new"
echo " rd = rails dbconsole"
@@ -30,7 +33,9 @@
echo " ra = rails application"
echo " rd = rails destroy"
echo " restartapp = touch tmp/restart.txt"
+ echo " restart = touch tmp/restart.txt"
echo " devlog = tail -f log/development.log"
+ echo " taild = tail -f log/development.log"
echo
}