app_finder.rb in passenger-4.0.51

- old
+ new

@@ -1,7 +1,7 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2013 Phusion
+#  Copyright (c) 2010-2014 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
 #  Permission is hereby granted, free of charge, to any person obtaining a copy
 #  of this software and associated documentation files (the "Software"), to deal
@@ -18,16 +18,19 @@
 #  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 #  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 #  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
+PhusionPassenger.require_passenger_lib 'standalone/utils'
 PhusionPassenger.require_passenger_lib 'utils/file_system_watcher'
 
 module PhusionPassenger
 module Standalone
 
 class AppFinder
+	include Standalone::Utils
+
 	attr_accessor :dirs
 	attr_reader :apps
 
 	def self.looks_like_app_directory?(dir)
 		return File.exist?("#{dir}/config.ru") ||
@@ -128,12 +131,12 @@
 	class ConfigLoadError < StandardError
 	end
 
 	def find_app_root
 		if @dirs.empty?
-			return File.expand_path(".")
+			return absolute_path(".")
 		else
-			return File.expand_path(@dirs[0])
+			return absolute_path(@dirs[0])
 		end
 	end
 
 	def load_config_file!(context, filename)
 		PhusionPassenger.require_passenger_lib 'utils/json' if !defined?(PhusionPassenger::Utils::JSON)