@@ -124,7 +124,8 @@ module Marvin @nicks = [] @nicks << self.configuration.nick @nicks += self.configuration.nicks.to_a unless self.configuration.nicks.blank? - @nicks_loaded + @nicks.compact! + @nicks_loaded = true end return @nicks end lib/marvin/abstract_client.rb @@ -36,9 +36,8 @@ module Marvin self.default_client ||= Marvin::IRC::Client self.default_parser ||= Marvin::Parsers::SimpleParser loaded_yaml = YAML.load_file(root / "config/settings.yml") - loaded_options = loaded_yaml["default"]. - merge(loaded_yaml[self.environment]). - merge(options) + env_settings = loaded_yaml[self.environment] || {} + loaded_options = loaded_yaml["default"].merge(env_settings).merge(options) self.configuration.merge!(loaded_options) self.configuration.symbolize_keys! mod = Module.new do lib/marvin/settings.rb @@ -2,7 +2,7 @@ Gem::Specification.new do |s| s.name = %q{marvin} - s.version = "0.3.2" + s.version = "0.3.3" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Darcy Laycock"] marvin.gemspec 7ae1a2781d2d70c48d538cde8ed62c6ec8180ead Darcy Laycock sutto@sutto.net http://github.com/Sutto/marvin/commit/1adf11a4648ee3443b4d8368614641c9dc94ac18 1adf11a4648ee3443b4d8368614641c9dc94ac18 2009-04-05T07:30:21-07:00 2009-04-05T07:30:21-07:00 Fix minor issues, bump gemspec 55aaa0dba89d2bea69066ef5bd45aee499d121e1 Darcy Laycock sutto@sutto.net