passenger 5.0.0.beta3 → 5.0.0.rc1

data/lib/phusion_passenger/config/system_metrics_command.rb

@@ -25,19 +25,19 @@ PhusionPassenger.require_passenger_lib 'constants'
 PhusionPassenger.require_passenger_lib 'config/command'
 
 module PhusionPassenger
-module Config
+  module Config
 
-class SystemMetricsCommand < Command
-	def run
-		agent_exe = PhusionPassenger.find_support_binary(AGENT_EXE)
-		if agent_exe
-			exec(agent_exe, "system-metrics", *@argv)
-		else
-			abort "This command requires the #{PROGRAM_NAME} agent to be installed. " +
-				"Please install it by running `passenger-config install-agent`."
-		end
-	end
-end
+    class SystemMetricsCommand < Command
+      def run
+        agent_exe = PhusionPassenger.find_support_binary(AGENT_EXE)
+        if agent_exe
+          exec(agent_exe, "system-metrics", *@argv)
+        else
+          abort "This command requires the #{PROGRAM_NAME} agent to be installed. " +
+            "Please install it by running `passenger-config install-agent`."
+        end
+      end
+    end
 
-end # module Config
+  end # module Config
 end # module PhusionPassenger

data/lib/phusion_passenger/config/utils.rb

@@ -24,110 +24,110 @@
 PhusionPassenger.require_passenger_lib 'constants'
 
 module PhusionPassenger
-module Config
+  module Config
 
-module Utils
-	extend self    # Make methods available as class methods.
+    module Utils
+      extend self    # Make methods available as class methods.
 
-	def self.included(klass)
-		# When included into another class, make sure that Utils
-		# methods are made private.
-		public_instance_methods(false).each do |method_name|
-			klass.send(:private, method_name)
-		end
-	end
+      def self.included(klass)
+        # When included into another class, make sure that Utils
+        # methods are made private.
+        public_instance_methods(false).each do |method_name|
+          klass.send(:private, method_name)
+        end
+      end
 
-	def select_passenger_instance
-		if name = @options[:instance]
-			@instance = AdminTools::InstanceRegistry.new.find_by_name_prefix(name)
-			if !@instance
-				STDERR.puts "*** ERROR: there doesn't seem to be a #{PROGRAM_NAME} instance running with the name '#{name}'."
-				list_all_passenger_instances(AdminTools::InstanceRegistry.new.list)
-				STDERR.puts
-				STDERR.puts "Please pass `--instance <NAME>` to select a specific #{PROGRAM_NAME} instance."
-				abort
-			elsif @instance == :ambigious
-				abort "*** ERROR: there are multiple instances whose name start with '#{name}'. Please specify the full name."
-			end
-		else
-			instances = AdminTools::InstanceRegistry.new.list
-			if instances.empty?
-				STDERR.puts "*** ERROR: #{PROGRAM_NAME} doesn't seem to be running. If you are sure that it"
-				STDERR.puts "is running, then the causes of this problem could be one of:"
-				STDERR.puts
-				STDERR.puts " 1. You customized the instance registry directory using Apache's"
-				STDERR.puts "    PassengerInstanceRegistryDir option, Nginx's"
-				STDERR.puts "    passenger_instance_registry_dir option, or #{PROGRAM_NAME} Standalone's"
-				STDERR.puts "    --instance-registry-dir command line argument. If so, please set the"
-				STDERR.puts "    environment variable PASSENGER_INSTANCE_REGISTRY_DIR to that directory"
-				STDERR.puts "    and run this command again."
-				STDERR.puts " 2. The instance directory has been removed by an operating system background"
-				STDERR.puts "    service. Please set a different instance registry directory using Apache's"
-				STDERR.puts "    PassengerInstanceRegistryDir option, Nginx's passenger_instance_registry_dir"
-				STDERR.puts "    option, or #{PROGRAM_NAME} Standalone's --instance-registry-dir command"
-				STDERR.puts "    line argument."
-				abort
-			elsif instances.size == 1
-				@instance = instances.first
-			else
-				complain_that_multiple_passenger_instances_are_running(instances)
-				abort
-			end
-		end
-	end
+      def select_passenger_instance
+        if name = @options[:instance]
+          @instance = AdminTools::InstanceRegistry.new.find_by_name_prefix(name)
+          if !@instance
+            STDERR.puts "*** ERROR: there doesn't seem to be a #{PROGRAM_NAME} instance running with the name '#{name}'."
+            list_all_passenger_instances(AdminTools::InstanceRegistry.new.list)
+            STDERR.puts
+            STDERR.puts "Please pass `--instance <NAME>` to select a specific #{PROGRAM_NAME} instance."
+            abort
+          elsif @instance == :ambigious
+            abort "*** ERROR: there are multiple instances whose name start with '#{name}'. Please specify the full name."
+          end
+        else
+          instances = AdminTools::InstanceRegistry.new.list
+          if instances.empty?
+            STDERR.puts "*** ERROR: #{PROGRAM_NAME} doesn't seem to be running. If you are sure that it"
+            STDERR.puts "is running, then the causes of this problem could be one of:"
+            STDERR.puts
+            STDERR.puts " 1. You customized the instance registry directory using Apache's"
+            STDERR.puts "    PassengerInstanceRegistryDir option, Nginx's"
+            STDERR.puts "    passenger_instance_registry_dir option, or #{PROGRAM_NAME} Standalone's"
+            STDERR.puts "    --instance-registry-dir command line argument. If so, please set the"
+            STDERR.puts "    environment variable PASSENGER_INSTANCE_REGISTRY_DIR to that directory"
+            STDERR.puts "    and run this command again."
+            STDERR.puts " 2. The instance directory has been removed by an operating system background"
+            STDERR.puts "    service. Please set a different instance registry directory using Apache's"
+            STDERR.puts "    PassengerInstanceRegistryDir option, Nginx's passenger_instance_registry_dir"
+            STDERR.puts "    option, or #{PROGRAM_NAME} Standalone's --instance-registry-dir command"
+            STDERR.puts "    line argument."
+            abort
+          elsif instances.size == 1
+            @instance = instances.first
+          else
+            complain_that_multiple_passenger_instances_are_running(instances)
+            abort
+          end
+        end
+      end
 
-	def complain_that_multiple_passenger_instances_are_running(instances)
-		puts "It appears that multiple #{PROGRAM_NAME} instances are running. Please select"
-		puts "a specific one by passing:"
-		puts
-		puts "  --instance <NAME>"
-		puts
-		list_all_passenger_instances(instances)
-		abort
-	end
+      def complain_that_multiple_passenger_instances_are_running(instances)
+        puts "It appears that multiple #{PROGRAM_NAME} instances are running. Please select"
+        puts "a specific one by passing:"
+        puts
+        puts "  --instance <NAME>"
+        puts
+        list_all_passenger_instances(instances)
+        abort
+      end
 
-	def list_all_passenger_instances(instances)
-		puts "The following #{PROGRAM_NAME} instances are running:"
-		puts
-		instances.each do |instance|
-			printf "%-25s  %s\n", "Name", "Description"
-			puts "------------------------------------------------------------------"
-			instances.each do |instance|
-				printf "%-25s  %s\n", instance.name, instance.server_software
-			end
-		end
-	end
+      def list_all_passenger_instances(instances)
+        puts "The following #{PROGRAM_NAME} instances are running:"
+        puts
+        instances.each do |instance|
+          printf "%-25s  %s\n", "Name", "Description"
+          puts "------------------------------------------------------------------"
+          instances.each do |instance|
+            printf "%-25s  %s\n", instance.name, instance.server_software
+          end
+        end
+      end
 
-	def obtain_read_only_admin_password(instance)
-		begin
-			return instance.read_only_admin_password
-		rescue Errno::EACCES
-			print_instance_querying_permission_error
-			abort
-		end
-	end
+      def obtain_read_only_admin_password(instance)
+        begin
+          return instance.read_only_admin_password
+        rescue Errno::EACCES
+          print_instance_querying_permission_error
+          abort
+        end
+      end
 
-	def obtain_full_admin_password(instance)
-		begin
-			return instance.full_admin_password
-		rescue Errno::EACCES
-			print_instance_querying_permission_error
-			abort
-		end
-	end
+      def obtain_full_admin_password(instance)
+        begin
+          return instance.full_admin_password
+        rescue Errno::EACCES
+          print_instance_querying_permission_error
+          abort
+        end
+      end
 
 
-	def print_instance_querying_permission_error
-		PhusionPassenger.require_passenger_lib 'platform_info/ruby'
-		STDERR.puts "*** ERROR: You are not authorized to query the status for this "
-			"#{PROGRAM_NAME} instance. Please try again with " +
-			"'#{PhusionPassenger::PlatformInfo.ruby_sudo_command}'."
-	end
+      def print_instance_querying_permission_error
+        PhusionPassenger.require_passenger_lib 'platform_info/ruby'
+        STDERR.puts "*** ERROR: You are not authorized to query the status for this "
+          "#{PROGRAM_NAME} instance. Please try again with " +
+          "'#{PhusionPassenger::PlatformInfo.ruby_sudo_command}'."
+      end
 
-	def is_enterprise?
-		return defined?(PhusionPassenger::PASSENGER_IS_ENTERPRISE) && PhusionPassenger::PASSENGER_IS_ENTERPRISE
-	end
-end
+      def is_enterprise?
+        return defined?(PhusionPassenger::PASSENGER_IS_ENTERPRISE) && PhusionPassenger::PASSENGER_IS_ENTERPRISE
+      end
+    end
 
-end # module Config
+  end # module Config
 end # module PhusionPassenger

data/lib/phusion_passenger/config/validate_install_command.rb

@@ -26,202 +26,202 @@ PhusionPassenger.require_passenger_lib 'constants'
 PhusionPassenger.require_passenger_lib 'config/command'
 
 module PhusionPassenger
-module Config
-
-class ValidateInstallCommand < Command
-	# Signifies that there is at least 1 error.
-	FAIL_EXIT_CODE = 1
-	# Signifies that there are no error, but at least 1 warning.
-	WARN_EXIT_CODE = 2
-
-	def self.help
-		puts "Usage: passenger-config validate-install"
-		puts "Validate this #{PROGRAM_NAME} installation."
-		puts
-		puts "Exit codes:"
-		puts "  0 - All checks passed. No errors, no warnings."
-		puts "  #{FAIL_EXIT_CODE} - There are some errors."
-		puts "  #{WARN_EXIT_CODE} - There are no errors, but there are some warnings."
-	end
-
-	def run
-		if @argv[0] == '--help'
-			self.class.help
-			exit
-		elsif @argv.size > 0
-			self.class.help
-			exit 1
-		end
-
-		begin
-			require 'rubygems'
-		rescue LoadError
-		end
-		PhusionPassenger.require_passenger_lib 'utils/ansi_colors'
-		PhusionPassenger.require_passenger_lib 'platform_info'
-
-		@error_count = 0
-		@warning_count = 0
-
-		prepare_terminal
-		begin
-			check_tools_in_path
-			check_no_other_installs_in_path
-
-			exit(FAIL_EXIT_CODE) if @error_count > 0
-			exit(WARN_EXIT_CODE) if @warning_count > 0
-		ensure
-			reset_terminal
-		end
-	end
-
-private
-	def prepare_terminal
-		STDOUT.write(Utils::AnsiColors::DEFAULT_TERMINAL_COLOR)
-		STDOUT.flush
-	end
-
-	def reset_terminal
-		STDOUT.write(Utils::AnsiColors::RESET)
-		STDOUT.flush
-	end
-
-	def check_tools_in_path
-		checking "whether this #{PROGRAM_NAME} install is in PATH"
-		paths = ENV['PATH'].to_s.split(':')
-		if paths.include?(gem_bindir) ||
-		   paths.include?(homebrew_bindir) ||
-		   paths.include?(PhusionPassenger.bin_dir)
-			check_ok
-		else
-			check_warning
-			suggest %Q{
-				Please add #{PhusionPassenger.bin_dir} to PATH.
-				Otherwise you will get "command not found" errors upon running
-				passenger-status and other tools.
-
-				Learn more at about PATH at:
-
-				  #{NGINX_DOC_URL}#_the_path_environment_variable
-			}
-		end
-	end
-
-	def check_no_other_installs_in_path
-		logn " * Checking whether there are no other #{PROGRAM_NAME} installations... "
-
-		paths = ENV['PATH'].to_s.split(':')
-		if Process.uid == 0 &&
-		   (sudo_user = ENV['SUDO_USER']) &&
-		   (bash = PlatformInfo.find_command("bash")) &&
-		   PlatformInfo.find_command("sudo")
-			# If we were invoked through sudo then we need to check the original user's PATH too.
-			output = `sudo -u #{sudo_user} #{bash} -lc 'echo; echo PATH FOLLOWS; echo "$PATH"' 2>&1`
-			output.sub!(/.*\nPATH FOLLOWS\n/m, '')
-			output.strip!
-			paths.concat(output.split(':'))
-		end
-
-		# These may not be in PATH if the user did not run this command through sudo.
-		paths << "/usr/bin"
-		paths << "/usr/sbin"
-		paths.delete(gem_bindir)
-		paths.delete(homebrew_bindir)
-		paths.delete(PhusionPassenger.bin_dir)
-		paths.uniq!
-
-		other_installs = []
-		paths.each do |path|
-			filename = "#{path}/passenger-config"
-			if File.exist?(filename)
-				other_installs << filename
-			end
-		end
-		if other_installs.empty?
-			check_ok
-		else
-			check_warning
-			suggest %Q{
-				Besides this #{PROGRAM_NAME} installation, the following other
-				#{PROGRAM_NAME} installations have been detected:
-
-				  #{other_installs.join("\n\t\t\t\t  ")}
-
-				Please uninstall them to avoid confusion or conflicts.
-			}
-		end
-	end
-
-	# Returns the RubyGems bin dir, if Phusion Passenger is installed through RubyGems.
-	def gem_bindir
-		if defined?(Gem) &&
-		   PhusionPassenger.originally_packaged? &&
-		   PhusionPassenger.build_system_dir =~ /^#{Regexp.escape Gem.dir}\// &&
-		   File.exist?("#{Gem.bindir}/passenger-config")
-			return Gem.bindir
-		else
-			return nil
-		end
-	end
-
-	# Returns the Homebrew bin dir, if Phusion Passenger is installed through Homebrew.
-	def homebrew_bindir
-		if PhusionPassenger.packaging_method == "homebrew"
-			return "/usr/local/bin"
-		else
-			return nil
-		end
-	end
-
-	def logn(message)
-		if STDOUT.tty?
-			STDOUT.write(Utils::AnsiColors.ansi_colorize(message))
-		else
-			STDOUT.write(Utils::AnsiColors.strip_color_tags(message))
-		end
-		STDOUT.flush
-	end
-
-	def log(message)
-		if STDOUT.tty?
-			STDOUT.puts(Utils::AnsiColors.ansi_colorize(message))
-		else
-			STDOUT.puts(Utils::AnsiColors.strip_color_tags(message))
-		end
-	end
-
-	def checking(message)
-		logn " * Checking #{message}... "
-	end
-
-	def check_ok(message = "✓")
-		log "<green>#{message}</green>"
-	end
-
-	def check_error(message = "✗")
-		log "<red>#{message}</red>"
-		@error_count += 1
-	end
-
-	def check_warning(message = "(!)")
-		log "<yellow>#{message}</yellow>"
-		@warning_count += 1
-	end
-
-	def suggest(message)
-		puts
-		log reindent(unindent(message), 3)
-		puts
-	end
-
-	def unindent(text)
-		return PlatformInfo.send(:unindent, text)
-	end
-
-	def reindent(text, level)
-		return PlatformInfo.send(:reindent, text, level)
-	end
-end
-
-end # module Config
+  module Config
+
+    class ValidateInstallCommand < Command
+      # Signifies that there is at least 1 error.
+      FAIL_EXIT_CODE = 1
+      # Signifies that there are no error, but at least 1 warning.
+      WARN_EXIT_CODE = 2
+
+      def self.help
+        puts "Usage: passenger-config validate-install"
+        puts "Validate this #{PROGRAM_NAME} installation."
+        puts
+        puts "Exit codes:"
+        puts "  0 - All checks passed. No errors, no warnings."
+        puts "  #{FAIL_EXIT_CODE} - There are some errors."
+        puts "  #{WARN_EXIT_CODE} - There are no errors, but there are some warnings."
+      end
+
+      def run
+        if @argv[0] == '--help'
+          self.class.help
+          exit
+        elsif @argv.size > 0
+          self.class.help
+          exit 1
+        end
+
+        begin
+          require 'rubygems'
+        rescue LoadError
+        end
+        PhusionPassenger.require_passenger_lib 'utils/ansi_colors'
+        PhusionPassenger.require_passenger_lib 'platform_info'
+
+        @error_count = 0
+        @warning_count = 0
+
+        prepare_terminal
+        begin
+          check_tools_in_path
+          check_no_other_installs_in_path
+
+          exit(FAIL_EXIT_CODE) if @error_count > 0
+          exit(WARN_EXIT_CODE) if @warning_count > 0
+        ensure
+          reset_terminal
+        end
+      end
+
+    private
+      def prepare_terminal
+        STDOUT.write(Utils::AnsiColors::DEFAULT_TERMINAL_COLOR)
+        STDOUT.flush
+      end
+
+      def reset_terminal
+        STDOUT.write(Utils::AnsiColors::RESET)
+        STDOUT.flush
+      end
+
+      def check_tools_in_path
+        checking "whether this #{PROGRAM_NAME} install is in PATH"
+        paths = ENV['PATH'].to_s.split(':')
+        if paths.include?(gem_bindir) ||
+           paths.include?(homebrew_bindir) ||
+           paths.include?(PhusionPassenger.bin_dir)
+          check_ok
+        else
+          check_warning
+          suggest %Q{
+            Please add #{PhusionPassenger.bin_dir} to PATH.
+            Otherwise you will get "command not found" errors upon running
+            passenger-status and other tools.
+
+            Learn more at about PATH at:
+
+              #{NGINX_DOC_URL}#_the_path_environment_variable
+          }
+        end
+      end
+
+      def check_no_other_installs_in_path
+        logn " * Checking whether there are no other #{PROGRAM_NAME} installations... "
+
+        paths = ENV['PATH'].to_s.split(':')
+        if Process.uid == 0 &&
+           (sudo_user = ENV['SUDO_USER']) &&
+           (bash = PlatformInfo.find_command("bash")) &&
+           PlatformInfo.find_command("sudo")
+          # If we were invoked through sudo then we need to check the original user's PATH too.
+          output = `sudo -u #{sudo_user} #{bash} -lc 'echo; echo PATH FOLLOWS; echo "$PATH"' 2>&1`
+          output.sub!(/.*\nPATH FOLLOWS\n/m, '')
+          output.strip!
+          paths.concat(output.split(':'))
+        end
+
+        # These may not be in PATH if the user did not run this command through sudo.
+        paths << "/usr/bin"
+        paths << "/usr/sbin"
+        paths.delete(gem_bindir)
+        paths.delete(homebrew_bindir)
+        paths.delete(PhusionPassenger.bin_dir)
+        paths.uniq!
+
+        other_installs = []
+        paths.each do |path|
+          filename = "#{path}/passenger-config"
+          if File.exist?(filename)
+            other_installs << filename
+          end
+        end
+        if other_installs.empty?
+          check_ok
+        else
+          check_warning
+          suggest %Q{
+            Besides this #{PROGRAM_NAME} installation, the following other
+            #{PROGRAM_NAME} installations have been detected:
+
+              #{other_installs.join("\n\t\t\t\t  ")}
+
+            Please uninstall them to avoid confusion or conflicts.
+          }
+        end
+      end
+
+      # Returns the RubyGems bin dir, if Phusion Passenger is installed through RubyGems.
+      def gem_bindir
+        if defined?(Gem) &&
+           PhusionPassenger.originally_packaged? &&
+           PhusionPassenger.build_system_dir =~ /^#{Regexp.escape Gem.dir}\// &&
+           File.exist?("#{Gem.bindir}/passenger-config")
+          return Gem.bindir
+        else
+          return nil
+        end
+      end
+
+      # Returns the Homebrew bin dir, if Phusion Passenger is installed through Homebrew.
+      def homebrew_bindir
+        if PhusionPassenger.packaging_method == "homebrew"
+          return "/usr/local/bin"
+        else
+          return nil
+        end
+      end
+
+      def logn(message)
+        if STDOUT.tty?
+          STDOUT.write(Utils::AnsiColors.ansi_colorize(message))
+        else
+          STDOUT.write(Utils::AnsiColors.strip_color_tags(message))
+        end
+        STDOUT.flush
+      end
+
+      def log(message)
+        if STDOUT.tty?
+          STDOUT.puts(Utils::AnsiColors.ansi_colorize(message))
+        else
+          STDOUT.puts(Utils::AnsiColors.strip_color_tags(message))
+        end
+      end
+
+      def checking(message)
+        logn " * Checking #{message}... "
+      end
+
+      def check_ok(message = "✓")
+        log "<green>#{message}</green>"
+      end
+
+      def check_error(message = "✗")
+        log "<red>#{message}</red>"
+        @error_count += 1
+      end
+
+      def check_warning(message = "(!)")
+        log "<yellow>#{message}</yellow>"
+        @warning_count += 1
+      end
+
+      def suggest(message)
+        puts
+        log reindent(unindent(message), 3)
+        puts
+      end
+
+      def unindent(text)
+        return PlatformInfo.send(:unindent, text)
+      end
+
+      def reindent(text, level)
+        return PlatformInfo.send(:reindent, text, level)
+      end
+    end
+
+  end # module Config
 end # module PhusionPassenger