passenger 5.0.0.beta3 → 5.0.0.rc1

data/lib/phusion_passenger/config/agent_compiler.rb

@@ -33,138 +33,138 @@ PhusionPassenger.require_passenger_lib 'utils/progress_bar'
 PhusionPassenger.require_passenger_lib 'utils/tmpio'
 
 module PhusionPassenger
-module Config
+  module Config
 
-class AgentCompiler < AbstractInstaller
-protected
-	def dependencies
-		specs = [
-			'depcheck_specs/compiler_toolchain',
-			'depcheck_specs/ruby',
-			'depcheck_specs/gems',
-			'depcheck_specs/libs',
-			'depcheck_specs/utilities'
-		]
-		ids = [
-			'cc',
-			'c++',
-			'rake',
-			'libcurl-dev',
-			'openssl-dev',
-			'zlib-dev'
-		].compact
-		return [specs, ids]
-	end
+    class AgentCompiler < AbstractInstaller
+    protected
+      def dependencies
+        specs = [
+          'depcheck_specs/compiler_toolchain',
+          'depcheck_specs/ruby',
+          'depcheck_specs/gems',
+          'depcheck_specs/libs',
+          'depcheck_specs/utilities'
+        ]
+        ids = [
+          'cc',
+          'c++',
+          'rake',
+          'libcurl-dev',
+          'openssl-dev',
+          'zlib-dev'
+        ].compact
+        return [specs, ids]
+      end
 
-	def users_guide_path
-		return PhusionPassenger.standalone_doc_path
-	end
+      def users_guide_path
+        return PhusionPassenger.standalone_doc_path
+      end
 
-	def users_guide_url
-		return STANDALONE_DOC_URL
-	end
+      def users_guide_url
+        return STANDALONE_DOC_URL
+      end
 
-	def run_steps
-		check_source_code_available!
-		if !@force
-			check_whether_os_is_broken
-			check_whether_system_has_enough_ram
-			InstallationUtils.check_for_download_tool!
-		end
-		check_dependencies(false) || abort
-		puts
+      def run_steps
+        check_source_code_available!
+        if !@force
+          check_whether_os_is_broken
+          check_whether_system_has_enough_ram
+          InstallationUtils.check_for_download_tool!
+        end
+        check_dependencies(false) || abort
+        puts
 
-		@destdir = InstallationUtils.find_or_create_writable_support_binaries_dir!
-		confirm_enable_optimizations
-		compile_agent
-	end
+        @destdir = InstallationUtils.find_or_create_writable_support_binaries_dir!
+        confirm_enable_optimizations
+        compile_agent
+      end
 
-	def before_install
-		super
-		if !@working_dir
-			@working_dir = PhusionPassenger::Utils.mktmpdir("passenger-install.", PlatformInfo.tmpexedir)
-			@owns_working_dir = true
-		end
-	end
+      def before_install
+        super
+        if !@working_dir
+          @working_dir = PhusionPassenger::Utils.mktmpdir("passenger-install.", PlatformInfo.tmpexedir)
+          @owns_working_dir = true
+        end
+      end
 
-	def after_install
-		super
-		FileUtils.remove_entry_secure(@working_dir) if @owns_working_dir
-	end
+      def after_install
+        super
+        FileUtils.remove_entry_secure(@working_dir) if @owns_working_dir
+      end
 
-private
-	def check_source_code_available!
-		if PhusionPassenger.build_system_dir.nil?
-			puts "<red>Cannot compile agent binary</red>"
-			puts
-			puts "This #{PROGRAM_NAME} installation does not " +
-				"come with any source code, so the agent binary cannot " +
-				"be compiled. So instead, please try to download a " +
-				"precompiled agent binary from the #{PROGRAM_NAME} website, " +
-				"by running:\n\n" +
-				"  <b>passenger-config download-agent</b>"
-			abort
-		end
-	end
+    private
+      def check_source_code_available!
+        if PhusionPassenger.build_system_dir.nil?
+          puts "<red>Cannot compile agent binary</red>"
+          puts
+          puts "This #{PROGRAM_NAME} installation does not " +
+            "come with any source code, so the agent binary cannot " +
+            "be compiled. So instead, please try to download a " +
+            "precompiled agent binary from the #{PROGRAM_NAME} website, " +
+            "by running:\n\n" +
+            "  <b>passenger-config download-agent</b>"
+          abort
+        end
+      end
 
-	def confirm_enable_optimizations
-		if @auto
-			if @optimize
-				puts "Compiling with optimizations."
-			else
-				puts "Not compiling with optimizations."
-			end
-		else
-			if @optimize
-				puts "Compiling with optimizations."
-			else
-				new_screen
-				render_template 'config/agent_compiler/confirm_enable_optimizations',
-					:total_ram => total_ram_gb
-				puts
-				@optimize = prompt_confirmation('Compile with optimizations?')
-				puts
-			end
-		end
-	end
+      def confirm_enable_optimizations
+        if @auto
+          if @optimize
+            puts "Compiling with optimizations."
+          else
+            puts "Not compiling with optimizations."
+          end
+        else
+          if @optimize
+            puts "Compiling with optimizations."
+          else
+            new_screen
+            render_template 'config/agent_compiler/confirm_enable_optimizations',
+              :total_ram => total_ram_gb
+            puts
+            @optimize = prompt_confirmation('Compile with optimizations?')
+            puts
+          end
+        end
+      end
 
-	def compile_agent
-		puts "<banner>Compiling #{PROGRAM_NAME} agent...</banner>"
-		progress_bar = ProgressBar.new
-		e_working_dir = Shellwords.escape(@working_dir)
-		args = "#{e_working_dir}/support-binaries/#{AGENT_EXE}" +
-			" CACHING=false" +
-			" OUTPUT_DIR=#{e_working_dir} "
-			" OPTIMIZE=#{!!@optimize}"
-		begin
-			progress_bar.set(0)
-			Dir.chdir(PhusionPassenger.build_system_dir) do
-				InstallationUtils.run_rake_task!(args) do |progress, total|
-					progress_bar.set(0.05 + (progress / total.to_f) * 0.95)
-				end
-			end
-			progress_bar.set(1)
-		ensure
-			progress_bar.finish
-		end
+      def compile_agent
+        puts "<banner>Compiling #{PROGRAM_NAME} agent...</banner>"
+        progress_bar = ProgressBar.new
+        e_working_dir = Shellwords.escape(@working_dir)
+        args = "#{e_working_dir}/support-binaries/#{AGENT_EXE}" +
+          " CACHING=false" +
+          " OUTPUT_DIR=#{e_working_dir} "
+          " OPTIMIZE=#{!!@optimize}"
+        begin
+          progress_bar.set(0)
+          Dir.chdir(PhusionPassenger.build_system_dir) do
+            InstallationUtils.run_rake_task!(args) do |progress, total|
+              progress_bar.set(0.05 + (progress / total.to_f) * 0.95)
+            end
+          end
+          progress_bar.set(1)
+        ensure
+          progress_bar.finish
+        end
 
-		FileUtils.cp("#{@working_dir}/support-binaries/#{AGENT_EXE}",
-			"#{@destdir}/#{AGENT_EXE}")
-		puts "<green>Compilation finished!</green>"
-	end
+        FileUtils.cp("#{@working_dir}/support-binaries/#{AGENT_EXE}",
+          "#{@destdir}/#{AGENT_EXE}")
+        puts "<green>Compilation finished!</green>"
+      end
 
-	def total_ram_gb
-		begin
-			meminfo = File.read("/proc/meminfo")
-			if meminfo =~ /^MemTotal: *(\d+) kB$/
-				return sprintf("%.1f", $1.to_i / 1024 / 1024)
-			end
-		rescue Errno::ENOENT, Errno::EACCES
-			# Don't do anything on systems without memory information.
-			return nil
-		end
-	end
-end
+      def total_ram_gb
+        begin
+          meminfo = File.read("/proc/meminfo")
+          if meminfo =~ /^MemTotal: *(\d+) kB$/
+            return sprintf("%.1f", $1.to_i / 1024 / 1024)
+          end
+        rescue Errno::ENOENT, Errno::EACCES
+          # Don't do anything on systems without memory information.
+          return nil
+        end
+      end
+    end
 
-end # module Standalone
+  end # module Standalone
 end # module PhusionPassenger

data/lib/phusion_passenger/config/build_native_support_command.rb

@@ -26,53 +26,53 @@ PhusionPassenger.require_passenger_lib 'constants'
 PhusionPassenger.require_passenger_lib 'config/command'
 
 module PhusionPassenger
-module Config
+  module Config
 
-class BuildNativeSupportCommand < Command
-	def run
-		parse_options
-		PhusionPassenger.require_passenger_lib 'native_support'
-	end
+    class BuildNativeSupportCommand < Command
+      def run
+        parse_options
+        PhusionPassenger.require_passenger_lib 'native_support'
+      end
 
-private
-	def self.create_option_parser(options)
-		PhusionPassenger.require_passenger_lib 'platform_info/ruby'
-		OptionParser.new do |opts|
-			nl = "\n" + ' ' * 37
-			opts.banner = "Usage: passenger-config build-native-support [OPTIONS]\n"
-			opts.separator ""
-			opts.separator "  #{PROGRAM_NAME} utilizes a Ruby native extension, called native_support,"
-			opts.separator "  for improving Ruby performance. The extension depends on the"
-			opts.separator "  #{PROGRAM_NAME} version and the Ruby version. Normally, every time you run"
-			opts.separator "  a #{PROGRAM_NAME} version with a Ruby version that it hasn't encountered"
-			opts.separator "  before, it will rebuild the native_support library for that Ruby version."
-			opts.separator "  By running this command, you can force the native_support to be built for"
-			opts.separator "  the current Ruby interpreter."
-			opts.separator ""
-			opts.separator "  The current Ruby interpreter is:"
-			opts.separator "    Path: #{PlatformInfo.ruby_command}"
-			opts.separator "    Version: #{RUBY_VERSION}"
-			opts.separator ""
+    private
+      def self.create_option_parser(options)
+        PhusionPassenger.require_passenger_lib 'platform_info/ruby'
+        OptionParser.new do |opts|
+          nl = "\n" + ' ' * 37
+          opts.banner = "Usage: passenger-config build-native-support [OPTIONS]\n"
+          opts.separator ""
+          opts.separator "  #{PROGRAM_NAME} utilizes a Ruby native extension, called native_support,"
+          opts.separator "  for improving Ruby performance. The extension depends on the"
+          opts.separator "  #{PROGRAM_NAME} version and the Ruby version. Normally, every time you run"
+          opts.separator "  a #{PROGRAM_NAME} version with a Ruby version that it hasn't encountered"
+          opts.separator "  before, it will rebuild the native_support library for that Ruby version."
+          opts.separator "  By running this command, you can force the native_support to be built for"
+          opts.separator "  the current Ruby interpreter."
+          opts.separator ""
+          opts.separator "  The current Ruby interpreter is:"
+          opts.separator "    Path: #{PlatformInfo.ruby_command}"
+          opts.separator "    Version: #{RUBY_VERSION}"
+          opts.separator ""
 
-			opts.separator "Options:"
-			opts.on("-h", "--help", "Show this help") do
-				options[:help] = true
-			end
-		end
-	end
+          opts.separator "Options:"
+          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.size > 0
-			help
-			abort
-		end
-	end
-end
+      def parse_options
+        super
+        if @argv.size > 0
+          help
+          abort
+        end
+      end
+    end
 
-end # module Config
+  end # module Config
 end # module PhusionPassenger

data/lib/phusion_passenger/config/command.rb

@@ -22,33 +22,33 @@
 #  THE SOFTWARE.
 
 module PhusionPassenger
-module Config
+  module Config
 
-class Command
-	def initialize(argv)
-		@argv = argv.dup
-		@options = self.class.create_default_options
-	end
+    class Command
+      def initialize(argv)
+        @argv = argv.dup
+        @options = self.class.create_default_options
+      end
 
-private
-	def self.create_default_options
-		return {}
-	end
+    private
+      def self.create_default_options
+        return {}
+      end
 
-	def parse_options
-		@parser = self.class.create_option_parser(@options)
-		begin
-			@parser.parse!(@argv)
-		rescue OptionParser::ParseError => e
-			STDERR.puts "*** ERROR: #{e}"
-			abort @parser.to_s
-		end
-		if @options[:help]
-			puts @parser
-			exit
-		end
-	end
-end
+      def parse_options
+        @parser = self.class.create_option_parser(@options)
+        begin
+          @parser.parse!(@argv)
+        rescue OptionParser::ParseError => e
+          STDERR.puts "*** ERROR: #{e}"
+          abort @parser.to_s
+        end
+        if @options[:help]
+          puts @parser
+          exit
+        end
+      end
+    end
 
-end # module Config
+  end # module Config
 end # module PhusionPassenger

data/lib/phusion_passenger/config/compile_agent_command.rb

@@ -28,75 +28,75 @@ PhusionPassenger.require_passenger_lib 'config/agent_compiler'
 PhusionPassenger.require_passenger_lib 'utils/ansi_colors'
 
 module PhusionPassenger
-module Config
+  module Config
 
-class CompileAgentCommand < Command
-	include InstallationUtils
+    class CompileAgentCommand < Command
+      include InstallationUtils
 
-	def run
-		@options = { :auto => !STDIN.tty? || !STDOUT.tty?, :colorize => :auto, :force_tip => true }
-		parse_options
-		initialize_objects
-		sanity_check
-		if !AgentCompiler.new(@options).run
-			abort
-		end
-	end
+      def run
+        @options = { :auto => !STDIN.tty? || !STDOUT.tty?, :colorize => :auto, :force_tip => true }
+        parse_options
+        initialize_objects
+        sanity_check
+        if !AgentCompiler.new(@options).run
+          abort
+        end
+      end
 
-private
-	def self.create_option_parser(options)
-		OptionParser.new do |opts|
-			nl = "\n" + ' ' * 37
-			opts.banner = "Usage: passenger-config compile-agent [OPTIONS]\n"
-			opts.separator ""
-			opts.separator "  Compile the #{PROGRAM_NAME} agent binary. The agent binary is required for"
-			opts.separator "  #{PROGRAM_NAME} to function properly."
-			opts.separator ""
+    private
+      def self.create_option_parser(options)
+        OptionParser.new do |opts|
+          nl = "\n" + ' ' * 37
+          opts.banner = "Usage: passenger-config compile-agent [OPTIONS]\n"
+          opts.separator ""
+          opts.separator "  Compile the #{PROGRAM_NAME} agent binary. The agent binary is required for"
+          opts.separator "  #{PROGRAM_NAME} to function properly."
+          opts.separator ""
 
-			opts.separator "Options:"
-			opts.on("--working-dir PATH", String, "Store temporary files in the given#{nl}" +
-				"directory, instead of creating one") do |val|
-				options[:working_dir] = val
-			end
-			opts.on("--auto", "Run in non-interactive mode. Default when#{nl}" +
-				"stdin or stdout is not a TTY") do
-				options[:auto] = true
-			end
-			opts.on("--optimize", "Compile agent with optimizations") do
-				options[:optimize] = true
-			end
-			opts.on("-f", "--force", "Skip sanity checks") do
-				options[:force] = true
-			end
-			opts.on("--no-force-tip", "Do not print any tips regarding the --force parameter") do
-				options[:force_tip] = false
-			end
-			opts.on("-h", "--help", "Show this help") do
-				options[:help] = true
-			end
-		end
-	end
+          opts.separator "Options:"
+          opts.on("--working-dir PATH", String, "Store temporary files in the given#{nl}" +
+            "directory, instead of creating one") do |val|
+            options[:working_dir] = val
+          end
+          opts.on("--auto", "Run in non-interactive mode. Default when#{nl}" +
+            "stdin or stdout is not a TTY") do
+            options[:auto] = true
+          end
+          opts.on("--optimize", "Compile agent with optimizations") do
+            options[:optimize] = true
+          end
+          opts.on("-f", "--force", "Skip sanity checks") do
+            options[:force] = true
+          end
+          opts.on("--no-force-tip", "Do not print any tips regarding the --force parameter") do
+            options[:force_tip] = false
+          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 initialize_objects
-		@colors = Utils::AnsiColors.new(@options[:colorize])
-	end
+      def initialize_objects
+        @colors = Utils::AnsiColors.new(@options[:colorize])
+      end
 
-	def sanity_check
-		return if @options[:force]
+      def sanity_check
+        return if @options[:force]
 
-		if PhusionPassenger.find_support_binary(AGENT_EXE)
-			puts "#{@colors.green}The #{PROGRAM_NAME} agent is already installed.#{@colors.reset}"
-			if @options[:force_tip]
-				puts "If you want to recompile it, re-run this program with the --force parameter."
-			end
-			exit
-		end
-	end
-end
+        if PhusionPassenger.find_support_binary(AGENT_EXE)
+          puts "#{@colors.green}The #{PROGRAM_NAME} agent is already installed.#{@colors.reset}"
+          if @options[:force_tip]
+            puts "If you want to recompile it, re-run this program with the --force parameter."
+          end
+          exit
+        end
+      end
+    end
 
-end # module Config
+  end # module Config
 end # module PhusionPassenger