Merge pull request #250 from Shopify/master0.10.0

refactoring, test coverage and github hook

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