Sutto-marvin 0.3.2 → 0.3.3

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 3
-:patch: 2
+:patch: 3

data/lib/marvin/abstract_client.rb

@@ -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

data/lib/marvin/settings.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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Sutto-marvin
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
 - Darcy Laycock