dafef0b6923c5f3c5e41c7270fedaabc8875444f

Author
Mark Drago <markdrago@gmail.com>
Committer
Mark Drago <markdrago@gmail.com>
Date

Message

Merge branch 'master' into cloud_parameter

Diff

 1diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
 2index 7b73c8fed6acc7a0d863eafecd316accc3f29c90..55564a252fce5d6d62ec745612067398ec4f8fce 100644
 3--- a/plugins/bundler/bundler.plugin.zsh
 4+++ b/plugins/bundler/bundler.plugin.zsh
 5@@ -10,7 +10,7 @@ alias bu="bundle update"
 6 
 7 # The following is based on https://github.com/gma/bundler-exec
 8 
 9-bundled_commands=(cap capify cucumber foreman guard heroku nanoc rackup rainbows rake rspec ruby shotgun spec spork thin unicorn unicorn_rails)
10+bundled_commands=(annotate cap capify cucumber foreman guard heroku nanoc rackup rainbows rake rspec ruby shotgun spec spork thin unicorn unicorn_rails)
11 
12 ## Functions
13 
14diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
15index 24621fe0b57e02b76d3179241ee2c78fc53934eb..604c0071393b07f0edcc6dbd80a4c6b0d290e7cd 100644
16--- a/plugins/rvm/rvm.plugin.zsh
17+++ b/plugins/rvm/rvm.plugin.zsh
18@@ -37,7 +37,7 @@ function gems {
19 	local current_gemset=`rvm-prompt g`
20 
21 	gem list $@ | sed \
22-		-Ee "s/\([0-9\.]+( .+)?\)/$fg[blue]&$reset_color/g" \
23+		-Ee "s/\([0-9, \.]+( .+)?\)/$fg[blue]&$reset_color/g" \
24 		-Ee "s|$(echo $rvm_path)|$fg[magenta]\$rvm_path$reset_color|g" \
25 		-Ee "s/$current_ruby@global/$fg[yellow]&$reset_color/g" \
26 		-Ee "s/$current_ruby$current_gemset$/$fg[green]&$reset_color/g"
27diff --git a/plugins/terminalapp/terminalapp.plugin.zsh b/plugins/terminalapp/terminalapp.plugin.zsh
28new file mode 100644
29index 0000000000000000000000000000000000000000..4695ad0556d62806bf335408a7ed79171860f1f4
30--- /dev/null
31+++ b/plugins/terminalapp/terminalapp.plugin.zsh
32@@ -0,0 +1,11 @@
33+# Set Apple Terminal.app resume directory
34+# based on this answer: http://superuser.com/a/315029
35+
36+function chpwd {
37+  local SEARCH=' '
38+  local REPLACE='%20'
39+  local PWD_URL="file://$HOSTNAME${PWD//$SEARCH/$REPLACE}"
40+  printf '\e]7;%s\a' "$PWD_URL"
41+}
42+
43+chpwd