diff options
author | Saku Ytti <saku@ytti.fi> | 2018-06-22 19:08:50 +0300 |
---|---|---|
committer | Saku Ytti <saku@ytti.fi> | 2018-06-22 19:08:50 +0300 |
commit | 2f3cf7647742ce80b428d5e0aad75b45e0510bdc (patch) | |
tree | 524dd56789ec65c06b820d2deae1a45098ddc305 | |
parent | 31b863f2eeff3ccbec8d0c0c35caf2c0e1d3e0ef (diff) |
remove csv smell
-rw-r--r-- | lib/oxidized/source/csv.rb | 21 |
1 files changed, 13 insertions, 8 deletions
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 |