passenger 3.9.2.beta → 4.0.0.rc4

data/lib/phusion_passenger/platform_info/depcheck_specs/compiler_toolchain.rb

@@ -0,0 +1,97 @@
+define 'gcc' do
+  name "GNU C compiler"
+  website "http://gcc.gnu.org/"
+  define_checker do
+    require 'phusion_passenger/platform_info/compiler'
+    check_for_command(PlatformInfo.cc)
+  end
+  
+  on :debian do
+    apt_get_install "build-essential"
+  end
+  on :mandriva do
+    urpmi "gcc"
+  end
+  on :redhat do
+    yum_install "gcc"
+  end
+  on :gentoo do
+    emerge "gcc"
+  end
+  on :macosx do
+    xcode_install "Command Line Tools"
+  end
+end
+
+define 'g++' do
+  name "GNU C++ compiler"
+  website "http://gcc.gnu.org/"
+  define_checker do
+    require 'phusion_passenger/platform_info/compiler'
+    check_for_command(PlatformInfo.cxx)
+  end
+  
+  on :debian do
+    apt_get_install "build-essential"
+  end
+  on :mandriva do
+    urpmi "gcc-c++"
+  end
+  on :redhat do
+    yum_install "gcc-c++"
+  end
+  on :gentoo do
+    emerge "gcc"
+  end
+  on :macosx do
+    xcode_install "Command Line Tools"
+  end
+end
+
+define 'make' do
+  name "The 'make' tool"
+  define_checker do
+    require 'phusion_passenger/platform_info/compiler'
+    check_for_command(PlatformInfo.make)
+  end
+  
+  on :debian do
+    apt_get_install "build-essential"
+  end
+  on :mandriva do
+    urpmi "make"
+  end
+  on :redhat do
+    yum_install "make"
+  end
+  on :macosx do
+    xcode_install "Command Line Tools"
+  end
+  on :other_platforms do
+    website "http://www.gnu.org/software/make/"
+  end
+end
+
+define 'gmake' do
+  name "GNU make"
+  define_checker do
+    require 'phusion_passenger/platform_info/compiler'
+    check_for_command(PlatformInfo.gnu_make)
+  end
+  
+  on :debian do
+    apt_get_install "build-essential"
+  end
+  on :mandriva do
+    urpmi "make"
+  end
+  on :redhat do
+    yum_install "make"
+  end
+  on :macosx do
+    xcode_install "Command Line Tools"
+  end
+  on :other_platforms do
+    website "http://www.gnu.org/software/make/"
+  end
+end

data/lib/phusion_passenger/platform_info/depcheck_specs/gems.rb

@@ -0,0 +1,39 @@
+define 'fastthread' do
+	name 'fastthread'
+	define_checker do
+		check_for_ruby_library('fastthread')
+	end
+	gem_install 'fastthread'
+end
+
+define 'rack' do
+	name 'rack'
+	define_checker do
+		check_for_ruby_library('rack')
+	end
+	gem_install 'rack'
+end
+
+define 'daemon_controller >= 1.1.0' do
+	name 'daemon_controller >= 1.1.0'
+	define_checker do
+		if check_for_ruby_library('daemon_controller')
+			gem_command = PlatformInfo.gem_command || "gem"
+			begin
+				require 'daemon_controller/version'
+				{
+					:found => DaemonController::VERSION_STRING >= '1.1.0',
+					"Installed version" => DaemonController::VERSION_STRING
+				}
+			rescue LoadError
+				{
+					:found => false,
+					"Installed version" => "way too old"
+				}
+			end
+		else
+			false
+		end
+	end
+	gem_install 'daemon_controller'
+end

data/lib/phusion_passenger/platform_info/depcheck_specs/libs.rb

@@ -0,0 +1,118 @@
+define 'openssl-dev' do
+	name "OpenSSL development headers"
+	website "http://www.openssl.org/"
+	define_checker do
+		check_for_header('openssl/ssl.h')
+	end
+
+	on :debian do
+		apt_get_install "libssl-dev"
+	end
+	on :redhat do
+		yum_install "openssl-devel"
+	end
+end
+
+define 'libcurl-dev' do
+	name "Curl development headers with SSL support"
+	website "http://curl.haxx.se/libcurl"
+	define_checker do
+		require 'phusion_passenger/platform_info/curl'
+		result = { :found => false }
+		
+		if !(curl_config = PlatformInfo.find_command('curl-config'))
+			result[:error] = "Cannot find the `curl-config` command."
+			next result
+		else
+			result["curl-config location"] = curl_config
+		end
+
+		if !(header = PlatformInfo.find_header("curl/curl.h", :c, PlatformInfo.curl_flags))
+			result[:error] = "Cannot find the curl/curl.h header file."
+			next result
+		else
+			result[:found] = true
+			result["Header location"] = header == true ? "somewhere, not sure where" : header
+		end
+
+		begin
+			result["Version"] = `#{curl_config} --version`.strip
+		rescue SystemCallError => e
+			result[:error] = "Cannot run `curl-config --version`: #{e}"
+			next result
+		end
+
+		source = %Q{
+			#include <curl/curl.h>
+			int main() {
+				curl_global_init(CURL_GLOBAL_ALL);
+				return 0;
+			}
+		}
+		ret = PlatformInfo.try_compile_and_run("Checking for libcurl usability", :c, source,
+			"#{PlatformInfo.curl_flags} #{PlatformInfo.curl_libs}")
+		result["Usable"] = ret ? "yes" : "no"
+		if !ret
+			result[:error] = "libcurl was found, but it isn't usable. Set VERBOSE=1 to see why."
+			next result
+		end
+
+		result["Supports SSL"] = PlatformInfo.curl_supports_ssl? ? "yes" : "no"
+		if !PlatformInfo.curl_supports_ssl?
+			result[:error] = "libcurl was found, but it doesn't support SSL. Please reinstall it with SSL support."
+			next result
+		end
+
+		result
+	end
+	
+	install_instructions "Please download Curl from <b>#{website}</b> " +
+		"and make sure you install it <b>with SSL support</b>."
+	on :debian do
+		install_instructions "Please run " +
+			"<b>apt-get install libcurl4-openssl-dev</b> " +
+			"or <b>libcurl4-gnutls-dev</b>, whichever you prefer."
+	end
+	on :redhat do
+		release = PlatformInfo.read_file("/etc/redhat-release")
+		if release =~ /release 4/
+			# http://code.google.com/p/phusion-passenger/issues/detail?id=554
+			yum_install "curl-devel zlib-devel e2fsprogs-devel krb5-devel libidn-devel"
+		else
+			yum_install "curl-devel"
+		end
+	end
+end
+
+define 'zlib-dev' do
+	name "Zlib development headers"
+	website "http://www.zlib.net/"
+	define_checker do
+		check_for_header('zlib.h')
+	end
+
+	on :debian do
+		apt_get_install "zlib1g-dev"
+	end
+	on :mandriva do
+		urpmi "zlib1-devel"
+	end
+	on :redhat do
+		yum_install "zlib-devel"
+	end
+end
+
+define 'pcre-dev' do
+	name "PCRE development headers"
+	website "http://www.pcre.org/"
+	define_checker do
+		check_for_header('pcre.h')
+	end
+
+	on :debian do
+		apt_get_install "libpcre3-dev"
+	end
+	on :redhat do
+		yum_install 'pcre-devel'
+	end
+end

data/lib/phusion_passenger/platform_info/depcheck_specs/ruby.rb

@@ -0,0 +1,137 @@
+define 'ruby-dev' do
+  name "Ruby development headers"
+  website "http://www.ruby-lang.org/"
+  define_checker do
+    require 'rbconfig'
+    begin
+      require 'mkmf'
+      rb_config = PlatformInfo.rb_config
+      header_dir = rb_config['rubyhdrdir'] || rb_config['archdir']
+      filename = "#{header_dir}/ruby.h"
+      if File.exist?(filename)
+        { :found => true, "Location" => filename }
+      else
+        false
+      end
+    rescue LoadError, SystemExit
+      # On RedHat/Fedora/CentOS, if ruby-devel is not installed then
+      # mkmf.rb will print an error and call 'exit'. So here we
+      # catch SystemExit as well.
+      false
+    rescue NotImplementedError
+      # JRuby raises this.
+      false
+    end
+  end
+  
+  if ruby_command =~ %r(^/usr/bin/ruby)
+    # Only tell user to install the headers with the system's package manager
+    # if Ruby itself was installed with the package manager.
+    on :debian do
+      apt_get_install "ruby-dev"
+    end
+    on :mandriva do
+      urpmi "ruby-devel"
+    end
+    on :redhat do
+      yum_install "ruby-devel"
+    end
+  end
+  on :other_platforms do
+    install_instructions "Please (re)install Ruby by downloading it from <b>#{website}</b>"
+  end
+end
+
+define 'ruby-openssl' do
+  name "OpenSSL support for Ruby"
+  if RUBY_PLATFORM =~ /java/
+    website "http://jruby.org/openssl"
+    install_instructions "Please install OpenSSL support for JRuby: #{website}"
+  else
+    website "http://www.ruby-lang.org/"
+    install_instructions "Please (re)install Ruby with OpenSSL support."
+  end
+  define_checker do
+    begin
+      require 'openssl'
+      { :found => true }
+    rescue LoadError
+      false
+    end
+  end
+
+  if ruby_command =~ %r(^/usr/bin/ruby)
+    # Only tell user to install ruby-openssl with the system's package manager
+    # if Ruby itself was installed with the package manager.
+    on :debian do
+      apt_get_install "libopenssl-ruby"
+    end
+  end
+end
+
+define 'rubygems' do
+  name "RubyGems"
+  website "http://rubyforge.org/frs/?group_id=126"
+  define_checker do
+    begin
+      require 'rubygems'
+      { :found => true }
+    rescue LoadError
+      false
+    end
+  end
+  
+  install_instructions "Please download it from <b>#{website}</b>. " +
+    "Extract the tarball, and run <b>ruby setup.rb</b>"
+  if ruby_command =~ %r(^/usr/bin/ruby)
+    # Only tell user to install RubyGems with the system's package manager
+    # if Ruby itself was installed with the package manager.
+    # 
+    # Older versions of Debian have totally messed up RubyGems by patching it to install binaries
+    # to /var/lib/gems/bin instead of /usr/bin or even /usr/local/bin. That
+    # wouldn't be so much of a problem were it not for the fact that
+    # /var/lib/gems/bin is not in $PATH by default, so on a regular basis people
+    # ask various Ruby/Rails support forums why they get a 'foo: command not found'
+    # after typing 'gem install foo'.
+    # 
+    # Luckily newer Debian versions fixed this problem.
+    on :debian do
+      apt_get_install "rubygems"
+    end
+  end
+end
+
+# The 'rake' spec looks for a Rake instance that's installed for the same
+# Ruby interpreter as the one that's currently running.
+# For example if you're running this 'rake.rb' file with Ruby 1.8, then
+# this checker will not find Ruby 1.9's Rake or JRuby's Rake.
+define 'rake' do
+  name "Rake (associated with #{ruby_command})"
+  website "http://rake.rubyforge.org/"
+  define_checker do
+    require 'phusion_passenger/platform_info/ruby'
+    if result = PlatformInfo.rake_command
+      { :found => true,
+        "Location" => result }
+    else
+      false
+    end
+  end
+  
+  if ruby_command =~ %r(^/usr/bin/ruby)
+    # Only tell user to install Rake with the system's package manager
+    # if Ruby itself was installed with the package manager.
+    on :debian do
+      apt_get_install "rake"
+    end
+    on :mandriva do
+      urpmi "rake"
+    end
+    on :redhat do
+      yum_install "rake"
+    end
+  end
+  on :other_platforms do
+    gem_install "rake"
+  end
+end

data/lib/phusion_passenger/platform_info/depcheck_specs/utilities.rb

@@ -0,0 +1,15 @@
+define 'download-tool' do
+	name "A download tool like 'wget' or 'curl'"
+	define_checker do
+		check_for_command('wget') || check_for_command('curl')
+	end
+	on :debian do
+		apt_get_install "wget curl"
+	end
+	on :redhat do
+		yum_install "wget curl"
+	end
+	on :other_platforms do
+		install_instructions "Please install either wget (http://www.gnu.org/software/wget/) or curl (http://curl.haxx.se/)."
+	end
+end

data/lib/phusion_passenger/platform_info/operating_system.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010 Phusion
+#  Copyright (c) 2010-2013 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -97,8 +97,9 @@ module PlatformInfo
 		else
 			arch = `uname -p`.strip
 			# On some systems 'uname -p' returns something like
-			# 'Intel(R) Pentium(R) M processor 1400MHz'.
-			if arch == "unknown" || arch =~ / /
+			# 'Intel(R) Pentium(R) M processor 1400MHz' or
+			# 'Intel(R)_Xeon(R)_CPU___________X7460__@_2.66GHz'.
+			if arch == "unknown" || arch =~ / / || arch =~ /Hz$/
 				arch = `uname -m`.strip
 			end
 			if arch =~ /^i.86$/
@@ -129,7 +130,7 @@ module PlatformInfo
 	def self.supports_sfence_instruction?
 		arch = cpu_architectures[0]
 		return arch == "x86_64" || (arch == "x86" &&
-			try_compile_and_run(:c, %Q{
+			try_compile_and_run("Checking for sfence instruction support", :c, %Q{
 				int
 				main() {
 					__asm__ __volatile__ ("sfence" ::: "memory");
@@ -144,7 +145,7 @@ module PlatformInfo
 	def self.supports_lfence_instruction?
 		arch = cpu_architectures[0]
 		return arch == "x86_64" || (arch == "x86" &&
-			try_compile_and_run(:c, %Q{
+			try_compile_and_run("Checking for lfence instruction support", :c, %Q{
 				int
 				main() {
 					__asm__ __volatile__ ("lfence" ::: "memory");

data/lib/phusion_passenger/platform_info/ruby.rb

@@ -48,29 +48,30 @@ module PlatformInfo
 	def self.ruby_command
 		if in_rvm?
 			name = rvm_ruby_string
-			dir = rvm_path
-			if name && dir
-				filename = "#{dir}/wrappers/#{name}/ruby"
-				if File.exist?(filename)
-					contents = File.open(filename, 'rb') do |f|
-						f.read
-					end
-					# Old wrapper scripts reference $HOME which causes
-					# things to blow up when run by a different user.
-					if contents.include?("$HOME")
+			dirs = rvm_paths
+			if name && dirs
+				dirs.each do |dir|
+					filename = "#{dir}/wrappers/#{name}/ruby"
+					if File.exist?(filename)
+						contents = File.open(filename, 'rb') do |f|
+							f.read
+						end
+						# Old wrapper scripts reference $HOME which causes
+						# things to blow up when run by a different user.
+						if contents.include?("$HOME")
+							filename = nil
+						end
+					else
 						filename = nil
 					end
-				else
-					filename = nil
-				end
-				if filename
-					return filename
-				else
-					STDERR.puts "Your RVM wrapper scripts are too old. Please " +
-						"update them first by running 'rvm get head && " +
-						"rvm reload && rvm repair all'."
-					exit 1
+					if filename
+						return filename
+					end
 				end
+				STDERR.puts "Your RVM wrapper scripts are too old. Please " +
+							"update them first by running 'rvm get head && " +
+							"rvm reload && rvm repair all'."
+				exit 1
 			else
 				# Something's wrong with the user's RVM installation.
 				# Raise an error so that the user knows this instead of
@@ -156,29 +157,39 @@ module PlatformInfo
 		return bindir.include?('/.rvm/') || bindir.include?('/rvm/')
 	end
 	
-	# If the current Ruby interpreter is managed by RVM, returns the
-	# directory in which RVM places its working files. Otherwise returns
-	# nil.
-	def self.rvm_path
+	# If the current Ruby interpreter is managed by RVM, returns all
+	# directories in which RVM places its working files. This is usually
+	# ~/.rvm or /usr/local/rvm, but in mixed-mode installations there
+	# can be multiple such paths.
+	# 
+	# Otherwise returns nil.
+	def self.rvm_paths
 		if in_rvm?
+			result = []
 			[ENV['rvm_path'], "~/.rvm", "/usr/local/rvm"].each do |path|
 				next if path.nil?
 				path = File.expand_path(path)
-				script_path = File.join(path, 'scripts', 'rvm')
-				return path if File.directory?(path) && File.exist?(script_path)
+				rubies_path = File.join(path, 'rubies')
+				if File.directory?(path) && File.directory?(rubies_path)
+					result << path
+				end
+			end
+			if result.empty?
+				# Failure to locate the RVM path is probably caused by the
+				# user customizing $rvm_path. Older RVM versions don't
+				# export $rvm_path, making us unable to detect its value.
+				STDERR.puts "Unable to locate the RVM path. Your RVM installation " +
+					"is probably too old. Please update it with " +
+					"'rvm get head && rvm reload && rvm repair all'."
+				exit 1
+			else
+				return result
 			end
-			# Failure to locate the RVM path is probably caused by the
-			# user customizing $rvm_path. Older RVM versions don't
-			# export $rvm_path, making us unable to detect its value.
-			STDERR.puts "Unable to locate the RVM path. Your RVM installation " +
-				"is probably too old. Please update it with " +
-				"'rvm get head && rvm reload && rvm repair all'."
-			exit 1
 		else
 			return nil
 		end
 	end
-	memoize :rvm_path
+	memoize :rvm_paths
 	
 	# If the current Ruby interpreter is managed by RVM, returns the
 	# RVM name which identifies the current Ruby interpreter plus the