@@ -286,30 +286,30 @@ subdir 'test' do desc "Run unit tests for the Ruby libraries" task 'test:ruby' => [:native_support] do - if PlatformInfo::RSPEC.nil? + if PlatformInfo.rspec.nil? abort "RSpec is not installed for Ruby interpreter '#{PlatformInfo::RUBY}'. Please install it." else - ruby "#{PlatformInfo::RSPEC} -c -f s ruby/*.rb ruby/*/*.rb" + ruby "#{PlatformInfo.rspec} -c -f s ruby/*.rb ruby/*/*.rb" end end task 'test:rcov' => [:native_support] do - if PlatformInfo::RSPEC.nil? + if PlatformInfo.rspec.nil? abort "RSpec is not installed for Ruby interpreter '#{PlatformInfo::RUBY}'. Please install it." else sh "rcov", "--exclude", "lib\/spec,\/spec$,_spec\.rb$,support\/,platform_info,integration_tests", - PlatformInfo::RSPEC, "--", "-c", "-f", "s", + PlatformInfo.rspec, "--", "-c", "-f", "s", *Dir["ruby/*.rb", "ruby/*/*.rb", "integration_tests.rb"] end end desc "Run integration tests" task 'test:integration' => [:apache2, :native_support] do - if PlatformInfo::RSPEC.nil? + if PlatformInfo.rspec.nil? abort "RSpec is not installed for Ruby interpreter '#{PlatformInfo::RUBY}'. Please install it." else - ruby "#{PlatformInfo::RSPEC} -c -f s integration_tests.rb" + ruby "#{PlatformInfo.rspec} -c -f s integration_tests.rb" end end Rakefile @@ -200,11 +200,11 @@ private color_puts '<banner>Compiling and installing Apache 2 module...</banner>' puts "cd #{PASSENGER_ROOT}" if ENV['TRACE'] - puts "#{RUBY} -S #{RAKE} --trace clean apache2" - return system(RUBY, "-S", RAKE, "--trace", "clean", "apache2") + puts "#{RUBY} -S #{PlatformInfo.rake} --trace clean apache2" + return system(RUBY, "-S", PlatformInfo.rake, "--trace", "clean", "apache2") else - puts "#{RUBY} -S #{RAKE} clean apache2" - return system(RUBY, "-S", RAKE, "clean", "apache2") + puts "#{RUBY} -S #{PlatformInfo.rake} clean apache2" + return system(RUBY, "-S", PlatformInfo.rake, "clean", "apache2") end end bin/passenger-install-apache2-module @@ -190,11 +190,10 @@ module Dependencies # :nodoc: all Rake = Dependency.new do |dep| dep.name = "Rake" dep.define_checker do |result| - rake = PlatformInfo::RAKE - if File.executable?(rake) - result.found(rake) - else + if PlatformInfo.rake.nil? result.not_found + else + result.found(PlatformInfo.rake) end end dep.website = "http://rake.rubyforge.org/" lib/phusion_passenger/dependencies.rb @@ -88,7 +88,20 @@ private if File.file?(filename) && File.executable?(filename) return filename else - return nil + # RubyGems might put binaries in a directory other + # than Ruby's bindir. Debian packaged RubyGems and + # DebGem packaged RubyGems are the prime examples. + begin + require 'rubygems' unless defined?(Gem) + filename = Gem.bindir + "/#{name}" + if File.file?(filename) && File.executable?(filename) + return filename + else + return nil + end + rescue LoadError + return nil + end end end @@ -157,10 +170,8 @@ private public # The absolute path to the current Ruby interpreter. RUBY = Config::CONFIG['bindir'] + '/' + Config::CONFIG['RUBY_INSTALL_NAME'] + Config::CONFIG['EXEEXT'] - # The correct 'gem', 'rake' and 'spec' commands for this Ruby interpreter. + # The correct 'gem' command for this Ruby interpreter. GEM = locate_ruby_executable('gem') - RAKE = locate_ruby_executable('rake') - RSPEC = locate_ruby_executable('spec') # Check whether the specified command is in $PATH, and return its # absolute filename. Returns nil if the command is not found. @@ -181,6 +192,22 @@ public ################ Programs ################ + # Returns the absolute path to the Rake executable that + # belongs to the current Ruby interpreter. Returns nil if it + # doesn't exist. + def self.rake + return locate_ruby_executable('rake') + end + memoize :rake + + # Returns the absolute path to the RSpec runner program that + # belongs to the current Ruby interpreter. Returns nil if it + # doesn't exist. + def self.rspec + return locate_ruby_executable('spec') + end + memoize :rspec + # The absolute path to the 'apxs' or 'apxs2' executable, or nil if not found. def self.apxs2 if env_defined?("APXS2") lib/phusion_passenger/platform_info.rb 01c0f89a805878f741cb871de30d30b563c4a26d Hongli Lai (Phusion) hongli@phusion.nl http://github.com/FooBarWidget/passenger/commit/2b958c3e2e10ddf68502461ba7f00345341ad2f9 2b958c3e2e10ddf68502461ba7f00345341ad2f9 2009-03-13T11:09:56-07:00 2009-03-13T11:09:56-07:00 Also look in Gem.bindir for Ruby executables, because Gem.bindir may be different from Ruby's bindir. 0d091cc3d90398d11e851271e6230c6e1a5bcc0a Hongli Lai (Phusion) hongli@phusion.nl