lib/roll/config.rb in roll-1.1.0 vs lib/roll/config.rb in roll-1.2.0

- old
+ new

@@ -1,23 +1,27 @@ require 'rbconfig' module ::Config + # TODO: use "XDG-lite" rather than XDG. + + # HOME = File.expand_path('~') # ENV['HOME'] # Location of user's personal config directory. CONFIG_HOME = File.expand_path(ENV['XDG_CONFIG_HOME'] || File.join(HOME, '.config')) # List of user shared system config directories. CONFIG_DIRS = ( dirs = ENV['XDG_CONFIG_DIRS'].to_s.split(/[:;]/) if dirs.empty? - dirs = File.join(Config::CONFIG['sysconfdir'], 'xdg') + dirs = [File.join(Config::CONFIG['sysconfdir'], 'xdg')] end dirs.collect{ |d| File.expand_path(d) } ) + # WIN_PATTERNS = [ /bccwin/i, /cygwin/i, /djgpp/i, /mingw/i, @@ -39,29 +43,30 @@ # "#{Config::CONFIG['datadir']}/#{name}", but may be # modified by packages like RubyGems and Rolls to handle # versioned data directories. #++ + # def self.datadir(name, versionless=false) if lib = Roll::Library.instance(name) lib.datadir(versionless) + elsif defined?(super) + super(name) else File.join(CONFIG['datadir'], name) end end # Return the path to the configuration directory. - def self.confdir(name) if lib = Roll::Library.instance(name) lib.confdir else File.join(CONFIG['confdir'], name) end end # Lookup configuration file. - def self.find_config(*glob) flag = 0 flag = (flag | glob.pop) while Fixnum === glob.last find = [] [CONFIG_HOME, *CONFIG_DIRS].each do |dir|