passenger 5.0.0.beta3 → 5.0.0.rc1

data/build/debian.rb

@@ -34,170 +34,170 @@ DEBIAN_ARCHS       = string_option("DEBIAN_ARCHS", "i386 amd64").split(/[ ,]/)
 DEBIAN_ORIG_TARBALL_FILES = lambda { PhusionPassenger::Packaging.debian_orig_tarball_files }
 
 def create_debian_package_dir(distribution, output_dir = PKG_DIR)
-	require 'time'
-
-	variables = {
-		:distribution => distribution
-	}
-
-	root = "#{output_dir}/#{distribution}"
-	orig_tarball = File.expand_path("#{PKG_DIR}/#{DEBIAN_NAME}_#{PACKAGE_VERSION}.orig.tar.gz")
-
-	sh "rm -rf #{root}"
-	sh "mkdir -p #{root}"
-	sh "cd #{root} && tar xzf #{orig_tarball}"
-	sh "bash -c 'shopt -s dotglob && mv #{root}/#{DEBIAN_NAME}_#{PACKAGE_VERSION}/* #{root}'"
-	sh "rmdir #{root}/#{DEBIAN_NAME}_#{PACKAGE_VERSION}"
-	recursive_copy_files(Dir["debian.template/**/*"], root,
-		true, variables)
-	sh "mv #{root}/debian.template #{root}/debian"
-	changelog = File.read("#{root}/debian/changelog")
-	changelog =
-		"#{DEBIAN_NAME} (#{DEBIAN_EPOCH}:#{PACKAGE_VERSION}-1~#{distribution}1) #{distribution}; urgency=low\n" +
-		"\n" +
-		"  * Package built.\n" +
-		"\n" +
-		" -- #{MAINTAINER_NAME} <#{MAINTAINER_EMAIL}>  #{Time.now.rfc2822}\n\n" +
-		changelog
-	File.open("#{root}/debian/changelog", "w") do |f|
-		f.write(changelog)
-	end
+  require 'time'
+
+  variables = {
+    :distribution => distribution
+  }
+
+  root = "#{output_dir}/#{distribution}"
+  orig_tarball = File.expand_path("#{PKG_DIR}/#{DEBIAN_NAME}_#{PACKAGE_VERSION}.orig.tar.gz")
+
+  sh "rm -rf #{root}"
+  sh "mkdir -p #{root}"
+  sh "cd #{root} && tar xzf #{orig_tarball}"
+  sh "bash -c 'shopt -s dotglob && mv #{root}/#{DEBIAN_NAME}_#{PACKAGE_VERSION}/* #{root}'"
+  sh "rmdir #{root}/#{DEBIAN_NAME}_#{PACKAGE_VERSION}"
+  recursive_copy_files(Dir["debian.template/**/*"], root,
+    true, variables)
+  sh "mv #{root}/debian.template #{root}/debian"
+  changelog = File.read("#{root}/debian/changelog")
+  changelog =
+    "#{DEBIAN_NAME} (#{DEBIAN_EPOCH}:#{PACKAGE_VERSION}-1~#{distribution}1) #{distribution}; urgency=low\n" +
+    "\n" +
+    "  * Package built.\n" +
+    "\n" +
+    " -- #{MAINTAINER_NAME} <#{MAINTAINER_EMAIL}>  #{Time.now.rfc2822}\n\n" +
+    changelog
+  File.open("#{root}/debian/changelog", "w") do |f|
+    f.write(changelog)
+  end
 end
 
 task 'debian:orig_tarball' => Packaging::PREGENERATED_FILES do
-	if File.exist?("#{PKG_DIR}/#{DEBIAN_NAME}_#{PACKAGE_VERSION}.orig.tar.gz")
-		puts "WARNING: Debian orig tarball #{PKG_DIR}/#{DEBIAN_NAME}_#{PACKAGE_VERSION}.orig.tar.gz already exists. " +
-			"It will not be regenerated. If you are sure that the orig tarball is outdated, please delete it " +
-			"and rerun this task."
-	else
-		sh "mkdir -p #{PKG_DIR}"
-		nginx_version = PhusionPassenger::PREFERRED_NGINX_VERSION
-		local_nginx_tarball = File.expand_path("#{PKG_DIR}/nginx-#{nginx_version}.tar.gz")
-		if File.exist?(local_nginx_tarball)
-			puts "#{local_nginx_tarball} already exists"
-		else
-			sh "curl -L --fail -o #{local_nginx_tarball} http://nginx.org/download/nginx-#{nginx_version}.tar.gz"
-		end
-		sh "rm -rf #{PKG_DIR}/#{DEBIAN_NAME}_#{PACKAGE_VERSION}"
-		sh "mkdir -p #{PKG_DIR}/#{DEBIAN_NAME}_#{PACKAGE_VERSION}"
-		recursive_copy_files(DEBIAN_ORIG_TARBALL_FILES.call, "#{PKG_DIR}/#{DEBIAN_NAME}_#{PACKAGE_VERSION}")
-		sh "cd #{PKG_DIR}/#{DEBIAN_NAME}_#{PACKAGE_VERSION} && tar xzf #{local_nginx_tarball}"
-		sh "cd #{PKG_DIR} && find #{DEBIAN_NAME}_#{PACKAGE_VERSION} -print0 | xargs -0 touch -d '2013-10-27 00:00:00 UTC'"
-		sh "cd #{PKG_DIR} && tar -c #{DEBIAN_NAME}_#{PACKAGE_VERSION} | gzip --no-name --best > #{DEBIAN_NAME}_#{PACKAGE_VERSION}.orig.tar.gz"
-	end
+  if File.exist?("#{PKG_DIR}/#{DEBIAN_NAME}_#{PACKAGE_VERSION}.orig.tar.gz")
+    puts "WARNING: Debian orig tarball #{PKG_DIR}/#{DEBIAN_NAME}_#{PACKAGE_VERSION}.orig.tar.gz already exists. " +
+      "It will not be regenerated. If you are sure that the orig tarball is outdated, please delete it " +
+      "and rerun this task."
+  else
+    sh "mkdir -p #{PKG_DIR}"
+    nginx_version = PhusionPassenger::PREFERRED_NGINX_VERSION
+    local_nginx_tarball = File.expand_path("#{PKG_DIR}/nginx-#{nginx_version}.tar.gz")
+    if File.exist?(local_nginx_tarball)
+      puts "#{local_nginx_tarball} already exists"
+    else
+      sh "curl -L --fail -o #{local_nginx_tarball} http://nginx.org/download/nginx-#{nginx_version}.tar.gz"
+    end
+    sh "rm -rf #{PKG_DIR}/#{DEBIAN_NAME}_#{PACKAGE_VERSION}"
+    sh "mkdir -p #{PKG_DIR}/#{DEBIAN_NAME}_#{PACKAGE_VERSION}"
+    recursive_copy_files(DEBIAN_ORIG_TARBALL_FILES.call, "#{PKG_DIR}/#{DEBIAN_NAME}_#{PACKAGE_VERSION}")
+    sh "cd #{PKG_DIR}/#{DEBIAN_NAME}_#{PACKAGE_VERSION} && tar xzf #{local_nginx_tarball}"
+    sh "cd #{PKG_DIR} && find #{DEBIAN_NAME}_#{PACKAGE_VERSION} -print0 | xargs -0 touch -d '2013-10-27 00:00:00 UTC'"
+    sh "cd #{PKG_DIR} && tar -c #{DEBIAN_NAME}_#{PACKAGE_VERSION} | gzip --no-name --best > #{DEBIAN_NAME}_#{PACKAGE_VERSION}.orig.tar.gz"
+  end
 end
 
 desc "Build Debian source and binary package(s) for local testing"
 task 'debian:dev' do
-	sh "rm -f #{PKG_DIR}/#{DEBIAN_NAME}_#{PACKAGE_VERSION}.orig.tar.gz"
-	Rake::Task["debian:clean"].invoke
-	Rake::Task["debian:orig_tarball"].invoke
-	if string_option('DISTRO').nil?
-		distributions = [File.read("/etc/lsb-release").scan(/^DISTRIB_CODENAME=(.+)/).first.first]
-	else
-		distributions = ALL_DISTRIBUTIONS
-	end
-	distributions.each do |distribution|
-		create_debian_package_dir(distribution)
-		sh "cd #{PKG_DIR}/#{distribution} && dpkg-checkbuilddeps"
-	end
-	distributions.each do |distribution|
-		sh "cd #{PKG_DIR}/#{distribution} && env DEBUILD_DPKG_BUILDPACKAGE_OPTS=-F " +
-			"debuild -e CCACHE_* -us -uc"
-	end
+  sh "rm -f #{PKG_DIR}/#{DEBIAN_NAME}_#{PACKAGE_VERSION}.orig.tar.gz"
+  Rake::Task["debian:clean"].invoke
+  Rake::Task["debian:orig_tarball"].invoke
+  if string_option('DISTRO').nil?
+    distributions = [File.read("/etc/lsb-release").scan(/^DISTRIB_CODENAME=(.+)/).first.first]
+  else
+    distributions = ALL_DISTRIBUTIONS
+  end
+  distributions.each do |distribution|
+    create_debian_package_dir(distribution)
+    sh "cd #{PKG_DIR}/#{distribution} && dpkg-checkbuilddeps"
+  end
+  distributions.each do |distribution|
+    sh "cd #{PKG_DIR}/#{distribution} && env DEBUILD_DPKG_BUILDPACKAGE_OPTS=-F " +
+      "debuild -e CCACHE_* -us -uc"
+  end
 end
 
 desc "(Re)install the Debian binary packages built for local testing"
 task 'debian:dev:reinstall' do
-	package_names = ["passenger", "passenger-dev",
-		"passenger-doc", "libapache2-mod-passenger"]
-	package_names.each do |name|
-		if Dir["#{PKG_DIR}/#{name}_*.deb"].size > 1
-			abort "Please ensure that #{PKG_DIR} only has 1 version of the Phusion Passenger packages."
-		end
-	end
-	package_names.each do |name|
-		if !system "sudo apt-get remove -y #{name}"
-			if !$? || $?.exitstatus != 100
-				abort
-			end
-		end
-	end
-	package_names.each do |name|
-		filename = Dir["#{PKG_DIR}/#{name}_*.deb"].first
-		sh "sudo gdebi -n #{filename}"
-	end
+  package_names = ["passenger", "passenger-dev",
+    "passenger-doc", "libapache2-mod-passenger"]
+  package_names.each do |name|
+    if Dir["#{PKG_DIR}/#{name}_*.deb"].size > 1
+      abort "Please ensure that #{PKG_DIR} only has 1 version of the Phusion Passenger packages."
+    end
+  end
+  package_names.each do |name|
+    if !system "sudo apt-get remove -y #{name}"
+      if !$? || $?.exitstatus != 100
+        abort
+      end
+    end
+  end
+  package_names.each do |name|
+    filename = Dir["#{PKG_DIR}/#{name}_*.deb"].first
+    sh "sudo gdebi -n #{filename}"
+  end
 end
 
 desc "Build official Debian source packages"
 task 'debian:source_packages' => 'debian:orig_tarball' do
-	if boolean_option('USE_CCACHE', false)
-		# The resulting Debian rules file must not set USE_CCACHE.
-		abort "USE_CCACHE must be returned off when running the debian:source_packages task."
-	end
-
-	pkg_dir = "#{PKG_DIR}/official"
-	if File.exist?(pkg_dir)
-		abort "#{pkg_dir} must not already exist when running the debian:source_packages task."
-	end
-	sh "mkdir #{pkg_dir}"
-	sh "cd #{pkg_dir} && ln -s ../#{DEBIAN_NAME}_#{PACKAGE_VERSION}.orig.tar.gz ."
-
-	ALL_DISTRIBUTIONS.each do |distribution|
-		create_debian_package_dir(distribution, pkg_dir)
-	end
-	ALL_DISTRIBUTIONS.each do |distribution|
-		sh "cd #{pkg_dir}/#{distribution} && env DEBUILD_DPKG_BUILDPACKAGE_OPTS=-S " +
-			"debuild -us -uc"
-	end
+  if boolean_option('USE_CCACHE', false)
+    # The resulting Debian rules file must not set USE_CCACHE.
+    abort "USE_CCACHE must be returned off when running the debian:source_packages task."
+  end
+
+  pkg_dir = "#{PKG_DIR}/official"
+  if File.exist?(pkg_dir)
+    abort "#{pkg_dir} must not already exist when running the debian:source_packages task."
+  end
+  sh "mkdir #{pkg_dir}"
+  sh "cd #{pkg_dir} && ln -s ../#{DEBIAN_NAME}_#{PACKAGE_VERSION}.orig.tar.gz ."
+
+  ALL_DISTRIBUTIONS.each do |distribution|
+    create_debian_package_dir(distribution, pkg_dir)
+  end
+  ALL_DISTRIBUTIONS.each do |distribution|
+    sh "cd #{pkg_dir}/#{distribution} && env DEBUILD_DPKG_BUILDPACKAGE_OPTS=-S " +
+      "debuild -us -uc"
+  end
 end
 
 def pbuilder_base_name(distribution, arch)
-	if arch == "amd64"
-		return distribution
-	else
-		return "#{distribution}-#{arch}"
-	end
+  if arch == "amd64"
+    return distribution
+  else
+    return "#{distribution}-#{arch}"
+  end
 end
 
 def create_debian_binary_package_task(distribution, arch)
-	task "debian:binary_package:#{distribution}_#{arch}" => 'debian:binary_packages:check' do
-		require 'shellwords'
-		base_name = "#{DEBIAN_NAME}_#{PACKAGE_VERSION}-1~#{distribution}1"
-		logfile = "#{PKG_DIR}/official/passenger_#{distribution}_#{arch}.log"
-		command = "cd #{PKG_DIR}/official && " +
-			"pbuilder-dist #{distribution} #{arch} build #{base_name}.dsc " +
-			"2>&1 | awk '{ print strftime(\"%Y-%m-%d %H:%M:%S -- \"), $0; fflush(); }'" +
-			" | tee #{logfile}; test ${PIPESTATUS[0]} -eq 0"
-		sh "bash -c #{Shellwords.escape(command)}"
-		sh "echo Done >> #{logfile}"
-	end
+  task "debian:binary_package:#{distribution}_#{arch}" => 'debian:binary_packages:check' do
+    require 'shellwords'
+    base_name = "#{DEBIAN_NAME}_#{PACKAGE_VERSION}-1~#{distribution}1"
+    logfile = "#{PKG_DIR}/official/passenger_#{distribution}_#{arch}.log"
+    command = "cd #{PKG_DIR}/official && " +
+      "pbuilder-dist #{distribution} #{arch} build #{base_name}.dsc " +
+      "2>&1 | awk '{ print strftime(\"%Y-%m-%d %H:%M:%S -- \"), $0; fflush(); }'" +
+      " | tee #{logfile}; test ${PIPESTATUS[0]} -eq 0"
+    sh "bash -c #{Shellwords.escape(command)}"
+    sh "echo Done >> #{logfile}"
+  end
 end
 
 DEBIAN_BINARY_PACKAGE_TASKS = []
 ALL_DISTRIBUTIONS.each do |distribution|
-	DEBIAN_ARCHS.each do |arch|
-		task = create_debian_binary_package_task(distribution, arch)
-		DEBIAN_BINARY_PACKAGE_TASKS << task
-	end
+  DEBIAN_ARCHS.each do |arch|
+    task = create_debian_binary_package_task(distribution, arch)
+    DEBIAN_BINARY_PACKAGE_TASKS << task
+  end
 end
 
 task 'debian:binary_packages:check' do
-	pkg_dir = "#{PKG_DIR}/official"
-	if !File.exist?(pkg_dir)
-		abort "Please run rake debian:source_packages first."
-	end
-
-	pbuilder_dir = File.expand_path("~/pbuilder")
-	ALL_DISTRIBUTIONS.each do |distribution|
-		DEBIAN_ARCHS.each do |arch|
-			pbase_name = pbuilder_base_name(distribution, arch) + "-base.tgz"
-			if !File.exist?("#{pbuilder_dir}/#{pbase_name}")
-				abort "Missing pbuilder environment for #{distribution}-#{arch}. " +
-					"Please run this first: pbuilder-dist #{distribution} #{arch} create"
-			end
-		end
-	end
+  pkg_dir = "#{PKG_DIR}/official"
+  if !File.exist?(pkg_dir)
+    abort "Please run rake debian:source_packages first."
+  end
+
+  pbuilder_dir = File.expand_path("~/pbuilder")
+  ALL_DISTRIBUTIONS.each do |distribution|
+    DEBIAN_ARCHS.each do |arch|
+      pbase_name = pbuilder_base_name(distribution, arch) + "-base.tgz"
+      if !File.exist?("#{pbuilder_dir}/#{pbase_name}")
+        abort "Missing pbuilder environment for #{distribution}-#{arch}. " +
+          "Please run this first: pbuilder-dist #{distribution} #{arch} create"
+      end
+    end
+  end
 end
 
 desc "Build official Debian binary packages"
@@ -205,11 +205,11 @@ task 'debian:binary_packages' => DEBIAN_BINARY_PACKAGE_TASKS
 
 desc "Clean Debian packaging products, except for orig tarball"
 task 'debian:clean' do
-	files = Dir["#{PKG_DIR}/*.{changes,build,deb,dsc,upload}"]
-	sh "rm -f #{files.join(' ')}"
-	sh "rm -rf #{PKG_DIR}/official"
-	ALL_DISTRIBUTIONS.each do |distribution|
-		sh "rm -rf #{PKG_DIR}/#{distribution}"
-	end
-	sh "rm -rf #{PKG_DIR}/*.debian.tar.gz"
+  files = Dir["#{PKG_DIR}/*.{changes,build,deb,dsc,upload}"]
+  sh "rm -f #{files.join(' ')}"
+  sh "rm -rf #{PKG_DIR}/official"
+  ALL_DISTRIBUTIONS.each do |distribution|
+    sh "rm -rf #{PKG_DIR}/#{distribution}"
+  end
+  sh "rm -rf #{PKG_DIR}/*.debian.tar.gz"
 end

data/build/documentation.rb

@@ -25,69 +25,69 @@ desc "Generate all documentation"
 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 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)
-	end
+  source = target.sub(/\.html$/, '.txt')
+  file target => [source] + Dir["doc/users_guide_snippets/**/*"] do
+    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)
+  end
 
-	task :clean do
-		if boolean_option('CLEAN_DOCS', true)
-			sh "rm -f '#{target}'"
-		end
-	end
+  task :clean do
+    if boolean_option('CLEAN_DOCS', true)
+      sh "rm -f '#{target}'"
+    end
+  end
 end
 
 def create_markdown_compilation_task(target)
-	source = target.sub(/\.html$/, '.txt.md')
-	dependencies = [
-		source,
-		'doc/templates/markdown.html.erb',
-		'doc/templates/bootstrap.min.css'
-	]
+  source = target.sub(/\.html$/, '.txt.md')
+  dependencies = [
+    source,
+    'doc/templates/markdown.html.erb',
+    'doc/templates/bootstrap.min.css'
+  ]
 
-	file(target => dependencies) do
-		sh "bluecloth -f #{source} > #{target}.tmp"
-		begin
-			puts "Creating #{target}"
-			require 'erb'
-			template = ERB.new(File.read('doc/templates/markdown.html.erb'))
-			title    = File.basename(target, '.html').gsub(/([A-Z])/, ' \1').strip
-			content  = File.read("#{target}.tmp")
-			css      = File.read('doc/templates/bootstrap.min.css')
-			data = template.result(binding)
-			File.open(target, 'w') do |f|
-				f.write(data)
-			end
-		ensure
-			sh "rm -f #{target}.tmp"
-		end
-	end
+  file(target => dependencies) do
+    sh "bluecloth -f #{source} > #{target}.tmp"
+    begin
+      puts "Creating #{target}"
+      require 'erb'
+      template = ERB.new(File.read('doc/templates/markdown.html.erb'))
+      title    = File.basename(target, '.html').gsub(/([A-Z])/, ' \1').strip
+      content  = File.read("#{target}.tmp")
+      css      = File.read('doc/templates/bootstrap.min.css')
+      data = template.result(binding)
+      File.open(target, 'w') do |f|
+        f.write(data)
+      end
+    ensure
+      sh "rm -f #{target}.tmp"
+    end
+  end
 
-	task :doc => target
+  task :doc => target
 
-	task :clean do
-		if boolean_option('CLEAN_DOCS', true)
-			sh "rm -f #{target}"
-		end
-	end
+  task :clean do
+    if boolean_option('CLEAN_DOCS', true)
+      sh "rm -f #{target}"
+    end
+  end
 end
 
 create_markdown_compilation_task('doc/Packaging.html')
@@ -96,6 +96,6 @@ create_markdown_compilation_task('doc/ServerOptimizationGuide.html')
 
 desc "Upload documentation to the Phusion web server"
 task 'doc:rsync' => :doc do
-	sh "cd doc && rsync -rv --progress --partial-dir=.rsync-partial --human-readable . " +
-		"shell.phusion.nl:/home/phusion/websites/passenger_docs/"
+  sh "cd doc && rsync -rv --progress --partial-dir=.rsync-partial --human-readable . " +
+    "shell.phusion.nl:/home/phusion/websites/passenger_docs/"
 end