passenger 5.0.0.beta3 → 5.0.0.rc1

data/lib/phusion_passenger/platform_info/apache_detector.rb

@@ -29,203 +29,203 @@ PhusionPassenger.require_passenger_lib 'utils/ansi_colors'
 require 'pathname'
 
 module PhusionPassenger
-module PlatformInfo
-
-# Detects all possible Apache installations on the system, and presents the
-# autodetection information to the user in a friendly way. It turns out too
-# many people have multiple Apache installations on their system, but they
-# don't know about that, or they don't know how to compile against the
-# correct Apache installation. This tool helps them.
-# 
-# If you use this class to log things to the terminal, then be sure to set
-# the terminal color to Utils::AnsiColors::DEFAULT_TERMINAL_COLOR.
-class ApacheDetector
-	class Result
-		# These are required and are never nil.
-		attr_accessor :apxs2, :httpd, :ctl, :version, :config_file
-		# These are optional and may be nil.
-		attr_accessor :a2enmod, :a2dismod
-		# This may be nil. It depends on how well we can infer information from the config file.
-		attr_accessor :error_log
-
-		def initialize(detector)
-			@detector = detector
-		end
-
-		def report
-			log " <b>* Found Apache #{version}!</b>"
-			log "   Information:"
-			log "      apxs2          : #{apxs2}"
-			log "      Main executable: #{httpd}"
-			log "      Control command: #{ctl}"
-			log "      Config file    : #{config_file}"
-			log "      Error log file : #{error_log || 'unknown'}"
-			log ""
-			log "   To install #{PROGRAM_NAME} against this specific Apache version:"
-			log "      #{PlatformInfo.ruby_command} #{PhusionPassenger.bin_dir}/passenger-install-apache2-module --apxs2-path='#{apxs2}'"
-			log ""
-			log "   To start, stop or restart this specific Apache version:"
-			log "      #{ctl} start"
-			log "      #{ctl} stop"
-			log "      #{ctl} restart"
-			log ""
-			if error_log
-				log "   To troubleshoot, please read the logs in this file:"
-				log "      #{error_log}"
-				log ""
-			end
-		end
-
-	private
-		def log(message)
-			@detector.send(:log, message)
-		end
-	end
-
-	attr_reader :results
-
-	def initialize(output)
-		@output  = output
-		@results = []
-		PlatformInfo.verbose = true
-		PlatformInfo.log_implementation = lambda do |message|
-			if message =~ /: found$/
-				log("<green> --> #{message}</green>")
-			else
-				log(" --> #{message}")
-			end
-		end
-	end
-
-	def finish
-		PlatformInfo.verbose = false
-		PlatformInfo.log_implementation = nil
-	end
-
-	def detect_all
-		log "<banner>Looking for possible Apache installations...</banner>"
-		apxses = PlatformInfo.find_all_commands("apxs2") +
-			PlatformInfo.find_all_commands("apxs")
-		apxses = remove_symlink_duplications(apxses)
-		log ""
-		apxses.each do |apxs2|
-			detect_one(apxs2)
-		end
-	end
-
-	def detect_one(apxs2)
-		log "<banner>Analyzing #{apxs2}...</banner>"
-		add_result do |result|
-			result.apxs2 = apxs2
-			log "Detecting main Apache executable..."
-			result.httpd = PlatformInfo.httpd(:apxs2 => apxs2)
-			if result.httpd
-				log "Detecting version..."
-				if result.version = PlatformInfo.httpd_version(:httpd => result.httpd)
-					log " --> #{result.version}"
-				else
-					log "<red> --> Cannot detect version!</red>"
-					result.httpd = nil
-				end
-			end
-			if result.httpd
-				log "Detecting control command..."
-				result.ctl = PlatformInfo.apache2ctl(:apxs2 => apxs2)
-				result.httpd = nil if !result.ctl
-			end
-			if result.httpd
-				log "Detecting configuration file location..."
-				result.config_file = PlatformInfo.httpd_default_config_file(:httpd => result.httpd)
-				if result.config_file
-					log " --> #{result.config_file}"
-				else
-					log "<red> --> Cannot detect default config file location!</red>"
-					result.httpd = nil
-				end
-			end
-			if result.httpd
-				log "Detecting error log file..."
-				result.error_log = PlatformInfo.httpd_actual_error_log(:httpd => result.httpd)
-				if result.error_log
-					log " --> #{result.error_log}"
-				else
-					log "<red> --> Cannot detect error log file!</red>"
-				end
-			end
-			if result.httpd
-				log "Detecting a2enmod and a2dismod..."
-				result.a2enmod = PlatformInfo.a2enmod(:apxs2 => apxs2)
-				result.a2dismod = PlatformInfo.a2dismod(:apxs2 => apxs2)
-			end
-			if result.httpd
-				log "<green>Found a usable Apache installation using #{apxs2}.</green>"
-				true
-			else
-				log "<yellow>Cannot find a usable Apache installation using #{apxs2}.</yellow>"
-				false
-			end
-		end
-		log ""
-	end
-
-	def report
-		log "<banner>Final autodetection results</banner>"
-		@results.each do |result|
-			result.report
-		end
-		if @results.empty?
-			log "<red>Sorry, this program cannot find an Apache installation.</red>"
-			log ""
-			log "To install Apache, please run the following. It will tell you how to install Apache."
-			log ""
-			log "   <b>#{PhusionPassenger.bin_dir}/passenger-install-apache2-module</b>"
-			log ""
-			log "If you are sure that you have Apache installed, please read the documentation:"
-			log "<b>#{APACHE2_DOC_URL}#forcing_location_of_command_line_tools_and_dependencies</b>"
-		elsif @results.size > 1
-			log "<yellow>WARNING: You have multiple Apache installations on your system!</yellow>"
-			log "You are strongly recommended to read this section of the documentation:"
-			log "<b>#{APACHE2_DOC_URL}#multiple_apache_installs</b>"
-		end
-	end
-
-	def result_for(apxs2)
-		# All the results use realpaths, so the input must too.
-		apxs2 = Pathname.new(apxs2).realpath
-		return @results.find { |r| r.apxs2 == apxs2 }
-	end
-
-private
-	def log(message)
-		if @output.tty?
-			@output.puts(Utils::AnsiColors.ansi_colorize(message))
-		else
-			@output.puts(Utils::AnsiColors.strip_color_tags(message))
-		end
-	end
-
-	# On Ubuntu, /usr/bin/apxs2 is a symlink to /usr/bin/apxs.
-	# On recent Arch Linux releases, /bin, /sbin etc are symlinks to
-	# /usr/bin and /usr/sbin.
-	# We're only supposed to detect one Apache in that case so we need to
-	# resolve symlinks.
-	def remove_symlink_duplications(filenames)
-		old_size = filenames.size
-		filenames = filenames.map do |filename|
-			Pathname.new(filename).realpath
-		end
-		filenames.uniq!
-		if old_size != filenames.size
-			log "#{old_size - filenames.size} symlink duplicate(s) detected; ignoring them."
-		end
-		return filenames
-	end
-
-	def add_result
-		result = Result.new(self)
-		@results << result if yield(result)
-	end
-end
-
-end
+  module PlatformInfo
+
+    # Detects all possible Apache installations on the system, and presents the
+    # autodetection information to the user in a friendly way. It turns out too
+    # many people have multiple Apache installations on their system, but they
+    # don't know about that, or they don't know how to compile against the
+    # correct Apache installation. This tool helps them.
+    #
+    # If you use this class to log things to the terminal, then be sure to set
+    # the terminal color to Utils::AnsiColors::DEFAULT_TERMINAL_COLOR.
+    class ApacheDetector
+      class Result
+        # These are required and are never nil.
+        attr_accessor :apxs2, :httpd, :ctl, :version, :config_file
+        # These are optional and may be nil.
+        attr_accessor :a2enmod, :a2dismod
+        # This may be nil. It depends on how well we can infer information from the config file.
+        attr_accessor :error_log
+
+        def initialize(detector)
+          @detector = detector
+        end
+
+        def report
+          log " <b>* Found Apache #{version}!</b>"
+          log "   Information:"
+          log "      apxs2          : #{apxs2}"
+          log "      Main executable: #{httpd}"
+          log "      Control command: #{ctl}"
+          log "      Config file    : #{config_file}"
+          log "      Error log file : #{error_log || 'unknown'}"
+          log ""
+          log "   To install #{PROGRAM_NAME} against this specific Apache version:"
+          log "      #{PlatformInfo.ruby_command} #{PhusionPassenger.bin_dir}/passenger-install-apache2-module --apxs2-path='#{apxs2}'"
+          log ""
+          log "   To start, stop or restart this specific Apache version:"
+          log "      #{ctl} start"
+          log "      #{ctl} stop"
+          log "      #{ctl} restart"
+          log ""
+          if error_log
+            log "   To troubleshoot, please read the logs in this file:"
+            log "      #{error_log}"
+            log ""
+          end
+        end
+
+      private
+        def log(message)
+          @detector.send(:log, message)
+        end
+      end
+
+      attr_reader :results
+
+      def initialize(output)
+        @output  = output
+        @results = []
+        PlatformInfo.verbose = true
+        PlatformInfo.log_implementation = lambda do |message|
+          if message =~ /: found$/
+            log("<green> --> #{message}</green>")
+          else
+            log(" --> #{message}")
+          end
+        end
+      end
+
+      def finish
+        PlatformInfo.verbose = false
+        PlatformInfo.log_implementation = nil
+      end
+
+      def detect_all
+        log "<banner>Looking for possible Apache installations...</banner>"
+        apxses = PlatformInfo.find_all_commands("apxs2") +
+          PlatformInfo.find_all_commands("apxs")
+        apxses = remove_symlink_duplications(apxses)
+        log ""
+        apxses.each do |apxs2|
+          detect_one(apxs2)
+        end
+      end
+
+      def detect_one(apxs2)
+        log "<banner>Analyzing #{apxs2}...</banner>"
+        add_result do |result|
+          result.apxs2 = apxs2
+          log "Detecting main Apache executable..."
+          result.httpd = PlatformInfo.httpd(:apxs2 => apxs2)
+          if result.httpd
+            log "Detecting version..."
+            if result.version = PlatformInfo.httpd_version(:httpd => result.httpd)
+              log " --> #{result.version}"
+            else
+              log "<red> --> Cannot detect version!</red>"
+              result.httpd = nil
+            end
+          end
+          if result.httpd
+            log "Detecting control command..."
+            result.ctl = PlatformInfo.apache2ctl(:apxs2 => apxs2)
+            result.httpd = nil if !result.ctl
+          end
+          if result.httpd
+            log "Detecting configuration file location..."
+            result.config_file = PlatformInfo.httpd_default_config_file(:httpd => result.httpd)
+            if result.config_file
+              log " --> #{result.config_file}"
+            else
+              log "<red> --> Cannot detect default config file location!</red>"
+              result.httpd = nil
+            end
+          end
+          if result.httpd
+            log "Detecting error log file..."
+            result.error_log = PlatformInfo.httpd_actual_error_log(:httpd => result.httpd)
+            if result.error_log
+              log " --> #{result.error_log}"
+            else
+              log "<red> --> Cannot detect error log file!</red>"
+            end
+          end
+          if result.httpd
+            log "Detecting a2enmod and a2dismod..."
+            result.a2enmod = PlatformInfo.a2enmod(:apxs2 => apxs2)
+            result.a2dismod = PlatformInfo.a2dismod(:apxs2 => apxs2)
+          end
+          if result.httpd
+            log "<green>Found a usable Apache installation using #{apxs2}.</green>"
+            true
+          else
+            log "<yellow>Cannot find a usable Apache installation using #{apxs2}.</yellow>"
+            false
+          end
+        end
+        log ""
+      end
+
+      def report
+        log "<banner>Final autodetection results</banner>"
+        @results.each do |result|
+          result.report
+        end
+        if @results.empty?
+          log "<red>Sorry, this program cannot find an Apache installation.</red>"
+          log ""
+          log "To install Apache, please run the following. It will tell you how to install Apache."
+          log ""
+          log "   <b>#{PhusionPassenger.bin_dir}/passenger-install-apache2-module</b>"
+          log ""
+          log "If you are sure that you have Apache installed, please read the documentation:"
+          log "<b>#{APACHE2_DOC_URL}#forcing_location_of_command_line_tools_and_dependencies</b>"
+        elsif @results.size > 1
+          log "<yellow>WARNING: You have multiple Apache installations on your system!</yellow>"
+          log "You are strongly recommended to read this section of the documentation:"
+          log "<b>#{APACHE2_DOC_URL}#multiple_apache_installs</b>"
+        end
+      end
+
+      def result_for(apxs2)
+        # All the results use realpaths, so the input must too.
+        apxs2 = Pathname.new(apxs2).realpath
+        return @results.find { |r| r.apxs2 == apxs2 }
+      end
+
+    private
+      def log(message)
+        if @output.tty?
+          @output.puts(Utils::AnsiColors.ansi_colorize(message))
+        else
+          @output.puts(Utils::AnsiColors.strip_color_tags(message))
+        end
+      end
+
+      # On Ubuntu, /usr/bin/apxs2 is a symlink to /usr/bin/apxs.
+      # On recent Arch Linux releases, /bin, /sbin etc are symlinks to
+      # /usr/bin and /usr/sbin.
+      # We're only supposed to detect one Apache in that case so we need to
+      # resolve symlinks.
+      def remove_symlink_duplications(filenames)
+        old_size = filenames.size
+        filenames = filenames.map do |filename|
+          Pathname.new(filename).realpath
+        end
+        filenames.uniq!
+        if old_size != filenames.size
+          log "#{old_size - filenames.size} symlink duplicate(s) detected; ignoring them."
+        end
+        return filenames
+      end
+
+      def add_result
+        result = Result.new(self)
+        @results << result if yield(result)
+      end
+    end
+
+  end
 end # module Phusion Passenger

data/lib/phusion_passenger/platform_info/binary_compatibility.rb

@@ -28,112 +28,112 @@ PhusionPassenger.require_passenger_lib 'platform_info/operating_system'
 
 module PhusionPassenger
 
-module PlatformInfo
-	# Returns a string that describes the current Ruby
-	# interpreter's extension binary compatibility. A Ruby extension
-	# compiled for a certain Ruby interpreter can also be loaded on
-	# a different Ruby interpreter with the same binary compatibility
-	# identifier.
-	#
-	# The result depends on the following factors:
-	# - Ruby engine name.
-	# - Ruby extension version.
-	#   This is not the same as the Ruby language version, which
-	#   identifies language-level compatibility. This is rather about
-	#   binary compatibility of extensions.
-	#   MRI seems to break source compatibility between tiny releases,
-	#   though patchlevel releases tend to be source and binary
-	#   compatible.
-	# - Ruby extension architecture.
-	#   This is not necessarily the same as the operating system
-	#   runtime architecture or the CPU architecture.
-	#   For example, in case of JRuby, the extension architecture is
-	#   just "java" because all extensions target the Java platform;
-	#   the architecture the JVM was compiled for has no effect on
-	#   compatibility.
-	#   On systems with universal binaries support there may be multiple
-	#   architectures. In this case the architecture is "universal"
-	#   because extensions must be able to support all of the Ruby
-	#   executable's architectures.
-	# - The operating system for which the Ruby interpreter was compiled.
-	def self.ruby_extension_binary_compatibility_id
-		ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : "ruby"
-		ruby_ext_version = RUBY_VERSION
-		if RUBY_PLATFORM =~ /darwin/
-			if RUBY_PLATFORM =~ /universal/
-				ruby_arch = "universal"
-			else
-				# OS X <  10.8: something like:
-				#   "/opt/ruby-enterprise/bin/ruby: Mach-O 64-bit executable x86_64"
-				output = `file -L "#{ruby_executable}"`.strip
-				ruby_arch = output.sub(/.* /, '')
-				if ruby_arch == "executable"
-					# OS X >= 10.8: something like:
-					#   "/opt/ruby-enterprise/bin/ruby: Mach-O 64-bit executable"
-					if output =~ /Mach-O 64-bit/
-						ruby_arch = "x86_64"
-					else
-						raise "Cannot autodetect the Ruby interpreter's architecture"
-					end
-				end
-			end
-		elsif RUBY_PLATFORM == "java"
-			ruby_arch = "java"
-		else
-			ruby_arch = cpu_architectures[0]
-		end
-		return "#{ruby_engine}-#{ruby_ext_version}-#{ruby_arch}-#{os_name}"
-	end
-	memoize :ruby_extension_binary_compatibility_id
-	
-	# Returns an identifier string that describes the current
-	# platform's binary compatibility with regard to C/C++
-	# binaries. Two systems with the same binary compatibility
-	# identifiers should be able to run the same C/C++ binaries.
-	#
-	# The the string depends on the following factors:
-	# - The operating system name.
-	# - Operating system runtime identifier.
-	#   This may include the kernel version, libc version, C++ ABI version,
-	#   etc. Everything that is of interest for binary compatibility with
-	#   regard to C/C++ binaries.
-	# - Operating system default runtime architecture.
-	#   This is not the same as the CPU architecture; some CPUs support
-	#   multiple architectures, e.g. Intel Core 2 Duo supports x86 and
-	#   x86_64. Some operating systems actually support multiple runtime
-	#   architectures: a lot of x86_64 Linux distributions also include
-	#   32-bit runtimes, and OS X Snow Leopard is x86_64 by default but
-	#   all system libraries also support x86.
-	#   This component identifies the architecture that is used when
-	#   compiling a binary with the system's C++ compiler with its default
-	#   options.
-	def self.cxx_binary_compatibility_id
-		if os_name == "macosx"
-			# RUBY_PLATFORM gives us the kernel version, but we want
-			# the OS X version.
-			os_version_string = `sw_vers -productVersion`.strip
-			# sw_vers returns something like "10.6.2". We're only
-			# interested in the first two digits (MAJOR.MINOR) since
-			# tiny releases tend to be binary compatible with each
-			# other.
-			components = os_version_string.split(".")
-			os_version = "#{components[0]}.#{components[1]}"
-			os_runtime = os_version
-			
-			os_arch = cpu_architectures[0]
-			if os_version >= "10.5" && os_arch =~ /^i.86$/
-				# On Snow Leopard, 'uname -m' returns i386 but
-				# we *know* that everything is x86_64 by default.
-				os_arch = "x86_64"
-			end
-		else
-			os_arch = cpu_architectures[0]
-			os_runtime = nil
-		end
-		
-		return [os_arch, os_name, os_runtime].compact.join("-")
-	end
-	memoize :cxx_binary_compatibility_id
-end
+  module PlatformInfo
+    # Returns a string that describes the current Ruby
+    # interpreter's extension binary compatibility. A Ruby extension
+    # compiled for a certain Ruby interpreter can also be loaded on
+    # a different Ruby interpreter with the same binary compatibility
+    # identifier.
+    #
+    # The result depends on the following factors:
+    # - Ruby engine name.
+    # - Ruby extension version.
+    #   This is not the same as the Ruby language version, which
+    #   identifies language-level compatibility. This is rather about
+    #   binary compatibility of extensions.
+    #   MRI seems to break source compatibility between tiny releases,
+    #   though patchlevel releases tend to be source and binary
+    #   compatible.
+    # - Ruby extension architecture.
+    #   This is not necessarily the same as the operating system
+    #   runtime architecture or the CPU architecture.
+    #   For example, in case of JRuby, the extension architecture is
+    #   just "java" because all extensions target the Java platform;
+    #   the architecture the JVM was compiled for has no effect on
+    #   compatibility.
+    #   On systems with universal binaries support there may be multiple
+    #   architectures. In this case the architecture is "universal"
+    #   because extensions must be able to support all of the Ruby
+    #   executable's architectures.
+    # - The operating system for which the Ruby interpreter was compiled.
+    def self.ruby_extension_binary_compatibility_id
+      ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : "ruby"
+      ruby_ext_version = RUBY_VERSION
+      if RUBY_PLATFORM =~ /darwin/
+        if RUBY_PLATFORM =~ /universal/
+          ruby_arch = "universal"
+        else
+          # OS X <  10.8: something like:
+          #   "/opt/ruby-enterprise/bin/ruby: Mach-O 64-bit executable x86_64"
+          output = `file -L "#{ruby_executable}"`.strip
+          ruby_arch = output.sub(/.* /, '')
+          if ruby_arch == "executable"
+            # OS X >= 10.8: something like:
+            #   "/opt/ruby-enterprise/bin/ruby: Mach-O 64-bit executable"
+            if output =~ /Mach-O 64-bit/
+              ruby_arch = "x86_64"
+            else
+              raise "Cannot autodetect the Ruby interpreter's architecture"
+            end
+          end
+        end
+      elsif RUBY_PLATFORM == "java"
+        ruby_arch = "java"
+      else
+        ruby_arch = cpu_architectures[0]
+      end
+      return "#{ruby_engine}-#{ruby_ext_version}-#{ruby_arch}-#{os_name}"
+    end
+    memoize :ruby_extension_binary_compatibility_id
+
+    # Returns an identifier string that describes the current
+    # platform's binary compatibility with regard to C/C++
+    # binaries. Two systems with the same binary compatibility
+    # identifiers should be able to run the same C/C++ binaries.
+    #
+    # The the string depends on the following factors:
+    # - The operating system name.
+    # - Operating system runtime identifier.
+    #   This may include the kernel version, libc version, C++ ABI version,
+    #   etc. Everything that is of interest for binary compatibility with
+    #   regard to C/C++ binaries.
+    # - Operating system default runtime architecture.
+    #   This is not the same as the CPU architecture; some CPUs support
+    #   multiple architectures, e.g. Intel Core 2 Duo supports x86 and
+    #   x86_64. Some operating systems actually support multiple runtime
+    #   architectures: a lot of x86_64 Linux distributions also include
+    #   32-bit runtimes, and OS X Snow Leopard is x86_64 by default but
+    #   all system libraries also support x86.
+    #   This component identifies the architecture that is used when
+    #   compiling a binary with the system's C++ compiler with its default
+    #   options.
+    def self.cxx_binary_compatibility_id
+      if os_name == "macosx"
+        # RUBY_PLATFORM gives us the kernel version, but we want
+        # the OS X version.
+        os_version_string = `sw_vers -productVersion`.strip
+        # sw_vers returns something like "10.6.2". We're only
+        # interested in the first two digits (MAJOR.MINOR) since
+        # tiny releases tend to be binary compatible with each
+        # other.
+        components = os_version_string.split(".")
+        os_version = "#{components[0]}.#{components[1]}"
+        os_runtime = os_version
+
+        os_arch = cpu_architectures[0]
+        if os_version >= "10.5" && os_arch =~ /^i.86$/
+          # On Snow Leopard, 'uname -m' returns i386 but
+          # we *know* that everything is x86_64 by default.
+          os_arch = "x86_64"
+        end
+      else
+        os_arch = cpu_architectures[0]
+        os_runtime = nil
+      end
+
+      return [os_arch, os_name, os_runtime].compact.join("-")
+    end
+    memoize :cxx_binary_compatibility_id
+  end
 
 end # module PhusionPassenger