From 2f3cf7647742ce80b428d5e0aad75b45e0510bdc Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Fri, 22 Jun 2018 19:08:50 +0300
Subject: remove csv smell

---
 lib/oxidized/source/csv.rb | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'lib')

diff --git a/lib/oxidized/source/csv.rb b/lib/oxidized/source/csv.rb
index 7b771f6..769b1f7 100644
--- a/lib/oxidized/source/csv.rb
+++ b/lib/oxidized/source/csv.rb
@@ -20,14 +20,7 @@ module Oxidized
 
     def load _node_want = nil
       nodes = []
-      file = File.expand_path(@cfg.file)
-      file = if @cfg.gpg?
-               crypto = GPGME::Crypto.new password: @cfg.gpg_password
-               file = crypto.decrypt(File.open(file)).to_s
-             else
-               open(file)
-             end
-      file.each_line do |line|
+      get_file.each_line do |line|
         next if line.match(/^\s*#/)
         data = line.chomp.split(@cfg.delimiter, -1)
         next if data.empty?
@@ -49,5 +42,17 @@ module Oxidized
       end
       nodes
     end
+
+    private
+
+    def get_file
+      file = File.expand_path(@cfg.file)
+      if @cfg.gpg?
+        crypto = GPGME::Crypto.new password: @cfg.gpg_password
+        crypto.decrypt(File.open(file)).to_s
+      else
+        open(file)
+      end
+    end
   end
 end
-- 
cgit v1.2.1