95971a287bc2bab899c96ce3c82eed4b7e6c299d

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

Message

Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh into cloud_parameter

Diff

 1diff --git a/lib/completion.zsh b/lib/completion.zsh
 2index 0e5d480ff4923f147ac2355504f16f068116c720..b964595edfbaec82a87a7b44c1c3b2088dbd3a69 100644
 3--- a/lib/completion.zsh
 4+++ b/lib/completion.zsh
 5@@ -39,7 +39,7 @@ hosts=(
 6   "$_global_ssh_hosts[@]"
 7   "$_ssh_hosts[@]"
 8   "$_etc_hosts[@]"
 9-  `hostname`
10+  "$HOST"
11   localhost
12 )
13 zstyle ':completion:*:hosts' hosts $hosts
14diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
15index 89f62232b7bfb4c106fe7e31673b1476533b11b1..7b73c8fed6acc7a0d863eafecd316accc3f29c90 100644
16--- a/plugins/bundler/bundler.plugin.zsh
17+++ b/plugins/bundler/bundler.plugin.zsh
18@@ -10,7 +10,7 @@ alias bu="bundle update"
19 
20 # The following is based on https://github.com/gma/bundler-exec
21 
22-bundled_commands=(cap capify cucumber foreman guard heroku nanoc rackup rails rainbows rake rspec ruby shotgun spec spork thin unicorn unicorn_rails)
23+bundled_commands=(cap capify cucumber foreman guard heroku nanoc rackup rainbows rake rspec ruby shotgun spec spork thin unicorn unicorn_rails)
24 
25 ## Functions
26 
27diff --git a/plugins/ruby/ruby.plugin.zsh b/plugins/ruby/ruby.plugin.zsh
28index 08ca9c60178faf69bb92b4bcd1a5fd66b31f49eb..38e4d7cd01c1c708a8dcfc5afcbd2e78fe7deea7 100644
29--- a/plugins/ruby/ruby.plugin.zsh
30+++ b/plugins/ruby/ruby.plugin.zsh
31@@ -3,4 +3,4 @@
32 alias sgem='sudo gem'
33 
34 # Find ruby file
35-alias rfind='find . -name *.rb | xargs grep -n'
36+alias rfind='find . -name "*.rb" | xargs grep -n'