passenger 2.2.15 → 3.0.0.pre1

data/bin/passenger

@@ -0,0 +1,32 @@
+#!/usr/bin/env ruby
+#  Phusion Passenger - http://www.modrails.com/
+#  Copyright (c) 2010 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.
+
+source_root = File.expand_path(File.dirname(__FILE__) + "/..")
+$LOAD_PATH.unshift("#{source_root}/lib")
+
+require 'rubygems' rescue nil
+require 'phusion_passenger'
+require 'phusion_passenger/standalone/main'
+
+PhusionPassenger::Standalone::Main.run!(ARGV)

data/bin/passenger-config

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #  Phusion Passenger - http://www.modrails.com/
-#  Copyright (c) 2008, 2009 Phusion
+#  Copyright (c) 2010 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -22,9 +22,9 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-PASSENGER_ROOT = File.expand_path(File.dirname(__FILE__) << "/..")
-$LOAD_PATH.unshift("#{PASSENGER_ROOT}/lib")
-require 'phusion_passenger/constants'
+source_root = File.expand_path(File.dirname(__FILE__) + "/..")
+$LOAD_PATH.unshift("#{source_root}/lib")
+require 'phusion_passenger'
 
 def help
 	puts "Tool for showing Passenger configuration information."
@@ -37,7 +37,7 @@ end
 
 case ARGV[0]
 when "--root"
-	puts PASSENGER_ROOT
+	puts PhusionPassenger::SOURCE_ROOT
 when "--version"
 	puts PhusionPassenger::VERSION_STRING
 else

data/bin/passenger-install-apache2-module

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #  Phusion Passenger - http://www.modrails.com/
-#  Copyright (c) 2008, 2009 Phusion
+#  Copyright (c) 2010 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -22,9 +22,9 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-PASSENGER_ROOT = File.expand_path(File.dirname(__FILE__) << "/..")
+PASSENGER_ROOT = File.expand_path(File.dirname(__FILE__) + "/..")
 $LOAD_PATH.unshift("#{PASSENGER_ROOT}/lib")
-$LOAD_PATH.unshift("#{PASSENGER_ROOT}/ext")
+require 'phusion_passenger'
 
 # The Apache executable may be located in an 'sbin' folder. We add
 # the 'sbin' folders to $PATH just in case. On some systems
@@ -33,17 +33,21 @@ $LOAD_PATH.unshift("#{PASSENGER_ROOT}/ext")
 ENV["PATH"] += ":/usr/sbin:/sbin:/usr/local/sbin"
 
 require 'optparse'
-require 'phusion_passenger/platform_info'
+require 'phusion_passenger/platform_info/ruby'
+require 'phusion_passenger/platform_info/apache'
 require 'phusion_passenger/dependencies'
 require 'phusion_passenger/abstract_installer'
-include PlatformInfo
 
 class Installer < PhusionPassenger::AbstractInstaller
 	include PhusionPassenger
+	include PhusionPassenger::PlatformInfo
 	
 	def dependencies
 		result = [
 			Dependencies::GCC,
+			Dependencies::Curl_Dev,
+			Dependencies::OpenSSL_Dev,
+			Dependencies::Zlib_Dev,
 			Dependencies::Ruby_DevHeaders,
 			Dependencies::Ruby_OpenSSL,
 			Dependencies::RubyGems,
@@ -74,6 +78,11 @@ class Installer < PhusionPassenger::AbstractInstaller
 	end
 	
 	def install!
+		if @snippet
+			show_apache2_config_snippets(true)
+			exit
+		end
+		
 		if PhusionPassenger.natively_packaged?
 			check_dependencies || exit(1)
 			show_apache2_config_snippets
@@ -150,30 +159,31 @@ private
 		color_puts '<banner>Compiling and installing Apache 2 module...</banner>'
 		puts "cd #{PASSENGER_ROOT}"
 		if ENV['TRACE']
-			puts "#{RUBY} -S #{PlatformInfo.rake} --trace clean apache2"
-			return sh(RUBY, "-S", PlatformInfo.rake, "--trace", "clean", "apache2")
+			puts "#{PlatformInfo.rake_command} --trace clean apache2"
+			return sh("#{PlatformInfo.rake_command} --trace apache2:clean apache2 CACHING=no")
 		else
-			puts "#{RUBY} -S #{PlatformInfo.rake} clean apache2"
-			return sh(RUBY, "-S", PlatformInfo.rake, "clean", "apache2")
+			puts "#{PlatformInfo.rake_command} clean apache2"
+			return sh("#{PlatformInfo.rake_command} apache2:clean apache2 CACHING=no")
 		end
 	end
 	
-	def show_apache2_config_snippets
-		puts
-		line
-		if PhusionPassenger.natively_packaged?
-			module_location = "#{PASSENGER_ROOT}/lib/phusion_passenger/mod_passenger.so"
+	def show_apache2_config_snippets(bare = false)
+		if bare
+			puts "LoadModule passenger_module #{APACHE2_MODULE}"
+			puts "PassengerRoot #{PASSENGER_ROOT}"
+			puts "PassengerRuby #{PlatformInfo.ruby_command}"
 		else
-			module_location = "#{PASSENGER_ROOT}/ext/apache2/mod_passenger.so"
-		end
-		render_template 'apache2/config_snippets',
-			:module_location => module_location,
-			:passenger_root => PASSENGER_ROOT,
-			:ruby => RUBY
-		if PhusionPassenger.natively_packaged?
-			wait(10)
-		else
-			wait
+			puts
+			line
+			render_template 'apache2/config_snippets',
+				:module_location => APACHE2_MODULE,
+				:passenger_root => PASSENGER_ROOT,
+				:ruby => PlatformInfo.ruby_command
+			if PhusionPassenger.natively_packaged?
+				wait(10)
+			else
+				wait
+			end
 		end
 	end
 	
@@ -211,6 +221,9 @@ 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("--snippet", "Show just the Apache config snippet.") do
+		options[:snippet] = true
+	end
 end
 begin
 	parser.parse!

data/bin/passenger-install-nginx-module

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #  Phusion Passenger - http://www.modrails.com/
-#  Copyright (c) 2009 Phusion
+#  Copyright (c) 2010 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -22,30 +22,30 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-PASSENGER_ROOT = File.expand_path(File.dirname(__FILE__) << "/..")
-$LOAD_PATH.unshift("#{PASSENGER_ROOT}/lib")
-$LOAD_PATH.unshift("#{PASSENGER_ROOT}/ext")
-
+passenger_root = File.expand_path("..", File.dirname(__FILE__))
+$LOAD_PATH.unshift("#{passenger_root}/lib")
+require 'phusion_passenger'
 require 'optparse'
 require 'fileutils'
-require 'phusion_passenger/platform_info'
+require 'phusion_passenger/platform_info/ruby'
 require 'phusion_passenger/dependencies'
 require 'phusion_passenger/abstract_installer'
-include PlatformInfo
 
 class Installer < PhusionPassenger::AbstractInstaller
 	include PhusionPassenger
-	
-	NGINX_VERSION = "0.7.67"
+	include PhusionPassenger::PlatformInfo
 	
 	def dependencies
 		result = [
 			Dependencies::GCC,
+			Dependencies::Make,
+			Dependencies::DownloadTool,
 			Dependencies::Ruby_DevHeaders,
 			Dependencies::Ruby_OpenSSL,
 			Dependencies::RubyGems,
 			Dependencies::Rake,
 			Dependencies::Rack,
+			Dependencies::Curl_Dev,
 			Dependencies::OpenSSL_Dev,
 			Dependencies::Zlib_Dev
 		]
@@ -60,11 +60,11 @@ class Installer < PhusionPassenger::AbstractInstaller
 	end
 	
 	def install!
-		Dir.chdir(PASSENGER_ROOT)
+		Dir.chdir(SOURCE_ROOT)
 		show_welcome_screen
 		check_dependencies || exit(1)
 		
-		check_whether_we_can_write_to(PASSENGER_ROOT) || exit(1)
+		check_whether_we_can_write_to(SOURCE_ROOT) || exit(1)
 		
 		download_and_install = should_we_download_and_install_nginx_automatically?
 		if pcre_is_installed?
@@ -105,6 +105,19 @@ class Installer < PhusionPassenger::AbstractInstaller
 		end
 	end
 
+	def before_install
+		super
+		myself = `whoami`.strip
+		@working_dir = "/tmp/#{myself}-passenger-#{Process.pid}"
+		FileUtils.rm_rf(@working_dir)
+		FileUtils.mkdir_p(@working_dir)
+	end
+	
+	def after_install
+		super
+		FileUtils.rm_rf(@working_dir)
+	end
+
 private
 	def show_welcome_screen
 		render_template 'nginx/welcome', :version => VERSION_STRING
@@ -114,13 +127,13 @@ private
 	def compile_passenger_support_files
 		new_screen
 		color_puts "<banner>Compiling Passenger support files...</banner>"
-		return sh(RUBY, "-S", PlatformInfo.rake, "clean", "nginx")
+		return sh("#{PlatformInfo.rake_command} nginx:clean nginx CACHING=no")
 	end
 	
 	def should_we_download_and_install_nginx_automatically?
 		new_screen
 		render_template 'nginx/query_download_and_install',
-			:nginx_version => NGINX_VERSION
+			:nginx_version => PREFERRED_NGINX_VERSION
 		puts
 		
 		if @auto_download
@@ -149,17 +162,15 @@ private
 		new_screen
 		color_puts "<banner>PCRE (required by Nginx) not installed, downloading it...</banner>"
 		
-		basename = "pcre-8.02.tar.gz"
-		dirname = "pcre-8.02"
-		url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/#{basename}"
-		File.unlink("/tmp/#{basename}") rescue nil
-		FileUtils.rm_rf("/tmp/#{dirname}")
+		url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-#{PREFERRED_PCRE_VERSION}.tar.gz"
+		dirname = "pcre-#{PREFERRED_PCRE_VERSION}"
+		tarball = "#{@working_dir}/pcre.tar.gz"
 		
-		if download(url, "/tmp/#{basename}")
-			Dir.chdir("/tmp") do
+		if download(url, tarball)
+			Dir.chdir(@working_dir) do
 				color_puts "<banner>Extracting PCRE source tarball...</banner>"
-				if sh("tar", "xzvf", basename)
-					return "/tmp/#{dirname}"
+				if sh("tar", "xzvf", tarball)
+					return "#{@working_dir}/#{dirname}"
 				else
 					new_screen
 					render_template "nginx/pcre_could_not_be_extracted"
@@ -181,16 +192,15 @@ private
 		new_screen
 		color_puts "<banner>Downloading Nginx...</banner>"
 		
-		basename = "nginx-#{NGINX_VERSION}.tar.gz"
-		url = "http://sysoev.ru/nginx/#{basename}"
-		File.unlink("/tmp/#{basename}") rescue nil
-		FileUtils.rm_rf("/tmp/nginx-#{NGINX_VERSION}")
+		url = "http://sysoev.ru/nginx/nginx-#{PREFERRED_NGINX_VERSION}.tar.gz"
+		dirname = "nginx-#{PREFERRED_NGINX_VERSION}"
+		tarball = "#{@working_dir}/nginx.tar.gz"
 		
-		if download(url, "/tmp/#{basename}")
-			Dir.chdir("/tmp") do
+		if download(url, tarball)
+			Dir.chdir(@working_dir) do
 				color_puts "<banner>Extracting Nginx source tarball...</banner>"
-				if sh("tar", "xzvf", basename)
-					return "/tmp/nginx-#{NGINX_VERSION}"
+				if sh("tar", "xzvf", tarball)
+					return "#{@working_dir}/#{dirname}"
 				else
 					return nil
 				end
@@ -329,8 +339,8 @@ private
 		new_screen
 		render_template 'nginx/config_snippets',
 			:config_file => locate_nginx_config_file(prefix),
-			:passenger_root => PASSENGER_ROOT,
-			:ruby => RUBY
+			:passenger_root => SOURCE_ROOT,
+			:ruby => PlatformInfo.ruby_command
 		wait
 	end
 	
@@ -365,8 +375,8 @@ private
 		contents = File.read(config_file)
 		contents.sub!(/^http \{/,
 			"http {\n" <<
-			"    passenger_root #{PASSENGER_ROOT};\n" <<
-			"    passenger_ruby #{RUBY};\n")
+			"    passenger_root #{SOURCE_ROOT};\n" <<
+			"    passenger_ruby #{PlatformInfo.ruby_command};\n")
 		File.open(config_file, 'w') do |f|
 			f.write(contents)
 		end
@@ -374,19 +384,19 @@ private
 		new_screen
 		render_template 'nginx/config_snippets_inserted',
 			:config_file => config_file,
-			:passenger_root => PASSENGER_ROOT,
-			:ruby => RUBY
+			:passenger_root => SOURCE_ROOT,
+			:ruby => PlatformInfo.ruby_command
 		wait
 	end
 	
 	def build_nginx_configure_command(prefix, extra_configure_flags = nil)
-		command = "./configure --prefix='#{prefix}' "
+		command = "sh ./configure --prefix='#{prefix}' --with-http_ssl_module "
 		if @pcre_source_dir
 			command << "--with-pcre='#{@pcre_source_dir}' "
 		elsif !pcre_is_installed?
 			command << "--without-http_rewrite_module "
 		end
-		command << "--add-module='#{PASSENGER_ROOT}/ext/nginx' #{extra_configure_flags}"
+		command << "--add-module='#{SOURCE_ROOT}/ext/nginx' #{extra_configure_flags}"
 		command.strip!
 		return command
 	end
@@ -410,14 +420,6 @@ private
 		end
 		return @pcre_is_installed
 	end
-	
-	def download(url, output)
-		if PlatformInfo.find_command("wget")
-			return sh("wget", "-O", output, url)
-		else
-			return sh("curl", url, "-o", output)
-		end
-	end
 end
 
 options = {}

data/bin/passenger-make-enterprisey

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
+# encoding: utf-8
 #  Phusion Passenger - http://www.modrails.com/
-#  Copyright (c) 2008, 2009 Phusion
+#  Copyright (c) 2010 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -22,7 +23,9 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-PASSENGER_ROOT = File.expand_path(File.dirname(__FILE__) << "/..")
+source_root = File.expand_path(File.dirname(__FILE__) + "/..")
+$LOAD_PATH.unshift("#{source_root}/lib")
+require 'phusion_passenger'
 require 'digest/md5'
 
 ##############################################################################
@@ -42,13 +45,9 @@ require 'digest/md5'
 
 
 
-
-def natively_packaged?
-	return File.expand_path(File.dirname(__FILE__)) == "/usr/bin"
-end
-
+include PhusionPassenger
 trap("INT") { exit 1 }
-if File.exist?("#{PASSENGER_ROOT}/enterprisey.txt") || File.exist?("/etc/passenger_enterprisey.txt")
+if File.exist?("#{SOURCE_ROOT}/enterprisey.txt") || File.exist?("/etc/passenger_enterprisey.txt")
 	puts "Congratulations, your Passenger Enterprise License has already been activated!"
 else
 	puts %{
@@ -71,7 +70,7 @@ else
 	if natively_packaged?
 		enterprise_file = "/etc/passenger_enterprisey.txt"
 	else
-		enterprise_file = "#{PASSENGER_ROOT}/enterprisey.txt"
+		enterprise_file = "#{SOURCE_ROOT}/enterprisey.txt"
 	end
 	if system("touch", enterprise_file)
 		puts "Congratulations! Your Passenger Enterprise License has been activated!"

data/bin/passenger-memory-stats

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #  Phusion Passenger - http://www.modrails.com/
-#  Copyright (c) 2008, 2009 Phusion
+#  Copyright (c) 2010 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -22,8 +22,13 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../lib")
+source_root = File.expand_path(File.dirname(__FILE__) + "/..")
+$LOAD_PATH.unshift("#{source_root}/lib")
+require 'phusion_passenger'
 require 'phusion_passenger/platform_info'
+require 'phusion_passenger/admin_tools/memory_stats'
+
+include PhusionPassenger
 
 # ANSI color codes
 RESET   = "\e[0m"
@@ -97,48 +102,15 @@ class Table
 	end
 end
 
-class MemoryStats
-	class Process
-		attr_accessor :pid
-		attr_accessor :ppid
-		attr_accessor :threads
-		attr_accessor :vm_size              # in KB
-		attr_accessor :rss                  # in KB
-		attr_accessor :name
-		attr_accessor :private_dirty_rss    # in KB
-		
-		def vm_size_in_mb
-			return sprintf("%.1f MB", vm_size / 1024.0)
-		end
-
-		def rss_in_mb
-			return sprintf("%.1f MB", rss / 1024.0)
-		end
-		
-		def private_dirty_rss_in_mb
-			if private_dirty_rss.is_a?(Numeric)
-				return sprintf("%.1f MB", private_dirty_rss / 1024.0)
-			else
-				return "?"
-			end
-		end
-		
-		def to_a
-			return [pid, ppid, vm_size_in_mb, private_dirty_rss_in_mb, rss_in_mb, name]
-		end
+class App
+	def initialize
+		@stats = AdminTools::MemoryStats.new
 	end
 	
 	def start
-		if PlatformInfo.httpd
-			apache_processes = list_processes(:exe => PlatformInfo.httpd)
-			if apache_processes.empty?
-				# On some Linux distros, the Apache worker processes
-				# are called "httpd.worker"
-				apache_processes = list_processes(:exe => "#{PlatformInfo.httpd}.worker")
-			end
-			print_process_list("Apache processes", apache_processes)
+		if @stats.apache_processes
+			print_process_list("Apache processes", @stats.apache_processes)
 		else
-			apache_processes = []
 			puts "#{BLUE_BG}#{BOLD}#{YELLOW}------------- Apache processes -------------#{RESET}\n"
 			STDERR.puts "*** WARNING: The Apache executable cannot be found."
 			STDERR.puts "Please set the APXS2 environment variable to your 'apxs2' " <<
@@ -147,136 +119,35 @@ class MemoryStats
 		end
 		
 		puts
-		nginx_processes = list_processes(:exe => "nginx")
-		print_process_list("Nginx processes", nginx_processes)
+		print_process_list("Nginx processes", @stats.nginx_processes)
 		
 		puts
-		passenger_processes = list_processes(:match =>
-			/((^| )Passenger |(^| )Rails:|(^| )Rack:|ApplicationPoolServerExecutable|PassengerNginxHelperServer)/)
-		print_process_list("Passenger processes", passenger_processes, :show_ppid => false)
+		print_process_list("Passenger processes", @stats.passenger_processes, :show_ppid => false)
 		
-		if RUBY_PLATFORM !~ /linux/
-			puts
-			puts "*** WARNING: The private dirty RSS can only be displayed " <<
-				"on Linux. You're currently using '#{RUBY_PLATFORM}'."
-		elsif ::Process.uid != 0 && (apache_processes + passenger_processes).any?{ |p| p.private_dirty_rss.nil? }
+		if @stats.platform_provides_private_dirty_rss_information? &&
+		   Process.euid != 0 &&
+		   @stats.root_privileges_required_for_private_dirty_rss?
 			puts
 			puts "*** WARNING: Please run this tool as root. Otherwise the " <<
 				"private dirty RSS of processes cannot be determined."
 		end
 	end
 	
-	# Returns a list of Process objects that match the given search criteria.
-	#
-	#  # Search by executable path.
-	#  list_processes(:exe => '/usr/sbin/apache2')
-	#  
-	#  # Search by executable name.
-	#  list_processes(:name => 'ruby1.8')
-	#  
-	#  # Search by process name.
-	#  list_processes(:match => 'Passenger FrameworkSpawner')
-	def list_processes(options)
-		if options[:exe]
-			name = options[:exe].sub(/.*\/(.*)/, '\1')
-			if RUBY_PLATFORM =~ /linux/
-				ps = "ps -C '#{name}'"
-			else
-				ps = "ps -A"
-				options[:match] = Regexp.new(Regexp.escape(name))
-			end
-		elsif options[:name]
-			if RUBY_PLATFORM =~ /linux/
-				ps = "ps -C '#{options[:name]}'"
-			else
-				ps = "ps -A"
-				options[:match] = Regexp.new(" #{Regexp.escape(options[:name])}")
-			end
-		elsif options[:match]
-			ps = "ps -A"
-		else
-			raise ArgumentError, "Invalid options."
-		end
-		
-		processes = []
-		case RUBY_PLATFORM
-		when /solaris/
-			list = `#{ps} -o pid,ppid,nlwp,vsz,rss,comm`.split("\n")
-			threads_known = true
-		when /darwin/
-			list = `#{ps} -w -o pid,ppid,vsz,rss,command`.split("\n")
-			threads_known = false
-		else
-			list = `#{ps} -w -o pid,ppid,nlwp,vsz,rss,command`.split("\n")
-			threads_known = true
-		end
-		list.shift
-		list.each do |line|
-			line.gsub!(/^ */, '')
-			line.gsub!(/ *$/, '')
-			
-			p = Process.new
-			if threads_known
-				p.pid, p.ppid, p.threads, p.vm_size, p.rss, p.name = line.split(/ +/, 6)
-			else
-				p.pid, p.ppid, p.vm_size, p.rss, p.name = line.split(/ +/, 5)
-				p.threads = "?"
-			end
-			p.name.sub!(/\Aruby: /, '')
-			p.name.sub!(/ \(ruby\)\Z/, '')
-			if p.name !~ /^ps/ && (!options[:match] || p.name.match(options[:match]))
-				# Convert some values to integer.
-				[:pid, :ppid, :vm_size, :rss].each do |attr|
-					p.send("#{attr}=", p.send(attr).to_i)
-				end
-				p.threads = p.threads.to_i if threads_known
-
-				if platform_provides_private_dirty_rss_information?
-					p.private_dirty_rss = determine_private_dirty_rss(p.pid)
-				end
-				processes << p
-			end
-		end
-		return processes
-	end
-
 private
-	def platform_provides_private_dirty_rss_information?
-		return RUBY_PLATFORM =~ /linux/
-	end
-
-	# Returns the private dirty RSS for the given process, in KB.
-	def determine_private_dirty_rss(pid)
-		total = 0
-		File.read("/proc/#{pid}/smaps").split("\n").each do |line|
-			line =~ /^(Private)_Dirty: +(\d+)/
-			if $2
-				total += $2.to_i
-			end
-		end
-		if total == 0
-			return nil
-		else
-			return total
-		end
-	rescue Errno::EACCES, Errno::ENOENT
-		return nil
-	end
-	
 	def print_process_list(title, processes, options = {})
 		table = Table.new(%w{PID PPID VMSize Private Resident Name})
 		table.add_rows(processes)
 		if options.has_key?(:show_ppid) && !options[:show_ppid]
 			table.remove_column('PPID')
 		end
-		if platform_provides_private_dirty_rss_information?
+		if @stats.platform_provides_private_dirty_rss_information?
 			table.remove_column('Resident')
 		else
 			table.remove_column('Private')
 		end
 		puts table.to_s(title)
 		
-		if platform_provides_private_dirty_rss_information?
+		if @stats.platform_provides_private_dirty_rss_information?
 			total_private_dirty_rss = 0
 			some_private_dirty_rss_cannot_be_determined = false
 			processes.each do |p|
@@ -297,5 +168,4 @@ private
 	end
 end
 
-MemoryStats.new.start
-
+App.new.start