Merge remote-tracking branch 'upstream/master'

* upstream/master: (109 commits)
  delete secret password if it is called secret
  bump up version
  update changelogs
  Recursively search from one dir above specified
  Fix suggested by ytti for issue #610
  Remove trailing whitespace and enable prompt detection
  Update eos.rb
  exclude time from output
  New hook: awssns - Publish messages to AWS SNS topics
  Updated config options
  Added option to disable ssl verification checks for http source
  Update ciscosmb.rb
  Update ciscosmb.rb
  Update ciscosmb.rb
  expect prompt after entering enable password
  add support for PLANET SG switches
  renamed  alvarion -> alvarion.rb
  This adds support for Hatteras Networks devices
  This adds support for D-Link switches
  This adds support for the Casa C1G CMTS
  ...

1 files changed, 12 insertions, 8 deletions

diff --git a/lib/oxidized/output/file.rb b/lib/oxidized/output/file.rb
index bb13827..45f72e1 100644
--- a/lib/oxidized/output/file.rb
+++ b/lib/oxidized/output/file.rb
@@ -17,7 +17,7 @@ class OxidizedFile < Output
   end
 
   def store node, outputs, opt={}
-    file = @cfg.directory
+    file = File.expand_path @cfg.directory
     if opt[:group]
       file = File.join File.dirname(file), opt[:group]
     end
@@ -28,18 +28,22 @@ class OxidizedFile < Output
   end
 
   def fetch node, group
-    cfg_dir = @cfg.directory
+    cfg_dir   = File.expand_path @cfg.directory
+    node_name = node.name
+
     if group # group is explicitly defined by user
-      IO.readlines File.join(cfg_dir, group, node)
+      cfg_dir = File.join File.dirname(cfg_dir), group
+      File.read File.join(cfg_dir, node_name)
     else
-      if File.exists? File.join(cfg_dir, node) # node configuration file is stored on base directory
-        IO.readlines File.join(cfg_dir, node)
+      if File.exists? File.join(cfg_dir, node_name) # node configuration file is stored on base directory
+        File.read File.join(cfg_dir, node_name)
       else
-        path = Dir.glob File.join(cfg_dir, '**', node) # fetch node in all groups
-        return nil if path[0].nil?
-        open(path[0], 'r').readlines
+        path = Dir.glob(File.join(File.dirname(cfg_dir), '**', node_name)).first # fetch node in all groups
+        File.read path
       end
     end
+  rescue Errno::ENOENT
+    return nil
   end
 
   def version node, group