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

3 files changed, 58 insertions, 7 deletions

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
new file mode 100644
index 000000000..fb40e2cec
--- /dev/null
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -0,0 +1,3 @@
+alias be="bundle exec"
+alias bi="bundle install"
+alias bu="bundle update"
diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index fce88c796..81eed5e92 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -1,11 +1,57 @@
+function savepath() {
+  pwd > ~/.current_path~
+}
+
 function tab() {
-  osascript 2>/dev/null <<EOF
+savepath
+osascript >/dev/null <<EOF
+on do_submenu(app_name, menu_name, menu_item, submenu_item)
+    -- bring the target application to the front
+    tell application app_name
+      activate
+    end tell
     tell application "System Events"
-      tell process "Terminal" to keystroke "t" using command down
-    end
-    tell application "Terminal"
+      tell process app_name
+        tell menu bar 1
+          tell menu bar item menu_name
+            tell menu menu_name
+              tell menu item menu_item
+                tell menu menu_item
+                  click menu item submenu_item
+                end tell
+              end tell
+            end tell
+          end tell
+        end tell
+      end tell
+    end tell
+end do_submenu
+
+do_submenu("Terminal", "Shell", "New Tab", 1)
+EOF
+}
+
+function itab() {
+savepath
+osascript >/dev/null <<EOF
+on do_submenu(app_name, menu_name, menu_item)
+    -- bring the target application to the front
+    tell application app_name
       activate
-      do script with command "cd \"$PWD\"; $*" in window 1
     end tell
+    tell application "System Events"
+      tell process app_name
+        tell menu bar 1
+          tell menu bar item menu_name
+            tell menu menu_name
+              click menu item menu_item
+            end tell
+          end tell
+        end tell
+      end tell
+    end tell
+end do_submenu
+
+do_submenu("iTerm", "Shell", "New Tab")
 EOF
-}
\ No newline at end of file
+}
diff --git a/plugins/rails3/rails3.plugin.zsh b/plugins/rails3/rails3.plugin.zsh
index 20ba0408c..6bf2ba088 100644
--- a/plugins/rails3/rails3.plugin.zsh
+++ b/plugins/rails3/rails3.plugin.zsh
@@ -3,6 +3,8 @@ alias rg='ruby script/rails generate'
 alias rd='ruby script/rails destroy'
 alias rp='ruby script/rails plugin'
 alias rdbm='rake db:migrate db:test:clone'
+alias rdbmr='rake db:migrate && rake db:migrate:redo'
 alias rc='ruby script/rails console'
-alias rd='ruby script/rais server --debugger'
+alias rd='ruby script/rails server --debugger'
 alias devlog='tail -f log/development.log'
+