kotovalexarian-likes-github/fog--fog
1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00
Code Releases Activity

Merge pull request #419 from jc00ke/master

Browse source 
Fixes non-absolute exception for File.expand_path
This commit is contained in:
Wesley Beary 2011-07-13 11:40:48 -07:00
commit ddfe5d5b34
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/fog/core/credentials.rb
View file

@ -21,6 +21,8 @@ module Fog
@credential_path ||= begin @credential_path ||= begin
path = ENV["FOG_RC"] || (ENV['HOME'] && File.directory?(ENV['HOME']) && '~/.fog') path = ENV["FOG_RC"] || (ENV['HOME'] && File.directory?(ENV['HOME']) && '~/.fog')
File.expand_path(path) if path File.expand_path(path) if path
rescue
nil
end end
end end

6
tests/core/credential_tests.rb
View file

@ -32,6 +32,12 @@ Shindo.tests do
Fog.credentials_path Fog.credentials_path
} }
returns(nil, 'File.expand_path raises because of non-absolute path') {
ENV.delete('FOG_RC')
ENV['HOME'] = '.'
Fog.credentials_path
}
returns(nil, 'returns nil when neither FOG_RC or HOME are set') { returns(nil, 'returns nil when neither FOG_RC or HOME are set') {
ENV.delete('HOME') ENV.delete('HOME')
ENV.delete('FOG_RC') ENV.delete('FOG_RC')