From ed9cc7ba22bab5b3f7262d869a8bc03f14b2d4cb Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sat, 5 Jun 2010 03:26:51 +0000 Subject: File.readable? and File.writable? are more readable ...than "test ?r" and "test ?w" Not everybody comes from a Unix shell programming background, even though they *should* ;) --- lib/unicorn/configurator.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/unicorn/configurator.rb b/lib/unicorn/configurator.rb index 86e58a0..e4305c2 100644 --- a/lib/unicorn/configurator.rb +++ b/lib/unicorn/configurator.rb @@ -56,7 +56,7 @@ module Unicorn [ :pid, :stderr_path, :stdout_path ].each do |var| String === (path = set[var]) or next path = File.expand_path(path) - test(?w, path) || test(?w, File.dirname(path)) or \ + File.writable?(path) || File.writable?(File.dirname(path)) or \ raise ArgumentError, "directory for #{var}=#{path} not writable" end @@ -341,7 +341,7 @@ module Unicorn path = File.expand_path(path) if config_file && config_file[0] != ?/ && - ! test(?r, "#{path}/#{config_file}") + ! File.readable?("#{path}/#{config_file}") raise ArgumentError, "config_file=#{config_file} would not be accessible in" \ " working_directory=#{path}" -- cgit v1.2.3-24-ge0c7