summaryrefslogtreecommitdiff
path: root/lib/oxidized/source/csv.rb
diff options
context:
space:
mode:
authorytti <saku@ytti.fi>2016-01-04 18:50:54 +0200
committerytti <saku@ytti.fi>2016-01-04 18:50:54 +0200
commit0eeba91b426c8b4a6335a88da9c65ba38e5fac15 (patch)
tree02ba46c4f7d43b5721f3eb7de38599e0e019e5cf /lib/oxidized/source/csv.rb
parentf112dfa0c604ae1c990f6411a002806924c00bf3 (diff)
parente41f7b429901eb38ad785ad1fc2527dd41f35959 (diff)
Merge pull request #250 from Shopify/master0.10.0
refactoring, test coverage and github hook
Diffstat (limited to 'lib/oxidized/source/csv.rb')
-rw-r--r--lib/oxidized/source/csv.rb14
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/oxidized/source/csv.rb b/lib/oxidized/source/csv.rb
index 5064e5e..a0ce848 100644
--- a/lib/oxidized/source/csv.rb
+++ b/lib/oxidized/source/csv.rb
@@ -1,17 +1,17 @@
module Oxidized
class CSV < Source
def initialize
- @cfg = CFG.source.csv
+ @cfg = Oxidized.config.source.csv
super
end
def setup
if @cfg.empty?
- CFGS.user.source.csv.file = File.join(Config::Root, 'router.db')
- CFGS.user.source.csv.delimiter = /:/
- CFGS.user.source.csv.map.name = 0
- CFGS.user.source.csv.map.model = 1
- CFGS.save :user
+ 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.save :user
raise NoConfig, 'no source csv config, edit ~/.config/oxidized/config'
end
end
@@ -19,7 +19,7 @@ class CSV < Source
def load
nodes = []
open(File.expand_path @cfg.file).each_line do |line|
- next if line.match /^\s*#/
+ next if line.match(/^\s*#/)
data = line.chomp.split @cfg.delimiter
next if data.empty?
# map node parameters