passenger 5.0.0.beta3 → 5.0.0.rc1

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

@@ -1,124 +1,124 @@
 define 'apache2' do
-	name 'Apache 2'
-	website 'http://httpd.apache.org/'
-	define_checker do
-		PhusionPassenger.require_passenger_lib 'platform_info/apache'
-		if check_for_command(PlatformInfo.httpd)
-			{
-				:found => true,
-				"Location of httpd" => PlatformInfo.httpd,
-				"Apache version"    => PlatformInfo.httpd_version
-			}
-		else
-			false
-		end
-	end
+  name 'Apache 2'
+  website 'http://httpd.apache.org/'
+  define_checker do
+    PhusionPassenger.require_passenger_lib 'platform_info/apache'
+    if check_for_command(PlatformInfo.httpd)
+      {
+        :found => true,
+        "Location of httpd" => PlatformInfo.httpd,
+        "Apache version"    => PlatformInfo.httpd_version
+      }
+    else
+      false
+    end
+  end
 
-	on :debian do
-		apt_get_install "apache2-mpm-worker"
-	end
-	on :mandriva do
-		urpmi "apache"
-	end
-	on :redhat do
-		yum_install "httpd"
-	end
-	on :gentoo do
-		emerge "apache"
-	end
+  on :debian do
+    apt_get_install "apache2-mpm-worker"
+  end
+  on :mandriva do
+    urpmi "apache"
+  end
+  on :redhat do
+    yum_install "httpd"
+  end
+  on :gentoo do
+    emerge "apache"
+  end
 end
 
 define 'apache2-dev' do
-	name "Apache 2 development headers"
-	website "http://httpd.apache.org/"
-	define_checker do
-		PhusionPassenger.require_passenger_lib 'platform_info/apache'
-		if PlatformInfo.apxs2
-			{
-				:found => true,
-				"Location of apxs2" => PlatformInfo.apxs2
-			}
-		else
-			false
-		end
-	end
+  name "Apache 2 development headers"
+  website "http://httpd.apache.org/"
+  define_checker do
+    PhusionPassenger.require_passenger_lib 'platform_info/apache'
+    if PlatformInfo.apxs2
+      {
+        :found => true,
+        "Location of apxs2" => PlatformInfo.apxs2
+      }
+    else
+      false
+    end
+  end
 
-	on :debian do
-		apt_get_install "apache2-threaded-dev"
-	end
-	on :mandriva do
-		urpmi "apache-devel"
-	end
-	on :redhat do
-		yum_install "httpd-devel"
-	end
-	on :gentoo do
-		emerge "apache"
-	end
-	on :macosx do
-		install_osx_command_line_tools
-	end
+  on :debian do
+    apt_get_install "apache2-threaded-dev"
+  end
+  on :mandriva do
+    urpmi "apache-devel"
+  end
+  on :redhat do
+    yum_install "httpd-devel"
+  end
+  on :gentoo do
+    emerge "apache"
+  end
+  on :macosx do
+    install_osx_command_line_tools
+  end
 end
 
 define 'apr-dev' do
-	name "Apache Portable Runtime (APR) development headers"
-	website "http://httpd.apache.org/"
-	define_checker do
-		PhusionPassenger.require_passenger_lib 'platform_info/apache'
-		if PlatformInfo.apr_config
-			{
-				:found     => true,
-				"Location" => PlatformInfo.apr_config,
-				"Version"  => `#{PlatformInfo.apr_config} --version`.strip
-			}
-		else
-			false
-		end
-	end
+  name "Apache Portable Runtime (APR) development headers"
+  website "http://httpd.apache.org/"
+  define_checker do
+    PhusionPassenger.require_passenger_lib 'platform_info/apache'
+    if PlatformInfo.apr_config
+      {
+        :found     => true,
+        "Location" => PlatformInfo.apr_config,
+        "Version"  => `#{PlatformInfo.apr_config} --version`.strip
+      }
+    else
+      false
+    end
+  end
 
-	on :debian do
-		apt_get_install "libapr1-dev"
-	end
-	on :mandriva do
-		urpmi "libapr-devel"
-	end
-	on :redhat do
-		yum_install "apr-devel"
-	end
-	on :gentoo do
-		emerge "apr"
-	end
-	on :macosx do
-		install_osx_command_line_tools
-	end
+  on :debian do
+    apt_get_install "libapr1-dev"
+  end
+  on :mandriva do
+    urpmi "libapr-devel"
+  end
+  on :redhat do
+    yum_install "apr-devel"
+  end
+  on :gentoo do
+    emerge "apr"
+  end
+  on :macosx do
+    install_osx_command_line_tools
+  end
 end
 
 define 'apu-dev' do
-	name "Apache Portable Runtime Utility (APU) development headers"
-	website "http://httpd.apache.org/"
-	define_checker do
-		PhusionPassenger.require_passenger_lib 'platform_info/apache'
-		if PlatformInfo.apu_config
-			{
-				:found     => true,
-				"Location" => PlatformInfo.apu_config,
-				"Version"  => `#{PlatformInfo.apu_config} --version`.strip
-			}
-		else
-			false
-		end
-	end
+  name "Apache Portable Runtime Utility (APU) development headers"
+  website "http://httpd.apache.org/"
+  define_checker do
+    PhusionPassenger.require_passenger_lib 'platform_info/apache'
+    if PlatformInfo.apu_config
+      {
+        :found     => true,
+        "Location" => PlatformInfo.apu_config,
+        "Version"  => `#{PlatformInfo.apu_config} --version`.strip
+      }
+    else
+      false
+    end
+  end
 
-	on :debian do
-		apt_get_install "libaprutil1-dev"
-	end
-	on :mandriva do
-		urpmi "libapr-util-devel"
-	end
-	on :redhat do
-		yum_install "apr-util-devel"
-	end
-	on :macosx do
-		install_osx_command_line_tools
-	end
+  on :debian do
+    apt_get_install "libaprutil1-dev"
+  end
+  on :mandriva do
+    urpmi "libapr-util-devel"
+  end
+  on :redhat do
+    yum_install "apr-util-devel"
+  end
+  on :macosx do
+    install_osx_command_line_tools
+  end
 end

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

@@ -5,7 +5,7 @@ define 'cc' do
     PhusionPassenger.require_passenger_lib 'platform_info/compiler'
     check_for_command(PlatformInfo.cc, false)
   end
-  
+
   on :debian do
     apt_get_install "build-essential"
   end
@@ -30,7 +30,7 @@ define 'c++' do
     PhusionPassenger.require_passenger_lib 'platform_info/compiler'
     check_for_command(PlatformInfo.cxx, false)
   end
-  
+
   on :debian do
     apt_get_install "build-essential"
   end
@@ -54,7 +54,7 @@ define 'make' do
     PhusionPassenger.require_passenger_lib 'platform_info/compiler'
     check_for_command(PlatformInfo.make)
   end
-  
+
   on :debian do
     apt_get_install "build-essential"
   end
@@ -78,7 +78,7 @@ define 'gmake' do
     PhusionPassenger.require_passenger_lib 'platform_info/compiler'
     check_for_command(PlatformInfo.gnu_make)
   end
-  
+
   on :debian do
     apt_get_install "build-essential"
   end

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

@@ -1,39 +1,15 @@
 define 'fastthread' do
-	name 'fastthread'
-	define_checker do
-		check_for_ruby_library('fastthread')
-	end
-	gem_install 'fastthread'
+  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'
+  name 'rack'
+  define_checker do
+    check_for_ruby_library('rack')
+  end
+  gem_install 'rack'
 end

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

@@ -1,120 +1,120 @@
 define 'openssl-dev' do
-	name "OpenSSL development headers"
-	website "http://www.openssl.org/"
-	define_checker do
-		check_for_header('openssl/ssl.h')
-	end
+  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
+  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
-		PhusionPassenger.require_passenger_lib '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
+  name "Curl development headers with SSL support"
+  website "http://curl.haxx.se/libcurl"
+  define_checker do
+    PhusionPassenger.require_passenger_lib 'platform_info/curl'
+    result = { :found => false }
 
-		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
+    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
 
-		begin
-			result["Version"] = `#{curl_config} --version`.strip
-		rescue SystemCallError => e
-			result[:error] = "Cannot run `curl-config --version`: #{e}"
-			next result
-		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
 
-		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
+    begin
+      result["Version"] = `#{curl_config} --version`.strip
+    rescue SystemCallError => e
+      result[:error] = "Cannot run `curl-config --version`: #{e}"
+      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
+    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
-	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"
-		elsif release =~ /release 5/
-			yum_install "curl-devel"
-		else
-			yum_install "libcurl-devel"
-		end
-	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"
+    elsif release =~ /release 5/
+      yum_install "curl-devel"
+    else
+      yum_install "libcurl-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
+  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
+  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
+  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
+  on :debian do
+    apt_get_install "libpcre3-dev"
+  end
+  on :redhat do
+    yum_install 'pcre-devel'
+  end
 end