chiu
/
google-auth-library-ruby
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update credentials_loader.rb

This commit is contained in:
Vijay Subramani 2015-12-31 15:48:39 -08:00
parent c75d7398ff
commit ec7e118248
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/googleauth/credentials_loader.rb
View File

@ -28,6 +28,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
require 'memoist' require 'memoist'
require 'os'
require 'rbconfig' require 'rbconfig'
module Google module Google
@ -55,12 +56,6 @@ module Google
SYSTEM_DEFAULT_ERROR = 'Unable to read the system default credential file' SYSTEM_DEFAULT_ERROR = 'Unable to read the system default credential file'
# determines if the current OS is windows
def windows?
RbConfig::CONFIG['host_os'] =~ /Windows|mswin/
end
memoize :windows?
# make_creds proxies the construction of a credentials instance # make_creds proxies the construction of a credentials instance
# #
# By default, it calls #new on the current class, but this behaviour can # By default, it calls #new on the current class, but this behaviour can
@ -91,10 +86,10 @@ module Google
# #
# @param scope [string|array|nil] the scope(s) to access # @param scope [string|array|nil] the scope(s) to access
def from_well_known_path(scope = nil) def from_well_known_path(scope = nil)
home_var = windows? ? 'APPDATA' : 'HOME' home_var = OS.windows? ? 'APPDATA' : 'HOME'
base = WELL_KNOWN_PATH base = WELL_KNOWN_PATH
root = ENV[home_var].nil? ? '' : ENV[home_var] root = ENV[home_var].nil? ? '' : ENV[home_var]
base = File.join('.config', base) unless windows? base = File.join('.config', base) unless OS.windows?
path = File.join(root, base) path = File.join(root, base)
return nil unless File.exist?(path) return nil unless File.exist?(path)
File.open(path) do |f| File.open(path) do |f|
@ -108,7 +103,7 @@ module Google
# #
# @param scope [string|array|nil] the scope(s) to access # @param scope [string|array|nil] the scope(s) to access
def from_system_default_path(scope = nil) def from_system_default_path(scope = nil)
if windows? if OS.windows?
return nil unless ENV['ProgramData'] return nil unless ENV['ProgramData']
prefix = File.join(ENV['ProgramData'], 'Google/Auth') prefix = File.join(ENV['ProgramData'], 'Google/Auth')
else else