passenger 5.0.0.beta3 → 5.0.0.rc1

data/build/integration_tests.rb

@@ -24,11 +24,11 @@
 ### Integration tests ###
 
 def integration_test_dependencies(runtime_target_name)
-	if string_option('PASSENGER_LOCATION_CONFIGURATION_FILE')
-		return []
-	else
-		return [runtime_target_name, NATIVE_SUPPORT_TARGET].compact
-	end
+  if string_option('PASSENGER_LOCATION_CONFIGURATION_FILE')
+    return []
+  else
+    return [runtime_target_name, NATIVE_SUPPORT_TARGET].compact
+  end
 end
 
 desc "Run all integration tests"
@@ -38,99 +38,99 @@ end
 dependencies = integration_test_dependencies(:_apache2)
 desc "Run Apache 2 integration tests"
 task 'test:integration:apache2' => dependencies do
-	command = "bundle exec rspec -c -f s --tty integration_tests/apache2_tests.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
-	sh "cd test && exec #{command}"
+  command = "bundle exec rspec -c -f s --tty integration_tests/apache2_tests.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
+  sh "cd test && exec #{command}"
 end
 
 dependencies = integration_test_dependencies(:_nginx)
 desc "Run Nginx integration tests"
 task 'test:integration:nginx' => dependencies do
-	command = "bundle exec rspec -c -f s --tty integration_tests/nginx_tests.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
-	repeat = true
-	while repeat
-		sh "cd test && exec #{command}"
-		repeat = boolean_option('REPEAT')
-	end
+  command = "bundle exec rspec -c -f s --tty integration_tests/nginx_tests.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
+  repeat = true
+  while repeat
+    sh "cd test && exec #{command}"
+    repeat = boolean_option('REPEAT')
+  end
 end
 
 dependencies = integration_test_dependencies(:_nginx)
 desc "Run Passenger Standalone integration tests"
 task 'test:integration:standalone' => dependencies do
-	command = "bundle exec rspec -c -f s --tty integration_tests/standalone_tests.rb"
-	if grep = string_option('E')
-		require 'shellwords'
-		command << " -e #{Shellwords.escape(grep)}"
-	end
-	sh "cd test && exec #{command}"
+  command = "bundle exec rspec -c -f s --tty integration_tests/standalone_tests.rb"
+  if grep = string_option('E')
+    require 'shellwords'
+    command << " -e #{Shellwords.escape(grep)}"
+  end
+  sh "cd test && exec #{command}"
 end
 
 desc "Run native packaging tests"
 task 'test:integration:native_packaging' do
-	command = "bundle exec rspec -c -f s --tty 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
-	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}"
+  command = "bundle exec rspec -c -f s --tty 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
+  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 = integration_test_dependencies(:_apache2)
 desc "Run the 'apache2' integration test infinitely, and abort if/when it fails"
 task 'test:restart' => dependencies do
-	require 'shellwords'
-	color_code_start = "\e[33m\e[44m\e[1m"
-	color_code_end = "\e[0m"
-	i = 1
-	while true do
-		puts "#{color_code_start}Test run #{i} (press Ctrl-C multiple times to abort)#{color_code_end}"
-		command = "bundle exec rspec -c -f s --tty integration_tests/apache2_tests.rb"
-		if grep = string_option('E')
-			command << " -e #{Shellwords.escape(grep)}"
-		end
-		sh "cd test && exec #{command}"
-		i += 1
-	end
+  require 'shellwords'
+  color_code_start = "\e[33m\e[44m\e[1m"
+  color_code_end = "\e[0m"
+  i = 1
+  while true do
+    puts "#{color_code_start}Test run #{i} (press Ctrl-C multiple times to abort)#{color_code_end}"
+    command = "bundle exec rspec -c -f s --tty integration_tests/apache2_tests.rb"
+    if grep = string_option('E')
+      command << " -e #{Shellwords.escape(grep)}"
+    end
+    sh "cd test && exec #{command}"
+    i += 1
+  end
 end

data/build/misc.rb

@@ -24,165 +24,165 @@
 
 desc "Run 'sloccount' to see how much code Passenger has"
 task :sloccount do
-	ENV['LC_ALL'] = 'C'
-	begin
-		# sloccount doesn't recognize the scripts in
-		# bin/ as Ruby, so we make symlinks with proper
-		# extensions.
-		tmpdir = ".sloccount"
-		system "rm -rf #{tmpdir}"
-		mkdir tmpdir
-		Dir['bin/*'].each do |file|
-			safe_ln file, "#{tmpdir}/#{File.basename(file)}.rb"
-		end
-		sh "sloccount", *Dir[
-			"#{tmpdir}/*",
-			"lib/phusion_passenger",
-			"ext/apache2",
-			"ext/nginx",
-			"ext/common",
-			"ext/oxt",
-			"ext/phusion_passenger/*.c",
-			"test/**/*.{cpp,rb,h}"
-		]
-	ensure
-		system "rm -rf #{tmpdir}"
-	end
+  ENV['LC_ALL'] = 'C'
+  begin
+    # sloccount doesn't recognize the scripts in
+    # bin/ as Ruby, so we make symlinks with proper
+    # extensions.
+    tmpdir = ".sloccount"
+    system "rm -rf #{tmpdir}"
+    mkdir tmpdir
+    Dir['bin/*'].each do |file|
+      safe_ln file, "#{tmpdir}/#{File.basename(file)}.rb"
+    end
+    sh "sloccount", *Dir[
+      "#{tmpdir}/*",
+      "lib/phusion_passenger",
+      "ext/apache2",
+      "ext/nginx",
+      "ext/common",
+      "ext/oxt",
+      "ext/phusion_passenger/*.c",
+      "test/**/*.{cpp,rb,h}"
+    ]
+  ensure
+    system "rm -rf #{tmpdir}"
+  end
 end
 
 def extract_latest_news_contents_and_items
-	# The text is in the following format:
-	#
-	#   Release x.x.x
-	#   -------------
-	#
-	#    * Text.
-	#    * More text.
-	#    * A header.
-	#      With yet more text.
-	#
-	#   Release y.y.y
-	#   -------------
-	#   .....
-	contents = File.read("CHANGELOG")
+  # The text is in the following format:
+  #
+  #   Release x.x.x
+  #   -------------
+  #
+  #    * Text.
+  #    * More text.
+  #    * A header.
+  #      With yet more text.
+  #
+  #   Release y.y.y
+  #   -------------
+  #   .....
+  contents = File.read("CHANGELOG")
 
-	# We're only interested in the latest release, so extract the text for that.
-	contents =~ /\A(Release.*?)^(Release|Older releases)/m
-	contents = $1
-	contents.sub!(/\A.*?\n-+\n+/m, '')
-	contents.sub!(/\n+\Z/, '')
+  # We're only interested in the latest release, so extract the text for that.
+  contents =~ /\A(Release.*?)^(Release|Older releases)/m
+  contents = $1
+  contents.sub!(/\A.*?\n-+\n+/m, '')
+  contents.sub!(/\n+\Z/, '')
 
-	# Now split the text into individual items.
-	items = contents.split(/^ \* /)
-	items.shift while items.first == ""
+  # Now split the text into individual items.
+  items = contents.split(/^ \* /)
+  items.shift while items.first == ""
 
-	return [contents, items]
+  return [contents, items]
 end
 
 desc "Convert the Changelog items for the latest release to HTML"
 task :changelog_as_html do
-	require 'cgi'
-	contents, items = extract_latest_news_contents_and_items
+  require 'cgi'
+  contents, items = extract_latest_news_contents_and_items
 
-	puts "<ul>"
-	items.each do |item|
-		def format_paragraph(text)
-			# Get rid of newlines: convert them into spaces.
-			text.gsub!("\n", ' ')
-			while text.index('  ')
-				text.gsub!('  ', ' ')
-			end
+  puts "<ul>"
+  items.each do |item|
+    def format_paragraph(text)
+      # Get rid of newlines: convert them into spaces.
+      text.gsub!("\n", ' ')
+      while text.index('  ')
+        text.gsub!('  ', ' ')
+      end
 
-			# Auto-link to issue tracker.
-			text.gsub!(/(bug #|issue #|GH-)(\d+)/i) do
-				url = "https://github.com/phusion/passenger/issues/#{$2}"
-				%Q(<{a href="#{url}"}>#{$1}#{$2}<{/a}>)
-			end
+      # Auto-link to issue tracker.
+      text.gsub!(/(bug #|issue #|GH-)(\d+)/i) do
+        url = "https://github.com/phusion/passenger/issues/#{$2}"
+        %Q(<{a href="#{url}"}>#{$1}#{$2}<{/a}>)
+      end
 
-			text.strip!
-			text = CGI.escapeHTML(text)
-			text.gsub!(%r(&lt;\{(.*?)\}&gt;(.*?)&lt;\{/(.*?)\}&gt;)) do
-				"<#{CGI.unescapeHTML $1}>#{$2}</#{CGI.unescapeHTML $3}>"
-			end
-			text
-		end
+      text.strip!
+      text = CGI.escapeHTML(text)
+      text.gsub!(%r(&lt;\{(.*?)\}&gt;(.*?)&lt;\{/(.*?)\}&gt;)) do
+        "<#{CGI.unescapeHTML $1}>#{$2}</#{CGI.unescapeHTML $3}>"
+      end
+      text
+    end
 
-		puts "<li>" + format_paragraph(item.strip) + "</li>"
-	end
-	puts "</ul>"
+    puts "<li>" + format_paragraph(item.strip) + "</li>"
+  end
+  puts "</ul>"
 end
 
 desc "Convert the Changelog items for the latest release to Markdown"
 task :changelog_as_markdown do
-	contents, items = extract_latest_news_contents_and_items
+  contents, items = extract_latest_news_contents_and_items
 
-	# Auto-link to issue tracker.
-	contents.gsub!(/(bug #|issue #|GH-)(\d+)/i) do
-		url = "https://github.com/phusion/passenger/issues/#{$2}"
-		%Q([#{$1}#{$2}](#{url}))
-	end
+  # Auto-link to issue tracker.
+  contents.gsub!(/(bug #|issue #|GH-)(\d+)/i) do
+    url = "https://github.com/phusion/passenger/issues/#{$2}"
+    %Q([#{$1}#{$2}](#{url}))
+  end
 
-	puts contents
+  puts contents
 end
 
 desc "Update CONTRIBUTORS file"
 task :contributors do
-	entries = `git log --format='%aN' | sort -u`.split("\n")
-	entries.delete "Hongli Lai"
-	entries.delete "Hongli Lai (Phusion"
-	entries.delete "Ninh Bui"
-	entries.push "Ninh Bui (Phusion)"
-	entries.delete "Phusion Dev"
-	entries.delete "Tinco Andringa"
-	entries.push "Tinco Andringa (Phusion)"
-	entries.delete "Goffert van Gool"
-	entries.push "Goffert van Gool (Phusion)"
-	entries.delete "Gokulnath"
-	entries.push "Gokulnath Manakkattil"
-	entries.push "Sean Wilkinson"
-	entries.push "Yichun Zhang"
-	File.open("CONTRIBUTORS", "w") do |f|
-		f.puts(entries.sort{ |a, b| a.downcase <=> b.downcase }.join("\n"))
-	end
-	puts "Updated CONTRIBUTORS"
+  entries = `git log --format='%aN' | sort -u`.split("\n")
+  entries.delete "Hongli Lai"
+  entries.delete "Hongli Lai (Phusion"
+  entries.delete "Ninh Bui"
+  entries.push "Ninh Bui (Phusion)"
+  entries.delete "Phusion Dev"
+  entries.delete "Tinco Andringa"
+  entries.push "Tinco Andringa (Phusion)"
+  entries.delete "Goffert van Gool"
+  entries.push "Goffert van Gool (Phusion)"
+  entries.delete "Gokulnath"
+  entries.push "Gokulnath Manakkattil"
+  entries.push "Sean Wilkinson"
+  entries.push "Yichun Zhang"
+  File.open("CONTRIBUTORS", "w") do |f|
+    f.puts(entries.sort{ |a, b| a.downcase <=> b.downcase }.join("\n"))
+  end
+  puts "Updated CONTRIBUTORS"
 end
 
 dependencies = [
-	COMMON_LIBRARY.link_objects,
-	LIBBOOST_OXT,
-	LIBEV_TARGET,
-	LIBEIO_TARGET
+  COMMON_LIBRARY.link_objects,
+  LIBBOOST_OXT,
+  LIBEV_TARGET,
+  LIBEIO_TARGET
 ].flatten.compact
 task :compile_app => dependencies do
-	source = ENV['SOURCE'] || ENV['FILE'] || ENV['F']
-	if !source
-		STDERR.puts "Please specify the source filename with SOURCE=(...)"
-		exit 1
-	end
-	if source =~ /\.h/
-		File.open('_source.cpp', 'w') do |f|
-			f.puts "#include \"#{source}\""
-		end
-		source = '_source.cpp'
-	end
-	object = source.sub(/\.cpp$/, '.o')
-	exe = source.sub(/\.cpp$/, '')
-	begin
-		compile_cxx(source,
-			"-DSTANDALONE -o #{object} " <<
-			"-Iext -Iext/common #{LIBEV_CFLAGS} #{LIBEIO_CFLAGS} " <<
-			"#{EXTRA_CXXFLAGS}")
-		create_executable(exe, object,
-			"-DSTANDALONE " <<
-			"-Iext -Iext/common #{LIBEV_CFLAGS} #{LIBEIO_CFLAGS} " <<
-			"#{EXTRA_CXXFLAGS} " <<
-			"#{COMMON_LIBRARY.link_objects_as_string} " <<
-			"#{LIBBOOST_OXT} " <<
-			"#{LIBEV_LIBS} " <<
-			"#{LIBEIO_LIBS} " <<
-			"#{PlatformInfo.portability_cxx_ldflags} " <<
-			"#{EXTRA_CXX_LDFLAGS}")
-	ensure
-		File.unlink('_source.cpp') rescue nil
-	end
+  source = ENV['SOURCE'] || ENV['FILE'] || ENV['F']
+  if !source
+    STDERR.puts "Please specify the source filename with SOURCE=(...)"
+    exit 1
+  end
+  if source =~ /\.h/
+    File.open('_source.cpp', 'w') do |f|
+      f.puts "#include \"#{source}\""
+    end
+    source = '_source.cpp'
+  end
+  object = source.sub(/\.cpp$/, '.o')
+  exe = source.sub(/\.cpp$/, '')
+  begin
+    compile_cxx(source,
+      "-DSTANDALONE -o #{object} " <<
+      "-Iext -Iext/common #{LIBEV_CFLAGS} #{LIBEIO_CFLAGS} " <<
+      "#{EXTRA_CXXFLAGS}")
+    create_executable(exe, object,
+      "-DSTANDALONE " <<
+      "-Iext -Iext/common #{LIBEV_CFLAGS} #{LIBEIO_CFLAGS} " <<
+      "#{EXTRA_CXXFLAGS} " <<
+      "#{COMMON_LIBRARY.link_objects_as_string} " <<
+      "#{LIBBOOST_OXT} " <<
+      "#{LIBEV_LIBS} " <<
+      "#{LIBEIO_LIBS} " <<
+      "#{PlatformInfo.portability_cxx_ldflags} " <<
+      "#{EXTRA_CXX_LDFLAGS}")
+  ensure
+    File.unlink('_source.cpp') rescue nil
+  end
 end