From ce283fa4399bf0bfaf7d677e52ce7a65b424e776 Mon Sep 17 00:00:00 2001
From: mbakerbp <michael.baker@bulletproof.net>
Date: Tue, 24 Jan 2017 10:45:34 +0800
Subject: Requested changes

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

(limited to 'lib/oxidized/source')

diff --git a/lib/oxidized/source/csv.rb b/lib/oxidized/source/csv.rb
index 449b297..c508358 100644
--- a/lib/oxidized/source/csv.rb
+++ b/lib/oxidized/source/csv.rb
@@ -10,21 +10,22 @@ class CSV < Source
       Oxidized.asetus.user.source.csv.file      = File.join(Config::Root, 'router.db')
       Oxidized.asetus.user.source.csv.delimiter = /:/
       Oxidized.asetus.user.source.csv.map.name  = 0
-      Oxidized.asetus.user.source.csv.map.model = 1
       Oxidized.asetus.user.source.csv.gpg       = false
       Oxidized.asetus.save :user
       raise NoConfig, 'no source csv config, edit ~/.config/oxidized/config'
     end
+    require 'gpgme' if @cfg.gpg?
   end
 
   def load
     nodes = []
-    if @cfg.gpg != 'false'
-      crypto = GPGME::Crypto.new :password => @cfg.gpg_password
-      file   = crypto.decrypt(File.open(@cfg.file)).to_s
+    file = File.expand_path(@cfg.file)
+    file = if @cfg.gpg?
+      crypto = GPGME::Crypto.new password: @cfg.gpg_password
+      crypto.decrypt(file).to_s
     else
-      file = open(File.expand_path @cfg.file)
-    end
+      open(file)
+    end  
     file.each_line do |line|
       next if line.match(/^\s*#/)
       data  = line.chomp.split(@cfg.delimiter, -1)
-- 
cgit v1.2.1