summaryrefslogtreecommitdiff
path: root/lib/oxidized/source
diff options
context:
space:
mode:
authorElvin Efendi <elvin.efendiyev@gmail.com>2015-11-13 11:19:20 -0500
committerElvin Efendi <elvin.efendiyev@gmail.com>2015-11-13 11:19:20 -0500
commit5a2364e50620b825d5325bfbbc5d0f3d8578e25f (patch)
tree0e985374cc7b4bd8111c012072c39218335881ef /lib/oxidized/source
parent1400b842f6dc61e662ce15f72f578a55126ffc06 (diff)
parentf2da63369fcb754e3715091cc4fd2f93db42106e (diff)
Merge pull request #2 from Shopify/testing-refactoring
Testing refactoring
Diffstat (limited to 'lib/oxidized/source')
-rw-r--r--lib/oxidized/source/csv.rb14
-rw-r--r--lib/oxidized/source/http.rb2
-rw-r--r--lib/oxidized/source/source.rb2
-rw-r--r--lib/oxidized/source/sql.rb14
4 files changed, 16 insertions, 16 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
diff --git a/lib/oxidized/source/http.rb b/lib/oxidized/source/http.rb
index d2e3ea6..6e765cf 100644
--- a/lib/oxidized/source/http.rb
+++ b/lib/oxidized/source/http.rb
@@ -1,7 +1,7 @@
module Oxidized
class HTTP < Source
def initialize
- @cfg = CFG.source.http
+ @cfg = Oxidized.config.source.http
super
end
diff --git a/lib/oxidized/source/source.rb b/lib/oxidized/source/source.rb
index 3c1f255..7862dd1 100644
--- a/lib/oxidized/source/source.rb
+++ b/lib/oxidized/source/source.rb
@@ -2,7 +2,7 @@ module Oxidized
class Source
class NoConfig < OxidizedError; end
def initialize
- @map = (CFG.model_map or {})
+ @map = (Oxidized.config.model_map or {})
end
def map_model model
@map.has_key?(model) ? @map[model] : model
diff --git a/lib/oxidized/source/sql.rb b/lib/oxidized/source/sql.rb
index cd9ef4a..fc1caa8 100644
--- a/lib/oxidized/source/sql.rb
+++ b/lib/oxidized/source/sql.rb
@@ -8,12 +8,12 @@ class SQL < Source
def setup
if @cfg.empty?
- CFGS.user.source.sql.adapter = 'sqlite'
- CFGS.user.source.sql.database = File.join(Config::Root, 'sqlite.db')
- CFGS.user.source.sql.table = 'devices'
- CFGS.user.source.sql.map.name = 'name'
- CFGS.user.source.sql.map.model = 'rancid'
- CFGS.save :user
+ Oxidized.asetus.user.source.sql.adapter = 'sqlite'
+ Oxidized.asetus.user.source.sql.database = File.join(Config::Root, 'sqlite.db')
+ Oxidized.asetus.user.source.sql.table = 'devices'
+ Oxidized.asetus.user.source.sql.map.name = 'name'
+ Oxidized.asetus.user.source.sql.map.model = 'rancid'
+ Oxidized.asetus.save :user
raise NoConfig, 'no source sql config, edit ~/.config/oxidized/config'
end
end
@@ -44,7 +44,7 @@ class SQL < Source
def initialize
super
- @cfg = CFG.source.sql
+ @cfg = Oxidized.config.source.sql
end
def connect