From 2aab2de99ad0ae18a18b212c710ac3f4de2b4093 Mon Sep 17 00:00:00 2001
From: Robin Wenglewski <robin@wenglewski.de>
Date: Thu, 29 Sep 2011 17:03:01 +0200
Subject: [PATCH] use textmate as default editor, set IDEA_JDK

---
 aliases.zsh | 6 ++++--
 config.zsh  | 9 +++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/aliases.zsh b/aliases.zsh
index ca3cfb3b2..4e5e5d050 100644
--- a/aliases.zsh
+++ b/aliases.zsh
@@ -23,10 +23,12 @@ alias git-authors='git shortlog -s -n'
 
 # rails
 alias r="rails"
-alias a='autotest -rails'
 alias tlog='tail -f log/development.log'
 alias rst='touch tmp/restart.txt'
-alias bist="bundle install"
+alias bi="bundle install"
+alias bu="bundle update"
+alias rake_db_migrate_both="rake db:migrate && rake db:migrate RAILS_ENV=test"
+
 
 # commands starting with % for pasting from web
 alias %=' '
diff --git a/config.zsh b/config.zsh
index 0c2bbb258..e355accb6 100644
--- a/config.zsh
+++ b/config.zsh
@@ -4,10 +4,10 @@
 # 	export PS1='%3~$(git_info_for_prompt)%# '
 # fi
 
-if (( ${+commands[mvim]} ));then
-	export EDITOR='mvim'
-elif (( ${+commands[mate]} ));then
-	export EDITOR="mate"
+if (( ${+commands[mate]} ));then
+	export EDITOR='mate'
+elif (( ${+commands[mvim]} ));then
+	export EDITOR="mvim"
 else
 	export EDITOR='vim'
 fi
@@ -26,6 +26,7 @@ if [[ -e /usr/libexec/java_home ]]; then
   export JAVA_HOME="`/usr/libexec/java_home`"
 fi
 
+export IDEA_JDK="$JAVA_HOME"
 fpath=(~/.zsh/functions $fpath)
 
 autoload -U ~/.zsh/functions/*(:t)