forecast 0.0.5 → 0.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDc2ZmVjYmVkY2EwNmVmMWNmODE3N2VhZWI0YjMxOTZmOWZmNmU5Nw==
+    Njg4ZDc4NzYyNGY2NTZhYjUzYWQxY2U0YWI4MjNiNzk2YzM2ZDlkMA==
   data.tar.gz: !binary |-
-    ZTA5YjIyMjI4MTg4YzQ1MmE4OGQ5Nzc2ZWNjN2Q2NjA1NjdmYTk0Mw==
+    NzU1ZjUwMWI5ZTlhN2NhYWY3ZDlhZWU5MTBhN2RjNzhlYWI3ZTFhNQ==
 SHA512:
   metadata.gz: !binary |-
-    ODRlYjk0MjEyZTdkNjk2OWRlNjA0NTk2MTAzYjUzNjYwN2IxZjc4YjkzZjMx
-    ODcxNjBmODE4OTE1MzJlMTU0YjA0NWZjM2E3YTI0NDljMmRjOGY5N2Q3MjI3
-    OTM4MzkyNTcyYzRhYWI4YWZmMmNmNjgzZDE2MjE3Yjg4M2FlZGQ=
+    ZTMzMDA4ODBiMTJiZjU3MTY1NjYxOGNmNDE4OTc5MTQ2ZjM4YjEyNmYzZDk2
+    M2YzNDM2ZWJhOTY3YjEwMmNlNTVmYTZmMzBmZDQwYWFmMTc1NTFjNTRiMTgx
+    NjgxZGYzNjBkODg2ZTA1ZDA3MzVkMmZjYWZhZmNjYTc5YjFiNzQ=
   data.tar.gz: !binary |-
-    MDFmMDRiNWFhNDY3MWEzNmE2MTMzYTY1Nzg4YmE5NzdjYTA4YzYxNWVjZjQ0
-    NDBhMmQ4NjhhMTIxMWViZWNkZmFmMmY3NGY5MjNiZmI3OGI2MzJkNGQ4NjU0
-    NThkYTkwYTUxM2NiM2Q0YjNjMzA1MjlmZjc1MWE0Njc2MjAzZTY=
+    Y2MxYjg0ZWI3NjY0YjRiNTAxYjk2NDNhNDA4MjAyZGI0NTA1YmVkZDUwY2Q3
+    YWQ5NjFjMzI1OTU2ZTQ1MTY1YTA2ZmNmY2VkZTcwMjMxMTQ3MjI2YTc5ZmUw
+    ZDhlYjAwZjRjM2ZiMTM5YjE1YjQ4MjU4YzZiMzZiOTdjNDdiOTY=

data/lib/forecast/config.rb

@@ -25,14 +25,15 @@ class Forecast
     end
     
     def load(pattern)
+      # puts 'load forecast pattern ' + pattern.to_s
       Dir.glob(pattern).sort{ |a, b| a.split(/\//).length <=> b.split(/\//).length}.reverse.each do |f|
         obj = YAML.load_file(f)
-        puts 'load forecast config ' + f.to_s
+        # puts 'load forecast config ' + f.to_s
         if obj['forecast'] != nil
           obj['forecast'].each do |k, v|
             if respond_to?("#{k}")
               o = send("#{k}")
-              if o.is_a?(Hash)
+              if v.is_a?(Hash) && o.is_a?(Hash)
                 v = deep_merge(o, v)
               end
             end
@@ -66,7 +67,6 @@ class Forecast
     yield self.config
     # puts 'configured'
     if self.config.config_file != nil
-      puts '**** load config from file'
       self.config.load(self.config.config_file)
     end
   end

data/lib/forecast/version.rb

@@ -1,3 +1,3 @@
 class Forecast
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forecast
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Rafael Nowrotek