onering-client 0.1.6 → 0.1.7

data/lib/onering/config.rb

@@ -27,9 +27,12 @@ module Onering
       # only load files we haven't seen before
         (@_configfiles - @_configfiles_seen.to_a).each do |i|
           c = YAML.load(File.read(File.expand_path(i))) rescue {}
-          Onering::Logger.info("Loading config file at #{File.expand_path(i) rescue i}", "Onering::Config") unless c.empty?
+            
+          if c and not c.empty?
+            Onering::Logger.info("Loading config file at #{File.expand_path(i) rescue i}", "Onering::Config")
+            @_config.deep_merge!(c)
+          end
 
-          @_config.deep_merge!(c)
           @_configfiles_seen << i
         end
 

data/lib/onering/plugins/reporter.rb

@@ -213,10 +213,12 @@ module Onering
               cache = _update_cache_file(cachefile)
             end
 
-          # remove cached_at key
-            Onering::Logger.debug("Using cached data (#{Time.now.to_i - Time.parse(cache.get('cached_at')).to_i} seconds old)", "Onering::Reporter")
-            cache.delete('cached_at')
-            return cache
+            if cache
+            # remove cached_at key
+              Onering::Logger.debug("Using cached data (#{Time.now.to_i - Time.parse(cache.get('cached_at')).to_i} seconds old)", "Onering::Reporter")
+              cache.delete('cached_at')
+              return cache
+            end
           else
             Onering::Logger.debug("Report cache file could not be read at #{cachefile}", "Onering::Reporter")
             throw :retry if _update_cache_file(cachefile)
@@ -230,7 +232,7 @@ module Onering
       def _update_cache_file(cachefile=DEFAULT_CACHE_FILE)
         begin
           report = nil
-          
+
           File.open(cachefile, 'w+') do |file|
             Onering::Logger.debug("Regenerating cache file at #{cachefile}", "Onering::Reporter")
             report = _generated_report()

data/lib/onering.rb

@@ -2,7 +2,7 @@ $: << File.expand_path(File.dirname(__FILE__))
 
 module Onering
   module Client
-    VERSION = "0.1.6"
+    VERSION = "0.1.7"
 
     class Error < Exception; end
     class FatalError < Error; end

metadata

@@ -2,7 +2,7 @@
 name: onering-client
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Gary Hetzel