Merge branch 'stable-2.1'

Rakefile

@@ -288,20 +288,31 @@ subdir 'test' do
 
 	desc "Run unit tests for the Ruby libraries"
 	task 'test:ruby' => [:native_support] do
-		sh "spec -c -f s ruby/*.rb ruby/*/*.rb"
+		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"
+		end
 	end
 
 	task 'test:rcov' => [:native_support] do
-		rspec = PlatformInfo.find_command('spec')
-		sh "rcov", "--exclude",
-			"lib\/spec,\/spec$,_spec\.rb$,support\/,platform_info,integration_tests",
-			rspec, "--", "-c", "-f", "s",
-			*Dir["ruby/*.rb", "ruby/*/*.rb", "integration_tests.rb"]
+		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",
+				*Dir["ruby/*.rb", "ruby/*/*.rb", "integration_tests.rb"]
+		end
 	end
 
 	desc "Run integration tests"
 	task 'test:integration' => [:apache2, :native_support] do
-		sh "spec -c -f s integration_tests.rb"
+		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"
+		end
 	end
 
 	file 'oxt/oxt_test_main' => TEST::OXT_OBJECTS.keys.map{ |x| "oxt/#{x}" } +

lib/phusion_passenger/platform_info.rb

@@ -81,9 +81,14 @@ def self.locate_ruby_executable(name)
 			# On OS X we must look for Ruby binaries in /usr/bin.
 			# RubyGems puts executables (e.g. 'rake') in there, not in
 			# /System/Libraries/(...)/bin.
-			return "/usr/bin/#{name}"
+			filename = "/usr/bin/#{name}"
 		else
-			return File.dirname(RUBY) + "/#{name}"
+			filename = File.dirname(RUBY) + "/#{name}"
+		end
+		if File.file?(filename) && File.executable?(filename)
+			return filename
+		else
+			return nil
 		end
 	end
 
@@ -152,9 +157,10 @@ def self.read_file(filename)
 public
 	# The absolute path to the current Ruby interpreter.
 	RUBY = Config::CONFIG['bindir'] + '/' + Config::CONFIG['RUBY_INSTALL_NAME'] + Config::CONFIG['EXEEXT']
-	# The correct 'gem' and 'rake' commands for this Ruby interpreter.
+	# The correct 'gem', 'rake' and 'spec' commands 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.