passenger 5.0.0.beta3 → 5.0.0.rc1

data/lib/phusion_passenger/utils/file_system_watcher.rb

@@ -24,163 +24,163 @@
 PhusionPassenger.require_passenger_lib 'native_support'
 
 module PhusionPassenger
-module Utils
+  module Utils
 
-# Watches changes on one or more files or directories. To use this class,
-# construct an object, passing it file or directory names to watch, then
-# call #wait_for_change. #wait_for_change waits until one of the following
-# events has happened since the constructor was called:
-#
-# - One of the specified files has been renamed, deleted, or its access
-#   revoked. This will cause +true+ to be returned.
-# - One of the specified directories has been modified, renamed, deleted,
-#   or its access revoked. This will cause +true+ to be returned.
-# - +termination_pipe+ (as passed to the constructor) becomes readable.
-#   This will cause +nil+ to be returned.
-# - The thread is interrupted. This will cause +nil+ to be returned.
-# 
-# The constructor will attempt to stat and possibly also open all specified
-# files/directories. If one of them cannot be statted or opened, then
-# +false+ will be returned by #wait_for_change.
-#
-# #wait_for_change may only be called once. After calling it one should
-# create a new object if one wishes to watch the filesystem again.
-#
-# Always call #close when a FileSystemWatcher object is no longer needed
-# in order to free resources.
-#
-# This class tries to use kqueue for efficient filesystem watching on
-# platforms that support it. On other platforms it'll fallback to stat
-# polling instead.
-
-if defined?(NativeSupport::FileSystemWatcher)
-	FileSystemWatcher = NativeSupport::FileSystemWatcher
-	
-	FileSystemWatcher.class_eval do
-		def self.new(filenames, termination_pipe = nil)
-			# Default parameter values, type conversion and exception
-			# handling in C is too much of a pain.
-			filenames = filenames.map do |filename|
-				filename.to_s
-			end
-			return _new(filenames, termination_pipe)
-		end
-		
-		def self.opens_files?
-			return true
-		end
-	end
-else
-	class FileSystemWatcher
-		attr_accessor :poll_interval
-		
-		def self.opens_files?
-			return false
-		end
-		
-		def initialize(filenames, termination_pipe = nil)
-			@poll_interval = 3
-			@termination_pipe = termination_pipe
-			@dirs  = []
-			@files = []
-		
-			begin
-				filenames.each do |filename|
-					stat = File.stat(filename)
-					if stat.directory?
-						@dirs << DirInfo.new(filename, stat)
-					else
-						@files << FileInfo.new(filename, stat)
-					end
-				end
-			rescue Errno::EACCES, Errno::ENOENT
-				@dirs = @files = nil
-			end
-		end
-		
-		def wait_for_change
-			if !@dirs
-				return false
-			end
-			
-			while true
-				if changed?
-					return true
-				elsif select([@termination_pipe], nil, nil, @poll_interval)
-					return nil
-				end
-			end
-		end
-	
-		def close
-		end
-		
-	private
-		class DirInfo
-			DOT    = "."
-			DOTDOT = ".."
-			
-			def initialize(filename, stat)
-				@filename = filename
-				@stat = stat
-				@subfiles = {}
-				Dir.foreach(filename) do |entry|
-					next if entry == DOT || entry == DOTDOT
-					subfilename = "#{filename}/#{entry}"
-					@subfiles[entry] = FileInfo.new(subfilename, File.stat(subfilename))
-				end
-			end
-			
-			def changed?
-				new_stat = File.stat(@filename)
-				if @stat.ino != new_stat.ino || !new_stat.directory? || @stat.mtime != new_stat.mtime
-					return true
-				end
-				
-				count = 0
-				Dir.foreach(@filename) do |entry|
-					next if entry == DOT || entry == DOTDOT
-					subfilename = "#{@filename}/#{entry}"
-				
-					file_info = @subfiles[entry]
-					if !file_info || file_info.changed?(false)
-						return true
-					else
-						count += 1
-					end
-				end
-				
-				return count != @subfiles.size
-			rescue Errno::EACCES, Errno::ENOENT
-				return true
-			end
-		end
-		
-		class FileInfo
-			def initialize(filename, stat)
-				@filename = filename
-				@stat = stat
-			end
-			
-			def changed?(check_mtime = true)
-				new_stat = File.stat(@filename)
-				if check_mtime
-					mtime_changed = @stat.mtime != new_stat.mtime || @stat.size != new_stat.size
-				else
-					mtime_changed = false
-				end
-				return @stat.ino != new_stat.ino || @stat.ftype != new_stat.ftype || mtime_changed
-			rescue Errno::EACCES, Errno::ENOENT
-				return true
-			end
-		end
-		
-		def changed?
-			return @dirs.any?  { |dir_info| dir_info.changed? } ||
-			       @files.any? { |file_info| file_info.changed? }
-		end
-	end
-end
-
-end # module Utils
+    # Watches changes on one or more files or directories. To use this class,
+    # construct an object, passing it file or directory names to watch, then
+    # call #wait_for_change. #wait_for_change waits until one of the following
+    # events has happened since the constructor was called:
+    #
+    # - One of the specified files has been renamed, deleted, or its access
+    #   revoked. This will cause +true+ to be returned.
+    # - One of the specified directories has been modified, renamed, deleted,
+    #   or its access revoked. This will cause +true+ to be returned.
+    # - +termination_pipe+ (as passed to the constructor) becomes readable.
+    #   This will cause +nil+ to be returned.
+    # - The thread is interrupted. This will cause +nil+ to be returned.
+    #
+    # The constructor will attempt to stat and possibly also open all specified
+    # files/directories. If one of them cannot be statted or opened, then
+    # +false+ will be returned by #wait_for_change.
+    #
+    # #wait_for_change may only be called once. After calling it one should
+    # create a new object if one wishes to watch the filesystem again.
+    #
+    # Always call #close when a FileSystemWatcher object is no longer needed
+    # in order to free resources.
+    #
+    # This class tries to use kqueue for efficient filesystem watching on
+    # platforms that support it. On other platforms it'll fallback to stat
+    # polling instead.
+
+    if defined?(NativeSupport::FileSystemWatcher)
+      FileSystemWatcher = NativeSupport::FileSystemWatcher
+
+      FileSystemWatcher.class_eval do
+        def self.new(filenames, termination_pipe = nil)
+          # Default parameter values, type conversion and exception
+          # handling in C is too much of a pain.
+          filenames = filenames.map do |filename|
+            filename.to_s
+          end
+          return _new(filenames, termination_pipe)
+        end
+
+        def self.opens_files?
+          return true
+        end
+      end
+    else
+      class FileSystemWatcher
+        attr_accessor :poll_interval
+
+        def self.opens_files?
+          return false
+        end
+
+        def initialize(filenames, termination_pipe = nil)
+          @poll_interval = 3
+          @termination_pipe = termination_pipe
+          @dirs  = []
+          @files = []
+
+          begin
+            filenames.each do |filename|
+              stat = File.stat(filename)
+              if stat.directory?
+                @dirs << DirInfo.new(filename, stat)
+              else
+                @files << FileInfo.new(filename, stat)
+              end
+            end
+          rescue Errno::EACCES, Errno::ENOENT
+            @dirs = @files = nil
+          end
+        end
+
+        def wait_for_change
+          if !@dirs
+            return false
+          end
+
+          while true
+            if changed?
+              return true
+            elsif select([@termination_pipe], nil, nil, @poll_interval)
+              return nil
+            end
+          end
+        end
+
+        def close
+        end
+
+      private
+        class DirInfo
+          DOT    = "."
+          DOTDOT = ".."
+
+          def initialize(filename, stat)
+            @filename = filename
+            @stat = stat
+            @subfiles = {}
+            Dir.foreach(filename) do |entry|
+              next if entry == DOT || entry == DOTDOT
+              subfilename = "#{filename}/#{entry}"
+              @subfiles[entry] = FileInfo.new(subfilename, File.stat(subfilename))
+            end
+          end
+
+          def changed?
+            new_stat = File.stat(@filename)
+            if @stat.ino != new_stat.ino || !new_stat.directory? || @stat.mtime != new_stat.mtime
+              return true
+            end
+
+            count = 0
+            Dir.foreach(@filename) do |entry|
+              next if entry == DOT || entry == DOTDOT
+              subfilename = "#{@filename}/#{entry}"
+
+              file_info = @subfiles[entry]
+              if !file_info || file_info.changed?(false)
+                return true
+              else
+                count += 1
+              end
+            end
+
+            return count != @subfiles.size
+          rescue Errno::EACCES, Errno::ENOENT
+            return true
+          end
+        end
+
+        class FileInfo
+          def initialize(filename, stat)
+            @filename = filename
+            @stat = stat
+          end
+
+          def changed?(check_mtime = true)
+            new_stat = File.stat(@filename)
+            if check_mtime
+              mtime_changed = @stat.mtime != new_stat.mtime || @stat.size != new_stat.size
+            else
+              mtime_changed = false
+            end
+            return @stat.ino != new_stat.ino || @stat.ftype != new_stat.ftype || mtime_changed
+          rescue Errno::EACCES, Errno::ENOENT
+            return true
+          end
+        end
+
+        def changed?
+          return @dirs.any?  { |dir_info| dir_info.changed? } ||
+                 @files.any? { |file_info| file_info.changed? }
+        end
+      end
+    end
+
+  end # module Utils
 end # module PhusionPassenger

data/lib/phusion_passenger/utils/hosts_file_parser.rb

@@ -25,108 +25,108 @@
 PhusionPassenger.require_passenger_lib 'platform_info/operating_system'
 
 module PhusionPassenger
-module Utils
+  module Utils
 
-# A /etc/hosts parser. Also supports writing groups of data to the file.
-class HostsFileParser
-	def self.flush_dns_cache!
-		if PlatformInfo.os_name == "macosx"
-			system("dscacheutil -flushcache")
-		end
-	end
-	
-	def initialize(filename_or_io = "/etc/hosts")
-		if filename_or_io.respond_to?(:readline)
-			read_and_parse(filename_or_io)
-		else
-			File.open(filename_or_io, "rb") do |f|
-				read_and_parse(f)
-			end
-		end
-	end
-	
-	def ip_count
-		return @ips.size
-	end
-	
-	def host_count
-		return @host_names.size
-	end
-	
-	def resolve(host_name)
-		if host_name.downcase == "localhost"
-			return "127.0.0.1"
-		else
-			return @host_names[host_name.downcase]
-		end
-	end
-	
-	def resolves_to_localhost?(hostname)
-		ip = resolve(hostname)
-		return ip == "127.0.0.1" || ip == "::1" || ip == "0.0.0.0"
-	end
-	
-	def add_group_data(marker, data)
-		begin_index = find_line(0, "###### BEGIN #{marker} ######")
-		end_index = find_line(begin_index + 1, "###### END #{marker} ######") if begin_index
-		if begin_index && end_index
-			@lines[begin_index + 1 .. end_index - 1] = data.split("\n")
-		else
-			@lines << "###### BEGIN #{marker} ######"
-			@lines.concat(data.split("\n"))
-			@lines << "###### END #{marker} ######"
-		end
-	end
-	
-	def write(io)
-		@lines.each do |line|
-			io.puts(line)
-		end
-	end
+    # A /etc/hosts parser. Also supports writing groups of data to the file.
+    class HostsFileParser
+      def self.flush_dns_cache!
+        if PlatformInfo.os_name == "macosx"
+          system("dscacheutil -flushcache")
+        end
+      end
 
-private
-	def read_and_parse(io)
-		lines = []
-		ips = {}
-		all_host_names = {}
-		while !io.eof?
-			line = io.readline
-			line.sub!(/\n\Z/m, '')
-			lines << line
-			ip, host_names = parse_line(line)
-			if ip
-				ips[ip] ||= []
-				ips[ip].concat(host_names)
-				host_names.each do |host_name|
-					all_host_names[host_name.downcase] = ip
-				end
-			end
-		end
-		@lines      = lines
-		@ips        = ips
-		@host_names = all_host_names
-	end
-	
-	def parse_line(line)
-		return nil if line =~ /^[\s\t]*#/
-		line = line.strip
-		return nil if line.empty?
-		ip, *host_names = line.split(/[ \t]+/)
-		return [ip, host_names]
-	end
-	
-	def find_line(start_index, content)
-		i = start_index
-		while i < @lines.size
-			if @lines[i] == content
-				return i
-			else
-				i += 1
-			end
-		end
-		return nil
-	end
-end
+      def initialize(filename_or_io = "/etc/hosts")
+        if filename_or_io.respond_to?(:readline)
+          read_and_parse(filename_or_io)
+        else
+          File.open(filename_or_io, "rb") do |f|
+            read_and_parse(f)
+          end
+        end
+      end
 
-end
+      def ip_count
+        return @ips.size
+      end
+
+      def host_count
+        return @host_names.size
+      end
+
+      def resolve(host_name)
+        if host_name.downcase == "localhost"
+          return "127.0.0.1"
+        else
+          return @host_names[host_name.downcase]
+        end
+      end
+
+      def resolves_to_localhost?(hostname)
+        ip = resolve(hostname)
+        return ip == "127.0.0.1" || ip == "::1" || ip == "0.0.0.0"
+      end
+
+      def add_group_data(marker, data)
+        begin_index = find_line(0, "###### BEGIN #{marker} ######")
+        end_index = find_line(begin_index + 1, "###### END #{marker} ######") if begin_index
+        if begin_index && end_index
+          @lines[begin_index + 1 .. end_index - 1] = data.split("\n")
+        else
+          @lines << "###### BEGIN #{marker} ######"
+          @lines.concat(data.split("\n"))
+          @lines << "###### END #{marker} ######"
+        end
+      end
+
+      def write(io)
+        @lines.each do |line|
+          io.puts(line)
+        end
+      end
+
+    private
+      def read_and_parse(io)
+        lines = []
+        ips = {}
+        all_host_names = {}
+        while !io.eof?
+          line = io.readline
+          line.sub!(/\n\Z/m, '')
+          lines << line
+          ip, host_names = parse_line(line)
+          if ip
+            ips[ip] ||= []
+            ips[ip].concat(host_names)
+            host_names.each do |host_name|
+              all_host_names[host_name.downcase] = ip
+            end
+          end
+        end
+        @lines      = lines
+        @ips        = ips
+        @host_names = all_host_names
+      end
+
+      def parse_line(line)
+        return nil if line =~ /^[\s\t]*#/
+        line = line.strip
+        return nil if line.empty?
+        ip, *host_names = line.split(/[ \t]+/)
+        return [ip, host_names]
+      end
+
+      def find_line(start_index, content)
+        i = start_index
+        while i < @lines.size
+          if @lines[i] == content
+            return i
+          else
+            i += 1
+          end
+        end
+        return nil
+      end
+    end
+
+  end
 end