passenger 4.0.30 → 4.0.31

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJSwdn6AAoJECrHRaUKISqMAv4H/iti9mO5AKDQjhzkjIACLUzI
-1eKK+17FK8AUKf6KblJCVznxuhR4yHpxnmxZ2twm9M6VJEKygTELiT+3Lb/FZmVA
-1evpYzx9I5nxic/604o0GmObGiXrGjdVC+o77l9AX8tZtVGv0+pnSe0WlpI1nqgC
-F4SJVrctf14NcGiIVPPwdzeSM/goDQOJe/T4CsXdQyaXiQOzgkNiJoTd+zD3f0Gl
-W/SuPNHZqhUuZH3T9FMnjzzvhN0iPdLuWtl8LzlczoQrPjMqDAmh/hMSC4lHaBFd
-y5T/7qrWgVtoqPBNz9MU/84hDSR2M5Hx8x3muo7+LeMyIeRa0EGkVHbcyrKa8Hs=
-=kfV3
+iQEcBAABAgAGBQJSxKiOAAoJECrHRaUKISqMerYH/iVcRRuAKssMiGFLbLIk3UwW
+CXa/+ccArp4JBe6Zzo1SWh41LtE6WDO3seaFje7N1oSsaU7FVhEHLp7yFWHrLF0V
+CgT0yi2gKcig57L7r4hkT5SP0O1vrmPXlkmSDbRgd/ZkrMmjU75OusNUWimXFSVe
+mlBAPhk6ysJKsmBFr4dfhWFfO6NwXLE7WxniISBQUK5oEfWW8jcPN6+/zMUepkhj
+AAxbkOV0qA+QIXCH3h8XBiG6piADmIJYLo2P17tV9RnJY6auoix1lBX/qyYTJWPd
+33wk4zNBol06CCk1CCr1qvEoK8F9sO4yVUc1yVe30N80NNWvLzaVCMcv8gNxjmA=
+=WFaL
 -----END PGP SIGNATURE-----

data/NEWS

@@ -1,3 +1,34 @@
+Release 4.0.31
+--------------
+
+ * Introduced a new tool: `passenger-config restart-app`. With this command you
+   can initiate an application restart without touching restart.txt.
+   Unlike touching restart.txt, this tool initiates the restart immediately
+   instead of on the next request.
+ * Fixed some problems in process spawning and request handling.
+ * Fixed some problems with the handling of HTTP chunked transfer encoding
+   bodies. These problems only occurred in Ruby.
+ * Fixed the HelperAgent, upon shutdown, not correctly waiting 5 seconds until
+   all clients have disconnected. Fixes issue #884.
+ * Fixed compilation problems on FreeBSD.
+ * Fixed some C++ strict aliasing problems.
+ * Fixed some problems with spawning applications that print messages without
+   newline during startup. Fixes issue #1039.
+ * Fixed potential hangs on JRuby when Ctrl-C is used to shutdown the server.
+   Fixes issue #1035.
+ * When Phusion Passenger is installed through the Debian package,
+   passenger-install-apache2-module now checks whether the Apache
+   module package (libapache2-mod-passenger) is properly installed,
+   and installs it using apt-get if it's not installed. Fixes
+   issue #1031.
+ * The `passenger-status --show=xml` command no longer prints the non-XML
+   preamble, such as the version number and the time. Fixes issue #1037.
+ * The Ruby native extension check whether it's loaded against the right Ruby
+   version, to prevent problems when people upgrade Ruby without recompiling
+   their native extensions.
+ * Various other minor Debian packaging improvements.
+
+
 Release 4.0.30
 --------------
 

data/bin/passenger

@@ -22,15 +22,15 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-## Magic comment: set locations.ini ##
-
+## Magic comment: begin bootstrap ##
 source_root = File.expand_path("..", File.dirname(__FILE__))
 $LOAD_PATH.unshift("#{source_root}/lib")
+require 'rubygems' rescue nil
 require 'phusion_passenger'
-PhusionPassenger.locate_directories
+## Magic comment: end bootstrap ##
 
-require 'rubygems' rescue nil
-require 'phusion_passenger/standalone/main'
+PhusionPassenger.locate_directories
+PhusionPassenger.require_passenger_lib 'standalone/main'
 
 STDOUT.sync = STDERR.sync = true
 PhusionPassenger::Standalone::Main.run!(ARGV)

data/bin/passenger-config

@@ -22,133 +22,13 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-## Magic comment: set locations.ini ##
-
+## Magic comment: begin bootstrap ##
 source_root = File.expand_path("..", File.dirname(__FILE__))
 $LOAD_PATH.unshift("#{source_root}/lib")
+require 'rubygems' rescue nil
 require 'phusion_passenger'
-PhusionPassenger.locate_directories
-
-require 'phusion_passenger/platform_info'
-require 'phusion_passenger/platform_info/compiler'
-
-def help
-	puts "Tool for showing Passenger configuration information."
-	puts "Usage: passenger-config <OPTION>"
-	puts
-	puts "Options:"
-	puts "  --root                     Show Phusion Passenger's root directory."
-	puts "  --includedir               Show the Nginx runtime library headers directory."
-	puts "  --nginx-addon-dir          Show the Phusion Passenger Nginx addon directory."
-	puts "  --nginx-libs               Show Nginx runtime library flags."
-	puts "  --compiled                 Check whether runtime libraries are compiled."
-	puts "  --natively-packaged        Check whether Phusion Passenger is natively packged."
-	puts "  --installed-from-release-package  Check whether this installation came from an official release package."
-	puts "  --make-locations-ini       Generate a locations.ini based on the current install paths."
-	puts "  --detect-apache2           Autodetect Apache installations."
-	puts "  --ruby-command             Print the correct command for invoking the Ruby interpreter."
-	puts "  --ruby-libdir              Show Phusion Passenger's Ruby library directory."
-	puts "  --rubyext-compat-id        Print the Ruby extension binary compatibility ID."
-	puts "  --cxx-compat-id            Print the C++ binary compatibility ID."
-	puts "  --version                  Show version number."
-end
+## Magic comment: end bootstrap ##
 
-def common_library
-	require 'phusion_passenger/common_library'
-	return COMMON_LIBRARY.
-		only(*NGINX_LIBS_SELECTOR).
-		set_output_dir("#{PhusionPassenger.lib_dir}/common/libpassenger_common")
-end
-
-case ARGV[0]
-when "--root"
-	puts PhusionPassenger.source_root
-when "--includedir"
-	puts PhusionPassenger.include_dir
-when "--nginx-addon-dir"
-	puts PhusionPassenger.nginx_module_source_dir
-when "--nginx-libs"
-	puts "#{common_library.link_objects_as_string} #{PhusionPassenger.lib_dir}/common/libboost_oxt.a"
-when "--compiled"
-	common_library.link_objects.each do |filename|
-		if !File.exist?(filename)
-			exit 1
-		end
-	end
-	if File.exist?("#{PhusionPassenger.lib_dir}/common/libboost_oxt.a")
-		exit 0
-	else
-		exit 1
-	end
-when "--natively-packaged"
-	if PhusionPassenger.natively_packaged?
-		exit 0
-	else
-		exit 1
-	end
-when "--installed-from-release-package"
-	if PhusionPassenger.installed_from_release_package?
-		exit 0
-	else
-		exit 1
-	end
-when "--make-locations-ini"
-	puts "[locations]"
-	puts "natively_packaged=true"
-	PhusionPassenger::REQUIRED_LOCATIONS_INI_FIELDS.each do |field|
-		puts "#{field}=#{PhusionPassenger.send(field)}"
-	end
-when "--detect-apache2"
-	require 'phusion_passenger/platform_info/apache_detector'
-	detector = PhusionPassenger::PlatformInfo::ApacheDetector.new(STDOUT)
-	begin
-		detector.detect_all
-		detector.report
-	ensure
-		detector.finish
-	end
-when "--ruby-command"
-	require 'phusion_passenger/platform_info/ruby'
-	ruby = PhusionPassenger::PlatformInfo.ruby_command
-	puts "passenger-config was invoked through the following Ruby interpreter:"
-	puts "  Command: #{ruby}"
-	STDOUT.write "  Version: "
-	STDOUT.flush
-	system("/bin/sh -c '#{ruby} -v'")
-	puts "  To use in Apache: PassengerRuby #{ruby}"
-	puts "  To use in Nginx : passenger_ruby #{ruby}"
-	puts "  To use with Standalone: #{ruby} #{PhusionPassenger.bin_dir}/passenger start"
-	puts
-
-	ruby = PhusionPassenger::PlatformInfo.find_command('ruby')
-	if ruby && !ruby.include?("rvm/rubies/")
-		# If this is an RVM Ruby executable then we don't show it. We want people to
-		# use the RVM wrapper scripts only.
-		puts "The following Ruby interpreter was found first in $PATH:"
-		puts "  Command: #{ruby}"
-		STDOUT.write "  Version: "
-		STDOUT.flush
-		system("/bin/sh -c '#{ruby} -v'")
-		puts "  To use in Apache: PassengerRuby #{ruby}"
-		puts "  To use in Nginx : passenger_ruby #{ruby}"
-		puts "  To use with Standalone: #{ruby} #{PhusionPassenger.bin_dir}/passenger start"
-	elsif !ruby.include?("rvm/rubies/")
-		puts "No Ruby interpreter found in $PATH."
-	end
-	puts
-	puts "## Notes for RVM users"
-	puts "Do you want to know which command to use for a different Ruby interpreter? 'rvm use' that Ruby interpreter, then re-run 'passenger-config --ruby-command'."
-when "--ruby-libdir"
-	puts PhusionPassenger.ruby_libdir
-when "--rubyext-compat-id"
-	require 'phusion_passenger/platform_info/binary_compatibility'
-	puts PhusionPassenger::PlatformInfo.ruby_extension_binary_compatibility_id
-when "--cxx-compat-id"
-	require 'phusion_passenger/platform_info/binary_compatibility'
-	puts PhusionPassenger::PlatformInfo.cxx_binary_compatibility_id
-when "--version"
-	puts PhusionPassenger::VERSION_STRING
-else
-	help
-	exit 1
-end
+PhusionPassenger.locate_directories
+PhusionPassenger.require_passenger_lib 'config'
+PhusionPassenger::Config.run!(ARGV)

data/bin/passenger-install-apache2-module

@@ -22,11 +22,13 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-## Magic comment: set locations.ini ##
-
-PASSENGER_ROOT = File.expand_path(File.dirname(__FILE__) + "/..")
-$LOAD_PATH.unshift("#{PASSENGER_ROOT}/lib")
+## Magic comment: begin bootstrap ##
+source_root = File.expand_path("..", File.dirname(__FILE__))
+$LOAD_PATH.unshift("#{source_root}/lib")
+require 'rubygems' rescue nil
 require 'phusion_passenger'
+## Magic comment: end bootstrap ##
+
 PhusionPassenger.locate_directories
 
 # The Apache executable may be located in an 'sbin' folder. We add
@@ -37,14 +39,16 @@ ENV["PATH"] += ":/usr/sbin:/sbin:/usr/local/sbin"
 
 require 'optparse'
 require 'stringio'
-require 'phusion_passenger/constants'
-require 'phusion_passenger/platform_info/ruby'
-require 'phusion_passenger/platform_info/apache'
-require 'phusion_passenger/platform_info/apache_detector'
-require 'phusion_passenger/abstract_installer'
+PhusionPassenger.require_passenger_lib 'constants'
+PhusionPassenger.require_passenger_lib 'platform_info/ruby'
+PhusionPassenger.require_passenger_lib 'platform_info/apache'
+PhusionPassenger.require_passenger_lib 'platform_info/apache_detector'
+PhusionPassenger.require_passenger_lib 'abstract_installer'
+PhusionPassenger.require_passenger_lib 'utils/terminal_choice_menu'
 
 class Installer < PhusionPassenger::AbstractInstaller
 	include PhusionPassenger
+	TerminalChoiceMenu = PhusionPassenger::Utils::TerminalChoiceMenu
 	
 	def dependencies
 		specs = [
@@ -60,14 +64,18 @@ class Installer < PhusionPassenger::AbstractInstaller
 			'libcurl-dev',
 			'openssl-dev',
 			'zlib-dev',
-			PlatformInfo.passenger_needs_ruby_dev_header? ? 'ruby-dev' : nil,
-			'ruby-openssl',
-			'rubygems',
-			'rake',
-			'rack',
 			'apache2',
-			'apache2-dev'
-		].compact
+			'apache2-dev',
+			'rake',
+			'ruby-openssl',
+			'rubygems'
+		]
+		if @languages.include?("ruby")
+			if PlatformInfo.passenger_needs_ruby_dev_header?
+				ids << 'ruby-dev'
+			end
+			ids << 'rack'
+		end
 		# Some broken servers don't have apr-config or apu-config installed.
 		# Nevertheless, it is possible to compile Apache modules if Apache
 		# was configured with --included-apr. So here we check whether
@@ -92,14 +100,18 @@ class Installer < PhusionPassenger::AbstractInstaller
 	
 	def run_steps
 		if PhusionPassenger.natively_packaged?
-			check_dependencies || exit(1)
-			show_apache2_config_snippets
-			show_deployment_example
+			if apache_module_available?
+				notify_apache_module_installed
+				show_deployment_example
+			else
+				install_apache_module_from_native_package || exit(1)
+			end
 			exit
 		end
 		
-		Dir.chdir(PASSENGER_ROOT)
+		Dir.chdir(PhusionPassenger.source_root)
 		show_welcome_screen
+		query_interested_languages
 		check_gem_install_permission_problems || exit(1)
 		check_directory_accessible_by_web_server
 		check_dependencies || exit(1)
@@ -123,6 +135,45 @@ private
 		wait
 	end
 
+	def query_interested_languages
+		menu = TerminalChoiceMenu.new(["Ruby", "Python", "Node.js", "Meteor"])
+		menu["Ruby"].checked = interesting_language?('ruby')
+		menu["Python"].checked = interesting_language?('python')
+		menu["Node.js"].checked = interesting_language?('nodejs', 'node')
+		menu["Meteor"].checked = interesting_language?('meteor')
+
+		new_screen
+		puts "<banner>Which languages are you interested in?</banner>"
+		puts
+		if interactive?
+			puts "Use <space> to select."
+		else
+			puts "Override selection with --languages."
+		end
+		puts
+
+		if interactive?
+			begin
+				menu.query
+			rescue Interrupt
+				raise Abort
+			end
+		else
+			menu.display_choices
+			puts
+		end
+
+		@languages = menu.selected_choices.map{ |x| x.downcase.gsub(/\./, '') }
+	end
+
+	def interesting_language?(name, command = nil)
+		if @languages
+			return @languages.include?(name)
+		else
+			return !!PlatformInfo.find_command(command || name)
+		end
+	end
+
 	def check_whether_there_are_multiple_apache_installs
 		new_screen
 		puts '<banner>Sanity checking Apache installation...</banner>'
@@ -221,7 +272,7 @@ private
 		puts
 		line
 		puts '<banner>Compiling and installing Apache 2 module...</banner>'
-		puts "cd #{PASSENGER_ROOT}"
+		puts "cd #{PhusionPassenger.source_root}"
 		if ENV['TRACE']
 			puts "#{PlatformInfo.rake_command} --trace apache2:clean apache2 RELEASE=yes"
 			return sh("#{PlatformInfo.rake_command} --trace apache2:clean apache2 RELEASE=yes")
@@ -252,13 +303,13 @@ private
 	end
 	
 	def show_deployment_example
-		puts
-		line
+		new_screen
 		render_template 'apache2/deployment_example',
 			:users_guide_path => users_guide_path,
 			:users_guide_url => users_guide_url,
 			:phusion_website => PHUSION_WEBSITE,
-			:passenger_website => PASSENGER_WEBSITE
+			:passenger_website => PASSENGER_WEBSITE,
+			:languages => @languages
 	end
 	
 	def show_possible_solutions_for_compilation_and_installation_problems
@@ -268,6 +319,31 @@ private
 			:users_guide_url => users_guide_url,
 			:support_url => SUPPORT_URL
 	end
+
+	def apache_module_available?
+		return File.exist?(PhusionPassenger.apache2_module_path)
+	end
+
+	def install_apache_module_from_native_package
+		case PhusionPassenger.native_packaging_method
+		when 'deb'
+			sh! "sudo apt-get update"
+			sh! "sudo apt-get install #{DEB_APACHE_MODULE_PACKAGE}"
+			return true
+		when 'rpm'
+			sh! "sudo yum install #{RPM_APACHE_MODULE_PACKAGE}"
+			return true
+		else
+			puts "<red>The #{PROGRAM_NAME} Apache module package is not installed.</red>"
+			puts "Please ask your operating system vendor how to install it."
+			return false
+		end
+	end
+
+	def notify_apache_module_installed
+		render_template 'apache2/notify_apache_module_installed'
+		wait
+	end
 end
 
 ORIG_ARGV = ARGV.dup
@@ -276,10 +352,11 @@ parser = OptionParser.new do |opts|
 	opts.banner = "Usage: passenger-install-apache2-module [options]"
 	opts.separator ""
 	
+	indent = ' ' * 37
 	opts.separator "Options:"
 	opts.on("-a", "--auto", String, "Automatically build the Apache module,\n" <<
-	        "#{' ' * 37}without interactively asking for user\n" <<
-	        "#{' ' * 37}input.") do
+	        "#{indent}without interactively asking for user\n" <<
+	        "#{indent}input.") do
 		options[:auto] = true
 	end
 	opts.on("--apxs2-path PATH", String, "Path to 'apxs2' command.") do |value|
@@ -288,6 +365,11 @@ parser = OptionParser.new do |opts|
 	opts.on("--apr-config-path PATH", String, "Path to 'apr-config' command.") do |value|
 		ENV['APR_CONFIG'] = value
 	end
+	opts.on("--languages NAMES", "Comma-separated list of interested\n" <<
+			"#{indent}languages (e.g.\n" <<
+			"#{indent}'ruby,python,nodejs,meteor')") do |value|
+		options[:languages] = value.split(",")
+	end
 	opts.on("--snippet", "Show just the Apache config snippet.") do
 		options[:snippet] = true
 	end

data/bin/passenger-install-nginx-module

@@ -22,22 +22,26 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-## Magic comment: set locations.ini ##
-
+## Magic comment: begin bootstrap ##
 source_root = File.expand_path("..", File.dirname(__FILE__))
 $LOAD_PATH.unshift("#{source_root}/lib")
+require 'rubygems' rescue nil
 require 'phusion_passenger'
+## Magic comment: end bootstrap ##
+
 PhusionPassenger.locate_directories
 
 require 'digest'
 require 'optparse'
 require 'fileutils'
-require 'phusion_passenger/platform_info/ruby'
-require 'phusion_passenger/abstract_installer'
-require 'phusion_passenger/utils/tmpio'
+PhusionPassenger.require_passenger_lib 'platform_info/ruby'
+PhusionPassenger.require_passenger_lib 'abstract_installer'
+PhusionPassenger.require_passenger_lib 'utils/terminal_choice_menu'
+PhusionPassenger.require_passenger_lib 'utils/tmpio'
 
 class Installer < PhusionPassenger::AbstractInstaller
 	include PhusionPassenger
+	TerminalChoiceMenu = PhusionPassenger::Utils::TerminalChoiceMenu
 	
 	def dependencies
 		specs = [
@@ -51,15 +55,19 @@ class Installer < PhusionPassenger::AbstractInstaller
 			'cc',
 			'c++',
 			'download-tool',
-			PlatformInfo.passenger_needs_ruby_dev_header? ? 'ruby-dev' : nil,
-			'ruby-openssl',
-			'rubygems',
-			'rake',
-			'rack',
 			'libcurl-dev',
 			'openssl-dev',
-			'zlib-dev'
-		].compact
+			'zlib-dev',
+			'rake',
+			'ruby-openssl',
+			'rubygems'
+		]
+		if @languages.include?("ruby")
+			if PlatformInfo.passenger_needs_ruby_dev_header?
+				ids << 'ruby-dev'
+			end
+			ids << 'rack'
+		end
 		return [specs, ids]
 	end
 	
@@ -75,8 +83,9 @@ class Installer < PhusionPassenger::AbstractInstaller
 		# Make sure the configure script finds the correct
 		# passenger-config command.
 		ENV['PATH'] = PhusionPassenger.bin_dir + ":" + ENV['PATH']
-		
+
 		show_welcome_screen
+		query_interested_languages
 		check_gem_install_permission_problems || exit(1)
 		check_directory_accessible_by_web_server
 		check_nginx_module_sources_available || exit(1)
@@ -148,6 +157,45 @@ private
 		wait
 	end
 
+	def query_interested_languages
+		menu = TerminalChoiceMenu.new(["Ruby", "Python", "Node.js", "Meteor"])
+		menu["Ruby"].checked = interesting_language?('ruby')
+		menu["Python"].checked = interesting_language?('python')
+		menu["Node.js"].checked = interesting_language?('nodejs', 'node')
+		menu["Meteor"].checked = interesting_language?('meteor')
+
+		new_screen
+		puts "<banner>Which languages are you interested in?</banner>"
+		puts
+		if interactive?
+			puts "Use <space> to select."
+		else
+			puts "Override selection with --languages."
+		end
+		puts
+
+		if interactive?
+			begin
+				menu.query
+			rescue Interrupt
+				raise Abort
+			end
+		else
+			menu.display_choices
+			puts
+		end
+
+		@languages = menu.selected_choices.map{ |x| x.downcase.gsub(/\./, '') }
+	end
+
+	def interesting_language?(name, command = nil)
+		if @languages
+			return @languages.include?(name)
+		else
+			return !!PlatformInfo.find_command(command || name)
+		end
+	end
+
 	def check_nginx_module_sources_available
 		if PhusionPassenger.natively_packaged? && !File.exist?(PhusionPassenger.nginx_module_source_dir)
 			new_screen
@@ -494,36 +542,42 @@ parser = OptionParser.new do |opts|
 	opts.banner = "Usage: passenger-install-nginx-module [options]"
 	opts.separator ""
 	
+	indent = ' ' * 37
 	opts.separator "Options:"
 	opts.on("--auto", "Automatically confirm 'Press ENTER to\n" <<
-	        "#{' ' * 37}continue' prompts.") do
+	        "#{indent}continue' prompts.") do
 		options[:auto] = true
 	end
 	opts.on("--prefix=DIR", String, "Use the given Nginx install prefix instead\n" <<
-	        "#{' ' * 37}of asking for it interactively.") do |dir|
+	        "#{indent}of asking for it interactively.") do |dir|
 		options[:prefix] = dir
 	end
 	opts.on("--auto-download", "Download and install Nginx automatically,\n" <<
-	        "#{' ' * 37}instead of asking interactively whether to\n" <<
-	        "#{' ' * 37}download+install or to use an existing\n" <<
-	        "#{' ' * 37}Nginx source directory.") do
+	        "#{indent}instead of asking interactively whether to\n" <<
+	        "#{indent}download+install or to use an existing\n" <<
+	        "#{indent}Nginx source directory.") do
 		options[:auto_download] = true
 	end
 	opts.on("--nginx-source-dir=DIR", String, "Compile and install Nginx using the given\n" <<
-	        "#{' ' * 37}Nginx source directory, instead of\n" <<
-	        "#{' ' * 37}interactively asking to download+install\n" <<
-	        "#{' ' * 37}or to use an existing Nginx source\n" <<
-	        "#{' ' * 37}directory. Conflicts with --auto-download.") do |dir|
+	        "#{indent}Nginx source directory, instead of\n" <<
+	        "#{indent}interactively asking to download+install\n" <<
+	        "#{indent}or to use an existing Nginx source\n" <<
+	        "#{indent}directory. Conflicts with --auto-download.") do |dir|
 		options[:nginx_source_dir] = dir
 	end
 	opts.on("--extra-configure-flags=STRING", String, "Pass these extra flags to Nginx's\n" <<
-	        "#{' ' * 37}'configure' script, instead of asking for\n" <<
-	        "#{' ' * 37}it interactively. Specify 'none' if you\n" <<
-	        "#{' ' * 37}do not want to pass additional flags but do\n" <<
-	        "#{' ' * 37}not want this installer to ask\n" <<
-	        "#{' ' * 37}interactively either.") do |flags|
+	        "#{indent}'configure' script, instead of asking for\n" <<
+	        "#{indent}it interactively. Specify 'none' if you\n" <<
+	        "#{indent}do not want to pass additional flags but do\n" <<
+	        "#{indent}not want this installer to ask\n" <<
+	        "#{indent}interactively either.") do |flags|
 		options[:extra_configure_flags] = flags
 	end
+	opts.on("--languages NAMES", "Comma-separated list of interested\n" <<
+			"#{indent}languages (e.g.\n" <<
+			"#{indent}'ruby,python,nodejs,meteor')") do |value|
+		options[:languages] = value.split(",")
+	end
 end
 begin
 	parser.parse!