passenger 5.0.0.beta3 → 5.0.0.rc1

data/lib/phusion_passenger/utils/lock.rb

@@ -22,41 +22,41 @@
 #  THE SOFTWARE.
 
 module PhusionPassenger
-module Utils
+  module Utils
 
-class Lock
-	def initialize(mutex)
-		@mutex = mutex
-		@locked = false
-	end
+    class Lock
+      def initialize(mutex)
+        @mutex = mutex
+        @locked = false
+      end
 
-	def reset(mutex, lock_now = true)
-		unlock if @locked
-		@mutex = mutex
-		lock if lock_now
-	end
+      def reset(mutex, lock_now = true)
+        unlock if @locked
+        @mutex = mutex
+        lock if lock_now
+      end
 
-	def synchronize
-		lock if !@locked
-		begin
-			yield(self)
-		ensure
-			unlock if @locked
-		end
-	end
+      def synchronize
+        lock if !@locked
+        begin
+          yield(self)
+        ensure
+          unlock if @locked
+        end
+      end
 
-	def lock
-		raise if @locked
-		@mutex.lock
-		@locked = true
-	end
+      def lock
+        raise if @locked
+        @mutex.lock
+        @locked = true
+      end
 
-	def unlock
-		raise if !@locked
-		@mutex.unlock
-		@locked = false
-	end
-end
+      def unlock
+        raise if !@locked
+        @mutex.unlock
+        @locked = false
+      end
+    end
 
-end # module Utils
+  end # module Utils
 end # module PhusionPassenger

data/lib/phusion_passenger/utils/native_support_utils.rb

@@ -24,42 +24,42 @@
 PhusionPassenger.require_passenger_lib 'native_support'
 
 module PhusionPassenger
-module Utils
+  module Utils
 
-# Utility functions that can potentially be accelerated by native_support functions.
-module NativeSupportUtils
-	extend self
+    # Utility functions that can potentially be accelerated by native_support functions.
+    module NativeSupportUtils
+      extend self
 
-	if defined?(PhusionPassenger::NativeSupport)
-		# Split the given string into an hash. Keys and values are obtained by splitting the
-		# string using the null character as the delimitor.
-		def split_by_null_into_hash(data)
-			return PhusionPassenger::NativeSupport.split_by_null_into_hash(data)
-		end
+      if defined?(PhusionPassenger::NativeSupport)
+        # Split the given string into an hash. Keys and values are obtained by splitting the
+        # string using the null character as the delimitor.
+        def split_by_null_into_hash(data)
+          return PhusionPassenger::NativeSupport.split_by_null_into_hash(data)
+        end
 
-		# Wrapper for getrusage().
-		def process_times
-			return PhusionPassenger::NativeSupport.process_times
-		end
-	else
-		NULL = "\0".freeze
+        # Wrapper for getrusage().
+        def process_times
+          return PhusionPassenger::NativeSupport.process_times
+        end
+      else
+        NULL = "\0".freeze
 
-		class ProcessTimes < Struct.new(:utime, :stime)
-		end
+        class ProcessTimes < Struct.new(:utime, :stime)
+        end
 
-		def split_by_null_into_hash(data)
-			args = data.split(NULL, -1)
-			args.pop
-			return Hash[*args]
-		end
+        def split_by_null_into_hash(data)
+          args = data.split(NULL, -1)
+          args.pop
+          return Hash[*args]
+        end
 
-		def process_times
-			times = Process.times
-			return ProcessTimes.new((times.utime * 1_000_000).to_i,
-				(times.stime * 1_000_000).to_i)
-		end
-	end
-end
+        def process_times
+          times = Process.times
+          return ProcessTimes.new((times.utime * 1_000_000).to_i,
+            (times.stime * 1_000_000).to_i)
+        end
+      end
+    end
 
-end # module Utils
+  end # module Utils
 end # module PhusionPassenger

data/lib/phusion_passenger/utils/progress_bar.rb

@@ -23,34 +23,34 @@
 
 module PhusionPassenger
 
-class ProgressBar
-	THROBBLER = ["-", "\\", "|", "/", "-"]
+  class ProgressBar
+    THROBBLER = ["-", "\\", "|", "/", "-"]
 
-	def initialize(output = STDOUT)
-		@output = output
-		@tty = output.tty?
-		@throbbler_index = 0
-	end
+    def initialize(output = STDOUT)
+      @output = output
+      @tty = output.tty?
+      @throbbler_index = 0
+    end
 
-	def set(percentage)
-		if @tty
-			width = (percentage * 50).to_i
-			bar   = "*" * width
-			space = " " * (50 - width)
-			text = sprintf("[%s%s] %s", bar, space, THROBBLER[@throbbler_index])
-			@throbbler_index = (@throbbler_index + 1) % THROBBLER.size
-			@output.write("#{text}\r")
-			@output.flush
-		else
-			@output.write(".")
-			@output.flush
-		end
-	end
+    def set(percentage)
+      if @tty
+        width = (percentage * 50).to_i
+        bar   = "*" * width
+        space = " " * (50 - width)
+        text = sprintf("[%s%s] %s", bar, space, THROBBLER[@throbbler_index])
+        @throbbler_index = (@throbbler_index + 1) % THROBBLER.size
+        @output.write("#{text}\r")
+        @output.flush
+      else
+        @output.write(".")
+        @output.flush
+      end
+    end
 
-	def finish
-		@output.write("\n")
-		@output.flush
-	end
-end
+    def finish
+      @output.write("\n")
+      @output.flush
+    end
+  end
 
 end # module PhusionPassenger

data/lib/phusion_passenger/utils/shellwords.rb

@@ -3,27 +3,27 @@
 require 'shellwords'
 
 if !Shellwords.respond_to?(:escape)
-	Shellwords.class_eval do
-		def self.escape(str)
-			# An empty argument will be skipped, so return empty quotes.
-			return "''" if str.empty?
-			str = str.dup
-			# Treat multibyte characters as is.  It is caller's responsibility
-			# to encode the string in the right encoding for the shell
-			# environment.
-			str.gsub!(/([^A-Za-z0-9_\-.,:\/@\n])/, "\\\\\\1")
-			# A LF cannot be escaped with a backslash because a backslash + LF
-			# combo is regarded as line continuation and simply ignored.
-			str.gsub!(/\n/, "'\n'")
-			return str
-		end
-	end
+  Shellwords.class_eval do
+    def self.escape(str)
+      # An empty argument will be skipped, so return empty quotes.
+      return "''" if str.empty?
+      str = str.dup
+      # Treat multibyte characters as is.  It is caller's responsibility
+      # to encode the string in the right encoding for the shell
+      # environment.
+      str.gsub!(/([^A-Za-z0-9_\-.,:\/@\n])/, "\\\\\\1")
+      # A LF cannot be escaped with a backslash because a backslash + LF
+      # combo is regarded as line continuation and simply ignored.
+      str.gsub!(/\n/, "'\n'")
+      return str
+    end
+  end
 end
 
 if !Shellwords.respond_to?(:join)
-	Shellwords.class_eval do
-		def self.join(array)
-			array.map { |arg| escape(arg) }.join(' ')
-		end
-	end
+  Shellwords.class_eval do
+    def self.join(array)
+      array.map { |arg| escape(arg) }.join(' ')
+    end
+  end
 end

data/lib/phusion_passenger/utils/terminal_choice_menu.rb

@@ -23,210 +23,210 @@
 #  THE SOFTWARE.
 
 module PhusionPassenger
-module Utils
-
-class TerminalChoiceMenu
-	class Choice
-		attr_reader :name
-		attr_accessor :checked
-
-		alias checked? checked
-
-		def self.create(choice)
-			if choice.is_a?(Choice)
-				return choice
-			else
-				return Choice.new(choice)
-			end
-		end
-
-		def initialize(name, checked = false)
-			@name = name
-			@checked = checked
-		end
-
-		def toggle!
-			@checked = !@checked
-		end
-	end
-
-	def initialize(choices)
-		@choices = choices.map { |choice| Choice.create(choice) }
-		@pointer = 0
-		@index   = index_choices
-	end
-
-	def display_choices
-		display(render_to_string)
-	end
-
-	def query
-		if STDIN.tty?
-			done = false
-			begin
-				raw_no_echo_mode
-				hide_cursor
-				while !done
-					display_choices
-					done = process_input
-					clear_screen if !done
-				end
-			ensure
-				restore_mode
-				show_cursor
-				puts
-			end
-		else
-			display_choices
-			puts
-		end
-	end
-
-	def [](name)
-		return @index[name]
-	end
-
-	def selected_choices
-		@choices.find_all{ |c| c.checked? }.map{ |c| c.name }
-	end
-
-private
-	JRUBY = defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
-
-	def index_choices
-		index = {}
-		@choices.each do |choice|
-			index[choice.name] = choice
-		end
-		return index
-	end
-
-	def process_input
-		case getchar(STDIN)
-		when "\x1b"
-			process_cursor_move
-			return false
-		when " "
-			process_toggle
-			return false
-		when "!"
-			process_disable_utf8
-			return false
-		when "\r"
-			return true
-		else
-			return false
-		end
-	end
-
-	def process_cursor_move
-		if getchar(STDIN) == "["
-			case getchar(STDIN)
-			when "A" # up
-				@pointer = [@pointer - 1, 0].max
-			when "B" # down
-				@pointer = [@pointer + 1, @choices.size - 1].min
-			end
-		end
-	end
-
-	def process_toggle
-		@choices[@pointer].toggle!
-	end
-
-	def process_disable_utf8
-		ENV['UTF8_MENUS'] = '0'
-	end
-
-	def render_to_string
-		str = ""
-		@choices.each_with_index do |choice, i|
-			pointer = render_pointer(i)
-			checkbox = render_checkbox(choice.checked)
-			str << " #{pointer} #{checkbox}  #{choice.name}\r\n"
-		end
-		str.chomp!
-		return str
-	end
-
-	def render_pointer(index)
-		return @pointer == index ? maybe_utf8("‣", ">") : " "
-	end
-
-	def render_checkbox(checked)
-		return checked ? maybe_utf8("⬢", "(*)") : maybe_utf8("⬡", "( )")
-	end
-
-	def display(str)
-		STDOUT.write(str)
-		STDOUT.flush
-	end
-
-	def clear_screen
-		number_of_lines = render_to_string.split("\n").size
-		display("\r")
-		(number_of_lines - 1).times do
-			display(move_up)
-		end
-	end
-
-	def maybe_utf8(utf8, plain)
-		if ENV['UTF8_MENUS'] == '0'
-			return plain
-		else
-			return utf8
-		end
-	end
-
-	def hide_cursor
-		display("\x1b[?25l")
-	end
-
-	def show_cursor
-		display("\x1b[?25h")
-	end
-
-	def move_up
-		return "\x1b[0A"
-	end
-
-	def getchar(io)
-		char = io.getc
-		char = char.chr if char.is_a?(Integer)
-		return char
-	end
-
-	if JRUBY
-		require 'java'
-		require 'readline'
-		java_import 'jline.console.ConsoleReader'
-
-		def raw_no_echo_mode
-			input = STDIN.to_inputstream
-			output = STDOUT.to_outputstream
-			@console = ConsoleReader.new(input, output)
-			@console.set_history_enabled(false)
-			@console.set_bell_enabled(true)
-			@console.set_pagination_enabled(false)
-			@terminal_state = @console.getEchoCharacter
-			@console.setEchoCharacter(0)
-		end
-
-		def restore_mode
-			@console.setEchoCharacter(@terminal_state)
-			@console.get_terminal.restore
-		end
-	else
-		def raw_no_echo_mode
-			@terminal_state = `stty -g`
-			system("stty raw -echo -icanon isig")
-		end
-
-		def restore_mode
-			system("stty #{@terminal_state}")
-		end
-	end
-end
-
-end # module Utils
+  module Utils
+
+    class TerminalChoiceMenu
+      class Choice
+        attr_reader :name
+        attr_accessor :checked
+
+        alias checked? checked
+
+        def self.create(choice)
+          if choice.is_a?(Choice)
+            return choice
+          else
+            return Choice.new(choice)
+          end
+        end
+
+        def initialize(name, checked = false)
+          @name = name
+          @checked = checked
+        end
+
+        def toggle!
+          @checked = !@checked
+        end
+      end
+
+      def initialize(choices)
+        @choices = choices.map { |choice| Choice.create(choice) }
+        @pointer = 0
+        @index   = index_choices
+      end
+
+      def display_choices
+        display(render_to_string)
+      end
+
+      def query
+        if STDIN.tty?
+          done = false
+          begin
+            raw_no_echo_mode
+            hide_cursor
+            while !done
+              display_choices
+              done = process_input
+              clear_screen if !done
+            end
+          ensure
+            restore_mode
+            show_cursor
+            puts
+          end
+        else
+          display_choices
+          puts
+        end
+      end
+
+      def [](name)
+        return @index[name]
+      end
+
+      def selected_choices
+        @choices.find_all{ |c| c.checked? }.map{ |c| c.name }
+      end
+
+    private
+      JRUBY = defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
+
+      def index_choices
+        index = {}
+        @choices.each do |choice|
+          index[choice.name] = choice
+        end
+        return index
+      end
+
+      def process_input
+        case getchar(STDIN)
+        when "\x1b"
+          process_cursor_move
+          return false
+        when " "
+          process_toggle
+          return false
+        when "!"
+          process_disable_utf8
+          return false
+        when "\r"
+          return true
+        else
+          return false
+        end
+      end
+
+      def process_cursor_move
+        if getchar(STDIN) == "["
+          case getchar(STDIN)
+          when "A" # up
+            @pointer = [@pointer - 1, 0].max
+          when "B" # down
+            @pointer = [@pointer + 1, @choices.size - 1].min
+          end
+        end
+      end
+
+      def process_toggle
+        @choices[@pointer].toggle!
+      end
+
+      def process_disable_utf8
+        ENV['UTF8_MENUS'] = '0'
+      end
+
+      def render_to_string
+        str = ""
+        @choices.each_with_index do |choice, i|
+          pointer = render_pointer(i)
+          checkbox = render_checkbox(choice.checked)
+          str << " #{pointer} #{checkbox}  #{choice.name}\r\n"
+        end
+        str.chomp!
+        return str
+      end
+
+      def render_pointer(index)
+        return @pointer == index ? maybe_utf8("‣", ">") : " "
+      end
+
+      def render_checkbox(checked)
+        return checked ? maybe_utf8("⬢", "(*)") : maybe_utf8("⬡", "( )")
+      end
+
+      def display(str)
+        STDOUT.write(str)
+        STDOUT.flush
+      end
+
+      def clear_screen
+        number_of_lines = render_to_string.split("\n").size
+        display("\r")
+        (number_of_lines - 1).times do
+          display(move_up)
+        end
+      end
+
+      def maybe_utf8(utf8, plain)
+        if ENV['UTF8_MENUS'] == '0'
+          return plain
+        else
+          return utf8
+        end
+      end
+
+      def hide_cursor
+        display("\x1b[?25l")
+      end
+
+      def show_cursor
+        display("\x1b[?25h")
+      end
+
+      def move_up
+        return "\x1b[0A"
+      end
+
+      def getchar(io)
+        char = io.getc
+        char = char.chr if char.is_a?(Integer)
+        return char
+      end
+
+      if JRUBY
+        require 'java'
+        require 'readline'
+        java_import 'jline.console.ConsoleReader'
+
+        def raw_no_echo_mode
+          input = STDIN.to_inputstream
+          output = STDOUT.to_outputstream
+          @console = ConsoleReader.new(input, output)
+          @console.set_history_enabled(false)
+          @console.set_bell_enabled(true)
+          @console.set_pagination_enabled(false)
+          @terminal_state = @console.getEchoCharacter
+          @console.setEchoCharacter(0)
+        end
+
+        def restore_mode
+          @console.setEchoCharacter(@terminal_state)
+          @console.get_terminal.restore
+        end
+      else
+        def raw_no_echo_mode
+          @terminal_state = `stty -g`
+          system("stty raw -echo -icanon isig")
+        end
+
+        def restore_mode
+          system("stty #{@terminal_state}")
+        end
+      end
+    end
+
+  end # module Utils
 end # module PhusionPassenger