@@ -1,3 +1,13 @@ +== 0.0.4 2008-12-08 +* fix the environment merging issue, for real this time + +== 0.0.3 2008-12-02 +* fix the environment merging issue + +== 0.0.2 2008-09-10 +* have find_config return the file if it exists instead of looking in . and +./config + == 0.0.1 2008-08-06 * 1 major enhancement: History.txt @@ -25,7 +25,7 @@ class ConfigReader def reload raise 'No config file set' unless @config_file - if defined?(ERB) + if defined?(ERB) conf = YAML.load(ERB.new(File.open(find_config).read).result) else conf = YAML.load(File.open(find_config).read) @@ -40,26 +40,28 @@ class ConfigReader end _conf = conf['defaults'] - _conf.merge(conf[env]) if conf[env] + _conf.merge!(conf[env]) if conf[env] _conf end def [](key) config[key] end - + def find_config + return @config_file if File.exist?(@config_file) + %w( . config ).each do |dir| config_file = File.join(dir, @config_file) return config_file if File.exist?(config_file) end '' - end + end def method_missing(key) config[key.to_s] || super end - + def inspect puts config.inspect end lib/config_reader.rb @@ -2,7 +2,7 @@ module ConfigReader module VERSION #:nodoc: MAJOR = 0 MINOR = 0 - TINY = 1 + TINY = 4 STRING = [MAJOR, MINOR, TINY].join('.') end lib/config_reader/version.rb cc2975e41a08821b1ff4e3ec44c9d80f4ce7f8f4 Michael Moen michael@underpantsgnome.com http://github.com/UnderpantsGnome/config_reader-gem/commit/0902cb879672145e819a3fd320e2105359d61a5a 0902cb879672145e819a3fd320e2105359d61a5a 2008-12-08T16:01:03-08:00 2008-12-08T16:01:03-08:00 fix the environment merge for real this time 50bee60cde8bf689143b6046c2b5f35e7ba13172 Michael Moen michael@underpantsgnome.com