aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/cmd
diff options
context:
space:
mode:
authorMike McQuaid2015-01-02 12:42:02 +0000
committerMike McQuaid2015-01-02 12:42:02 +0000
commit9e8103cf38f10a4240f0a796bbecdb635dbc74d4 (patch)
treeea272f7fc17ba44240ad8f494d904f0c9c0d8477 /Library/Homebrew/cmd
parent81986ee7a75befabd0e4998568349163049b843b (diff)
downloadbrew-9e8103cf38f10a4240f0a796bbecdb635dbc74d4.tar.bz2
Add Homebrew.install_gem_setup_path! function.
This uses the logic from tests.rb in man.rb too so that this can be shared in a few places.
Diffstat (limited to 'Library/Homebrew/cmd')
-rw-r--r--Library/Homebrew/cmd/man.rb2
-rw-r--r--Library/Homebrew/cmd/tests.rb10
2 files changed, 4 insertions, 8 deletions
diff --git a/Library/Homebrew/cmd/man.rb b/Library/Homebrew/cmd/man.rb
index f28d76de1..c1a202156 100644
--- a/Library/Homebrew/cmd/man.rb
+++ b/Library/Homebrew/cmd/man.rb
@@ -13,7 +13,7 @@ module Homebrew
end
end
- which("ronn") || odie("You need to \"gem install ronn\" and put it in your path.")
+ Homebrew.install_gem_setup_path! "ronn"
if ARGV.include?("--server") || ARGV.include?("-s")
puts "Man page test server: http://localhost:1207/"
diff --git a/Library/Homebrew/cmd/tests.rb b/Library/Homebrew/cmd/tests.rb
index 623c14f04..93f70f8eb 100644
--- a/Library/Homebrew/cmd/tests.rb
+++ b/Library/Homebrew/cmd/tests.rb
@@ -1,12 +1,8 @@
module Homebrew
def tests
- (HOMEBREW_LIBRARY/'Homebrew/test').cd do
- ENV['TESTOPTS'] = '-v' if ARGV.verbose?
- quiet_system("gem", "list", "--installed", "bundler") || \
- system("gem", "install", "--no-ri", "--no-rdoc",
- "--user-install", "bundler")
- require 'rubygems'
- ENV["PATH"] = "#{Gem.user_dir}/bin:#{ENV["PATH"]}"
+ (HOMEBREW_LIBRARY/"Homebrew/test").cd do
+ ENV["TESTOPTS"] = "-v" if ARGV.verbose?
+ Homebrew.install_gem_setup_path! "bundler"
quiet_system("bundle", "check") || \
system("bundle", "install", "--path", "vendor/bundle")
system "bundle", "exec", "rake", "test"