summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorMark Drago <markdrago@gmail.com>2012-01-11 09:29:13 -0500
committerMark Drago <markdrago@gmail.com>2012-01-11 09:29:13 -0500
commitdafef0b6923c5f3c5e41c7270fedaabc8875444f (patch)
treebab6a811f7784d484cc813642c683ed667ec702c /plugins
parent95971a287bc2bab899c96ce3c82eed4b7e6c299d (diff)
parent7a41498b0d4f68c537d494b5f849913361315fde (diff)
downloadzsh-dafef0b6923c5f3c5e41c7270fedaabc8875444f.tar.gz
zsh-dafef0b6923c5f3c5e41c7270fedaabc8875444f.tar.bz2
zsh-dafef0b6923c5f3c5e41c7270fedaabc8875444f.zip
Merge branch 'master' into cloud_parameter
Diffstat (limited to 'plugins')
-rw-r--r--plugins/bundler/bundler.plugin.zsh2
-rw-r--r--plugins/rvm/rvm.plugin.zsh2
-rw-r--r--plugins/terminalapp/terminalapp.plugin.zsh11
3 files changed, 13 insertions, 2 deletions
diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index 7b73c8fed..55564a252 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -10,7 +10,7 @@ alias bu="bundle update"
# The following is based on https://github.com/gma/bundler-exec
-bundled_commands=(cap capify cucumber foreman guard heroku nanoc rackup rainbows rake rspec ruby shotgun spec spork thin unicorn unicorn_rails)
+bundled_commands=(annotate cap capify cucumber foreman guard heroku nanoc rackup rainbows rake rspec ruby shotgun spec spork thin unicorn unicorn_rails)
## Functions
diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
index 24621fe0b..604c00713 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -37,7 +37,7 @@ function gems {
local current_gemset=`rvm-prompt g`
gem list $@ | sed \
- -Ee "s/\([0-9\.]+( .+)?\)/$fg[blue]&$reset_color/g" \
+ -Ee "s/\([0-9, \.]+( .+)?\)/$fg[blue]&$reset_color/g" \
-Ee "s|$(echo $rvm_path)|$fg[magenta]\$rvm_path$reset_color|g" \
-Ee "s/$current_ruby@global/$fg[yellow]&$reset_color/g" \
-Ee "s/$current_ruby$current_gemset$/$fg[green]&$reset_color/g"
diff --git a/plugins/terminalapp/terminalapp.plugin.zsh b/plugins/terminalapp/terminalapp.plugin.zsh
new file mode 100644
index 000000000..4695ad055
--- /dev/null
+++ b/plugins/terminalapp/terminalapp.plugin.zsh
@@ -0,0 +1,11 @@
+# Set Apple Terminal.app resume directory
+# based on this answer: http://superuser.com/a/315029
+
+function chpwd {
+ local SEARCH=' '
+ local REPLACE='%20'
+ local PWD_URL="file://$HOSTNAME${PWD//$SEARCH/$REPLACE}"
+ printf '\e]7;%s\a' "$PWD_URL"
+}
+
+chpwd \ No newline at end of file