passenger 5.0.0.beta3 → 5.0.0.rc1

data/lib/phusion_passenger/config/installation_utils.rb

@@ -34,208 +34,208 @@ PhusionPassenger.require_passenger_lib 'platform_info/depcheck'
 PhusionPassenger.require_passenger_lib 'utils/ansi_colors'
 
 module PhusionPassenger
-module Config
-
-module InstallationUtils
-	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 find_or_create_writable_support_binaries_dir!
-		if File.exist?(PhusionPassenger.support_binaries_dir)
-			result = directory_writable?(PhusionPassenger.support_binaries_dir)
-			if result == true  # return value can be a SystemCallError
-				return PhusionPassenger.support_binaries_dir
-			end
-
-			if Process.euid == 0
-				if result == false
-					print_installation_error_header
-					render_template 'installation_utils/support_binaries_dir_not_writable_despite_running_as_root',
-						:dir => PhusionPassenger.support_binaries_dir,
-						:myself => myself
-				else
-					render_template 'installation_utils/unexpected_filesystem_problem',
-						:dir => PhusionPassenger.support_binaries_dir,
-						:exception => result
-				end
-				abort
-			else
-				return find_or_create_writable_user_support_binaries_dir!
-			end
-		else
-			if Process.euid == 0
-				mkdir_p_preserve_parent_owner(PhusionPassenger.support_binaries_dir)
-				return PhusionPassenger.support_binaries_dir
-			else
-				return find_or_create_writable_user_support_binaries_dir!
-			end
-		end
-	end
-
-	def check_for_download_tool!
-		PlatformInfo::Depcheck.load('depcheck_specs/utilities')
-		result = PlatformInfo::Depcheck.find('download-tool').check
-		# Don't output anything if there is a download tool.
-		# We want to be as quiet as possible.
-		return if result && result[:found]
-
-		colors = @colors || Utils::AnsiColors.new
-		puts colors.ansi_colorize("<banner>Checking for basic prerequities...</banner>")
-		puts
-
-		runner = PlatformInfo::Depcheck::ConsoleRunner.new
-		runner.add('download-tool')
-
-		result = runner.check_all
-		puts
-		if !result
-			puts "---------------------------------------"
-			puts
-			render_template 'installation_utils/download_tool_missing',
-				:runner => runner
-			abort
-		end
-	end
-
-	# Override this method to print a different header
-	def print_installation_error_header
-		if @colors
-			red = @colors.red
-			reset = @colors.reset
-		else
-			red = nil
-			reset = nil
-		end
-		@logger.warn "------------------------------------------" if @logger
-		puts "#{red}Cannot proceed with installation#{reset}"
-		puts
-	end
-
-	def rake
-		return "env NOEXEC_DISABLE=1 #{PlatformInfo.rake_command}"
-	end
-
-	def run_rake_task!(target)
-		total_lines = `#{rake} #{target} --dry-run STDERR_TO_STDOUT=1`.split("\n").size - 1
-		backlog = ""
-
-		command = "#{rake} #{target} --trace STDERR_TO_STDOUT=1"
-		IO.popen(command, "rb") do |io|
-			progress = 1
-			while !io.eof?
-				line = io.readline
-				yield(progress, total_lines)
-				if line =~ /^\*\* /
-					backlog.replace("")
-					progress += 1
-				else
-					backlog << line
-				end
-			end
-		end
-		if $?.exitstatus != 0
-			stderr = @stderr || STDERR
-			stderr.puts
-			stderr.puts "*** ERROR: the following command failed:"
-			stderr.puts(backlog)
-			exit 1
-		end
-	end
-
-private
-	# We can't use File.writable() and friends here because they
-	# don't always work right with ACLs. Instead of we use 'real'
-	# checks.
-	def directory_writable?(path)
-		filename = "#{path}/.__test_#{object_id}__.txt"
-		@logger.debug "Checking whether we can write to #{path}..." if @logger
-		begin
-			File.new(filename, "w").close
-			@logger.debug "Yes" if @logger
-			return true
-		rescue Errno::EACCES
-			@logger.debug "No" if @logger
-			return false
-		rescue SystemCallError => e
-			@logger.warn "Unable to check whether we can write to #{path}: #{e}" if @logger
-			return e
-		ensure
-			File.unlink(filename) rescue nil
-		end
-	end
-
-	def find_or_create_writable_user_support_binaries_dir!
-		if !File.exist?(PhusionPassenger.user_support_binaries_dir)
-			create_user_support_binaries_dir!
-		end
-		result = directory_writable?(PhusionPassenger.user_support_binaries_dir)
-		case result
-		when true
-			return PhusionPassenger.user_support_binaries_dir
-		when false
-			print_installation_error_header
-			render_template 'installation_utils/user_support_binaries_dir_not_writable'
-			abort
-		else
-			print_installation_error_header
-			render_template 'installation_utils/unexpected_filesystem_problem',
-				:dir => PhusionPassenger.support_binaries_dir,
-				:exception => result
-			abort
-		end
-	end
-
-	def create_user_support_binaries_dir!
-		dir = PhusionPassenger.user_support_binaries_dir
-		begin
-			mkdir_p_preserve_parent_owner(dir)
-		rescue Errno::EACCES
-			print_installation_error_header
-			render_template 'installation_utils/cannot_create_user_support_binaries_dir',
-				:dir => dir,
-				:myself => myself
-			abort
-		rescue SystemCallError
-			print_installation_error_header
-			render_template 'installation_utils/unexpected_filesystem_problem',
-				:dir => dir,
-				:exception => result
-			abort
-		end
-	end
-
-	# When creating PhusionPassenger.support_binaries_dir, preserve the
-	# parent directory's UID and GID. This way, running `passenger-config compile-agent`
-	# with sudo privileged, even though Phusion Passenger isn't installed as root,
-	# won't mess up permissions.
-	def mkdir_p_preserve_parent_owner(path)
-		Pathname.new(path).descend do |subpath|
-			if !subpath.exist?
-				stat = subpath.parent.stat
-				Dir.mkdir(subpath.to_s)
-				if Process.euid == 0
-					File.chown(stat.uid, stat.gid, subpath.to_s)
-				end
-			end
-		end
-	end
-
-	def myself
-		return `whoami`.strip
-	end
-
-	def render_template(name, options = {})
-		options.merge!(:colors => @colors || PhusionPassenger::Utils::AnsiColors.new)
-		puts ConsoleTextTemplate.new({ :file => "config/#{name}" }, options).result
-	end
-end
-
-end # module Config
+  module Config
+
+    module InstallationUtils
+      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 find_or_create_writable_support_binaries_dir!
+        if File.exist?(PhusionPassenger.support_binaries_dir)
+          result = directory_writable?(PhusionPassenger.support_binaries_dir)
+          if result == true  # return value can be a SystemCallError
+            return PhusionPassenger.support_binaries_dir
+          end
+
+          if Process.euid == 0
+            if result == false
+              print_installation_error_header
+              render_template 'installation_utils/support_binaries_dir_not_writable_despite_running_as_root',
+                :dir => PhusionPassenger.support_binaries_dir,
+                :myself => myself
+            else
+              render_template 'installation_utils/unexpected_filesystem_problem',
+                :dir => PhusionPassenger.support_binaries_dir,
+                :exception => result
+            end
+            abort
+          else
+            return find_or_create_writable_user_support_binaries_dir!
+          end
+        else
+          if Process.euid == 0
+            mkdir_p_preserve_parent_owner(PhusionPassenger.support_binaries_dir)
+            return PhusionPassenger.support_binaries_dir
+          else
+            return find_or_create_writable_user_support_binaries_dir!
+          end
+        end
+      end
+
+      def check_for_download_tool!
+        PlatformInfo::Depcheck.load('depcheck_specs/utilities')
+        result = PlatformInfo::Depcheck.find('download-tool').check
+        # Don't output anything if there is a download tool.
+        # We want to be as quiet as possible.
+        return if result && result[:found]
+
+        colors = @colors || Utils::AnsiColors.new
+        puts colors.ansi_colorize("<banner>Checking for basic prerequities...</banner>")
+        puts
+
+        runner = PlatformInfo::Depcheck::ConsoleRunner.new
+        runner.add('download-tool')
+
+        result = runner.check_all
+        puts
+        if !result
+          puts "---------------------------------------"
+          puts
+          render_template 'installation_utils/download_tool_missing',
+            :runner => runner
+          abort
+        end
+      end
+
+      # Override this method to print a different header
+      def print_installation_error_header
+        if @colors
+          red = @colors.red
+          reset = @colors.reset
+        else
+          red = nil
+          reset = nil
+        end
+        @logger.warn "------------------------------------------" if @logger
+        puts "#{red}Cannot proceed with installation#{reset}"
+        puts
+      end
+
+      def rake
+        return "env NOEXEC_DISABLE=1 #{PlatformInfo.rake_command}"
+      end
+
+      def run_rake_task!(target)
+        total_lines = `#{rake} #{target} --dry-run STDERR_TO_STDOUT=1`.split("\n").size - 1
+        backlog = ""
+
+        command = "#{rake} #{target} --trace STDERR_TO_STDOUT=1"
+        IO.popen(command, "rb") do |io|
+          progress = 1
+          while !io.eof?
+            line = io.readline
+            yield(progress, total_lines)
+            if line =~ /^\*\* /
+              backlog.replace("")
+              progress += 1
+            else
+              backlog << line
+            end
+          end
+        end
+        if $?.exitstatus != 0
+          stderr = @stderr || STDERR
+          stderr.puts
+          stderr.puts "*** ERROR: the following command failed:"
+          stderr.puts(backlog)
+          exit 1
+        end
+      end
+
+    private
+      # We can't use File.writable() and friends here because they
+      # don't always work right with ACLs. Instead of we use 'real'
+      # checks.
+      def directory_writable?(path)
+        filename = "#{path}/.__test_#{object_id}__.txt"
+        @logger.debug "Checking whether we can write to #{path}..." if @logger
+        begin
+          File.new(filename, "w").close
+          @logger.debug "Yes" if @logger
+          return true
+        rescue Errno::EACCES
+          @logger.debug "No" if @logger
+          return false
+        rescue SystemCallError => e
+          @logger.warn "Unable to check whether we can write to #{path}: #{e}" if @logger
+          return e
+        ensure
+          File.unlink(filename) rescue nil
+        end
+      end
+
+      def find_or_create_writable_user_support_binaries_dir!
+        if !File.exist?(PhusionPassenger.user_support_binaries_dir)
+          create_user_support_binaries_dir!
+        end
+        result = directory_writable?(PhusionPassenger.user_support_binaries_dir)
+        case result
+        when true
+          return PhusionPassenger.user_support_binaries_dir
+        when false
+          print_installation_error_header
+          render_template 'installation_utils/user_support_binaries_dir_not_writable'
+          abort
+        else
+          print_installation_error_header
+          render_template 'installation_utils/unexpected_filesystem_problem',
+            :dir => PhusionPassenger.support_binaries_dir,
+            :exception => result
+          abort
+        end
+      end
+
+      def create_user_support_binaries_dir!
+        dir = PhusionPassenger.user_support_binaries_dir
+        begin
+          mkdir_p_preserve_parent_owner(dir)
+        rescue Errno::EACCES
+          print_installation_error_header
+          render_template 'installation_utils/cannot_create_user_support_binaries_dir',
+            :dir => dir,
+            :myself => myself
+          abort
+        rescue SystemCallError
+          print_installation_error_header
+          render_template 'installation_utils/unexpected_filesystem_problem',
+            :dir => dir,
+            :exception => result
+          abort
+        end
+      end
+
+      # When creating PhusionPassenger.support_binaries_dir, preserve the
+      # parent directory's UID and GID. This way, running `passenger-config compile-agent`
+      # with sudo privileged, even though Phusion Passenger isn't installed as root,
+      # won't mess up permissions.
+      def mkdir_p_preserve_parent_owner(path)
+        Pathname.new(path).descend do |subpath|
+          if !subpath.exist?
+            stat = subpath.parent.stat
+            Dir.mkdir(subpath.to_s)
+            if Process.euid == 0
+              File.chown(stat.uid, stat.gid, subpath.to_s)
+            end
+          end
+        end
+      end
+
+      def myself
+        return `whoami`.strip
+      end
+
+      def render_template(name, options = {})
+        options.merge!(:colors => @colors || PhusionPassenger::Utils::AnsiColors.new)
+        puts ConsoleTextTemplate.new({ :file => "config/#{name}" }, options).result
+      end
+    end
+
+  end # module Config
 end # module PhusionPassenger

data/lib/phusion_passenger/config/list_instances_command.rb

@@ -29,78 +29,78 @@ PhusionPassenger.require_passenger_lib 'config/utils'
 PhusionPassenger.require_passenger_lib 'utils/json'
 
 module PhusionPassenger
-module Config
+  module Config
 
-class ListInstancesCommand < Command
-	include PhusionPassenger::Config::Utils
+    class ListInstancesCommand < Command
+      include PhusionPassenger::Config::Utils
 
-	def run
-		parse_options
-		instances = AdminTools::InstanceRegistry.new.list
-		if @options[:json]
-			print_json(instances)
-		elsif instances.empty?
-			print_no_instances_running
-		else
-			print_instances(instances)
-		end
-	end
+      def run
+        parse_options
+        instances = AdminTools::InstanceRegistry.new.list
+        if @options[:json]
+          print_json(instances)
+        elsif instances.empty?
+          print_no_instances_running
+        else
+          print_instances(instances)
+        end
+      end
 
-private
-	def self.create_option_parser(options)
-		OptionParser.new do |opts|
-			nl = "\n" + ' ' * 37
-			opts.banner = "Usage: passenger-config list-instances [OPTIONS] <PID>\n"
-			opts.separator ""
-			opts.separator "  List all running #{PROGRAM_NAME} instances."
-			opts.separator ""
+    private
+      def self.create_option_parser(options)
+        OptionParser.new do |opts|
+          nl = "\n" + ' ' * 37
+          opts.banner = "Usage: passenger-config list-instances [OPTIONS] <PID>\n"
+          opts.separator ""
+          opts.separator "  List all running #{PROGRAM_NAME} instances."
+          opts.separator ""
 
-			opts.on("--json", "Print output in JSON format") do
-				options[:json] = true
-			end
-			opts.on("-q", "--quiet", "Don't print anything if there are no #{PROGRAM_NAME} instances running") do
-				options[:quiet] = true
-			end
-			opts.on("-h", "--help", "Show this help") do
-				options[:help] = true
-			end
-		end
-	end
+          opts.on("--json", "Print output in JSON format") do
+            options[:json] = true
+          end
+          opts.on("-q", "--quiet", "Don't print anything if there are no #{PROGRAM_NAME} instances running") do
+            options[:quiet] = true
+          end
+          opts.on("-h", "--help", "Show this help") do
+            options[:help] = true
+          end
+        end
+      end
 
-	def help
-		puts @parser
-	end
+      def help
+        puts @parser
+      end
 
-	def parse_options
-		super
-		if !@argv.empty?
-			help
-			abort
-		end
-	end
+      def parse_options
+        super
+        if !@argv.empty?
+          help
+          abort
+        end
+      end
 
-	def print_no_instances_running
-		if !@options[:quiet]
-			puts "There are no #{PROGRAM_NAME} instances running."
-		end
-	end
+      def print_no_instances_running
+        if !@options[:quiet]
+          puts "There are no #{PROGRAM_NAME} instances running."
+        end
+      end
 
-	def print_json(instances)
-		result = []
-		instances.each do |instance|
-			result << instance.properties
-		end
-		puts PhusionPassenger::Utils::JSON.generate(result)
-	end
+      def print_json(instances)
+        result = []
+        instances.each do |instance|
+          result << instance.properties
+        end
+        puts PhusionPassenger::Utils::JSON.generate(result)
+      end
 
-	def print_instances(instances)
-		printf "%-25s  %s\n", "Name", "Description"
-		puts "------------------------------------------------------------------"
-		instances.each do |instance|
-			printf "%-25s  %s\n", instance.name, instance.server_software
-		end
-	end
-end
+      def print_instances(instances)
+        printf "%-25s  %s\n", "Name", "Description"
+        puts "------------------------------------------------------------------"
+        instances.each do |instance|
+          printf "%-25s  %s\n", instance.name, instance.server_software
+        end
+      end
+    end
 
-end # module Config
+  end # module Config
 end # module PhusionPassenger