lib/ruby-conf.rb in ruby-conf-2.6.5 vs lib/ruby-conf.rb in ruby-conf-2.7.0

- old
+ new

@@ -10,11 +10,11 @@ def self.puts(logger = $stdout, *obj) logger.puts(*obj) if logger.respond_to?(:puts) end def self.err(*objs) self.puts($stderr, *objs) end def self.out(*objs) self.puts($stdout, *objs) end class Loader < BasicObject - EXTENTIONS = %w{\\.rbc \\.rbcnf \\.rconf rbconf rbconfig rubyconf rubyconfig ruby-conf ruby-config} + EXTENTIONS = %w{\\.rc \\.rbc \\.rb \\.config \\.conf \\.rbcnf \\.rconf rbconf rbconfig rubyconf rubyconfig ruby-conf ruby-config} @@conf = @@path = @@mtime = @@md5 = nil class << self def __rc_loaded_conf() { path:@@path, mtime:@@mtime, md5:@@md5 } end @@ -35,11 +35,11 @@ end def method_missing(name, *args, &block) __rc_reload if @@conf.nil? Find.find('.') do |path| - next unless @@conf.nil? && path =~ /(?:\.rb|\.config|\.conf|#{EXTENTIONS.join('|')})$/ - if path =~ /(?:#{EXTENTIONS.join('|')})$/ || File.read(path) =~ /^\s*\#\s*\:\s*ruby-conf\s*$/mi + next unless @@conf.nil? && path =~ /(?:#{EXTENTIONS.join('|')})$/ + if !!(path =~ /(?:#{EXTENTIONS.join('|')})$/) && !!(File.read(path) =~ /^\s*\#\s*\:\s*ruby-conf\s*(?::.*)?$/mi) break if __rc_load(path) end end end @@conf.__send__(name, *args, &block)