passenger 4.0.33 → 4.0.34

data/bin/passenger-install-nginx-module

@@ -94,7 +94,7 @@ class Installer < PhusionPassenger::AbstractInstaller
 		check_nginx_module_sources_available || exit(1)
 		check_dependencies || exit(1)
 		if needs_compiling_support_files?
-			check_whether_we_can_write_to(PhusionPassenger.source_root) || exit(1)
+			check_whether_we_can_write_to(PhusionPassenger.build_system_dir) || exit(1)
 		end
 		check_whether_os_is_broken
 		check_whether_system_has_enough_ram
@@ -112,6 +112,7 @@ class Installer < PhusionPassenger::AbstractInstaller
 				exit(1)
 			end
 			nginx_prefix = ask_for_nginx_install_prefix
+			check_whether_other_nginx_installations_exist(nginx_prefix)
 			if @extra_configure_flags == "none"
 				extra_nginx_configure_flags = nil
 			else
@@ -120,6 +121,7 @@ class Installer < PhusionPassenger::AbstractInstaller
 		else
 			nginx_source_dir = ask_for_nginx_source_dir
 			nginx_prefix = ask_for_nginx_install_prefix
+			check_whether_other_nginx_installations_exist(nginx_prefix)
 			extra_nginx_configure_flags = ask_for_extra_nginx_configure_flags(nginx_prefix)
 		end
 		check_whether_we_can_write_to(nginx_prefix) || exit(1)
@@ -172,6 +174,7 @@ private
 		puts
 		if interactive?
 			puts "Use <space> to select."
+			puts "<dgray>If the menu doesn't display correctly, ensure that your terminal supports UTF-8.</dgray>"
 		else
 			puts "Override selection with --languages."
 		end
@@ -216,7 +219,7 @@ private
 	def compile_passenger_support_files
 		new_screen
 		puts "<banner>Compiling Passenger support files...</banner>"
-		Dir.chdir(PhusionPassenger.source_root) do
+		Dir.chdir(PhusionPassenger.build_system_dir) do
 			return sh("#{PlatformInfo.rake_command} nginx:clean nginx RELEASE=yes")
 		end
 	end
@@ -345,6 +348,27 @@ private
 		end
 	end
 	
+	def check_whether_other_nginx_installations_exist(nginx_prefix)
+		check_for = [
+			"/usr/bin/nginx",
+			"/usr/sbin/nginx"
+		]
+		existing_binary = nil
+		check_for.each do |filename|
+			if File.exist?(filename)
+				existing_binary = filename
+				break
+			end
+		end
+		if existing_binary
+			new_screen
+			render_template 'nginx/other_nginx_installations_exist',
+				:existing_binary => existing_binary,
+				:prefix => nginx_prefix
+			wait
+		end
+	end
+
 	def ask_for_nginx_source_dir
 		new_screen
 		puts "<banner>Where is your Nginx source code located?</banner>"

data/build/cxx_tests.rb

@@ -234,7 +234,7 @@ task 'test:cxx' => dependencies do
 		end
 		sh "cd test && while #{command}; do echo -------------------------------------------; done"
 	else
-		sh "cd test && #{command}"
+		sh "cd test && exec #{command}"
 	end
 end
 

data/build/documentation.rb

@@ -27,29 +27,25 @@ task :doc => Packaging::ASCII_DOCS
 Packaging::ASCII_DOCS.each do |target|
 	source = target.sub(/\.html$/, '.txt')
 	file target => [source] + Dir["doc/users_guide_snippets/**/*"] do
-		if PlatformInfo.find_command('mizuho')
-			if target =~ /apache/i
-				type = "apache"
-				juvia_site_key = "5jpmkyjqlml8rktsfldfpbwth8ig7w9"
-			elsif target =~ /nginx/i
-				type = "nginx"
-				juvia_site_key = "q0ptarhn8o9xanwomq8zkgewbtwffyz"
-			elsif target =~ /standalone/i
-				type = "standalone"
-				juvia_site_key = "amggdy0k65hb4hbjg3dh7pnb9zd8dwy"
-			else
-				type = nil
-				juvia_site_key = nil
-			end
-			command = "mizuho '#{source}'"
-			command << " -a #{type}" if type
-			if juvia_site_key
-				command << " -c juvia --juvia-url http://juvia.phusion.nl --juvia-site-key #{juvia_site_key}"
-			end
-			sh(command)
+		if target =~ /apache/i
+			type = "apache"
+			juvia_site_key = "5jpmkyjqlml8rktsfldfpbwth8ig7w9"
+		elsif target =~ /nginx/i
+			type = "nginx"
+			juvia_site_key = "q0ptarhn8o9xanwomq8zkgewbtwffyz"
+		elsif target =~ /standalone/i
+			type = "standalone"
+			juvia_site_key = "amggdy0k65hb4hbjg3dh7pnb9zd8dwy"
 		else
-			sh "echo 'Mizuho required to build docs' > '#{target}'"
+			type = nil
+			juvia_site_key = nil
 		end
+		command = "mizuho '#{source}'"
+		command << " -a #{type}" if type
+		if juvia_site_key
+			command << " -c juvia --juvia-url http://juvia.phusion.nl --juvia-site-key #{juvia_site_key}"
+		end
+		sh(command)
 	end
 	
 	task :clean do
@@ -85,6 +81,8 @@ def create_markdown_compilation_task(target)
 		end
 	end
 
+	task :doc => target
+
 	task :clean do
 		if boolean_option('CLEAN_DOCS', true)
 			sh "rm -f #{target}"

data/build/integration_tests.rb

@@ -41,7 +41,7 @@ task 'test:integration:apache2' => dependencies do
 			require 'shellwords'
 			command << " -e #{Shellwords.escape(grep)}"
 		end
-		sh "cd test && #{command}"
+		sh "cd test && exec #{command}"
 	end
 end
 
@@ -59,7 +59,7 @@ task 'test:integration:nginx' => dependencies do
 			require 'shellwords'
 			command << " -e #{Shellwords.escape(grep)}"
 		end
-		sh "cd test && #{command}"
+		sh "cd test && exec #{command}"
 	end
 end
 
@@ -74,9 +74,7 @@ task 'test:integration:standalone' => dependencies do
 			require 'shellwords'
 			command << " -e #{Shellwords.escape(grep)}"
 		end
-		Dir.chdir("test") do
-			ruby command
-		end
+		sh "cd test && exec #{command}"
 	end
 end
 
@@ -84,13 +82,42 @@ desc "Run native packaging tests"
 task 'test:integration:native_packaging' do
 	if PlatformInfo.rspec.nil?
 		abort "RSpec is not installed for Ruby interpreter '#{PlatformInfo.ruby_command}'. Please install it."
-	else
-		command = "#{PlatformInfo.rspec} -c -f s integration_tests/native_packaging_spec.rb"
-		if boolean_option('SUDO')
-			command = "#{PlatformInfo.ruby_sudo_command} -E #{command}"
+	end
+	command = "rspec -c -f s integration_tests/native_packaging_spec.rb"
+	if boolean_option('SUDO')
+		command = "#{PlatformInfo.ruby_sudo_command} -E #{command}"
+	end
+	if grep = string_option('E')
+		require 'shellwords'
+		command << " -e #{Shellwords.escape(grep)}"
+	end
+	case PlatformInfo.os_name
+	when "linux"
+		if PlatformInfo.linux_distro_tags.include?(:debian)
+			command = "env NATIVE_PACKAGING_METHOD=deb " +
+				"LOCATIONS_INI=/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini " +
+				command
+		elsif PlatformInfo.linux_distro_tags.include?(:redhat)
+			command = "env NATIVE_PACKAGING_METHOD=rpm " +
+				"LOCATIONS_INI=/usr/lib/ruby/site_ruby/1.8/phusion_passenger/locations.ini " +
+				command
+		else
+			abort "Unsupported Linux distribution"
 		end
-		sh "cd test && #{command}"
+	when "macosx"
+		# The tests put /usr/bin and /usr/sbin first in PATH, causing /usr/bin/ruby to be used.
+		# We should run the tests in /usr/bin/ruby too, so that native_support is compiled for
+		# the same Ruby.
+		prefix = "env NATIVE_PACKAGING_METHOD=homebrew " +
+			"LOCATIONS_INI=/usr/local/Cellar/passenger/#{VERSION_STRING}/libexec/lib/phusion_passenger/locations.ini"
+		if PlatformInfo.in_rvm?
+			prefix << " rvm-exec system /usr/bin/ruby -S"
+		end
+		command = "#{prefix} #{command}"
+	else
+		abort "Unsupported operating system"
 	end
+	sh "cd test && exec #{command}"
 end
 
 dependencies = [:apache2, NATIVE_SUPPORT_TARGET].compact
@@ -102,11 +129,11 @@ task 'test:restart' => dependencies do
 	i = 1
 	while true do
 		puts "#{color_code_start}Test run #{i} (press Ctrl-C multiple times to abort)#{color_code_end}"
-		command = "cd test && rspec -c -f s integration_tests/apache2_tests.rb"
+		command = "rspec -c -f s integration_tests/apache2_tests.rb"
 		if grep = string_option('E')
 			command << " -e #{Shellwords.escape(grep)}"
 		end
-		sh(command)
+		sh "cd test && exec #{command}"
 		i += 1
 	end
 end

data/build/misc.rb

@@ -145,6 +145,24 @@ task :contributors do
 	puts "Updated CONTRIBUTORS"
 end
 
+# Compile the WebHelper binary, used by Homebrew packaging.
+task :webhelper => :nginx do
+	require 'tmpdir'
+	require 'logger'
+	PhusionPassenger.require_passenger_lib 'utils/download'
+	Dir.mktmpdir do |path|
+		Utils::Download.download("http://nginx.org/download/nginx-#{PREFERRED_NGINX_VERSION}.tar.gz",
+			"#{path}/nginx.tar.gz")
+		sh "cd '#{path}' && tar xzf nginx.tar.gz"
+		sh "cd '#{path}/nginx-#{PREFERRED_NGINX_VERSION}' && " +
+			"./configure --prefix=/tmp " +
+			"#{STANDALONE_NGINX_CONFIGURE_OPTIONS} " +
+			"--add-module='#{Dir.pwd}/ext/nginx' && " +
+			"make"
+		sh "cp '#{path}/nginx-#{PREFERRED_NGINX_VERSION}/objs/nginx' '#{OUTPUT_DIR}PassengerWebHelper'"
+	end
+end
+
 dependencies = [
 	COMMON_LIBRARY.link_objects,
 	LIBBOOST_OXT,

data/build/packaging.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2013 Phusion
+#  Copyright (c) 2010-2014 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -71,6 +71,34 @@ def word_wrap(text, max = 72)
 	return text
 end
 
+def is_open_source?
+	return !is_enterprise?
+end
+
+def is_enterprise?
+	return PACKAGE_NAME =~ /enterprise/
+end
+
+def enterprise_git_url
+	return "TODO"
+end
+
+def git_tag_prefix
+	if is_open_source?
+		return "release"
+	else
+		return "enterprise"
+	end
+end
+
+def git_tag
+	return "#{git_tag_prefix}-#{VERSION_STRING}"
+end
+
+def homebrew_dir
+	return "/tmp/homebrew"
+end
+
 
 task :clobber => 'package:clean'
 
@@ -85,13 +113,9 @@ task 'package:release' => ['package:set_official', 'package:gem', 'package:tarba
 	require 'uri'
 	require 'net/http'
 	require 'net/https'
-	require 'digest/sha1'
 	basename   = "#{PhusionPassenger::PACKAGE_NAME}-#{PhusionPassenger::VERSION_STRING}"
 	version    = PhusionPassenger::VERSION_STRING
-	is_enterprise  = basename =~ /enterprise/
-	is_open_source = !is_enterprise
 	is_beta        = !!version.split('.')[3]
-	tag_prefix     = is_open_source ? 'release' : 'enterprise'
 	
 	if !`git status --porcelain | grep -Ev '^\\?\\? '`.empty?
 		STDERR.puts "-------------------"
@@ -112,14 +136,20 @@ task 'package:release' => ['package:set_official', 'package:gem', 'package:tarba
 		abort "*** ERROR: Please 'brew install hub' first"
 	end
 
-	tag = "#{tag_prefix}-#{version}"
-	sh "git tag -s #{tag} -u 0A212A8C -m 'Release #{version}'"
+	if boolean_option('HOMEBREW_UPDATE', true)
+		puts "Updating Homebrew formula..."
+		Rake::Task['package:update_homebrew'].invoke
+	else
+		puts "HOMEBREW_UPDATE set to false, not updating Homebrew formula."
+	end
+
+	sh "git tag -s #{git_tag} -u 0A212A8C -m 'Release #{version}'"
 
 	puts "Proceed with pushing tag to remote Git repo and uploading the gem and signatures? [y/n]"
 	if STDIN.readline == "y\n"
-		sh "git push origin #{tag_prefix}-#{version}"
+		sh "git push origin #{git_tag}"
 		
-		if is_open_source
+		if is_open_source?
 			sh "s3cmd -P put #{PKG_DIR}/passenger-#{version}.{gem,tar.gz,gem.asc,tar.gz.asc} s3://phusion-passenger/releases/"
 			sh "gem push #{PKG_DIR}/passenger-#{version}.gem"
 
@@ -142,47 +172,24 @@ task 'package:release' => ['package:set_official', 'package:gem', 'package:tarba
 					response.body
 			end
 
-			puts "Submitting Homebrew pull request..."
-			sha1 = File.open("#{PKG_DIR}/passenger-#{version}.tar.gz", "rb") do |f|
-				Digest::SHA1.hexdigest(f.read)
-			end
-			homebrew_dir = "/tmp/homebrew"
-			sh "rm -rf #{homebrew_dir}"
-			sh "git clone git@github.com:phusion/homebrew.git #{homebrew_dir}"
-			sh "cd #{homebrew_dir} && git remote add Homebrew https://github.com/Homebrew/homebrew.git"
-			sh "cd #{homebrew_dir} && git fetch Homebrew"
-			sh "cd #{homebrew_dir} && git reset --hard Homebrew/master"
-			formula = File.read("/tmp/homebrew/Library/Formula/passenger.rb")
-			formula.gsub!(/passenger-.+?\.tar\.gz/, "passenger-#{version}.tar.gz") ||
-				abort("Unable to substitute Homebrew formula tarball filename")
-			formula.gsub!(/sha1 .*/, "sha1 '#{sha1}'") ||
-				abort("Unable to substitute Homebrew formula SHA-1")
-			necessary_dirs = ORIG_TARBALL_FILES.call.map{ |filename| filename.split("/").first }.uniq
-			necessary_dirs -= PhusionPassenger::Packaging::HOMEBREW_EXCLUDE
-			necessary_dirs += ["buildout"]
-			necessary_dirs_str = word_wrap(necessary_dirs.inspect).split("\n").join("\n      ")
-			formula.sub!(/necessary_files = .*?\]/m, "necessary_files = Dir#{necessary_dirs_str}") ||
-				abort("Unable to substitute file whitelist")
-			File.open("/tmp/homebrew/Library/Formula/passenger.rb", "w") do |f|
-				f.write(formula)
-			end
-			sh "cd #{homebrew_dir} && git commit -a -m 'passenger #{version}'"
-			sh "cd #{homebrew_dir} && git push -f"
-			sh "cd #{homebrew_dir} && hub pull-request 'Update passenger to version #{version}' -b Homebrew:master"
-
 			puts "Initiating building of Debian packages"
 			Rake::Task['package:initiate_debian_building'].invoke
 
 			puts "Building OS X binaries..."
-			sh "cd ../passenger_autobuilder && " +
-				"git pull && " +
-				"./autobuild-osx https://github.com/phusion/passenger.git passenger psg_autobuilder_chroot@juvia-helper.phusion.nl --tag=#{tag}"
+			Rake::Task['package:build_osx_binaries'].invoke
+
+			if boolean_option('HOMEBREW_DRY_RUN', false)
+				echo "HOMEBREW_DRY_RUN set, not submitting pull request. Please find the repo in /tmp/homebrew."
+			else
+				echo "Submitting Homebrew pull request..."
+				sh "cd #{homebrew_dir} && hub pull-request 'Update passenger to version #{version}' -b Homebrew:master"
+			end
+
 			puts "--------------"
 			puts "All done."
 		else
 			dir = "/u/apps/passenger_website/shared"
 			subdir = string_option('NAME', version)
-			git_url = `git config remote.origin.url`.strip
 
 			sh "scp #{PKG_DIR}/#{basename}.{gem,tar.gz,gem.asc,tar.gz.asc} app@shell.phusion.nl:#{dir}/"
 			sh "ssh app@shell.phusion.nl 'mkdir -p \"#{dir}/assets/#{subdir}\" && mv #{dir}/#{basename}.{gem,tar.gz,gem.asc,tar.gz.asc} \"#{dir}/assets/#{subdir}/\"'"
@@ -202,15 +209,17 @@ task 'package:release' => ['package:set_official', 'package:gem', 'package:tarba
 			puts "Initiating building of binaries"
 			command = "cd /srv/passenger_autobuilder/app && " +
 				"/tools/silence-unless-failed chpst -l /tmp/passenger_autobuilder.lock " +
-				"./autobuild-with-pbuilder #{git_url} passenger-enterprise --tag=#{tag}"
+				"./autobuild-with-pbuilder #{enterprise_git_url} passenger-enterprise --tag=#{git_tag}"
 			sh "ssh psg_autobuilder_run@juvia-helper.phusion.nl at now <<<'#{command}'"
 
 			puts "Initiating building of Debian packages"
 			Rake::Task['package:initiate_debian_building'].invoke
 
-			sh "cd ../passenger_autobuilder && " +
-				"git pull && " +
-				"./autobuild-osx TODO passenger-enterprise psg_autobuilder_chroot@juvia-helper.phusion.nl --tag=#{tag}"
+			puts "Building OS X binaries..."
+			Rake::Task['package:build_osx_binaries'].invoke
+
+			puts "--------------"
+			puts "All done."
 		end
 	else
 		puts "Did not upload anything."
@@ -252,13 +261,16 @@ task 'package:tarball' => Packaging::PREGENERATED_FILES do
 	if ENV['OFFICIAL_RELEASE']
 		File.open("#{PKG_DIR}/#{basename}/resources/release.txt", "w").close
 	end
-	sh "cd #{PKG_DIR} && tar -c #{basename} | gzip --best > #{basename}.tar.gz"
+	if PlatformInfo.os_name == "macosx"
+		sh "cd #{PKG_DIR}/#{basename} && find . -print0 | xargs -0 touch -t '201310270000'"
+	else
+		sh "cd #{PKG_DIR}/#{basename} && find . -print0 | xargs -0 touch -d '2013-10-27 00:00:00 UTC'"
+	end
+	sh "cd #{PKG_DIR} && tar -c #{basename} | gzip --no-name --best > #{basename}.tar.gz"
 	sh "rm -rf #{PKG_DIR}/#{basename}"
 end
 
 task 'package:sign' do
-	require 'phusion_passenger'
-
 	if File.exist?(File.expand_path("~/.gnupg/gpg-agent.conf")) || ENV['GPG_AGENT_INFO']
 		puts "It looks like you're using gpg-agent, so skipping automatically password caching."
 	else
@@ -292,27 +304,75 @@ task 'package:sign' do
 	end
 end
 
-task 'package:initiate_debian_building' do
-	version        = PhusionPassenger::VERSION_STRING
-	is_enterprise  = PhusionPassenger::PACKAGE_NAME =~ /enterprise/
-	is_open_source = !is_enterprise
+task 'package:update_homebrew' do
+	require 'digest/sha1'
+	version = VERSION_STRING
+	sha1 = File.open("#{PKG_DIR}/passenger-#{version}.tar.gz", "rb") do |f|
+		Digest::SHA1.hexdigest(f.read)
+	end
+	sh "rm -rf #{homebrew_dir}"
+	sh "git clone git@github.com:phusion/homebrew.git #{homebrew_dir}"
+	sh "cd #{homebrew_dir} && git remote add Homebrew https://github.com/Homebrew/homebrew.git"
+	sh "cd #{homebrew_dir} && git fetch Homebrew"
+	sh "cd #{homebrew_dir} && git reset --hard Homebrew/master"
+	formula = File.read("/tmp/homebrew/Library/Formula/passenger.rb")
+	formula.gsub!(/passenger-.+?\.tar\.gz/, "passenger-#{version}.tar.gz") ||
+		abort("Unable to substitute Homebrew formula tarball filename")
+	formula.gsub!(/sha1 .*/, "sha1 '#{sha1}'") ||
+		abort("Unable to substitute Homebrew formula SHA-1")
+	necessary_dirs = ORIG_TARBALL_FILES.call.map{ |filename| filename.split("/").first }.uniq
+	necessary_dirs -= Packaging::HOMEBREW_EXCLUDE
+	necessary_dirs += ["buildout"]
+	necessary_dirs_str = word_wrap(necessary_dirs.inspect).split("\n").join("\n      ")
+	formula.sub!(/necessary_files = .*?\]/m, "necessary_files = Dir#{necessary_dirs_str}") ||
+		abort("Unable to substitute file whitelist")
+	File.open("/tmp/homebrew/Library/Formula/passenger.rb", "w") do |f|
+		f.write(formula)
+	end
+	sh "cd #{homebrew_dir} && git commit -a -m 'passenger #{version}'"
+	sh "cd #{homebrew_dir} && git push -f"
+	if boolean_option('HOMEBREW_TEST', true)
+		sh "cp /tmp/homebrew/Library/Formula/passenger.rb /usr/local/Library/Formula/passenger.rb"
+		if `brew info passenger` !~ /^Not installed$/
+			sh "brew uninstall passenger"
+		end
+		sh "cp #{PKG_DIR}/passenger-#{version}.tar.gz `brew --cache`/"
+		sh "brew install passenger"
+		Rake::Task['test:integration:native_packaging'].invoke
+	end
+end
 
-	if is_open_source
+task 'package:initiate_debian_building' do
+	version = VERSION_STRING
+	if is_open_source?
 		command = "cd /srv/passenger_apt_automation && " +
 			"chpst -l /tmp/passenger_apt_automation.lock " +
 			"/tools/silence-unless-failed " +
-			"./new_release https://github.com/phusion/passenger.git passenger.repo passenger.apt release-#{version}"
+			"./new_release https://github.com/phusion/passenger.git passenger.repo passenger.apt #{git_tag}"
 	else
-		git_url = `git config remote.origin.url`.strip
 		command = "cd /srv/passenger_apt_automation && " +
 			"chpst -l /tmp/passenger_apt_automation.lock " +
 			"/tools/silence-unless-failed " +
-			"./new_release #{git_url} passenger-enterprise.repo passenger-enterprise.apt enterprise-#{version}"
+			"./new_release #{enterprise_git_url} passenger-enterprise.repo passenger-enterprise.apt #{git_tag}"
 	end
 
 	sh "ssh psg_apt_automation@juvia-helper.phusion.nl at now <<<'#{command}'"
 end
 
+task 'package:build_osx_binaries' do
+	if is_open_source?
+		sh "cd ../passenger_autobuilder && " +
+			"git pull && " +
+			"./autobuild-osx https://github.com/phusion/passenger.git passenger " +
+				"psg_autobuilder_chroot@juvia-helper.phusion.nl --tag=#{git_tag}"
+	else
+		sh "cd ../passenger_autobuilder && " +
+			"git pull && " +
+			"./autobuild-osx #{enterprise_git_url} passenger-enterprise " +
+			"psg_autobuilder_chroot@juvia-helper.phusion.nl --tag=#{git_tag}"
+	end
+end
+
 desc "Remove gem, tarball and signatures"
 task 'package:clean' do
 	require 'phusion_passenger'