passenger 4.0.30 → 4.0.31

data/lib/phusion_passenger/ruby_core_enhancements.rb

@@ -37,7 +37,7 @@ if (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby") && RUBY_VERSION < "1.8.7"
 			"gem install fastthread"
 	end
 end
-require 'phusion_passenger/native_support'
+PhusionPassenger.require_passenger_lib 'native_support'
 
 class Exception
 	def backtrace_string(current_location = nil)

data/lib/phusion_passenger/standalone/app_finder.rb

@@ -20,7 +20,7 @@
 #  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
-require 'phusion_passenger/utils/file_system_watcher'
+PhusionPassenger.require_passenger_lib 'utils/file_system_watcher'
 
 module PhusionPassenger
 module Standalone
@@ -137,7 +137,7 @@ private
 	end
 	
 	def load_config_file!(context, filename)
-		require 'phusion_passenger/utils/json' if !defined?(PhusionPassenger::Utils::JSON)
+		PhusionPassenger.require_passenger_lib 'utils/json' if !defined?(PhusionPassenger::Utils::JSON)
 		begin
 			data = File.open(filename, "r:utf-8") do |f|
 				f.read

data/lib/phusion_passenger/standalone/command.rb

@@ -21,9 +21,8 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 require 'optparse'
-require 'phusion_passenger'
-require 'phusion_passenger/constants'
-require 'phusion_passenger/standalone/utils'
+PhusionPassenger.require_passenger_lib 'constants'
+PhusionPassenger.require_passenger_lib 'standalone/utils'
 
 module PhusionPassenger
 module Standalone
@@ -94,7 +93,7 @@ private
 	end
 	
 	def require_app_finder
-		require 'phusion_passenger/standalone/app_finder' unless defined?(AppFinder)
+		PhusionPassenger.require_passenger_lib 'standalone/app_finder' unless defined?(AppFinder)
 	end
 	
 	def debugging?
@@ -106,7 +105,7 @@ private
 		
 		global_config_file = File.join(ENV['HOME'], USER_NAMESPACE_DIRNAME, "standalone", "config")
 		if File.exist?(global_config_file)
-			require 'phusion_passenger/standalone/config_file' unless defined?(ConfigFile)
+			PhusionPassenger.require_passenger_lib 'standalone/config_file' unless defined?(ConfigFile)
 			global_options = ConfigFile.new(:global_config, global_config_file).options
 			@options.merge!(global_options)
 		end
@@ -182,8 +181,8 @@ private
 	end
 	
 	def write_nginx_config_file
-		require 'phusion_passenger/platform_info/ruby'
-		require 'phusion_passenger/utils/tmpio'
+		PhusionPassenger.require_passenger_lib 'platform_info/ruby'
+		PhusionPassenger.require_passenger_lib 'utils/tmpio'
 		@temp_dir = PhusionPassenger::Utils.mktmpdir(
 			"passenger-standalone.")
 		@config_filename = "#{@temp_dir}/config"
@@ -198,7 +197,10 @@ private
 		
 		File.open(location_config_filename, 'w') do |f|
 			f.puts '[locations]'
-			f.puts "natively_packaged=false"
+			f.puts "natively_packaged=#{PhusionPassenger.natively_packaged?}"
+			if PhusionPassenger.natively_packaged?
+				f.puts "native_packaging_method=#{PhusionPassenger.native_packaging_method}"
+			end
 			f.puts "lib_dir=#{@runtime_locator.find_lib_dir}"
 			f.puts "agents_dir=#{@runtime_locator.find_agents_dir}"
 			locations_ini_fields.each do |field|

data/lib/phusion_passenger/standalone/help_command.rb

@@ -20,7 +20,7 @@
 #  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
-require 'phusion_passenger/standalone/command'
+PhusionPassenger.require_passenger_lib 'standalone/command'
 
 module PhusionPassenger
 module Standalone

data/lib/phusion_passenger/standalone/main.rb

@@ -20,7 +20,7 @@
 #  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
-require 'phusion_passenger/standalone/command'
+PhusionPassenger.require_passenger_lib 'standalone/command'
 
 module PhusionPassenger
 module Standalone
@@ -43,7 +43,7 @@ class Main
 		COMMANDS.each do |command_spec|
 			command_name = command_spec[0]
 			filename     = command_name.sub(/-/, '_') + "_command"
-			require "phusion_passenger/standalone/#{filename}"
+			PhusionPassenger.require_passenger_lib "standalone/#{filename}"
 			command_class = Standalone.const_get(command_spec[1])
 			yield(command_name, command_class)
 		end
@@ -107,7 +107,7 @@ private
 	def get_command_class(spec)
 		command_name, class_name = spec
 		filename = command_name.sub(/-/, '_') + "_command"
-		require "phusion_passenger/standalone/#{filename}"
+		PhusionPassenger.require_passenger_lib("standalone/#{filename}")
 		return Standalone.const_get(class_name)
 	end
 end

data/lib/phusion_passenger/standalone/package_runtime_command.rb

@@ -31,8 +31,8 @@ class PackageRuntimeCommand < Command
 	end
 
 	def self.require_libs
-		require 'phusion_passenger/platform_info/binary_compatibility'
-		require 'phusion_passenger/standalone/runtime_installer'
+		PhusionPassenger.require_passenger_lib 'platform_info/binary_compatibility'
+		PhusionPassenger.require_passenger_lib 'standalone/runtime_installer'
 	end
 
 	def run

data/lib/phusion_passenger/standalone/runtime_installer.rb

@@ -23,15 +23,16 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 require 'fileutils'
-require 'phusion_passenger'
-require 'phusion_passenger/abstract_installer'
-require 'phusion_passenger/packaging'
-require 'phusion_passenger/common_library'
-require 'phusion_passenger/platform_info'
-require 'phusion_passenger/platform_info/ruby'
-require 'phusion_passenger/platform_info/binary_compatibility'
-require 'phusion_passenger/standalone/utils'
-require 'phusion_passenger/utils/tmpio'
+require 'logger'
+PhusionPassenger.require_passenger_lib 'constants'
+PhusionPassenger.require_passenger_lib 'abstract_installer'
+PhusionPassenger.require_passenger_lib 'packaging'
+PhusionPassenger.require_passenger_lib 'common_library'
+PhusionPassenger.require_passenger_lib 'platform_info'
+PhusionPassenger.require_passenger_lib 'platform_info/ruby'
+PhusionPassenger.require_passenger_lib 'platform_info/binary_compatibility'
+PhusionPassenger.require_passenger_lib 'standalone/utils'
+PhusionPassenger.require_passenger_lib 'utils/tmpio'
 
 module PhusionPassenger
 module Standalone
@@ -146,7 +147,7 @@ protected
 
 private
 	def check_for_download_tool
-		require 'phusion_passenger/platform_info/depcheck'
+		PhusionPassenger.require_passenger_lib 'platform_info/depcheck'
 		PlatformInfo::Depcheck.load('depcheck_specs/utilities')
 		result = PlatformInfo::Depcheck.find('download-tool').check
 		# Don't output anything if there is a download tool.
@@ -189,6 +190,7 @@ private
 					"because --no-compile-runtime is given."
 				exit(1)
 			end
+			check_nginx_module_sources_available || exit(1)
 			puts
 			check_dependencies(false) || exit(1)
 			puts
@@ -278,8 +280,15 @@ private
 		basename = "webhelper-#{@nginx_version}-#{PlatformInfo.cxx_binary_compatibility_id}.tar.gz"
 		url      = "#{@binaries_url_root}/#{PhusionPassenger::VERSION_STRING}/#{basename}"
 		tarball  = "#{@working_dir}/#{basename}"
-		if !download(url, tarball, :cacert => PhusionPassenger.binaries_ca_cert_path, :use_cache => true)
-			puts "     No binary are available for your platform. Will compile them from source"
+		logger = Logger.new(STDOUT)
+		logger.level = Logger::WARN
+		logger.formatter = proc { |severity, datetime, progname, msg| "     #{msg}\n" }
+		result = download(url, tarball,
+			:cacert => PhusionPassenger.binaries_ca_cert_path,
+			:use_cache => true,
+			:logger => logger)
+		if !result
+			puts "     No binary is available for your platform. Will compile it from source."
 			return false
 		end
 
@@ -406,6 +415,39 @@ private
 		puts
 	end
 	
+	def check_nginx_module_sources_available
+		if PhusionPassenger.natively_packaged? && !File.exist?(PhusionPassenger.nginx_module_source_dir)
+			case PhusionPassenger.native_packaging_method
+			when "deb"
+				command = "sudo sh -c 'apt-get update && apt-get install #{DEB_DEV_PACKAGE}'"
+			when "rpm"
+				command = "sudo yum install #{RPM_DEV_PACKAGE}"
+			end
+			if command
+				if STDIN.tty?
+					puts " --> Installing #{PhusionPassenger::PROGRAM_NAME} web helper sources"
+					puts "     Running: #{command}"
+					if system(command)
+						return true
+					else
+						puts "     <red>*** Command failed: #{command}</red>"
+						return false
+					end
+				else
+					puts " --> #{PhusionPassenger::PROGRAM_NAME} web helper sources not installed"
+					puts "     Please install them first: #{command}"
+					return false
+				end
+			else
+				puts " --> #{PhusionPassenger::PROGRAM_NAME} web helper sources not installed"
+				puts "     <red>Please ask your operating system vendor how to install these.</red>"
+				return false
+			end
+		else
+			return true
+		end
+	end
+
 	def check_whether_we_can_write_to(dir)
 		FileUtils.mkdir_p(dir)
 		File.new("#{dir}/__test__.txt", "w").close
@@ -563,7 +605,7 @@ private
 	end
 	
 	def install_nginx_from_source(source_dir)
-		require 'phusion_passenger/platform_info/compiler'
+		PhusionPassenger.require_passenger_lib 'platform_info/compiler'
 		Dir.chdir(source_dir) do
 			shell = PlatformInfo.find_command('bash') || "sh"
 			command = ""

data/lib/phusion_passenger/standalone/runtime_locator.rb

@@ -22,8 +22,8 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-require 'phusion_passenger/platform_info/binary_compatibility'
-require 'phusion_passenger/utils/json'
+PhusionPassenger.require_passenger_lib 'platform_info/binary_compatibility'
+PhusionPassenger.require_passenger_lib 'utils/json'
 require 'etc'
 
 module PhusionPassenger
@@ -55,7 +55,7 @@ class RuntimeLocator
 
 		if PhusionPassenger.originally_packaged?
 			if debugging?
-				@support_dir = "#{PhusionPassenger.source_root}/buildout"
+				@support_dir = PhusionPassenger.buildout_dir
 			else
 				dir = "#{@runtime_dir}/#{version}/support-#{cxx_compat_id}"
 				if self.class.looks_like_support_dir?(dir)

data/lib/phusion_passenger/standalone/start_command.rb

@@ -23,10 +23,9 @@
 require 'socket'
 require 'thread'
 require 'etc'
-require 'phusion_passenger'
-require 'phusion_passenger/plugin'
-require 'phusion_passenger/standalone/command'
-require 'phusion_passenger/platform_info/operating_system'
+PhusionPassenger.require_passenger_lib 'plugin'
+PhusionPassenger.require_passenger_lib 'standalone/command'
+PhusionPassenger.require_passenger_lib 'platform_info/operating_system'
 
 # We lazy load as many libraries as possible not only to improve startup performance,
 # but also to ensure that we don't require libraries before we've passed the dependency
@@ -53,7 +52,7 @@ class StartCommand < Command
 		parse_my_options
 		sanity_check_options
 
-		require 'phusion_passenger/standalone/runtime_locator'
+		PhusionPassenger.require_passenger_lib 'standalone/runtime_locator'
 		@runtime_locator = RuntimeLocator.new(@options[:runtime_dir],
 			@options[:nginx_version])
 		ensure_runtime_installed
@@ -321,7 +320,7 @@ private
 			begin
 				TCPServer.new('127.0.0.1', @options[:port]).close
 			rescue Errno::EACCES
-				require 'phusion_passenger/platform_info/ruby'
+				PhusionPassenger.require_passenger_lib 'platform_info/ruby'
 				myself = `whoami`.strip
 				error "Only the 'root' user can run this program on port #{@options[:port]}. " <<
 				      "You are currently running as '#{myself}'. Please re-run this program " <<
@@ -450,7 +449,7 @@ private
 	end
 
 	def install_runtime(runtime_locator)
-		require 'phusion_passenger/standalone/runtime_installer'
+		PhusionPassenger.require_passenger_lib 'standalone/runtime_installer'
 		installer = RuntimeInstaller.new(
 			:targets     => runtime_locator.install_targets,
 			:support_dir => runtime_locator.support_dir_install_destination,

data/lib/phusion_passenger/standalone/status_command.rb

@@ -20,7 +20,7 @@
 #  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
-require 'phusion_passenger/standalone/command'
+PhusionPassenger.require_passenger_lib 'standalone/command'
 
 module PhusionPassenger
 module Standalone

data/lib/phusion_passenger/standalone/stop_command.rb

@@ -20,7 +20,7 @@
 #  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
-require 'phusion_passenger/standalone/command'
+PhusionPassenger.require_passenger_lib 'standalone/command'
 
 module PhusionPassenger
 module Standalone

data/lib/phusion_passenger/standalone/utils.rb

@@ -28,7 +28,7 @@ module Utils
 private
 	def require_platform_info_binary_compatibility
 		if !defined?(PlatformInfo) || !PlatformInfo.respond_to?(:cxx_binary_compatibility_id)
-			require 'phusion_passenger/platform_info/binary_compatibility'
+			PhusionPassenger.require_passenger_lib 'platform_info/binary_compatibility'
 		end
 	end
 	

data/lib/phusion_passenger/standalone/version_command.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.
 #
@@ -20,8 +20,7 @@
 #  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
-require 'phusion_passenger'
-require 'phusion_passenger/standalone/command'
+PhusionPassenger.require_passenger_lib 'standalone/command'
 
 module PhusionPassenger
 module Standalone

data/lib/phusion_passenger/utils.rb

@@ -26,7 +26,7 @@ begin
 	require 'rubygems'
 rescue LoadError
 end
-require 'phusion_passenger/native_support'
+PhusionPassenger.require_passenger_lib 'native_support'
 
 module PhusionPassenger
 

data/lib/phusion_passenger/utils/download.rb

@@ -22,8 +22,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-require 'phusion_passenger'
-require 'phusion_passenger/platform_info'
+PhusionPassenger.require_passenger_lib 'platform_info'
 require 'fileutils'
 require 'shellwords'
 

data/lib/phusion_passenger/utils/file_system_watcher.rb

@@ -21,7 +21,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-require 'phusion_passenger/native_support'
+PhusionPassenger.require_passenger_lib 'native_support'
 
 module PhusionPassenger
 module Utils

data/lib/phusion_passenger/utils/hosts_file_parser.rb

@@ -22,7 +22,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-require 'phusion_passenger/platform_info/operating_system'
+PhusionPassenger.require_passenger_lib 'platform_info/operating_system'
 
 module PhusionPassenger
 module Utils

data/lib/phusion_passenger/utils/tee_input.rb

@@ -54,7 +54,7 @@
 #    PURPOSE.
 
 require 'stringio'
-require 'phusion_passenger/utils/tmpio'
+PhusionPassenger.require_passenger_lib 'utils/tmpio'
 
 module PhusionPassenger
 module Utils

data/lib/phusion_passenger/utils/terminal_choice_menu.rb

@@ -0,0 +1,217 @@
+# encoding: utf-8
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 2013 Phusion
+#
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#
+#  Permission is hereby granted, free of charge, to any person obtaining a copy
+#  of this software and associated documentation files (the "Software"), to deal
+#  in the Software without restriction, including without limitation the rights
+#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
+#
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+#  THE SOFTWARE.
+
+module PhusionPassenger
+module Utils
+
+class TerminalChoiceMenu
+	class Choice
+		attr_reader :name
+		attr_accessor :checked
+
+		alias checked? checked
+
+		def self.create(choice)
+			if choice.is_a?(Choice)
+				return choice
+			else
+				return Choice.new(choice)
+			end
+		end
+
+		def initialize(name, checked = false)
+			@name = name
+			@checked = checked
+		end
+
+		def toggle!
+			@checked = !@checked
+		end
+	end
+
+	def initialize(choices)
+		@choices = choices.map { |choice| Choice.create(choice) }
+		@pointer = 0
+		@index   = index_choices
+		initialize_terminal_control
+	end
+
+	def display_choices
+		display(render_to_string)
+	end
+
+	def query
+		if STDIN.tty?
+			done = false
+			begin
+				raw_no_echo_mode
+				hide_cursor
+				while !done
+					display_choices
+					done = process_input
+					clear_screen if !done
+				end
+			ensure
+				restore_mode
+				show_cursor
+				puts
+			end
+		else
+			display_choices
+			puts
+		end
+	end
+
+	def [](name)
+		return @index[name]
+	end
+
+	def selected_choices
+		@choices.find_all{ |c| c.checked? }.map{ |c| c.name }
+	end
+
+private
+	JRUBY = defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
+
+	def index_choices
+		index = {}
+		@choices.each do |choice|
+			index[choice.name] = choice
+		end
+		return index
+	end
+
+	def process_input
+		case STDIN.getc
+		when "\x1b"
+			process_cursor_move
+			return false
+		when " "
+			process_toggle
+			return false
+		when "\r"
+			return true
+		else
+			return false
+		end
+	end
+
+	def process_cursor_move
+		if STDIN.getc == "["
+			case STDIN.getc
+			when "A" # up
+				@pointer = [@pointer - 1, 0].max
+			when "B" # down
+				@pointer = [@pointer + 1, @choices.size - 1].min
+			end
+		end
+	end
+
+	def process_toggle
+		@choices[@pointer].toggle!
+	end
+
+	def render_to_string
+		str = ""
+		@choices.each_with_index do |choice, i|
+			pointer = render_pointer(i)
+			checkbox = render_checkbox(choice.checked)
+			str << " #{pointer} #{checkbox}  #{choice.name}\r\n"
+		end
+		str.chomp!
+		return str
+	end
+
+	def render_pointer(index)
+		return @pointer == index ? "‣" : " "
+	end
+
+	def render_checkbox(checked)
+		return checked ? "⬢" : "⬡"
+	end
+
+	def display(str)
+		STDOUT.write(str)
+		STDOUT.flush
+	end
+
+	def clear_screen
+		number_of_lines = render_to_string.split("\n").size
+		display("\r")
+		(number_of_lines - 1).times do
+			display(move_up)
+		end
+	end
+
+	def hide_cursor
+		display("\x1b[?25l")
+	end
+
+	def show_cursor
+		display("\x1b[?25h")
+	end
+
+	def move_up
+		return "\x1b[0A"
+	end
+
+	if JRUBY
+		require 'java'
+		require 'readline'
+		java_import 'jline.console.ConsoleReader'
+
+		def initialize_terminal_control
+			input = STDIN.to_inputstream
+			output = STDOUT.to_outputstream
+			@console = ConsoleReader.new(input, output)
+			@console.set_history_enabled(false)
+			@console.set_bell_enabled(true)
+			@console.set_pagination_enabled(false)
+		end
+
+		def raw_no_echo_mode
+			@terminal_state = @console.getEchoCharacter
+            @console.setEchoCharacter(0)
+		end
+
+		def restore_mode
+			@console.setEchoCharacter(@terminal_state)
+		end
+	else
+		def initialize_terminal_control
+		end
+
+		def raw_no_echo_mode
+			@terminal_state = `stty -g`
+			system("stty raw -echo -icanon isig")
+		end
+
+		def restore_mode
+			system("stty #{@terminal_state}")
+		end
+	end
+end
+
+end # module Utils
+end # module PhusionPassenger