From d156ac397beffabe3f0cb045f923050a3ab74887 Mon Sep 17 00:00:00 2001
From: Neil Lathwood <neil@lathwood.co.uk>
Date: Tue, 31 Oct 2017 21:38:54 +0000
Subject: Added support for sending single node request to http source

---
 lib/oxidized/nodes.rb       | 3 ++-
 lib/oxidized/source/http.rb | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/oxidized/nodes.rb b/lib/oxidized/nodes.rb
index 3f84e15..84cf956 100644
--- a/lib/oxidized/nodes.rb
+++ b/lib/oxidized/nodes.rb
@@ -12,7 +12,8 @@ module Oxidized
         @source = Oxidized.config.source.default
         Oxidized.mgr.add_source @source
         Oxidized.logger.info "lib/oxidized/nodes.rb: Loading nodes"
-        Oxidized.mgr.source[@source].new.load.each do |node|
+        nodes = Oxidized.mgr.source[@source].new.load node_want
+        nodes.each do |node|
           # we want to load specific node(s), not all of them
           next unless node_want? node_want, node
           begin
diff --git a/lib/oxidized/source/http.rb b/lib/oxidized/source/http.rb
index 6c12f29..e4cb58e 100644
--- a/lib/oxidized/source/http.rb
+++ b/lib/oxidized/source/http.rb
@@ -15,7 +15,7 @@ class HTTP < Source
   require "uri"
   require "json"
 
-  def load
+  def load node=nil
     nodes = []
     uri = URI.parse(@cfg.url)
     http = Net::HTTP.new(uri.host, uri.port)
@@ -28,7 +28,11 @@ class HTTP < Source
       headers[header] = value
     end
 
-    request = Net::HTTP::Get.new(uri.request_uri, headers)
+    req_uri = uri.request_uri
+    if node
+      req_uri = "#{req_uri}/#{node}"
+    end
+    request = Net::HTTP::Get.new(req_uri, headers)
     if (@cfg.user? && @cfg.pass?)
         request.basic_auth(@cfg.user,@cfg.pass)
     end
-- 
cgit v1.2.1


From 29704b5f2721a742d312ced784a8076e27e8063b Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Fri, 10 Nov 2017 14:12:13 +0000
Subject: Added sql support for calling for single host

---
 lib/oxidized/source/http.rb | 6 +++---
 lib/oxidized/source/sql.rb  | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/oxidized/source/http.rb b/lib/oxidized/source/http.rb
index e4cb58e..73df6f7 100644
--- a/lib/oxidized/source/http.rb
+++ b/lib/oxidized/source/http.rb
@@ -15,7 +15,7 @@ class HTTP < Source
   require "uri"
   require "json"
 
-  def load node=nil
+  def load node_want=nil
     nodes = []
     uri = URI.parse(@cfg.url)
     http = Net::HTTP.new(uri.host, uri.port)
@@ -29,8 +29,8 @@ class HTTP < Source
     end
 
     req_uri = uri.request_uri
-    if node
-      req_uri = "#{req_uri}/#{node}"
+    if node_want
+      req_uri = "#{req_uri}/#{node_want}"
     end
     request = Net::HTTP::Get.new(req_uri, headers)
     if (@cfg.user? && @cfg.pass?)
diff --git a/lib/oxidized/source/sql.rb b/lib/oxidized/source/sql.rb
index 13fc39b..7e2824d 100644
--- a/lib/oxidized/source/sql.rb
+++ b/lib/oxidized/source/sql.rb
@@ -18,11 +18,12 @@ class SQL < Source
     end
   end
 
-  def load
+  def load node_want=nil
     nodes = []
     db = connect
     query = db[@cfg.table.to_sym]
     query = query.with_sql(@cfg.query) if @cfg.query?
+    query = qeury.where(@cfg.map.name.to_sym node_want)
     query.each do |node|
       # map node parameters
       keys = {}
-- 
cgit v1.2.1


From d96cfac1f09ff4055f54ab604358290865d41f62 Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Fri, 10 Nov 2017 14:44:45 +0000
Subject: updated to check if node_want

---
 lib/oxidized/source/sql.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/oxidized/source/sql.rb b/lib/oxidized/source/sql.rb
index 7e2824d..97064fa 100644
--- a/lib/oxidized/source/sql.rb
+++ b/lib/oxidized/source/sql.rb
@@ -23,7 +23,11 @@ class SQL < Source
     db = connect
     query = db[@cfg.table.to_sym]
     query = query.with_sql(@cfg.query) if @cfg.query?
-    query = qeury.where(@cfg.map.name.to_sym node_want)
+
+    if node_want
+      query = query.where(@cfg.map.name.to_sym=>node_want)
+    end
+
     query.each do |node|
       # map node parameters
       keys = {}
-- 
cgit v1.2.1


From 7c108b6b7a3277aac44455b93a587d1d01a58041 Mon Sep 17 00:00:00 2001
From: Neil Lathwood <neil@lathwood.co.uk>
Date: Mon, 5 Feb 2018 21:55:31 +0000
Subject: Added support for setting ssh auth methods

---
 docs/Configuration.md      | 9 +++++++++
 docs/Model-Notes/EOS.md    | 9 +++++++++
 docs/Model-Notes/README.md | 1 +
 lib/oxidized/input/ssh.rb  | 5 ++++-
 lib/oxidized/worker.rb     | 6 +++++-
 5 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 docs/Model-Notes/EOS.md

diff --git a/docs/Configuration.md b/docs/Configuration.md
index e2db05e..d0afdf6 100644
--- a/docs/Configuration.md
+++ b/docs/Configuration.md
@@ -59,6 +59,15 @@ vars:
   ssh_no_exec: true
 ```
 
+### SSH Auth Methods
+
+By default, Oxidized registers the following auth methods: `none`, `publickey` and `password`. However you can configure this globally, by groups, models or nodes.
+
+```
+vars:
+    auth_methods: none, publickey, password, keyboard-interactive
+```
+
 ### SSH Proxy Command
 
 Oxidized can `ssh` through a proxy as well. To do so we just need to set `ssh_proxy` variable.
diff --git a/docs/Model-Notes/EOS.md b/docs/Model-Notes/EOS.md
new file mode 100644
index 0000000..66287e3
--- /dev/null
+++ b/docs/Model-Notes/EOS.md
@@ -0,0 +1,9 @@
+Arista EOS Configuration
+========================
+
+By default EOS requires keyboard-interactive to be added to your Oxidized config. You can avoid having to do this by configuring the following on the EOS device:
+
+```
+management ssh
+   authentication mode password
+```
diff --git a/docs/Model-Notes/README.md b/docs/Model-Notes/README.md
index f51ed80..636c9fa 100644
--- a/docs/Model-Notes/README.md
+++ b/docs/Model-Notes/README.md
@@ -11,6 +11,7 @@ Use the table below for more information on the Vendor/Model caveats.
 
 Vendor          | Model           |Updated
 ----------------|-----------------|----------------
+Arista|[EOS](EOS.md)|05 Feb 2018
 Huawei|[VRP](VRP-Huawei.md)|17 Nov 2017
 Juniper|[MX/QFX/EX/SRX/J Series](JunOS.md)|18 Jan 2018
 Xyzel|[XGS4600 Series](XGS4600-Zyxel.md)|23 Jan 2018
diff --git a/lib/oxidized/input/ssh.rb b/lib/oxidized/input/ssh.rb
index 27e81e0..8df18f5 100644
--- a/lib/oxidized/input/ssh.rb
+++ b/lib/oxidized/input/ssh.rb
@@ -29,10 +29,13 @@ module Oxidized
                 :port => port.to_i,
                 :password => @node.auth[:password], :timeout => Oxidized.config.timeout,
                 :paranoid => secure,
-                :auth_methods => %w(none publickey password keyboard-interactive),
                 :number_of_password_prompts => 0,
         }
 
+      auth_methods = vars(:auth_methods) || %w(none publickey password)
+      ssh_opts[:auth_methods] = auth_methods
+      Oxidized.logger.info "AUTH METHODS::#{auth_methods}"
+
       if proxy_host = vars(:ssh_proxy)
         proxy_command =  "ssh "
         proxy_command += "-o StrictHostKeyChecking=no " unless secure
diff --git a/lib/oxidized/worker.rb b/lib/oxidized/worker.rb
index 4173680..062233b 100644
--- a/lib/oxidized/worker.rb
+++ b/lib/oxidized/worker.rb
@@ -80,7 +80,11 @@ module Oxidized
     private
 
     def is_cycle_finished?
-      @jobs_done > 0 && @jobs_done % @nodes.count == 0
+      if @jobs_done > @nodes.count
+        true
+      else
+        @jobs_done > 0 && @jobs_done % @nodes.count == 0
+      end
     end
 
     def run_done_hook
-- 
cgit v1.2.1


From ff0a42cdfd2bdb34d0852a0d85f63825a44fdf1b Mon Sep 17 00:00:00 2001
From: James Hannah <james.hannah@stfc.ac.uk>
Date: Wed, 21 Mar 2018 09:02:38 +0000
Subject: Alter DNOS config. Remove constantly changing info

Gsub out the uptime which changes constantly, and remove the output of
"show system" which duplicates the info from "show version" and contains
fan speed data which isn't helpful.
---
 lib/oxidized/model/dnos.rb | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/oxidized/model/dnos.rb b/lib/oxidized/model/dnos.rb
index 5c3cd53..22e1876 100644
--- a/lib/oxidized/model/dnos.rb
+++ b/lib/oxidized/model/dnos.rb
@@ -6,6 +6,7 @@ class DNOS  < Oxidized::Model
 
   cmd :all do |cfg|
     cfg.gsub! /^% Invalid input detected at '\^' marker\.$|^\s+\^$/, ''
+    cfg.gsub! /^Dell Networking OS uptime is\s.+/, '' # Omit constantly changing uptime info
     cfg.each_line.to_a[2..-2].join
   end
 
@@ -27,10 +28,6 @@ class DNOS  < Oxidized::Model
     comment cfg
   end
 
-  cmd 'show system' do |cfg|
-    comment cfg
-  end
-
   cmd 'show running-config' do |cfg|
     cfg = cfg.each_line.to_a[3..-1].join
     cfg
-- 
cgit v1.2.1


From a4bd3e5ca5ab747fdbf2bd876d7be7a947e74f46 Mon Sep 17 00:00:00 2001
From: Wild Kat <wk@futureinquestion.net>
Date: Sun, 8 Apr 2018 00:35:47 +0200
Subject: eliminate inverse methods from models

---
 lib/oxidized/model/aosw.rb         | 2 +-
 lib/oxidized/model/asa.rb          | 2 +-
 lib/oxidized/model/comware.rb      | 2 +-
 lib/oxidized/model/firewareos.rb   | 2 +-
 lib/oxidized/model/powerconnect.rb | 4 ++--
 lib/oxidized/model/procurve.rb     | 2 +-
 lib/oxidized/model/routeros.rb     | 2 +-
 lib/oxidized/model/vrp.rb          | 2 +-
 lib/oxidized/model/zhoneolt.rb     | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/oxidized/model/aosw.rb b/lib/oxidized/model/aosw.rb
index 71fde2e..3397305 100644
--- a/lib/oxidized/model/aosw.rb
+++ b/lib/oxidized/model/aosw.rb
@@ -40,7 +40,7 @@ class AOSW < Oxidized::Model
   end
 
   cmd 'show version' do |cfg|
-    cfg = cfg.each_line.select { |line| not line.match /(Switch|AP) uptime/i }
+    cfg = cfg.each_line.reject { |line| line.match /(Switch|AP) uptime/i }
     rstrip_cfg comment cfg.join
   end
 
diff --git a/lib/oxidized/model/asa.rb b/lib/oxidized/model/asa.rb
index 9df4206..bea0705 100644
--- a/lib/oxidized/model/asa.rb
+++ b/lib/oxidized/model/asa.rb
@@ -27,7 +27,7 @@ class ASA < Oxidized::Model
 
   cmd 'show version' do |cfg|
     # avoid commits due to uptime / ixo-router01 up 2 mins 28 secs / ixo-router01 up 1 days 2 hours
-    cfg = cfg.each_line.select { |line| not line.match /(\s+up\s+\d+\s+)|(.*days.*)/ }
+    cfg = cfg.each_line.reject { |line| line.match /(\s+up\s+\d+\s+)|(.*days.*)/ }
     cfg = cfg.join
     comment cfg
   end
diff --git a/lib/oxidized/model/comware.rb b/lib/oxidized/model/comware.rb
index a5b7190..0ba26d5 100644
--- a/lib/oxidized/model/comware.rb
+++ b/lib/oxidized/model/comware.rb
@@ -47,7 +47,7 @@ class Comware < Oxidized::Model
   end
 
   cmd 'display version' do |cfg|
-    cfg = cfg.each_line.select {|l| not l.match /uptime/i }.join
+    cfg = cfg.each_line.reject { |l| l.match /uptime/i }.join
     comment cfg
   end
 
diff --git a/lib/oxidized/model/firewareos.rb b/lib/oxidized/model/firewareos.rb
index 1b3d07c..31770dc 100644
--- a/lib/oxidized/model/firewareos.rb
+++ b/lib/oxidized/model/firewareos.rb
@@ -15,7 +15,7 @@ class FirewareOS < Oxidized::Model
 
   cmd 'show sysinfo' do |cfg|
     # avoid commits due to uptime
-    cfg = cfg.each_line.select { |line| not line.match /(.*time.*)|(.*memory.*)|(.*cpu.*)/ }
+    cfg = cfg.each_line.reject { |line| line.match /(.*time.*)|(.*memory.*)|(.*cpu.*)/ }
     cfg = cfg.join
     comment cfg
   end
diff --git a/lib/oxidized/model/powerconnect.rb b/lib/oxidized/model/powerconnect.rb
index f602a36..ca91e60 100644
--- a/lib/oxidized/model/powerconnect.rb
+++ b/lib/oxidized/model/powerconnect.rb
@@ -22,7 +22,7 @@ class PowerConnect < Oxidized::Model
     if (@stackable.nil?)
       @stackable = true if cfg.match /(U|u)nit\s/
     end
-    cfg = cfg.split("\n").select { |line| not line[/Up\sTime/] }
+    cfg = cfg.split("\n").reject { |line| line[/Up\sTime/] }
     comment cfg.join("\n") + "\n"
   end
 
@@ -72,7 +72,7 @@ class PowerConnect < Oxidized::Model
       end
       out << line.strip
     end
-    out = out.select { |line| not line[/Up\sTime/] }
+    out = out.reject { |line| line[/Up\sTime/] }
     out = comment out.join "\n"
     out << "\n"
   end
diff --git a/lib/oxidized/model/procurve.rb b/lib/oxidized/model/procurve.rb
index 444fb5b..705a814 100644
--- a/lib/oxidized/model/procurve.rb
+++ b/lib/oxidized/model/procurve.rb
@@ -67,7 +67,7 @@ class Procurve < Oxidized::Model
 
   # not supported on all models
   cmd 'show system information' do |cfg|
-    cfg = cfg.each_line.select { |line| not line.match /(.*CPU.*)|(.*Up Time.*)|(.*Total.*)|(.*Free.*)|(.*Lowest.*)|(.*Missed.*)/ }
+    cfg = cfg.each_line.reject { |line| line.match /(.*CPU.*)|(.*Up Time.*)|(.*Total.*)|(.*Free.*)|(.*Lowest.*)|(.*Missed.*)/ }
     cfg = cfg.join
     comment cfg
   end
diff --git a/lib/oxidized/model/routeros.rb b/lib/oxidized/model/routeros.rb
index 6717446..b62a3be 100644
--- a/lib/oxidized/model/routeros.rb
+++ b/lib/oxidized/model/routeros.rb
@@ -20,7 +20,7 @@ class RouterOS < Oxidized::Model
       cfg.gsub! /\x1B\[([0-9]{1,3}((;[0-9]{1,3})*)?)?[m|K]/, '' # strip ANSI colours
       cfg.gsub! /\\\r\n\s+/, ''   # strip new line
       cfg.gsub! /# inactive time\r\n/, ''   # Remove time based system comment
-      cfg = cfg.split("\n").select { |line| not line[/^\#\s\w{3}\/\d{2}\/\d{4}.*$/] }
+      cfg = cfg.split("\n").reject { |line| line[/^\#\s\w{3}\/\d{2}\/\d{4}.*$/] }
       cfg.join("\n") + "\n"
     end
   end
diff --git a/lib/oxidized/model/vrp.rb b/lib/oxidized/model/vrp.rb
index 98229c3..e44f69e 100644
--- a/lib/oxidized/model/vrp.rb
+++ b/lib/oxidized/model/vrp.rb
@@ -25,7 +25,7 @@ class VRP < Oxidized::Model
   end
 
   cmd 'display version' do |cfg|
-    cfg = cfg.each_line.select {|l| not l.match /uptime/ }.join
+    cfg = cfg.each_line.reject { |l| l.match /uptime/ }.join
     comment cfg
   end
 
diff --git a/lib/oxidized/model/zhoneolt.rb b/lib/oxidized/model/zhoneolt.rb
index b60edb2..c50680c 100644
--- a/lib/oxidized/model/zhoneolt.rb
+++ b/lib/oxidized/model/zhoneolt.rb
@@ -39,7 +39,7 @@ class ZhoneOLT < Oxidized::Model
   end
 
   cmd 'dump console' do |cfg|
-    cfg = cfg.each_line.select { |line| not line.match /To Abort the operation enter Ctrl-C/ }.join
+    cfg = cfg.each_line.reject { |line| line.match /To Abort the operation enter Ctrl-C/ }.join
   end
 
   # zhone technically supports ssh, but it locks up a ton.  Especially when
-- 
cgit v1.2.1


From 01d7f29905fd9ca712e8b640408425cf2d3ad64d Mon Sep 17 00:00:00 2001
From: Wild Kat <wk@futureinquestion.net>
Date: Wed, 11 Apr 2018 19:58:30 +0200
Subject: standardize on verbose hash methods

---
 .rubocop_todo.yml           | 11 -----------
 lib/oxidized/manager.rb     |  4 ++--
 lib/oxidized/source/csv.rb  |  2 +-
 lib/oxidized/source/http.rb |  2 +-
 lib/oxidized/source/sql.rb  |  2 +-
 5 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 8121015..3724d84 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1033,17 +1033,6 @@ Style/PerlBackrefs:
     - 'lib/oxidized/model/junos.rb'
     - 'lib/oxidized/model/powerconnect.rb'
 
-# Offense count: 5
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: short, verbose
-Style/PreferredHashMethods:
-  Exclude:
-    - 'lib/oxidized/manager.rb'
-    - 'lib/oxidized/source/csv.rb'
-    - 'lib/oxidized/source/http.rb'
-    - 'lib/oxidized/source/sql.rb'
-
 # Offense count: 1
 # Cop supports --auto-correct.
 Style/Proc:
diff --git a/lib/oxidized/manager.rb b/lib/oxidized/manager.rb
index bf28ae7..d2ef4d2 100644
--- a/lib/oxidized/manager.rb
+++ b/lib/oxidized/manager.rb
@@ -49,13 +49,13 @@ module Oxidized
       @model.merge! _model
     end
     def add_source _source
-      return nil if @source.key? _source
+      return nil if @source.has_key? _source
       _source = Manager.load Config::SourceDir, _source
       return false if _source.empty?
       @source.merge! _source
     end
     def add_hook _hook
-      return nil if @hook.key? _hook
+      return nil if @hook.has_key? _hook
       name = _hook
       _hook = Manager.load File.join(Config::Root, 'hook'), name
       _hook = Manager.load Config::HookDir, name if _hook.empty?
diff --git a/lib/oxidized/source/csv.rb b/lib/oxidized/source/csv.rb
index 4814bd7..b61525e 100644
--- a/lib/oxidized/source/csv.rb
+++ b/lib/oxidized/source/csv.rb
@@ -36,7 +36,7 @@ class CSV < Source
       @cfg.map.each do |key, position|
         keys[key.to_sym] = node_var_interpolate data[position]
       end
-      keys[:model] = map_model keys[:model] if keys.key? :model
+      keys[:model] = map_model keys[:model] if keys.has_key? :model
 
       # map node specific vars
       vars = {}
diff --git a/lib/oxidized/source/http.rb b/lib/oxidized/source/http.rb
index 6c12f29..56a575b 100644
--- a/lib/oxidized/source/http.rb
+++ b/lib/oxidized/source/http.rb
@@ -43,7 +43,7 @@ class HTTP < Source
         want_positions = want_position.split('.')
         keys[key.to_sym] = node_var_interpolate node.dig(*want_positions)
       end
-      keys[:model] = map_model keys[:model] if keys.key? :model
+      keys[:model] = map_model keys[:model] if keys.has_key? :model
 
       # map node specific vars
       vars = {}
diff --git a/lib/oxidized/source/sql.rb b/lib/oxidized/source/sql.rb
index 13fc39b..ca3bcc3 100644
--- a/lib/oxidized/source/sql.rb
+++ b/lib/oxidized/source/sql.rb
@@ -27,7 +27,7 @@ class SQL < Source
       # map node parameters
       keys = {}
       @cfg.map.each { |key, sql_column| keys[key.to_sym] = node_var_interpolate node[sql_column.to_sym] }
-      keys[:model] = map_model keys[:model] if keys.key? :model
+      keys[:model] = map_model keys[:model] if keys.has_key? :model
 
       # map node specific vars
       vars = {}
-- 
cgit v1.2.1


From 7cd3568c90e2aaeaa17863ba14e2af6c23b08b0c Mon Sep 17 00:00:00 2001
From: Wild Kat <wk@futureinquestion.net>
Date: Wed, 11 Apr 2018 20:03:41 +0200
Subject: adapt rubocop todo

---
 .rubocop_todo.yml | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 8121015..76e23a3 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -882,21 +882,6 @@ Style/InfiniteLoop:
     - 'extra/syslog.rb'
     - 'lib/oxidized/core.rb'
 
-# Offense count: 10
-# Cop supports --auto-correct.
-# Configuration parameters: InverseMethods, InverseBlocks.
-Style/InverseMethods:
-  Exclude:
-    - 'lib/oxidized/model/aosw.rb'
-    - 'lib/oxidized/model/asa.rb'
-    - 'lib/oxidized/model/comware.rb'
-    - 'lib/oxidized/model/firewareos.rb'
-    - 'lib/oxidized/model/powerconnect.rb'
-    - 'lib/oxidized/model/procurve.rb'
-    - 'lib/oxidized/model/routeros.rb'
-    - 'lib/oxidized/model/vrp.rb'
-    - 'lib/oxidized/model/zhoneolt.rb'
-
 # Offense count: 1
 # Cop supports --auto-correct.
 Style/LineEndConcatenation:
-- 
cgit v1.2.1


From 36f31e7d053365fe9f5d6b64bae4ac485677c93c Mon Sep 17 00:00:00 2001
From: Wild Kat <wk@futureinquestion.net>
Date: Wed, 11 Apr 2018 21:14:56 +0200
Subject: eliminate tabs in favor of double space

---
 .rubocop_todo.yml               |  10 -
 lib/oxidized/model/asyncos.rb   |  88 ++++----
 lib/oxidized/model/ciscosma.rb  |  80 +++----
 lib/oxidized/model/cumulus.rb   |   2 +-
 lib/oxidized/output/gitcrypt.rb | 484 ++++++++++++++++++++--------------------
 5 files changed, 327 insertions(+), 337 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 8121015..8167e2a 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -414,16 +414,6 @@ Layout/SpaceInsideRangeLiteral:
   Exclude:
     - 'lib/oxidized/input/telnet.rb'
 
-# Offense count: 302
-# Cop supports --auto-correct.
-# Configuration parameters: IndentationWidth.
-Layout/Tab:
-  Exclude:
-    - 'lib/oxidized/model/asyncos.rb'
-    - 'lib/oxidized/model/ciscosma.rb'
-    - 'lib/oxidized/model/cumulus.rb'
-    - 'lib/oxidized/output/gitcrypt.rb'
-
 # Offense count: 8
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
diff --git a/lib/oxidized/model/asyncos.rb b/lib/oxidized/model/asyncos.rb
index 875690b..ac19e34 100644
--- a/lib/oxidized/model/asyncos.rb
+++ b/lib/oxidized/model/asyncos.rb
@@ -1,49 +1,49 @@
 class AsyncOS < Oxidized::Model
 
-	# ESA prompt "(mail.example.com)> "
-	prompt /^\r*([(][\w. ]+[)][#>]\s+)$/
-	comment  '! '
-	
-	# Select passphrase display option 
-	expect /\[\S+\]>\s/ do |data, re|  
-		send "3\n"	
-		data.sub re, ''
-	end
-	
-	# handle paging
-	expect /-Press Any Key For More-+.*$/ do |data, re| 
-		send " "
-		data.sub re, ''
-	end
-	
-	cmd 'version' do |cfg|
-		comment cfg
-	end
+  # ESA prompt "(mail.example.com)> "
+  prompt /^\r*([(][\w. ]+[)][#>]\s+)$/
+  comment  '! '
+  
+  # Select passphrase display option 
+  expect /\[\S+\]>\s/ do |data, re|  
+    send "3\n"	
+    data.sub re, ''
+  end
+  
+  # handle paging
+  expect /-Press Any Key For More-+.*$/ do |data, re| 
+    send " "
+    data.sub re, ''
+  end
+  
+  cmd 'version' do |cfg|
+    comment cfg
+  end
 
-	cmd 'showconfig' do |cfg|
-		#Delete hour and date which change each run
-		#cfg.gsub! /\sCurrent Time: \S+\s\S+\s+\S+\s\S+\s\S+/, ' Current Time:'
-		# Delete select passphrase display option
-		cfg.gsub! /Choose the passphrase option:/, ''
-		cfg.gsub! /1. Mask passphrases \(Files with masked passphrases cannot be loaded using/, ''
-		cfg.gsub! /loadconfig command\)/, ''
-		cfg.gsub! /2. Encrypt passphrases/, ''
-		cfg.gsub! /3. Plain passphrases/, ''
-		cfg.gsub! /^3$/, ''
-		#Delete space 
-		cfg.gsub! /\n\s{25,26}/, '' 
-		#Delete after line
-		cfg.gsub! /([-\\\/,.\w><@]+)(\s{25,27})/,"\\1" 
-		# Add a carriage return 
-		cfg.gsub! /([-\\\/,.\w><@]+)(\s{6})([-\\\/,.\w><@]+)/,"\\1\n\\2\\3" 
-		# Delete prompt
-		cfg.gsub! /^\r*([(][\w. ]+[)][#>]\s+)$/, '' 
-		cfg
+  cmd 'showconfig' do |cfg|
+    #Delete hour and date which change each run
+    #cfg.gsub! /\sCurrent Time: \S+\s\S+\s+\S+\s\S+\s\S+/, ' Current Time:'
+    # Delete select passphrase display option
+    cfg.gsub! /Choose the passphrase option:/, ''
+    cfg.gsub! /1. Mask passphrases \(Files with masked passphrases cannot be loaded using/, ''
+    cfg.gsub! /loadconfig command\)/, ''
+    cfg.gsub! /2. Encrypt passphrases/, ''
+    cfg.gsub! /3. Plain passphrases/, ''
+    cfg.gsub! /^3$/, ''
+    #Delete space 
+    cfg.gsub! /\n\s{25,26}/, '' 
+    #Delete after line
+    cfg.gsub! /([-\\\/,.\w><@]+)(\s{25,27})/,"\\1" 
+    # Add a carriage return 
+    cfg.gsub! /([-\\\/,.\w><@]+)(\s{6})([-\\\/,.\w><@]+)/,"\\1\n\\2\\3" 
+    # Delete prompt
+    cfg.gsub! /^\r*([(][\w. ]+[)][#>]\s+)$/, '' 
+    cfg
 
-	end
-	
-	cfg :ssh do
-		pre_logout "exit"
-	end
-	                            
+  end
+  
+  cfg :ssh do
+    pre_logout "exit"
+  end
+                              
 end
diff --git a/lib/oxidized/model/ciscosma.rb b/lib/oxidized/model/ciscosma.rb
index a52e38a..6777ad5 100644
--- a/lib/oxidized/model/ciscosma.rb
+++ b/lib/oxidized/model/ciscosma.rb
@@ -1,45 +1,45 @@
 class CiscoSMA < Oxidized::Model
 
-	# SMA prompt "mail.example.com> "
-	prompt /^\r*([-\w. ]+\.[-\w. ]+\.[-\w. ]+[#>]\s+)$/
-	comment  '! '
-	
-	# Select passphrase display option 
-	expect /using loadconfig command\. \[Y\]\>/ do |data, re|  
-		send "y\n"	
-		data.sub re, ''
-	end
-	
-	# handle paging
-	expect /-Press Any Key For More-+.*$/ do |data, re| 
-		send " "
-		data.sub re, ''
-	end
-	
-	cmd 'version' do |cfg|
-		comment cfg
-	end
+  # SMA prompt "mail.example.com> "
+  prompt /^\r*([-\w. ]+\.[-\w. ]+\.[-\w. ]+[#>]\s+)$/
+  comment  '! '
+  
+  # Select passphrase display option 
+  expect /using loadconfig command\. \[Y\]\>/ do |data, re|  
+    send "y\n"	
+    data.sub re, ''
+  end
+  
+  # handle paging
+  expect /-Press Any Key For More-+.*$/ do |data, re| 
+    send " "
+    data.sub re, ''
+  end
+  
+  cmd 'version' do |cfg|
+    comment cfg
+  end
 
-	cmd 'showconfig' do |cfg|
-		#Delete hour and date which change each run
-		#cfg.gsub! /\sCurrent Time: \S+\s\S+\s+\S+\s\S+\s\S+/, ' Current Time:'
-		# Delete select passphrase display option
-		cfg.gsub! /Do you want to mask the password\? Files with masked passwords cannot be loaded/, ''
-		cfg.gsub! /^\s+y/, ''
-		# Delete space 
-		cfg.gsub! /\n\s{25}/, '' 
-		# Delete after line
-		cfg.gsub! /([\/\-,.\w><@]+)(\s{27})/,"\\1" 
-		# Add a carriage return 
-		cfg.gsub! /([\/\-,.\w><@]+)(\s{6,8})([\/\-,.\w><@]+)/,"\\1\n\\2\\3" 
-		# Delete prompt
-		cfg.gsub! /^\r*([-\w. ]+\.[-\w. ]+\.[-\w. ]+[#>]\s+)$/, '' 
-		cfg
+  cmd 'showconfig' do |cfg|
+    #Delete hour and date which change each run
+    #cfg.gsub! /\sCurrent Time: \S+\s\S+\s+\S+\s\S+\s\S+/, ' Current Time:'
+    # Delete select passphrase display option
+    cfg.gsub! /Do you want to mask the password\? Files with masked passwords cannot be loaded/, ''
+    cfg.gsub! /^\s+y/, ''
+    # Delete space 
+    cfg.gsub! /\n\s{25}/, '' 
+    # Delete after line
+    cfg.gsub! /([\/\-,.\w><@]+)(\s{27})/,"\\1" 
+    # Add a carriage return 
+    cfg.gsub! /([\/\-,.\w><@]+)(\s{6,8})([\/\-,.\w><@]+)/,"\\1\n\\2\\3" 
+    # Delete prompt
+    cfg.gsub! /^\r*([-\w. ]+\.[-\w. ]+\.[-\w. ]+[#>]\s+)$/, '' 
+    cfg
 
-	end
-	
-	cfg :ssh do
-		pre_logout "exit"
-	end
-	                            
+  end
+  
+  cfg :ssh do
+    pre_logout "exit"
+  end
+                              
 end
diff --git a/lib/oxidized/model/cumulus.rb b/lib/oxidized/model/cumulus.rb
index 20acb8a..09f3955 100644
--- a/lib/oxidized/model/cumulus.rb
+++ b/lib/oxidized/model/cumulus.rb
@@ -68,7 +68,7 @@ class Cumulus < Oxidized::Model
     
     cfg += add_comment 'TRAFFIC'
     cfg += cmd 'cat /etc/cumulus/datapath/traffic.conf'
-   	
+     
     cfg += add_comment 'ACL'
     cfg += cmd 'iptables -L -n'
     
diff --git a/lib/oxidized/output/gitcrypt.rb b/lib/oxidized/output/gitcrypt.rb
index b0d80f2..0567458 100644
--- a/lib/oxidized/output/gitcrypt.rb
+++ b/lib/oxidized/output/gitcrypt.rb
@@ -1,244 +1,244 @@
 module Oxidized
-	class GitCrypt < Output
-		class GitCryptError < OxidizedError; end
-		begin
-			require 'git'
-		rescue LoadError
-			raise OxidizedError, 'git not found: sudo gem install ruby-git'
-		end
-
-		attr_reader :commitref
-
-		def initialize
-			@cfg = Oxidized.config.output.gitcrypt
-			@gitcrypt_cmd = "/usr/bin/git-crypt"
-			@gitcrypt_init = @gitcrypt_cmd + " init"
-			@gitcrypt_unlock = @gitcrypt_cmd + " unlock"
-			@gitcrypt_lock = @gitcrypt_cmd + " lock"
-			@gitcrypt_adduser = @gitcrypt_cmd + " add-gpg-user --trusted "
-		end
-
-		def setup
-			if @cfg.empty?
-				Oxidized.asetus.user.output.gitcrypt.user  = 'Oxidized'
-				Oxidized.asetus.user.output.gitcrypt.email = 'o@example.com'
-				Oxidized.asetus.user.output.gitcrypt.repo  =  File.join(Config::Root, 'oxidized.git')
-				Oxidized.asetus.save :user
-				raise NoConfig, 'no output git config, edit ~/.config/oxidized/config'
-			end
-
-			if @cfg.repo.respond_to?(:each)
-				@cfg.repo.each do |group, repo|
-					@cfg.repo["#{group}="] = File.expand_path repo
-				end
-			else
-				@cfg.repo = File.expand_path @cfg.repo
-			end
-		end
-
-		def crypt_init repo
-			repo.chdir do
-				system(@gitcrypt_init)
-				@cfg.users.each do |user|
-					system("#{@gitcrypt_adduser} #{user}")
-				end
-				File.write(".gitattributes", "* filter=git-crypt diff=git-crypt\n.gitattributes !filter !diff")
-				repo.add(".gitattributes")
-				repo.commit("Initial commit: crypt all config files")
-			end
-		end
-
-		def lock repo
-			repo.chdir do
-				system(@gitcrypt_lock)
-			end
-		end
-
-		def unlock repo
-			repo.chdir do
-				system(@gitcrypt_unlock)
-			end
-		end
-
-		def store file, outputs, opt={}
-			@msg   = opt[:msg]
-			@user  = (opt[:user]  or @cfg.user)
-			@email = (opt[:email] or @cfg.email)
-			@opt   = opt
-			@commitref = nil
-			repo   = @cfg.repo
-
-			outputs.types.each do |type|
-				type_cfg = ''
-				type_repo = File.join(File.dirname(repo), type + '.git')
-				outputs.type(type).each do |output|
-					(type_cfg << output; next) if not output.name
-					type_file = file + '--' + output.name
-					if @cfg.type_as_directory?
-						type_file = type + '/' + type_file
-						type_repo = repo
-					end
-					update type_repo, type_file, output
-				end
-				update type_repo, file, type_cfg
-			end
-
-			update repo, file, outputs.to_cfg
-		end
-
-
-		def fetch node, group
-			begin
-				repo, path = yield_repo_and_path(node, group)
-				repo = Git.open repo
-				unlock repo
-				index = repo.index
-				# Empty repo ?
-				empty = File.exists? index.path
-				if empty
-					raise 'Empty git repo'
-				else
-					File.read path
-				end
-				lock repo
-			rescue
-				'node not found'
-			end
-		end
-
-		# give a hash of all oid revision for the given node, and the date of the commit
-		def version node, group
-			begin
-				repo, path = yield_repo_and_path(node, group)
-
-				repo = Git.open repo
-				unlock repo
-				walker = repo.log.path(path)
-				i = -1
-				tab  = []
-				walker.each do |commit|
-					hash = {}
-					hash[:date] = commit.date.to_s
-					hash[:oid] = commit.objectish
-					hash[:author] = commit.author
-					hash[:message] = commit.message
-					tab[i += 1] = hash
-				end
-				walker.reset
-				tab
-			rescue
-				'node not found'
-			end
-		end
-
-		#give the blob of a specific revision
-		def get_version node, group, oid
-			begin
-				repo, path = yield_repo_and_path(node, group)
-				repo = Git.open repo
-				unlock repo
-				repo.gtree(oid).files[path].contents
-			rescue
-				'version not found'
-			ensure
-				lock repo
-			end
-		end
-
-		#give a hash with the patch of a diff between 2 revision and the stats (added and deleted lines)
-		def get_diff node, group, oid1, oid2
-			begin
-				diff_commits = nil
-				repo, path = yield_repo_and_path(node, group)
-				repo = Git.open repo
-				unlock repo
-				commit = repo.gcommit(oid1)
-
-				if oid2
-					commit_old = repo.gcommit(oid2)
-					diff = repo.diff(commit_old, commit)
-					stats = [diff.stats[:files][node.name][:insertions], diff.stats[:files][node.name][:deletions]]
-					diff.each do |patch|
-						if /#{node.name}\s+/.match(patch.patch.to_s.lines.first)
-							diff_commits = {:patch => patch.patch.to_s, :stat => stats}
-							break
-						end
-					end
-				else
-					stat = commit.parents[0].diff(commit).stats
-					stat = [stat[:files][node.name][:insertions],stat[:files][node.name][:deletions]]
-					patch = commit.parents[0].diff(commit).patch
-					diff_commits = {:patch => patch, :stat => stat}
-				end
-				lock repo
-				diff_commits
-			rescue
-				'no diffs'
-			ensure
-				lock repo
-			end
-		end
-
-		private
-
-		def yield_repo_and_path(node, group)
-			repo, path = node.repo, node.name
-
-			if group and @cfg.single_repo?
-				path = "#{group}/#{node.name}"
-			end
-
-			[repo, path]
-		end
-
-		def update repo, file, data
-			return if data.empty?
-
-			if @opt[:group]
-				if @cfg.single_repo?
-					file = File.join @opt[:group], file
-				else
-					repo = if repo.is_a?(::String)
-						File.join File.dirname(repo), @opt[:group] + '.git'
-					else
-						repo[@opt[:group]]
-					end
-				end
-			end
-
-			begin
-				update_repo repo, file, data, @msg, @user, @email
-			rescue Git::GitExecuteError, ArgumentError => open_error
-				Oxidized.logger.debug "open_error #{open_error} #{file}"
-				begin
-					grepo = Git.init repo
-					crypt_init grepo
-				rescue => create_error
-					raise GitCryptError, "first '#{open_error.message}' was raised while opening git repo, then '#{create_error.message}' was while trying to create git repo"
-				end
-				retry
-			end
-		end
-
-		def update_repo repo, file, data, msg, user, email
-			grepo = Git.open repo
-			grepo.config('user.name', user)
-			grepo.config('user.email', email)
-			grepo.chdir do
-				unlock grepo
-				File.write(file, data)
-				grepo.add(file)
-				if grepo.status[file].nil?
-					grepo.commit(msg)
-					@commitref = grepo.log(1).first.objectish
-					true
-				elsif !grepo.status[file].type.nil?
-					grepo.commit(msg)
-					@commitref = grepo.log(1).first.objectish
-					true
-				end
-				lock grepo
-			end
-		end
-	end
+  class GitCrypt < Output
+    class GitCryptError < OxidizedError; end
+    begin
+      require 'git'
+    rescue LoadError
+      raise OxidizedError, 'git not found: sudo gem install ruby-git'
+    end
+
+    attr_reader :commitref
+
+    def initialize
+      @cfg = Oxidized.config.output.gitcrypt
+      @gitcrypt_cmd = "/usr/bin/git-crypt"
+      @gitcrypt_init = @gitcrypt_cmd + " init"
+      @gitcrypt_unlock = @gitcrypt_cmd + " unlock"
+      @gitcrypt_lock = @gitcrypt_cmd + " lock"
+      @gitcrypt_adduser = @gitcrypt_cmd + " add-gpg-user --trusted "
+    end
+
+    def setup
+      if @cfg.empty?
+        Oxidized.asetus.user.output.gitcrypt.user  = 'Oxidized'
+        Oxidized.asetus.user.output.gitcrypt.email = 'o@example.com'
+        Oxidized.asetus.user.output.gitcrypt.repo  =  File.join(Config::Root, 'oxidized.git')
+        Oxidized.asetus.save :user
+        raise NoConfig, 'no output git config, edit ~/.config/oxidized/config'
+      end
+
+      if @cfg.repo.respond_to?(:each)
+        @cfg.repo.each do |group, repo|
+          @cfg.repo["#{group}="] = File.expand_path repo
+        end
+      else
+        @cfg.repo = File.expand_path @cfg.repo
+      end
+    end
+
+    def crypt_init repo
+      repo.chdir do
+        system(@gitcrypt_init)
+        @cfg.users.each do |user|
+          system("#{@gitcrypt_adduser} #{user}")
+        end
+        File.write(".gitattributes", "* filter=git-crypt diff=git-crypt\n.gitattributes !filter !diff")
+        repo.add(".gitattributes")
+        repo.commit("Initial commit: crypt all config files")
+      end
+    end
+
+    def lock repo
+      repo.chdir do
+        system(@gitcrypt_lock)
+      end
+    end
+
+    def unlock repo
+      repo.chdir do
+        system(@gitcrypt_unlock)
+      end
+    end
+
+    def store file, outputs, opt={}
+      @msg   = opt[:msg]
+      @user  = (opt[:user]  or @cfg.user)
+      @email = (opt[:email] or @cfg.email)
+      @opt   = opt
+      @commitref = nil
+      repo   = @cfg.repo
+
+      outputs.types.each do |type|
+        type_cfg = ''
+        type_repo = File.join(File.dirname(repo), type + '.git')
+        outputs.type(type).each do |output|
+          (type_cfg << output; next) if not output.name
+          type_file = file + '--' + output.name
+          if @cfg.type_as_directory?
+            type_file = type + '/' + type_file
+            type_repo = repo
+          end
+          update type_repo, type_file, output
+        end
+        update type_repo, file, type_cfg
+      end
+
+      update repo, file, outputs.to_cfg
+    end
+
+
+    def fetch node, group
+      begin
+        repo, path = yield_repo_and_path(node, group)
+        repo = Git.open repo
+        unlock repo
+        index = repo.index
+        # Empty repo ?
+        empty = File.exists? index.path
+        if empty
+          raise 'Empty git repo'
+        else
+          File.read path
+        end
+        lock repo
+      rescue
+        'node not found'
+      end
+    end
+
+    # give a hash of all oid revision for the given node, and the date of the commit
+    def version node, group
+      begin
+        repo, path = yield_repo_and_path(node, group)
+
+        repo = Git.open repo
+        unlock repo
+        walker = repo.log.path(path)
+        i = -1
+        tab  = []
+        walker.each do |commit|
+          hash = {}
+          hash[:date] = commit.date.to_s
+          hash[:oid] = commit.objectish
+          hash[:author] = commit.author
+          hash[:message] = commit.message
+          tab[i += 1] = hash
+        end
+        walker.reset
+        tab
+      rescue
+        'node not found'
+      end
+    end
+
+    #give the blob of a specific revision
+    def get_version node, group, oid
+      begin
+        repo, path = yield_repo_and_path(node, group)
+        repo = Git.open repo
+        unlock repo
+        repo.gtree(oid).files[path].contents
+      rescue
+        'version not found'
+      ensure
+        lock repo
+      end
+    end
+
+    #give a hash with the patch of a diff between 2 revision and the stats (added and deleted lines)
+    def get_diff node, group, oid1, oid2
+      begin
+        diff_commits = nil
+        repo, path = yield_repo_and_path(node, group)
+        repo = Git.open repo
+        unlock repo
+        commit = repo.gcommit(oid1)
+
+        if oid2
+          commit_old = repo.gcommit(oid2)
+          diff = repo.diff(commit_old, commit)
+          stats = [diff.stats[:files][node.name][:insertions], diff.stats[:files][node.name][:deletions]]
+          diff.each do |patch|
+            if /#{node.name}\s+/.match(patch.patch.to_s.lines.first)
+              diff_commits = {:patch => patch.patch.to_s, :stat => stats}
+              break
+            end
+          end
+        else
+          stat = commit.parents[0].diff(commit).stats
+          stat = [stat[:files][node.name][:insertions],stat[:files][node.name][:deletions]]
+          patch = commit.parents[0].diff(commit).patch
+          diff_commits = {:patch => patch, :stat => stat}
+        end
+        lock repo
+        diff_commits
+      rescue
+        'no diffs'
+      ensure
+        lock repo
+      end
+    end
+
+    private
+
+    def yield_repo_and_path(node, group)
+      repo, path = node.repo, node.name
+
+      if group and @cfg.single_repo?
+        path = "#{group}/#{node.name}"
+      end
+
+      [repo, path]
+    end
+
+    def update repo, file, data
+      return if data.empty?
+
+      if @opt[:group]
+        if @cfg.single_repo?
+          file = File.join @opt[:group], file
+        else
+          repo = if repo.is_a?(::String)
+            File.join File.dirname(repo), @opt[:group] + '.git'
+          else
+            repo[@opt[:group]]
+          end
+        end
+      end
+
+      begin
+        update_repo repo, file, data, @msg, @user, @email
+      rescue Git::GitExecuteError, ArgumentError => open_error
+        Oxidized.logger.debug "open_error #{open_error} #{file}"
+        begin
+          grepo = Git.init repo
+          crypt_init grepo
+        rescue => create_error
+          raise GitCryptError, "first '#{open_error.message}' was raised while opening git repo, then '#{create_error.message}' was while trying to create git repo"
+        end
+        retry
+      end
+    end
+
+    def update_repo repo, file, data, msg, user, email
+      grepo = Git.open repo
+      grepo.config('user.name', user)
+      grepo.config('user.email', email)
+      grepo.chdir do
+        unlock grepo
+        File.write(file, data)
+        grepo.add(file)
+        if grepo.status[file].nil?
+          grepo.commit(msg)
+          @commitref = grepo.log(1).first.objectish
+          true
+        elsif !grepo.status[file].type.nil?
+          grepo.commit(msg)
+          @commitref = grepo.log(1).first.objectish
+          true
+        end
+        lock grepo
+      end
+    end
+  end
 end
-- 
cgit v1.2.1


From cc5c846b3b88cafd8c01c645e6ada3bab714ae91 Mon Sep 17 00:00:00 2001
From: Wild Kat <wk@futureinquestion.net>
Date: Sun, 15 Apr 2018 13:08:53 +0200
Subject: restructure xmppdiff.rb to comply with rubocop

---
 .rubocop_todo.yml             | 12 ------
 lib/oxidized/hook/xmppdiff.rb | 86 +++++++++++++++++++++----------------------
 2 files changed, 42 insertions(+), 56 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 8121015..0ff8dce 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -94,14 +94,6 @@ Layout/CommentIndentation:
     - 'lib/oxidized/model/planet.rb'
     - 'lib/oxidized/output/http.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyleAlignWith, AutoCorrect, Severity.
-# SupportedStylesAlignWith: start_of_line, def
-Layout/DefEndAlignment:
-  Exclude:
-    - 'lib/oxidized/hook/xmppdiff.rb'
-
 # Offense count: 3
 # Cop supports --auto-correct.
 Layout/ElseAlignment:
@@ -504,7 +496,6 @@ Lint/ShadowingOuterLocalVariable:
 Lint/StringConversionInInterpolation:
   Exclude:
     - 'lib/oxidized/hook/slackdiff.rb'
-    - 'lib/oxidized/hook/xmppdiff.rb'
 
 # Offense count: 10
 Lint/UnderscorePrefixedVariableName:
@@ -716,7 +707,6 @@ Style/AsciiComments:
 # IgnoredMethods: lambda, proc, it
 Style/BlockDelimiters:
   Exclude:
-    - 'lib/oxidized/hook/xmppdiff.rb'
     - 'lib/oxidized/model/aricentiss.rb'
     - 'lib/oxidized/model/hatteras.rb'
 
@@ -768,7 +758,6 @@ Style/ClassVars:
 # Cop supports --auto-correct.
 Style/ColonMethodCall:
   Exclude:
-    - 'lib/oxidized/hook/xmppdiff.rb'
     - 'lib/oxidized/input/ssh.rb'
     - 'lib/oxidized/input/telnet.rb'
 
@@ -841,7 +830,6 @@ Style/GuardClause:
   Exclude:
     - 'lib/oxidized/cli.rb'
     - 'lib/oxidized/hook/slackdiff.rb'
-    - 'lib/oxidized/hook/xmppdiff.rb'
     - 'lib/oxidized/input/cli.rb'
     - 'lib/oxidized/jobs.rb'
     - 'lib/oxidized/nodes.rb'
diff --git a/lib/oxidized/hook/xmppdiff.rb b/lib/oxidized/hook/xmppdiff.rb
index 396d1b3..52cc0e0 100644
--- a/lib/oxidized/hook/xmppdiff.rb
+++ b/lib/oxidized/hook/xmppdiff.rb
@@ -7,54 +7,52 @@ class XMPPDiff < Oxidized::Hook
     raise KeyError, 'hook.password is required' unless cfg.has_key?('password')
     raise KeyError, 'hook.channel is required' unless cfg.has_key?('channel')
     raise KeyError, 'hook.nick is required' unless cfg.has_key?('nick')
- end
+  end
 
   def run_hook(ctx)
-    if ctx.node
-      if ctx.event.to_s == "post_store"
-        begin
-          Timeout::timeout(15) do
-            gitoutput = ctx.node.output.new
-            diff = gitoutput.get_diff ctx.node, ctx.node.group, ctx.commitref, nil
-
-            interesting = diff[:patch].lines.to_a[4..-1].any? { |line|
-              ["+", "-"].include?(line[0]) and not ["#", "!"].include?(line[1])
-            }
-            interesting &&= diff[:patch].lines.to_a[5..-1].any? { |line| line[0] == '-' }
-            interesting &&= diff[:patch].lines.to_a[5..-1].any? { |line| line[0] == '+' }
-
-            if interesting
-              log "Connecting to XMPP"
-              client = Jabber::Client.new(Jabber::JID.new(cfg.jid))
-              client.connect
-              sleep 1
-              client.auth(cfg.password)
-              sleep 1
-
-              log "Connected"
-
-              m = Jabber::MUC::SimpleMUCClient.new(client)
-              m.join(cfg.channel + "/" + cfg.nick)
-
-              log "Joined"
-
-              title = "#{ctx.node.name.to_s} #{ctx.node.group.to_s} #{ctx.node.model.class.name.to_s.downcase}"
-              log "Posting diff as snippet to #{cfg.channel}"
-
-              m.say(title + "\n\n" + diff[:patch].lines.to_a[4..-1].join)
-
-              sleep 1
-
-              client.close
-
-              log "Finished"
-
-            end
-          end
-        rescue Timeout::Error
-          log "timed out"
+    return unless ctx.node
+    return unless ctx.event.to_s == "post_store"
+    begin
+      Timeout.timeout(15) do
+        gitoutput = ctx.node.output.new
+        diff = gitoutput.get_diff ctx.node, ctx.node.group, ctx.commitref, nil
+
+        interesting = diff[:patch].lines.to_a[4..-1].any? do |line|
+          ["+", "-"].include?(line[0]) and not ["#", "!"].include?(line[1])
+        end
+        interesting &&= diff[:patch].lines.to_a[5..-1].any? { |line| line[0] == '-' }
+        interesting &&= diff[:patch].lines.to_a[5..-1].any? { |line| line[0] == '+' }
+
+        if interesting
+          log "Connecting to XMPP"
+          client = Jabber::Client.new(Jabber::JID.new(cfg.jid))
+          client.connect
+          sleep 1
+          client.auth(cfg.password)
+          sleep 1
+  
+          log "Connected"
+  
+          m = Jabber::MUC::SimpleMUCClient.new(client)
+          m.join(cfg.channel + "/" + cfg.nick)
+  
+          log "Joined"
+  
+          title = "#{ctx.node.name} #{ctx.node.group} #{ctx.node.model.class.name.to_s.downcase}"
+          log "Posting diff as snippet to #{cfg.channel}"
+  
+          m.say(title + "\n\n" + diff[:patch].lines.to_a[4..-1].join)
+  
+          sleep 1
+  
+          client.close
+  
+          log "Finished"
+  
         end
       end
+    rescue Timeout::Error
+      log "timed out"
     end
   end
 end
-- 
cgit v1.2.1


From 140954f78e50bed1aaf3f8fd42f849e3892e55c0 Mon Sep 17 00:00:00 2001
From: Wild Kat <wk@futureinquestion.net>
Date: Sun, 15 Apr 2018 13:24:05 +0200
Subject: restructure slackdiff.rb to comply with rubocop

---
 .rubocop_todo.yml              | 11 ------
 lib/oxidized/hook/slackdiff.rb | 77 ++++++++++++++++++++----------------------
 2 files changed, 37 insertions(+), 51 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 8121015..93a9271 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -269,7 +269,6 @@ Layout/MultilineBlockLayout:
 # SupportedStyles: symmetrical, new_line, same_line
 Layout/MultilineMethodCallBraceLayout:
   Exclude:
-    - 'lib/oxidized/hook/slackdiff.rb'
     - 'lib/oxidized/output/git.rb'
 
 # Offense count: 14
@@ -387,7 +386,6 @@ Layout/SpaceInsideBlockBraces:
 # SupportedStylesForEmptyBraces: space, no_space
 Layout/SpaceInsideHashLiteralBraces:
   Exclude:
-    - 'lib/oxidized/hook/slackdiff.rb'
     - 'lib/oxidized/output/git.rb'
     - 'lib/oxidized/output/gitcrypt.rb'
     - 'lib/oxidized/output/http.rb'
@@ -503,7 +501,6 @@ Lint/ShadowingOuterLocalVariable:
 # Cop supports --auto-correct.
 Lint/StringConversionInInterpolation:
   Exclude:
-    - 'lib/oxidized/hook/slackdiff.rb'
     - 'lib/oxidized/hook/xmppdiff.rb'
 
 # Offense count: 10
@@ -701,12 +698,6 @@ Style/Alias:
 Style/AndOr:
   Enabled: false
 
-# Offense count: 1
-# Configuration parameters: AllowedChars.
-Style/AsciiComments:
-  Exclude:
-    - 'lib/oxidized/hook/slackdiff.rb'
-
 # Offense count: 4
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, IgnoredMethods.
@@ -823,7 +814,6 @@ Style/ExpandPathArguments:
 # SupportedStyles: format, sprintf, percent
 Style/FormatString:
   Exclude:
-    - 'lib/oxidized/hook/slackdiff.rb'
     - 'lib/oxidized/node.rb'
     - 'lib/oxidized/nodes.rb'
 
@@ -840,7 +830,6 @@ Style/FormatStringToken:
 Style/GuardClause:
   Exclude:
     - 'lib/oxidized/cli.rb'
-    - 'lib/oxidized/hook/slackdiff.rb'
     - 'lib/oxidized/hook/xmppdiff.rb'
     - 'lib/oxidized/input/cli.rb'
     - 'lib/oxidized/jobs.rb'
diff --git a/lib/oxidized/hook/slackdiff.rb b/lib/oxidized/hook/slackdiff.rb
index 7cd4465..e271d5f 100644
--- a/lib/oxidized/hook/slackdiff.rb
+++ b/lib/oxidized/hook/slackdiff.rb
@@ -10,47 +10,44 @@ class SlackDiff < Oxidized::Hook
   end
 
   def run_hook(ctx)
-    if ctx.node
-      if ctx.event.to_s == "post_store"
-        log "Connecting to slack"
-        Slack.configure do |config|
-           config.token = cfg.token
-           config.proxy = cfg.proxy if cfg.has_key?('proxy')
-        end
-        client = Slack::Client.new
-        client.auth_test
-        log "Connected"
-        # diff snippet - default
-        diffenable = true
-        if cfg.has_key?('diff') == true
-          if cfg.diff == false
-            diffenable = false
-          end
-        end
-        if diffenable == true
-          gitoutput = ctx.node.output.new
-          diff = gitoutput.get_diff ctx.node, ctx.node.group, ctx.commitref, nil
-          unless diff == "no diffs"
-            title = "#{ctx.node.name.to_s} #{ctx.node.group.to_s} #{ctx.node.model.class.name.to_s.downcase}"
-            log "Posting diff as snippet to #{cfg.channel}"
-            client.files_upload(channels: cfg.channel, as_user: true,
-                                content: diff[:patch].lines.to_a[4..-1].join,
-                                filetype: "diff",
-                                title: title,
-                                filename: "change"
-                               )
-          end
-        end
-        # message custom formatted - optional
-        if cfg.has_key?('message') == true
-          log cfg.message
-          msg = cfg.message % {:node => ctx.node.name.to_s, :group => ctx.node.group.to_s, :commitref => ctx.commitref, :model => ctx.node.model.class.name.to_s.downcase}
-          log msg
-          log "Posting message to #{cfg.channel}"
-          client.chat_postMessage(channel: cfg.channel, text: msg,  as_user: true)
-        end
-        log "Finished"
+    return unless ctx.node
+    return unless ctx.event.to_s == "post_store"
+    log "Connecting to slack"
+    Slack.configure do |config|
+       config.token = cfg.token
+       config.proxy = cfg.proxy if cfg.has_key?('proxy')
+    end
+    client = Slack::Client.new
+    client.auth_test
+    log "Connected"
+    # diff snippet - default
+    diffenable = true
+    if cfg.has_key?('diff') == true
+      if cfg.diff == false
+        diffenable = false
+      end
+    end
+    if diffenable == true
+      gitoutput = ctx.node.output.new
+      diff = gitoutput.get_diff ctx.node, ctx.node.group, ctx.commitref, nil
+      unless diff == "no diffs"
+        title = "#{ctx.node.name} #{ctx.node.group} #{ctx.node.model.class.name.to_s.downcase}"
+        log "Posting diff as snippet to #{cfg.channel}"
+        client.files_upload(channels: cfg.channel, as_user: true,
+                            content: diff[:patch].lines.to_a[4..-1].join,
+                            filetype: "diff",
+                            title: title,
+                            filename: "change")
       end
     end
+    # message custom formatted - optional
+    if cfg.has_key?('message') == true
+      log cfg.message
+      msg = format(cfg.message, :node => ctx.node.name.to_s, :group => ctx.node.group.to_s, :commitref => ctx.commitref, :model => ctx.node.model.class.name.to_s.downcase)
+      log msg
+      log "Posting message to #{cfg.channel}"
+      client.chat_postMessage(channel: cfg.channel, text: msg,  as_user: true)
+    end
+    log "Finished"
   end
 end
-- 
cgit v1.2.1


From b29550ce0cfaf6192652747d340da2dc777ac22b Mon Sep 17 00:00:00 2001
From: Zsolt Zsiros <ZsZs73@users.noreply.github.com>
Date: Mon, 16 Apr 2018 14:48:43 +0200
Subject: model: netgear.rb support for older models (#1268)

* Added support for older models (FW 5.x.y.z like on GS110TP, GS748Tv4, etc)

* Fixed prompt regex

* docs/Model-Notes/Netgear created

* docs/Model-Notes/Netgear fixed typos
---
 docs/Model-Notes/Netgear.md   | 66 +++++++++++++++++++++++++++++++++++++++++++
 docs/Model-Notes/README.md    |  1 +
 lib/oxidized/model/netgear.rb |  5 ++--
 3 files changed, 70 insertions(+), 2 deletions(-)
 create mode 100644 docs/Model-Notes/Netgear.md

diff --git a/docs/Model-Notes/Netgear.md b/docs/Model-Notes/Netgear.md
new file mode 100644
index 0000000..9bfd094
--- /dev/null
+++ b/docs/Model-Notes/Netgear.md
@@ -0,0 +1,66 @@
+Netgear Configuration
+=====================
+
+There are several models available with CLI management via telnet (port 60000), but they all behave like one of the following:
+- older models:
+```
+Connected to 192.168.3.201.
+
+(GS748Tv4) 
+Applying Interface configuration, please wait ...admin
+Password:********
+(GS748Tv4) >enable
+Password:
+
+(GS748Tv4) #terminal length 0
+
+(GS748Tv4) #show running-config
+```
+
+- newer models:
+```
+Connected to 172.0.3.203.
+
+User:admin
+Password:********
+(GS724Tv4) >enable
+
+(GS724Tv4) #terminal length 0
+
+(GS724Tv4) #show running-config
+```
+
+The main differences are:
+- the prompt for username is different (looks quite strange for older models)
+- enable password
+  - the older model prompts for enable password and it expects empty string
+  - the newer model does not prompt for enable password at all
+
+Configuration for older/newer models: make sure you have defined variable 'enable':
+- `'true'` for newer models
+- `''` empty string: for older models
+
+One possible configuration:
+- oxidized config
+```
+source:
+  default: csv
+  csv:
+    file: "/home/oxidized/.config/oxidized/router.db"
+    delimiter: !ruby/regexp /:/
+    map:
+      name: 0
+      model: 1
+      username: 2
+      password: 3
+    vars_map:
+      enable: 4
+      telnet_port: 5
+```
+- router.db
+```
+switchOldFW:netgear:admin:adminpw::60000
+switchNewFW:netgear:admin:adminpw:true:60000
+```
+
+[Reference](https://github.com/ytti/oxidized/pull/1268)
\ No newline at end of file
diff --git a/docs/Model-Notes/README.md b/docs/Model-Notes/README.md
index c4b0ed1..fd1298e 100644
--- a/docs/Model-Notes/README.md
+++ b/docs/Model-Notes/README.md
@@ -12,6 +12,7 @@ AireOS|[AireOS](AireOS.md)|29 Nov 2017
 Arbor Networks|[ArbOS](ArbOS.md)|27 Feb 2018
 Huawei|[VRP](VRP-Huawei.md)|17 Nov 2017
 Juniper|[MX/QFX/EX/SRX/J Series](JunOS.md)|18 Jan 2018
+Netgear|[Netgear](Netgear.md)|11 Apr 2018
 Zyxel|[XGS4600 Series](XGS4600-Zyxel.md)|23 Jan 2018
 
 If you discover additional caveats or problems please make sure to consult the [GitHub issues for oxidized](https://github.com/ytti/oxidized/issues) known issues.
diff --git a/lib/oxidized/model/netgear.rb b/lib/oxidized/model/netgear.rb
index 0ab1349..a32eb66 100644
--- a/lib/oxidized/model/netgear.rb
+++ b/lib/oxidized/model/netgear.rb
@@ -1,15 +1,16 @@
 class Netgear < Oxidized::Model
 
   comment '!'
-  prompt /^(\([\w\-.]+\)\s[#>])$/
+  prompt /^(\([\w\s\-.]+\)\s[#>])$/
 
   cmd :secret do |cfg|
     cfg.gsub!(/password (\S+)/, 'password <hidden>')
+    cfg.gsub!(/encrypted (\S+)/, 'encrypted <hidden>')
     cfg
   end
 
   cfg :telnet do
-    username /^User:/
+    username /^(User:|Applying Interface configuration, please wait ...)/
   end
 
   cfg :telnet, :ssh do
-- 
cgit v1.2.1


From 1b66348be97d4603566a262756d6ad5a2d21bd58 Mon Sep 17 00:00:00 2001
From: Wild Kat <wk@futureinquestion.net>
Date: Mon, 16 Apr 2018 21:03:35 +0200
Subject: restructure awssns.rb to comply with rubocop

---
 .rubocop_todo.yml           | 2 --
 lib/oxidized/hook/awssns.rb | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 81776bd..e71f1ba 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -216,7 +216,6 @@ Layout/FirstParameterIndentation:
 # SupportedStyles: special_inside_parentheses, consistent, align_braces
 Layout/IndentHash:
   Exclude:
-    - 'lib/oxidized/hook/awssns.rb'
     - 'lib/oxidized/hook/githubrepo.rb'
     - 'lib/oxidized/input/ssh.rb'
     - 'lib/oxidized/output/http.rb'
@@ -692,7 +691,6 @@ Style/BlockDelimiters:
 # SupportedStyles: braces, no_braces, context_dependent
 Style/BracesAroundHashParameters:
   Exclude:
-    - 'lib/oxidized/hook/awssns.rb'
     - 'lib/oxidized/hook/githubrepo.rb'
     - 'lib/oxidized/input/telnet.rb'
     - 'lib/oxidized/model/procurve.rb'
diff --git a/lib/oxidized/hook/awssns.rb b/lib/oxidized/hook/awssns.rb
index dbc2d47..82c118e 100644
--- a/lib/oxidized/hook/awssns.rb
+++ b/lib/oxidized/hook/awssns.rb
@@ -19,9 +19,9 @@ class AwsSns < Oxidized::Hook
         :node => ctx.node.name.to_s
       )
     end
-    topic.publish({
+    topic.publish(
       message: message.to_json
-    })
+    )
   end
 
 end
-- 
cgit v1.2.1


From b846b591289c721ac831fa2ec8fe4f248ab0bf17 Mon Sep 17 00:00:00 2001
From: Wild Kat <wk@futureinquestion.net>
Date: Mon, 16 Apr 2018 23:34:32 +0200
Subject: remove mention of ruby 1.9.3 from CentOS instructions in favor of 2.0

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ebe3d43..9e52792 100644
--- a/README.md
+++ b/README.md
@@ -79,7 +79,7 @@ gem install oxidized-script oxidized-web # if you don't install oxidized-web, ma
 
 ### CentOS, Oracle Linux, Red Hat Linux
 
-On CentOS 6 / RHEL 6, install Ruby greater than 1.9.3 (for Ruby 2.1.2 installation instructions see [Installing Ruby 2.1.2 using RVM](#installing-ruby-212-using-rvm)), then install Oxidized dependencies
+On CentOS 6 / RHEL 6, install Ruby 2.0 or greater (for Ruby 2.1.2 installation instructions see [Installing Ruby 2.1.2 using RVM](#installing-ruby-212-using-rvm)), then install Oxidized dependencies
 
 ```shell
 yum install cmake sqlite-devel openssl-devel libssh2-devel
-- 
cgit v1.2.1


From 12c770dd3504748d3e67f99175b26d0515a3d283 Mon Sep 17 00:00:00 2001
From: Yuri Zubov <y.zubov@sumatosoft.com>
Date: Thu, 19 Apr 2018 14:19:41 +0300
Subject: Basic support for NDMS OS (Zyxel Keenetic)

---
 docs/Supported-OS-Types.md |  1 +
 lib/oxidized/model/ndms.rb | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 lib/oxidized/model/ndms.rb

diff --git a/docs/Supported-OS-Types.md b/docs/Supported-OS-Types.md
index 7a765f8..4556946 100644
--- a/docs/Supported-OS-Types.md
+++ b/docs/Supported-OS-Types.md
@@ -163,3 +163,4 @@
   * [Zhone (OLT and MX)](/lib/oxidized/model/zhoneolt.rb)
 * Zyxel
   * [ZyNOS](/lib/oxidized/model/zynos.rb)
+  * [NDMS](/lib/oxidized/model/ndms.rb)
diff --git a/lib/oxidized/model/ndms.rb b/lib/oxidized/model/ndms.rb
new file mode 100644
index 0000000..c632bb9
--- /dev/null
+++ b/lib/oxidized/model/ndms.rb
@@ -0,0 +1,25 @@
+class NDMS < Oxidized::Model
+
+  # Pull config from Zyxel Keenetic devices from version NDMS >= 2.0
+
+  comment  '! '
+
+  prompt /^([\w.@()-]+[#>]\s?)/m
+
+  cmd 'show version' do |cfg|
+    cfg = cfg.each_line.to_a[1..-3].join
+    comment cfg
+  end
+
+  cmd 'show running-config' do |cfg|
+    cfg = cfg.each_line.to_a[1..-2]
+    cfg = cfg.reject { |line| line.match /(clock date|checksum)/ }.join
+    cfg
+  end
+
+  cfg :telnet do
+    username /^Login:/
+    password /^Password:/
+    pre_logout 'exit'
+  end
+end
-- 
cgit v1.2.1


From 9ed50b5de4be4ae49c381fd539b9184631958d5b Mon Sep 17 00:00:00 2001
From: Wild Kat <wk@futureinquestion.net>
Date: Thu, 19 Apr 2018 22:42:44 +0200
Subject: tidy up tests with rubocop

---
 .rubocop_todo.yml       | 28 ----------------------------
 spec/githubrepo_spec.rb | 31 +++++++++++++++----------------
 spec/input/ssh_spec.rb  | 15 +++++++--------
 spec/node_spec.rb       |  7 +++----
 spec/nodes_spec.rb      |  4 ++--
 5 files changed, 27 insertions(+), 58 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 81776bd..55642fc 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -29,16 +29,6 @@ Layout/AccessModifierIndentation:
   Exclude:
     - 'lib/oxidized/output/gitcrypt.rb'
 
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
-# SupportedHashRocketStyles: key, separator, table
-# SupportedColonStyles: key, separator, table
-# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
-Layout/AlignHash:
-  Exclude:
-    - 'spec/input/ssh_spec.rb'
-
 # Offense count: 4
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
@@ -150,8 +140,6 @@ Layout/EmptyLinesAroundBlockBody:
     - 'lib/oxidized/model/audiocodes.rb'
     - 'lib/oxidized/model/ciscosma.rb'
     - 'lib/oxidized/model/tplink.rb'
-    - 'spec/input/ssh_spec.rb'
-    - 'spec/node_spec.rb'
 
 # Offense count: 158
 # Cop supports --auto-correct.
@@ -220,8 +208,6 @@ Layout/IndentHash:
     - 'lib/oxidized/hook/githubrepo.rb'
     - 'lib/oxidized/input/ssh.rb'
     - 'lib/oxidized/output/http.rb'
-    - 'spec/githubrepo_spec.rb'
-    - 'spec/node_spec.rb'
 
 # Offense count: 21
 # Cop supports --auto-correct.
@@ -381,8 +367,6 @@ Layout/SpaceInsideHashLiteralBraces:
     - 'lib/oxidized/output/git.rb'
     - 'lib/oxidized/output/gitcrypt.rb'
     - 'lib/oxidized/output/http.rb'
-    - 'spec/githubrepo_spec.rb'
-    - 'spec/input/ssh_spec.rb'
 
 # Offense count: 9
 # Cop supports --auto-correct.
@@ -697,9 +681,6 @@ Style/BracesAroundHashParameters:
     - 'lib/oxidized/input/telnet.rb'
     - 'lib/oxidized/model/procurve.rb'
     - 'lib/oxidized/output/http.rb'
-    - 'spec/githubrepo_spec.rb'
-    - 'spec/input/ssh_spec.rb'
-    - 'spec/node_spec.rb'
 
 # Offense count: 3
 Style/CaseEquality:
@@ -850,13 +831,6 @@ Style/LineEndConcatenation:
   Exclude:
     - 'lib/oxidized/hook.rb'
 
-# Offense count: 9
-# Cop supports --auto-correct.
-Style/MethodCallWithoutArgsParentheses:
-  Exclude:
-    - 'spec/githubrepo_spec.rb'
-    - 'spec/input/ssh_spec.rb'
-
 # Offense count: 131
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
@@ -968,7 +942,6 @@ Style/PercentLiteralDelimiters:
     - 'lib/oxidized/config.rb'
     - 'lib/oxidized/input/ssh.rb'
     - 'oxidized.gemspec'
-    - 'spec/nodes_spec.rb'
 
 # Offense count: 22
 # Cop supports --auto-correct.
@@ -1134,7 +1107,6 @@ Style/TrailingUnderscoreVariable:
   Exclude:
     - 'lib/oxidized/node.rb'
     - 'lib/oxidized/output/git.rb'
-    - 'spec/node_spec.rb'
 
 # Offense count: 3
 # Cop supports --auto-correct.
diff --git a/spec/githubrepo_spec.rb b/spec/githubrepo_spec.rb
index e676534..baa9a14 100644
--- a/spec/githubrepo_spec.rb
+++ b/spec/githubrepo_spec.rb
@@ -3,11 +3,11 @@ require 'rugged'
 require 'oxidized/hook/githubrepo'
 
 describe GithubRepo do
-  let(:credentials) { mock() }
-  let(:remote) { mock() }
-  let(:remotes) { mock() }
-  let(:repo_head) { mock() }
-  let(:repo) { mock() }
+  let(:credentials) { mock }
+  let(:remote) { mock }
+  let(:remotes) { mock }
+  let(:repo_head) { mock }
+  let(:repo) { mock }
   let(:gr) { GithubRepo.new }
 
   before do
@@ -44,15 +44,15 @@ describe GithubRepo do
       gr.fetch_and_merge_remote(repo).must_equal nil
     end
     describe "when there is update considering conflicts" do
-      let(:merge_index) { mock() }
-      let(:their_branch) { mock() }
+      let(:merge_index) { mock }
+      let(:their_branch) { mock }
 
       before(:each) do
-        repo.expects(:fetch).with('origin', ['refs/heads/master'], credentials: credentials).returns({total_deltas: 1})
+        repo.expects(:fetch).with('origin', ['refs/heads/master'], credentials: credentials).returns(total_deltas: 1)
         their_branch.expects(:target_id).returns(1)
         repo_head.expects(:target_id).returns(2)
         repo.expects(:merge_commits).with(2, 1).returns(merge_index)
-        repo.expects(:branches).returns({"origin/master" => their_branch})
+        repo.expects(:branches).returns("origin/master" => their_branch)
       end
 
       it "should not try merging when there's conflict" do
@@ -70,12 +70,11 @@ describe GithubRepo do
         repo_head.expects(:target).returns("our_target")
         merge_index.expects(:write_tree).with(repo).returns("tree")
         merge_index.expects(:conflicts?).returns(false)
-        Rugged::Commit.expects(:create).with(repo, {
-          parents: ["our_target", "their_target"],
-          tree: "tree",
-          message: "Merge remote-tracking branch 'origin/master'",
-          update_ref: "HEAD"
-        }).returns(1)
+        Rugged::Commit.expects(:create).with(repo, 
+                                             parents: ["our_target", "their_target"],
+                                             tree: "tree",
+                                             message: "Merge remote-tracking branch 'origin/master'",
+                                             update_ref: "HEAD").returns(1)
         gr.fetch_and_merge_remote(repo).must_equal 1
       end
     end
@@ -101,7 +100,7 @@ describe GithubRepo do
         Oxidized.config.output.git.repo = '/foo.git'
         remote.expects(:url).returns('https://github.com/username/foo.git')
         remote.expects(:push).with(['refs/heads/master'], credentials: credentials).returns(true)
-        repo.expects(:remotes).returns({'origin' => remote})
+        repo.expects(:remotes).returns('origin' => remote)
         Rugged::Repository.expects(:new).with('/foo.git').returns(repo)
       end
 
diff --git a/spec/input/ssh_spec.rb b/spec/input/ssh_spec.rb
index 7be9139..2d1f5ce 100644
--- a/spec/input/ssh_spec.rb
+++ b/spec/input/ssh_spec.rb
@@ -14,23 +14,22 @@ describe Oxidized::SSH do
                                model: 'junos',
                                username: 'alma',
                                password: 'armud',
-                               vars: {ssh_proxy: 'test.com'})
-
+                               vars: { ssh_proxy: 'test.com' })
   end
 
   describe "#connect" do
     it "should use proxy command when proxy host given" do
       ssh = Oxidized::SSH.new
 
-      model = mock()
-      model.expects(:cfg).returns({'ssh' => []})
+      model = mock
+      model.expects(:cfg).returns('ssh' => [])
       @node.expects(:model).returns(model).at_least_once
 
-      proxy = mock()
+      proxy = mock
       Net::SSH::Proxy::Command.expects(:new).with("ssh test.com -W %h:%p").returns(proxy)
-      Net::SSH.expects(:start).with('93.184.216.34', 'alma', {:port => 22, :password => 'armud', :timeout => Oxidized.config.timeout,
-                                    :paranoid => Oxidized.config.input.ssh.secure, :auth_methods => ['none', 'publickey', 'password', 'keyboard-interactive'],
-                                    :number_of_password_prompts => 0, :proxy => proxy})
+      Net::SSH.expects(:start).with('93.184.216.34', 'alma',  :port => 22, :password => 'armud', :timeout => Oxidized.config.timeout,
+                                                              :paranoid => Oxidized.config.input.ssh.secure, :auth_methods => ['none', 'publickey', 'password', 'keyboard-interactive'],
+                                                              :number_of_password_prompts => 0, :proxy => proxy)
 
       ssh.instance_variable_set("@exec", true)
       ssh.connect(@node)
diff --git a/spec/node_spec.rb b/spec/node_spec.rb
index 829e05a..f769751 100644
--- a/spec/node_spec.rb
+++ b/spec/node_spec.rb
@@ -14,7 +14,6 @@ describe Oxidized::Node do
                                username: 'alma',
                                password: 'armud',
                                prompt: 'test_prompt')
-
   end
 
   describe '#new' do
@@ -39,7 +38,7 @@ describe Oxidized::Node do
     it 'should fetch the configuration' do
       stub_oxidized_ssh
 
-      status, _ = @node.run
+      status, = @node.run
       status.must_equal :success
     end
   end
@@ -52,9 +51,9 @@ describe Oxidized::Node do
 
     let(:group) { nil }
     let(:node) do
-      Oxidized::Node.new({
+      Oxidized::Node.new(
         ip: '127.0.0.1', group: group, model: 'junos'
-      })
+      )
     end
 
     it 'when there are no groups' do
diff --git a/spec/nodes_spec.rb b/spec/nodes_spec.rb
index 6fa4b41..a801107 100644
--- a/spec/nodes_spec.rb
+++ b/spec/nodes_spec.rb
@@ -17,8 +17,8 @@ describe Oxidized::Nodes do
 
     Oxidized::Node.any_instance.stubs(:resolve_repo)
     Oxidized::Node.any_instance.stubs(:resolve_output)
-    @nodes_org = %w(ltt-pe1.hel kes2-rr1.tku tor-peer1.oul
-                    hal-p2.tre sav-gr1-sw1.kuo psl-sec-pe1.hel).map { |e| Oxidized::Node.new(opts.merge(name: e)) }
+    @nodes_org = %w[ltt-pe1.hel kes2-rr1.tku tor-peer1.oul
+                    hal-p2.tre sav-gr1-sw1.kuo psl-sec-pe1.hel].map { |e| Oxidized::Node.new(opts.merge(name: e)) }
     @node = @nodes_org.delete_at(0)
     @nodes = Oxidized::Nodes.new(nodes: @nodes_org.dup)
   end
-- 
cgit v1.2.1


From a38057c0a6cae070748187b8c15f1ed26441a47e Mon Sep 17 00:00:00 2001
From: Yuri Zubov <y.zubov@sumatosoft.com>
Date: Fri, 20 Apr 2018 12:17:29 +0300
Subject: remove .ruby-version & add many ruby-version in .travis.yml

---
 .gitignore    | 2 ++
 .ruby-version | 1 -
 .travis.yml   | 8 +++++++-
 3 files changed, 9 insertions(+), 2 deletions(-)
 delete mode 100644 .ruby-version

diff --git a/.gitignore b/.gitignore
index f6a2251..3fd09d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,8 @@
 /tmp/
 .idea/
 Gemfile.lock
+.ruby-version
+.sass-cache/
 
 # Used by dotenv library to load environment variables.
 # .env
diff --git a/.ruby-version b/.ruby-version
deleted file mode 100644
index ebf14b4..0000000
--- a/.ruby-version
+++ /dev/null
@@ -1 +0,0 @@
-2.1.8
diff --git a/.travis.yml b/.travis.yml
index 8f97b30..db2925a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,11 @@
 language: ruby
 sudo: false
 cache: bundler
+before_install:
+  - gem install bundler
 rvm:
-  - 2.1.6
+  - 2.1
+  - 2.2
+  - 2.3
+  - 2.4
+  - 2.5
-- 
cgit v1.2.1


From aff10437b94e83e29ad16fbb3c17932a7a1488b3 Mon Sep 17 00:00:00 2001
From: Wild Kat <wk@futureinquestion.net>
Date: Fri, 20 Apr 2018 14:39:57 +0200
Subject: bump rubocop to 0.55 and regenerate .rubocop_todo.yml

---
 .rubocop.yml      |  3 +++
 .rubocop_todo.yml | 79 +++++++++++++++++++++++++++++--------------------------
 oxidized.gemspec  |  2 +-
 3 files changed, 46 insertions(+), 38 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index ad1ca31..bc013cd 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -14,6 +14,9 @@ LineLength:
 Style/PreferredHashMethods:
   EnforcedStyle: verbose
 
+Style/Not:
+  Enabled: false
+
 AllCops:
   Exclude:
     - 'vendor/**/*'
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index a56def7..b91409a 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2018-04-11 13:02:45 +0200 using RuboCop version 0.54.0.
+# on 2018-04-20 14:46:50 +0200 using RuboCop version 0.55.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -21,14 +21,6 @@ Gemspec/RequiredRubyVersion:
   Exclude:
     - 'oxidized.gemspec'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: outdent, indent
-Layout/AccessModifierIndentation:
-  Exclude:
-    - 'lib/oxidized/output/gitcrypt.rb'
-
 # Offense count: 4
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
@@ -128,7 +120,7 @@ Layout/EmptyLines:
     - 'lib/oxidized/output/git.rb'
     - 'lib/oxidized/output/gitcrypt.rb'
 
-# Offense count: 9
+# Offense count: 7
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: empty_lines, no_empty_lines
@@ -141,7 +133,7 @@ Layout/EmptyLinesAroundBlockBody:
     - 'lib/oxidized/model/ciscosma.rb'
     - 'lib/oxidized/model/tplink.rb'
 
-# Offense count: 158
+# Offense count: 159
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines, beginning_only, ending_only
@@ -198,7 +190,7 @@ Layout/FirstParameterIndentation:
   Exclude:
     - 'lib/oxidized/output/http.rb'
 
-# Offense count: 11
+# Offense count: 5
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: special_inside_parentheses, consistent, align_braces
@@ -223,13 +215,13 @@ Layout/IndentationConsistency:
     - 'lib/oxidized/model/slxos.rb'
     - 'lib/oxidized/output/git.rb'
 
-# Offense count: 116
+# Offense count: 47
 # Cop supports --auto-correct.
 # Configuration parameters: Width, IgnoredPatterns.
 Layout/IndentationWidth:
   Enabled: false
 
-# Offense count: 109
+# Offense count: 108
 # Cop supports --auto-correct.
 Layout/LeadingCommentSpace:
   Enabled: false
@@ -240,7 +232,7 @@ Layout/MultilineBlockLayout:
   Exclude:
     - 'lib/oxidized/model/hatteras.rb'
 
-# Offense count: 2
+# Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: symmetrical, new_line, same_line
@@ -348,15 +340,30 @@ Layout/SpaceInsideArrayLiteralBrackets:
     - 'lib/oxidized/input/telnet.rb'
     - 'oxidized.gemspec'
 
-# Offense count: 31
+# Offense count: 29
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
 # SupportedStyles: space, no_space
 # SupportedStylesForEmptyBraces: space, no_space
 Layout/SpaceInsideBlockBraces:
-  Enabled: false
+  Exclude:
+    - 'lib/oxidized/cli.rb'
+    - 'lib/oxidized/hook.rb'
+    - 'lib/oxidized/model/aos.rb'
+    - 'lib/oxidized/model/aos7.rb'
+    - 'lib/oxidized/model/c4cmts.rb'
+    - 'lib/oxidized/model/coriantgroove.rb'
+    - 'lib/oxidized/model/dlink.rb'
+    - 'lib/oxidized/model/enterasys.rb'
+    - 'lib/oxidized/model/fabricos.rb'
+    - 'lib/oxidized/model/hpebladesystem.rb'
+    - 'lib/oxidized/model/mtrlrfs.rb'
+    - 'lib/oxidized/model/xos.rb'
+    - 'lib/oxidized/model/zhoneolt.rb'
+    - 'lib/oxidized/node.rb'
+    - 'lib/oxidized/nodes.rb'
 
-# Offense count: 23
+# Offense count: 9
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
 # SupportedStyles: space, no_space, compact
@@ -369,6 +376,8 @@ Layout/SpaceInsideHashLiteralBraces:
 
 # Offense count: 9
 # Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: space, no_space
 Layout/SpaceInsideParens:
   Exclude:
     - 'extra/syslog.rb'
@@ -402,8 +411,9 @@ Layout/TrailingBlankLines:
     - 'lib/oxidized/model/tplink.rb'
     - 'lib/oxidized/output/http.rb'
 
-# Offense count: 165
+# Offense count: 179
 # Cop supports --auto-correct.
+# Configuration parameters: AllowInHeredoc.
 Layout/TrailingWhitespace:
   Enabled: false
 
@@ -413,7 +423,7 @@ Lint/AmbiguousBlockAssociation:
     - 'lib/oxidized/model/model.rb'
     - 'lib/oxidized/model/nos.rb'
 
-# Offense count: 648
+# Offense count: 652
 Lint/AmbiguousRegexpLiteral:
   Enabled: false
 
@@ -510,14 +520,14 @@ Lint/Void:
 
 # Offense count: 60
 Metrics/AbcSize:
-  Max: 86
+  Max: 84
 
 # Offense count: 15
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/BlockLength:
-  Max: 143
+  Max: 142
 
-# Offense count: 4
+# Offense count: 2
 # Configuration parameters: CountBlocks.
 Metrics/BlockNesting:
   Max: 4
@@ -585,7 +595,7 @@ Naming/PredicateName:
 
 # Offense count: 11
 # Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
-# AllowedNames: io, id, to
+# AllowedNames: io, id, to, by, on, in, at
 Naming/UncommunicativeMethodParamName:
   Exclude:
     - 'extra/syslog.rb'
@@ -657,7 +667,7 @@ Style/Alias:
 Style/AndOr:
   Enabled: false
 
-# Offense count: 4
+# Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, IgnoredMethods.
 # SupportedStyles: line_count_based, semantic, braces_for_chaining
@@ -669,7 +679,7 @@ Style/BlockDelimiters:
     - 'lib/oxidized/model/aricentiss.rb'
     - 'lib/oxidized/model/hatteras.rb'
 
-# Offense count: 12
+# Offense count: 4
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: braces, no_braces, context_dependent
@@ -709,7 +719,7 @@ Style/ClassVars:
   Exclude:
     - 'lib/oxidized.rb'
 
-# Offense count: 5
+# Offense count: 4
 # Cop supports --auto-correct.
 Style/ColonMethodCall:
   Exclude:
@@ -730,7 +740,7 @@ Style/ConditionalAssignment:
     - 'lib/oxidized/hook/githubrepo.rb'
     - 'lib/oxidized/model/model.rb'
 
-# Offense count: 142
+# Offense count: 143
 Style/Documentation:
   Enabled: false
 
@@ -761,7 +771,7 @@ Style/ExpandPathArguments:
     - 'bin/console'
     - 'oxidized.gemspec'
 
-# Offense count: 7
+# Offense count: 6
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: format, sprintf, percent
@@ -778,7 +788,7 @@ Style/FormatStringToken:
     - 'lib/oxidized/node.rb'
     - 'lib/oxidized/nodes.rb'
 
-# Offense count: 15
+# Offense count: 13
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
   Exclude:
@@ -881,11 +891,6 @@ Style/NilComparison:
   Exclude:
     - 'lib/oxidized/input/ssh.rb'
 
-# Offense count: 31
-# Cop supports --auto-correct.
-Style/Not:
-  Enabled: false
-
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedOctalStyle.
@@ -932,7 +937,7 @@ Style/ParenthesesAroundCondition:
     - 'lib/oxidized/model/powerconnect.rb'
     - 'lib/oxidized/source/http.rb'
 
-# Offense count: 10
+# Offense count: 9
 # Cop supports --auto-correct.
 # Configuration parameters: PreferredDelimiters.
 Style/PercentLiteralDelimiters:
@@ -1098,7 +1103,7 @@ Style/TrailingCommaInHashLiteral:
     - 'lib/oxidized/node.rb'
     - 'lib/oxidized/node/stats.rb'
 
-# Offense count: 3
+# Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: AllowNamedUnderscoreVariables.
 Style/TrailingUnderscoreVariable:
diff --git a/oxidized.gemspec b/oxidized.gemspec
index 6019842..ba5c74b 100644
--- a/oxidized.gemspec
+++ b/oxidized.gemspec
@@ -34,6 +34,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'minitest', '~> 5.8'
   s.add_development_dependency 'mocha',    '~> 1.1'
   s.add_development_dependency 'git',      '~> 1'
-  s.add_development_dependency 'rubocop',  '~> 0.54'
+  s.add_development_dependency 'rubocop',  '~> 0.55'
   s.add_development_dependency 'rails_best_practices', '~> 1.19'
 end
-- 
cgit v1.2.1


From c7a439becb4def5d52e306f9aa1a0029b6ef0a97 Mon Sep 17 00:00:00 2001
From: Wild Kat <wk@users.noreply.github.com>
Date: Fri, 20 Apr 2018 15:25:00 +0200
Subject: Be pessimistic about rubocop

---
 oxidized.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oxidized.gemspec b/oxidized.gemspec
index ba5c74b..dfcaf4c 100644
--- a/oxidized.gemspec
+++ b/oxidized.gemspec
@@ -34,6 +34,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'minitest', '~> 5.8'
   s.add_development_dependency 'mocha',    '~> 1.1'
   s.add_development_dependency 'git',      '~> 1'
-  s.add_development_dependency 'rubocop',  '~> 0.55'
+  s.add_development_dependency 'rubocop',  '~> 0.55.0'
   s.add_development_dependency 'rails_best_practices', '~> 1.19'
 end
-- 
cgit v1.2.1


From 21e3d6490496573f25ef77fe8172766ac7d1a736 Mon Sep 17 00:00:00 2001
From: Wild Kat <wk@futureinquestion.net>
Date: Sat, 21 Apr 2018 13:27:05 +0200
Subject: the great makeover - standardize layout, alignment, indentation

---
 .rubocop_todo.yml                    | 400 +----------------------------------
 bin/oxidized                         |   1 -
 extra/rest_client.rb                 |   9 +-
 extra/syslog.rb                      |  32 +--
 lib/oxidized/cli.rb                  |   4 +-
 lib/oxidized/config.rb               |   4 +-
 lib/oxidized/core.rb                 |   6 +-
 lib/oxidized/hook.rb                 | 129 ++++++-----
 lib/oxidized/hook/awssns.rb          |   1 -
 lib/oxidized/hook/exec.rb            |   5 +-
 lib/oxidized/hook/githubrepo.rb      |  13 +-
 lib/oxidized/hook/slackdiff.rb       |   6 +-
 lib/oxidized/hook/xmppdiff.rb        |  18 +-
 lib/oxidized/input/cli.rb            |  11 +-
 lib/oxidized/input/ftp.rb            |  13 +-
 lib/oxidized/input/ssh.rb            |  25 ++-
 lib/oxidized/input/telnet.rb         |  48 ++---
 lib/oxidized/jobs.rb                 |   7 +-
 lib/oxidized/manager.rb              |   9 +-
 lib/oxidized/model/acos.rb           |  31 ++-
 lib/oxidized/model/acsw.rb           |  11 +-
 lib/oxidized/model/aen.rb            |   3 +-
 lib/oxidized/model/aireos.rb         |   8 +-
 lib/oxidized/model/alteonos.rb       |  34 ++-
 lib/oxidized/model/alvarion.rb       |   4 -
 lib/oxidized/model/aos.rb            |   6 +-
 lib/oxidized/model/aos7.rb           |   5 +-
 lib/oxidized/model/aosw.rb           |  24 +--
 lib/oxidized/model/apc_aos.rb        |   3 -
 lib/oxidized/model/arbos.rb          |   5 +-
 lib/oxidized/model/aricentiss.rb     |   2 -
 lib/oxidized/model/asa.rb            |  66 +++---
 lib/oxidized/model/asyncos.rb        |  39 ++--
 lib/oxidized/model/audiocodes.rb     |  12 +-
 lib/oxidized/model/awplus.rb         |  79 ++++---
 lib/oxidized/model/boss.rb           |   7 +-
 lib/oxidized/model/br6910.rb         |  88 ++++----
 lib/oxidized/model/c4cmts.rb         |   8 +-
 lib/oxidized/model/catos.rb          |   2 -
 lib/oxidized/model/cisconga.rb       |   4 +-
 lib/oxidized/model/ciscosma.rb       |  37 ++--
 lib/oxidized/model/ciscosmb.rb       |   8 +-
 lib/oxidized/model/comware.rb        |  12 +-
 lib/oxidized/model/coriant8600.rb    |   8 +-
 lib/oxidized/model/coriantgroove.rb  |   8 +-
 lib/oxidized/model/corianttmos.rb    |   4 +-
 lib/oxidized/model/cumulus.rb        |  58 +++--
 lib/oxidized/model/datacom.rb        |   2 -
 lib/oxidized/model/dcnos.rb          |   2 -
 lib/oxidized/model/dlink.rb          |   2 +-
 lib/oxidized/model/dnos.rb           |   8 +-
 lib/oxidized/model/edgecos.rb        |   6 +-
 lib/oxidized/model/edgeos.rb         |   2 -
 lib/oxidized/model/edgeswitch.rb     |   4 +-
 lib/oxidized/model/enterasys.rb      |   4 +-
 lib/oxidized/model/eos.rb            |  14 +-
 lib/oxidized/model/fabricos.rb       |   8 +-
 lib/oxidized/model/firewareos.rb     |   3 -
 lib/oxidized/model/fortios.rb        |  28 ++-
 lib/oxidized/model/ftos.rb           |   6 +-
 lib/oxidized/model/fujitsupy.rb      |   6 +-
 lib/oxidized/model/gaiaos.rb         |  16 +-
 lib/oxidized/model/gcombnps.rb       |  19 +-
 lib/oxidized/model/hatteras.rb       |  13 +-
 lib/oxidized/model/hirschmann.rb     |  18 +-
 lib/oxidized/model/hpebladesystem.rb |  32 +--
 lib/oxidized/model/hpemsa.rb         |   3 -
 lib/oxidized/model/ios.rb            | 108 +++++-----
 lib/oxidized/model/iosxr.rb          |   4 +-
 lib/oxidized/model/ipos.rb           |   4 +-
 lib/oxidized/model/ironware.rb       |  27 ++-
 lib/oxidized/model/isam.rb           |   9 +-
 lib/oxidized/model/junos.rb          |  10 +-
 lib/oxidized/model/masteros.rb       |   4 +-
 lib/oxidized/model/mlnxos.rb         |   7 +-
 lib/oxidized/model/model.rb          |  21 +-
 lib/oxidized/model/mtrlrfs.rb        |   5 +-
 lib/oxidized/model/ndms.rb           |   1 -
 lib/oxidized/model/netgear.rb        |   2 -
 lib/oxidized/model/netscaler.rb      |   2 -
 lib/oxidized/model/nos.rb            |   4 +-
 lib/oxidized/model/nxos.rb           |   5 +-
 lib/oxidized/model/oneos.rb          |  14 +-
 lib/oxidized/model/opengear.rb       |   6 +-
 lib/oxidized/model/opnsense.rb       |   8 +-
 lib/oxidized/model/outputs.rb        |   4 +-
 lib/oxidized/model/panos.rb          |   3 +-
 lib/oxidized/model/pfsense.rb        |   8 +-
 lib/oxidized/model/planet.rb         |  20 +-
 lib/oxidized/model/powerconnect.rb   |   9 +-
 lib/oxidized/model/procurve.rb       |   4 +-
 lib/oxidized/model/quantaos.rb       |   8 +-
 lib/oxidized/model/routeros.rb       |   4 +-
 lib/oxidized/model/saos.rb           |   1 -
 lib/oxidized/model/screenos.rb       |   8 +-
 lib/oxidized/model/sgos.rb           |   5 +-
 lib/oxidized/model/siklu.rb          |   2 -
 lib/oxidized/model/slxos.rb          |  26 ++-
 lib/oxidized/model/sros.rb           |   1 -
 lib/oxidized/model/tmos.rb           |   4 +-
 lib/oxidized/model/tplink.rb         |  18 +-
 lib/oxidized/model/trango.rb         |  13 +-
 lib/oxidized/model/ucs.rb            |   1 -
 lib/oxidized/model/voltaire.rb       |   9 +-
 lib/oxidized/model/voss.rb           |   3 +-
 lib/oxidized/model/vrp.rb            |   7 +-
 lib/oxidized/model/vyatta.rb         |   4 +-
 lib/oxidized/model/weos.rb           |   4 +-
 lib/oxidized/model/xos.rb            |   6 +-
 lib/oxidized/model/zhoneolt.rb       |   2 +-
 lib/oxidized/model/zynos.rb          |   4 +-
 lib/oxidized/node.rb                 |  19 +-
 lib/oxidized/node/stats.rb           |   3 +-
 lib/oxidized/nodes.rb                |  13 +-
 lib/oxidized/output/file.rb          |  83 ++++----
 lib/oxidized/output/git.rb           | 228 ++++++++++----------
 lib/oxidized/output/gitcrypt.rb      |  27 ++-
 lib/oxidized/output/http.rb          |  50 ++---
 lib/oxidized/output/output.rb        |   3 +-
 lib/oxidized/source/csv.rb           |  89 ++++----
 lib/oxidized/source/http.rb          |  97 +++++----
 lib/oxidized/source/source.rb        |  13 +-
 lib/oxidized/source/sql.rb           | 103 +++++----
 lib/oxidized/string.rb               |   5 +-
 lib/oxidized/worker.rb               |   2 +-
 oxidized.gemspec                     |  11 +-
 spec/cli_spec.rb                     |   8 +-
 spec/githubrepo_spec.rb              |   2 +-
 128 files changed, 1050 insertions(+), 1638 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index b91409a..1b40a21 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2018-04-20 14:46:50 +0200 using RuboCop version 0.55.0.
+# on 2018-04-21 13:24:05 +0200 using RuboCop version 0.55.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -21,402 +21,6 @@ Gemspec/RequiredRubyVersion:
   Exclude:
     - 'oxidized.gemspec'
 
-# Offense count: 4
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: with_first_parameter, with_fixed_indentation
-Layout/AlignParameters:
-  Exclude:
-    - 'lib/oxidized/hook.rb'
-    - 'lib/oxidized/hook/exec.rb'
-    - 'lib/oxidized/output/git.rb'
-    - 'lib/oxidized/worker.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyleAlignWith.
-# SupportedStylesAlignWith: either, start_of_block, start_of_line
-Layout/BlockAlignment:
-  Exclude:
-    - 'lib/oxidized/model/awplus.rb'
-    - 'lib/oxidized/model/sgos.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-Layout/BlockEndNewline:
-  Exclude:
-    - 'lib/oxidized/model/awplus.rb'
-    - 'lib/oxidized/model/hatteras.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, IndentOneStep, IndentationWidth.
-# SupportedStyles: case, end
-Layout/CaseIndentation:
-  Exclude:
-    - 'lib/oxidized/output/http.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Layout/ClosingParenthesisIndentation:
-  Exclude:
-    - 'lib/oxidized/output/git.rb'
-
-# Offense count: 13
-# Cop supports --auto-correct.
-Layout/CommentIndentation:
-  Exclude:
-    - 'lib/oxidized/model/aosw.rb'
-    - 'lib/oxidized/model/audiocodes.rb'
-    - 'lib/oxidized/model/awplus.rb'
-    - 'lib/oxidized/model/edgeswitch.rb'
-    - 'lib/oxidized/model/fujitsupy.rb'
-    - 'lib/oxidized/model/gcombnps.rb'
-    - 'lib/oxidized/model/masteros.rb'
-    - 'lib/oxidized/model/planet.rb'
-    - 'lib/oxidized/output/http.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-Layout/ElseAlignment:
-  Exclude:
-    - 'lib/oxidized/input/telnet.rb'
-    - 'lib/oxidized/output/gitcrypt.rb'
-    - 'lib/oxidized/source/csv.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Layout/EmptyLineAfterMagicComment:
-  Exclude:
-    - 'oxidized.gemspec'
-
-# Offense count: 17
-# Cop supports --auto-correct.
-# Configuration parameters: AllowAdjacentOneLineDefs, NumberOfEmptyLines.
-Layout/EmptyLineBetweenDefs:
-  Exclude:
-    - 'extra/syslog.rb'
-    - 'lib/oxidized/manager.rb'
-    - 'lib/oxidized/model/model.rb'
-    - 'lib/oxidized/nodes.rb'
-    - 'lib/oxidized/output/git.rb'
-    - 'lib/oxidized/output/gitcrypt.rb'
-
-# Offense count: 17
-# Cop supports --auto-correct.
-Layout/EmptyLines:
-  Exclude:
-    - 'bin/oxidized'
-    - 'lib/oxidized/input/telnet.rb'
-    - 'lib/oxidized/model/acsw.rb'
-    - 'lib/oxidized/model/alvarion.rb'
-    - 'lib/oxidized/model/gaiaos.rb'
-    - 'lib/oxidized/model/gcombnps.rb'
-    - 'lib/oxidized/model/hatteras.rb'
-    - 'lib/oxidized/model/ironware.rb'
-    - 'lib/oxidized/model/planet.rb'
-    - 'lib/oxidized/model/voltaire.rb'
-    - 'lib/oxidized/nodes.rb'
-    - 'lib/oxidized/output/git.rb'
-    - 'lib/oxidized/output/gitcrypt.rb'
-
-# Offense count: 7
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: empty_lines, no_empty_lines
-Layout/EmptyLinesAroundBlockBody:
-  Exclude:
-    - 'lib/oxidized/hook/githubrepo.rb'
-    - 'lib/oxidized/model/alvarion.rb'
-    - 'lib/oxidized/model/asyncos.rb'
-    - 'lib/oxidized/model/audiocodes.rb'
-    - 'lib/oxidized/model/ciscosma.rb'
-    - 'lib/oxidized/model/tplink.rb'
-
-# Offense count: 159
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines, beginning_only, ending_only
-Layout/EmptyLinesAroundClassBody:
-  Enabled: false
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Layout/EmptyLinesAroundExceptionHandlingKeywords:
-  Exclude:
-    - 'lib/oxidized/hook/exec.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Layout/EmptyLinesAroundMethodBody:
-  Exclude:
-    - 'lib/oxidized/output/http.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines
-Layout/EmptyLinesAroundModuleBody:
-  Exclude:
-    - 'lib/oxidized/input/cli.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyleAlignWith, AutoCorrect, Severity.
-# SupportedStylesAlignWith: keyword, variable, start_of_line
-Layout/EndAlignment:
-  Exclude:
-    - 'lib/oxidized/output/gitcrypt.rb'
-    - 'lib/oxidized/source/csv.rb'
-
-# Offense count: 1
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: native, lf, crlf
-Layout/EndOfLine:
-  Exclude:
-    - 'lib/oxidized/model/br6910.rb'
-
-# Offense count: 63
-# Cop supports --auto-correct.
-# Configuration parameters: AllowForAlignment, ForceEqualSignAlignment.
-Layout/ExtraSpacing:
-  Enabled: false
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: consistent, special_for_inner_method_call, special_for_inner_method_call_in_parentheses
-Layout/FirstParameterIndentation:
-  Exclude:
-    - 'lib/oxidized/output/http.rb'
-
-# Offense count: 5
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: special_inside_parentheses, consistent, align_braces
-Layout/IndentHash:
-  Exclude:
-    - 'lib/oxidized/hook/githubrepo.rb'
-    - 'lib/oxidized/input/ssh.rb'
-    - 'lib/oxidized/output/http.rb'
-
-# Offense count: 21
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: normal, rails
-Layout/IndentationConsistency:
-  Exclude:
-    - 'lib/oxidized/model/acsw.rb'
-    - 'lib/oxidized/model/awplus.rb'
-    - 'lib/oxidized/model/fortios.rb'
-    - 'lib/oxidized/model/hpebladesystem.rb'
-    - 'lib/oxidized/model/masteros.rb'
-    - 'lib/oxidized/model/sgos.rb'
-    - 'lib/oxidized/model/slxos.rb'
-    - 'lib/oxidized/output/git.rb'
-
-# Offense count: 47
-# Cop supports --auto-correct.
-# Configuration parameters: Width, IgnoredPatterns.
-Layout/IndentationWidth:
-  Enabled: false
-
-# Offense count: 108
-# Cop supports --auto-correct.
-Layout/LeadingCommentSpace:
-  Enabled: false
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Layout/MultilineBlockLayout:
-  Exclude:
-    - 'lib/oxidized/model/hatteras.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: symmetrical, new_line, same_line
-Layout/MultilineMethodCallBraceLayout:
-  Exclude:
-    - 'lib/oxidized/output/git.rb'
-
-# Offense count: 14
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: aligned, indented
-Layout/MultilineOperationIndentation:
-  Exclude:
-    - 'lib/oxidized/hook.rb'
-    - 'lib/oxidized/model/awplus.rb'
-    - 'lib/oxidized/model/hatteras.rb'
-    - 'lib/oxidized/model/quantaos.rb'
-    - 'lib/oxidized/model/trango.rb'
-
-# Offense count: 33
-# Cop supports --auto-correct.
-Layout/SpaceAfterComma:
-  Enabled: false
-
-# Offense count: 12
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyleInsidePipes.
-# SupportedStylesInsidePipes: space, no_space
-Layout/SpaceAroundBlockParameters:
-  Exclude:
-    - 'lib/oxidized/model/aos.rb'
-    - 'lib/oxidized/model/aos7.rb'
-    - 'lib/oxidized/model/c4cmts.rb'
-    - 'lib/oxidized/model/coriantgroove.rb'
-    - 'lib/oxidized/model/dlink.rb'
-    - 'lib/oxidized/model/enterasys.rb'
-    - 'lib/oxidized/model/hpebladesystem.rb'
-    - 'lib/oxidized/model/mtrlrfs.rb'
-    - 'lib/oxidized/model/xos.rb'
-    - 'lib/oxidized/model/zhoneolt.rb'
-    - 'lib/oxidized/node.rb'
-
-# Offense count: 32
-# Cop supports --auto-correct.
-# Configuration parameters: .
-# SupportedStyles: space, no_space
-Layout/SpaceAroundEqualsInParameterDefault:
-  EnforcedStyle: no_space
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Layout/SpaceAroundKeyword:
-  Exclude:
-    - 'lib/oxidized/input/telnet.rb'
-    - 'lib/oxidized/model/xos.rb'
-
-# Offense count: 49
-# Cop supports --auto-correct.
-# Configuration parameters: AllowForAlignment.
-Layout/SpaceAroundOperators:
-  Enabled: false
-
-# Offense count: 15
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
-# SupportedStyles: space, no_space
-# SupportedStylesForEmptyBraces: space, no_space
-Layout/SpaceBeforeBlockBraces:
-  Exclude:
-    - 'lib/oxidized/cli.rb'
-    - 'lib/oxidized/model/aos.rb'
-    - 'lib/oxidized/model/aos7.rb'
-    - 'lib/oxidized/model/c4cmts.rb'
-    - 'lib/oxidized/model/coriantgroove.rb'
-    - 'lib/oxidized/model/dlink.rb'
-    - 'lib/oxidized/model/enterasys.rb'
-    - 'lib/oxidized/model/hpebladesystem.rb'
-    - 'lib/oxidized/model/mtrlrfs.rb'
-    - 'lib/oxidized/model/xos.rb'
-    - 'lib/oxidized/model/zhoneolt.rb'
-    - 'lib/oxidized/node.rb'
-    - 'lib/oxidized/output/output.rb'
-
-# Offense count: 4
-# Cop supports --auto-correct.
-Layout/SpaceBeforeComma:
-  Exclude:
-    - 'lib/oxidized/hook/exec.rb'
-    - 'lib/oxidized/model/fortios.rb'
-
-# Offense count: 25
-# Cop supports --auto-correct.
-# Configuration parameters: AllowForAlignment.
-Layout/SpaceBeforeFirstArg:
-  Enabled: false
-
-# Offense count: 6
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBrackets.
-# SupportedStyles: space, no_space, compact
-# SupportedStylesForEmptyBrackets: space, no_space
-Layout/SpaceInsideArrayLiteralBrackets:
-  Exclude:
-    - 'lib/oxidized/input/ssh.rb'
-    - 'lib/oxidized/input/telnet.rb'
-    - 'oxidized.gemspec'
-
-# Offense count: 29
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
-# SupportedStyles: space, no_space
-# SupportedStylesForEmptyBraces: space, no_space
-Layout/SpaceInsideBlockBraces:
-  Exclude:
-    - 'lib/oxidized/cli.rb'
-    - 'lib/oxidized/hook.rb'
-    - 'lib/oxidized/model/aos.rb'
-    - 'lib/oxidized/model/aos7.rb'
-    - 'lib/oxidized/model/c4cmts.rb'
-    - 'lib/oxidized/model/coriantgroove.rb'
-    - 'lib/oxidized/model/dlink.rb'
-    - 'lib/oxidized/model/enterasys.rb'
-    - 'lib/oxidized/model/fabricos.rb'
-    - 'lib/oxidized/model/hpebladesystem.rb'
-    - 'lib/oxidized/model/mtrlrfs.rb'
-    - 'lib/oxidized/model/xos.rb'
-    - 'lib/oxidized/model/zhoneolt.rb'
-    - 'lib/oxidized/node.rb'
-    - 'lib/oxidized/nodes.rb'
-
-# Offense count: 9
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
-# SupportedStyles: space, no_space, compact
-# SupportedStylesForEmptyBraces: space, no_space
-Layout/SpaceInsideHashLiteralBraces:
-  Exclude:
-    - 'lib/oxidized/output/git.rb'
-    - 'lib/oxidized/output/gitcrypt.rb'
-    - 'lib/oxidized/output/http.rb'
-
-# Offense count: 9
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: space, no_space
-Layout/SpaceInsideParens:
-  Exclude:
-    - 'extra/syslog.rb'
-    - 'lib/oxidized/input/telnet.rb'
-    - 'lib/oxidized/model/asa.rb'
-
-# Offense count: 5
-# Cop supports --auto-correct.
-Layout/SpaceInsidePercentLiteralDelimiters:
-  Exclude:
-    - 'oxidized.gemspec'
-
-# Offense count: 6
-# Cop supports --auto-correct.
-Layout/SpaceInsideRangeLiteral:
-  Exclude:
-    - 'lib/oxidized/input/telnet.rb'
-
-# Offense count: 8
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: final_newline, final_blank_line
-Layout/TrailingBlankLines:
-  Exclude:
-    - 'lib/oxidized/model/aen.rb'
-    - 'lib/oxidized/model/apc_aos.rb'
-    - 'lib/oxidized/model/firewareos.rb'
-    - 'lib/oxidized/model/gcombnps.rb'
-    - 'lib/oxidized/model/hpemsa.rb'
-    - 'lib/oxidized/model/mtrlrfs.rb'
-    - 'lib/oxidized/model/tplink.rb'
-    - 'lib/oxidized/output/http.rb'
-
-# Offense count: 179
-# Cop supports --auto-correct.
-# Configuration parameters: AllowInHeredoc.
-Layout/TrailingWhitespace:
-  Enabled: false
-
 # Offense count: 4
 Lint/AmbiguousBlockAssociation:
   Exclude:
@@ -1145,7 +749,7 @@ Style/ZeroLengthPredicate:
     - 'lib/oxidized/model/ciscosmb.rb'
     - 'lib/oxidized/output/git.rb'
 
-# Offense count: 275
+# Offense count: 269
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
diff --git a/bin/oxidized b/bin/oxidized
index 7a0b03d..92730ee 100755
--- a/bin/oxidized
+++ b/bin/oxidized
@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 
-
 # FIX ME, killing oxidized needs -9
 trap("INT") { exit } # sinatra will otherwise steal this from us
 
diff --git a/extra/rest_client.rb b/extra/rest_client.rb
index 35d93ae..dba89c3 100644
--- a/extra/rest_client.rb
+++ b/extra/rest_client.rb
@@ -6,10 +6,10 @@ module Oxidized
     require 'asetus'
 
     class Config
-      Root      = Root = ENV['OXIDIZED_HOME'] || File.join(ENV['HOME'], '.config', 'oxidized')
+      Root = Root = ENV['OXIDIZED_HOME'] || File.join(ENV['HOME'], '.config', 'oxidized')
     end
 
-    CFGS = Asetus.new :name=>'oxidized', :load=>false, :key_to_s=>true
+    CFGS = Asetus.new :name => 'oxidized', :load => false, :key_to_s => true
     CFGS.default.rest = '127.0.0.1:8888'
 
     begin
@@ -28,13 +28,13 @@ module Oxidized
     PATH = URI(restcfg).path
 
     class << self
-      def next opt={}, host=HOST, port=PORT
+      def next opt = {}, host = HOST, port = PORT
         web = new host, port
         web.next opt
       end
     end
 
-    def initialize host=HOST, port=PORT
+    def initialize host = HOST, port = PORT
       @web = Net::HTTP.new host, port
     end
 
@@ -42,6 +42,5 @@ module Oxidized
       data = JSON.dump opt
       @web.put PATH + '/node/next/' + opt[:name].to_s, data
     end
-
   end
 end
diff --git a/extra/syslog.rb b/extra/syslog.rb
index e364cf9..f7d271f 100755
--- a/extra/syslog.rb
+++ b/extra/syslog.rb
@@ -27,13 +27,12 @@ require 'resolv'
 require_relative 'rest_client'
 
 module Oxidized
-  
   require 'asetus'
   class Config
-    Root      = File.join ENV['HOME'], '.config', 'oxidized'
+    Root = File.join ENV['HOME'], '.config', 'oxidized'
   end
 
-  CFGS = Asetus.new :name=>'oxidized', :load=>false, :key_to_s=>true
+  CFGS = Asetus.new :name => 'oxidized', :load => false, :key_to_s => true
   CFGS.default.syslogd.port        = 514
   CFGS.default.syslogd.file        = 'messages'
   CFGS.default.syslogd.resolve     = true
@@ -43,7 +42,7 @@ module Oxidized
   rescue => error
     raise InvalidConfig, "Error loading config: #{error.message}"
   ensure
-    CFG = CFGS.cfg  # convenienence, instead of Config.cfg.password, CFG.password
+    CFG = CFGS.cfg # convenienence, instead of Config.cfg.password, CFG.password
   end
 
   class SyslogMonitor
@@ -59,12 +58,13 @@ module Oxidized
     }
 
     class << self
-      def udp port=Oxidized::CFG.syslogd.port, listen=0
+      def udp port = Oxidized::CFG.syslogd.port, listen = 0
         io = UDPSocket.new
         io.bind listen, port
         new io, :udp
       end
-      def file syslog_file=Oxidized::CFG.syslogd.file
+
+      def file syslog_file = Oxidized::CFG.syslogd.file
         io = open syslog_file, 'r'
         io.seek 0, IO::SEEK_END
         new io, :file
@@ -73,7 +73,7 @@ module Oxidized
 
     private
 
-    def initialize io, mode=:udp
+    def initialize io, mode = :udp
       @mode = mode
       run io
     end
@@ -84,24 +84,24 @@ module Oxidized
 
     def ios ip, log, i
       # TODO: we need to fetch 'ip/name' in mode == :file here
-      user = log[i+5]
+      user = log[i + 5]
       from = log[-1][1..-2]
-      rest( :user => user, :from => from, :model => 'ios', :ip => ip,
-            :name => getname(ip) )
+      rest(:user => user, :from => from, :model => 'ios', :ip => ip,
+           :name => getname(ip))
     end
 
     def jnpr ip, log, i
       # TODO: we need to fetch 'ip/name' in mode == :file here
-      user = log[i+2][1..-2]
-      msg  = log[(i+6)..-1].join(' ')[10..-2]
+      user = log[i + 2][1..-2]
+      msg  = log[(i + 6)..-1].join(' ')[10..-2]
       msg  = nil if msg == 'none'
-      rest( :user => user, :msg => msg, :model => 'jnpr', :ip => ip,
-            :name => getname(ip) )
+      rest(:user => user, :msg => msg, :model => 'jnpr', :ip => ip,
+           :name => getname(ip))
     end
 
     def handle_log log, ip
       log = log.to_s.split ' '
-      if i = log.find_index { |e| e.match( MSG[:ios] ) }
+      if i = log.find_index { |e| e.match(MSG[:ios]) }
         ios ip, log,  i
       elsif i = log.index(MSG[:junos])
         jnpr ip, log, i
@@ -140,4 +140,4 @@ module Oxidized
 end
 
 Oxidized::SyslogMonitor.udp
-#Oxidized::SyslogMonitor.file '/var/log/poop'
+# Oxidized::SyslogMonitor.file '/var/log/poop'
diff --git a/lib/oxidized/cli.rb b/lib/oxidized/cli.rb
index 9a09d41..c29e269 100644
--- a/lib/oxidized/cli.rb
+++ b/lib/oxidized/cli.rb
@@ -40,7 +40,7 @@ module Oxidized
     end
 
     def parse_opts
-      opts = Slop.new(:help=>true) do
+      opts = Slop.new(:help => true) do
         on 'd', 'debug', 'turn on debugging'
         on 'daemonize',  'Daemonize/fork the process'
         on 'v', 'version', 'show version' do
@@ -62,7 +62,7 @@ module Oxidized
     def write_pid
       if pidfile?
         begin
-          File.open(pidfile, ::File::CREAT | ::File::EXCL | ::File::WRONLY){|f| f.write("#{Process.pid}") }
+          File.open(pidfile, ::File::CREAT | ::File::EXCL | ::File::WRONLY) { |f| f.write("#{Process.pid}") }
           at_exit { File.delete(pidfile) if File.exists?(pidfile) }
         rescue Errno::EEXIST
           check_pid
diff --git a/lib/oxidized/config.rb b/lib/oxidized/config.rb
index 47544fb..a825d39 100644
--- a/lib/oxidized/config.rb
+++ b/lib/oxidized/config.rb
@@ -13,7 +13,7 @@ module Oxidized
     HookDir   = File.join Directory, %w(lib oxidized hook)
     Sleep     = 1
 
-    def self.load(cmd_opts={})
+    def self.load(cmd_opts = {})
       asetus = Asetus.new(name: 'oxidized', load: false, key_to_s: true)
       Oxidized.asetus = asetus
 
@@ -37,7 +37,7 @@ module Oxidized
       asetus.default.input.default    = 'ssh, telnet'
       asetus.default.input.debug      = false # or String for session log file
       asetus.default.input.ssh.secure = false # complain about changed certs
-      asetus.default.input.ftp.passive= true  # ftp passive mode
+      asetus.default.input.ftp.passive = true # ftp passive mode
 
       asetus.default.output.default = 'file'  # file, git
       asetus.default.source.default = 'csv'   # csv, sql
diff --git a/lib/oxidized/core.rb b/lib/oxidized/core.rb
index e007c9d..440d8e2 100644
--- a/lib/oxidized/core.rb
+++ b/lib/oxidized/core.rb
@@ -11,9 +11,9 @@ module Oxidized
     def initialize args
       Oxidized.mgr = Manager.new
       Oxidized.Hooks = HookManager.from_config(Oxidized.config)
-      nodes        = Nodes.new
+      nodes = Nodes.new
       raise NoNodesFound, 'source returns no usable nodes' if nodes.size == 0
-      @worker      = Worker.new nodes
+      @worker = Worker.new nodes
       trap('HUP') { nodes.load }
       if Oxidized.config.rest?
         begin
@@ -22,7 +22,7 @@ module Oxidized
           raise OxidizedError, 'oxidized-web not found: sudo gem install oxidized-web - \
           or disable web support by setting "rest: false" in your configuration'
         end
-        @rest        = API::Web.new nodes, Oxidized.config.rest
+        @rest = API::Web.new nodes, Oxidized.config.rest
         @rest.run
       end
       run
diff --git a/lib/oxidized/hook.rb b/lib/oxidized/hook.rb
index c27f6fd..915299b 100644
--- a/lib/oxidized/hook.rb
+++ b/lib/oxidized/hook.rb
@@ -1,89 +1,88 @@
 module Oxidized
-class HookManager
-  class << self
-    def from_config cfg
-      mgr = new
-      cfg.hooks.each do |name,h_cfg|
-        h_cfg.events.each do |event|
-          mgr.register event.to_sym, name, h_cfg.type, h_cfg
+  class HookManager
+    class << self
+      def from_config cfg
+        mgr = new
+        cfg.hooks.each do |name, h_cfg|
+          h_cfg.events.each do |event|
+            mgr.register event.to_sym, name, h_cfg.type, h_cfg
+          end
         end
+        mgr
       end
-      mgr
     end
-  end
-
-  # HookContext is passed to each hook. It can contain anything related to the
-  # event in question. At least it contains the event name
-  class HookContext < OpenStruct; end
 
-  # RegisteredHook is a container for a Hook instance
-  class RegisteredHook < Struct.new(:name, :hook); end
+    # HookContext is passed to each hook. It can contain anything related to the
+    # event in question. At least it contains the event name
+    class HookContext < OpenStruct; end
 
-  Events = [
-    :node_success,
-    :node_fail,
-    :post_store,
-    :nodes_done
-  ]
-  attr_reader :registered_hooks
+    # RegisteredHook is a container for a Hook instance
+    class RegisteredHook < Struct.new(:name, :hook); end
 
-  def initialize
-    @registered_hooks = Hash.new {|h,k| h[k] = []}
-  end
+    Events = [
+      :node_success,
+      :node_fail,
+      :post_store,
+      :nodes_done
+    ]
+    attr_reader :registered_hooks
 
-  def register event, name, hook_type, cfg
-    unless Events.include? event
-      raise ArgumentError,
-        "unknown event #{event}, available: #{Events.join ','}"
+    def initialize
+      @registered_hooks = Hash.new { |h, k| h[k] = [] }
     end
 
-    Oxidized.mgr.add_hook hook_type
-    begin
-      hook = Oxidized.mgr.hook.fetch(hook_type).new
-    rescue KeyError
-      raise KeyError, "cannot find hook #{hook_type.inspect}"
-    end
+    def register event, name, hook_type, cfg
+      unless Events.include? event
+        raise ArgumentError,
+              "unknown event #{event}, available: #{Events.join ','}"
+      end
 
-    hook.cfg = cfg
+      Oxidized.mgr.add_hook hook_type
+      begin
+        hook = Oxidized.mgr.hook.fetch(hook_type).new
+      rescue KeyError
+        raise KeyError, "cannot find hook #{hook_type.inspect}"
+      end
 
-    @registered_hooks[event] << RegisteredHook.new(name, hook)
-    Oxidized.logger.debug "Hook #{name.inspect} registered #{hook.class} for event #{event.inspect}"
-  end
+      hook.cfg = cfg
 
-  def handle event, ctx_params={}
-    ctx = HookContext.new ctx_params
-    ctx.event = event
+      @registered_hooks[event] << RegisteredHook.new(name, hook)
+      Oxidized.logger.debug "Hook #{name.inspect} registered #{hook.class} for event #{event.inspect}"
+    end
 
-    @registered_hooks[event].each do |r_hook|
-      begin
-        r_hook.hook.run_hook ctx
-      rescue => e
-        Oxidized.logger.error "Hook #{r_hook.name} (#{r_hook.hook}) failed " +
-                  "(#{e.inspect}) for event #{event.inspect}"
+    def handle event, ctx_params = {}
+      ctx = HookContext.new ctx_params
+      ctx.event = event
+
+      @registered_hooks[event].each do |r_hook|
+        begin
+          r_hook.hook.run_hook ctx
+        rescue => e
+          Oxidized.logger.error "Hook #{r_hook.name} (#{r_hook.hook}) failed " +
+                                "(#{e.inspect}) for event #{event.inspect}"
+        end
       end
     end
   end
-end
 
-# Hook abstract base class
-class Hook
-  attr_reader :cfg
+  # Hook abstract base class
+  class Hook
+    attr_reader :cfg
 
-  def initialize
-  end
+    def initialize
+    end
 
-  def cfg=(cfg)
-    @cfg = cfg
-    validate_cfg! if self.respond_to? :validate_cfg!
-  end
+    def cfg=(cfg)
+      @cfg = cfg
+      validate_cfg! if self.respond_to? :validate_cfg!
+    end
 
-  def run_hook ctx
-    raise NotImplementedError
-  end
+    def run_hook ctx
+      raise NotImplementedError
+    end
 
-  def log(msg, level=:info)
-    Oxidized.logger.send(level, "#{self.class.name}: #{msg}")
+    def log(msg, level = :info)
+      Oxidized.logger.send(level, "#{self.class.name}: #{msg}")
+    end
   end
-
-end
 end
diff --git a/lib/oxidized/hook/awssns.rb b/lib/oxidized/hook/awssns.rb
index 82c118e..183cd2c 100644
--- a/lib/oxidized/hook/awssns.rb
+++ b/lib/oxidized/hook/awssns.rb
@@ -23,5 +23,4 @@ class AwsSns < Oxidized::Hook
       message: message.to_json
     )
   end
-
 end
diff --git a/lib/oxidized/hook/exec.rb b/lib/oxidized/hook/exec.rb
index 3f984c2..8a32412 100644
--- a/lib/oxidized/hook/exec.rb
+++ b/lib/oxidized/hook/exec.rb
@@ -23,10 +23,9 @@ class Exec < Oxidized::Hook
       @cmd = cfg.cmd
       raise "invalid cmd value" unless @cmd.is_a?(String) || @cmd.is_a?(Array)
     end
-
   rescue RuntimeError => e
     raise ArgumentError,
-      "#{self.class.name}: configuration invalid: #{e.message}"
+          "#{self.class.name}: configuration invalid: #{e.message}"
   end
 
   def run_hook ctx
@@ -45,7 +44,7 @@ class Exec < Oxidized::Hook
   def run_cmd! env
     pid, status = nil, nil
     Timeout.timeout(@timeout) do
-      pid = spawn env, @cmd , :unsetenv_others => true
+      pid = spawn env, @cmd, :unsetenv_others => true
       pid, status = wait2 pid
       unless status.exitstatus.zero?
         msg = "#{@cmd.inspect} failed with exit value #{status.exitstatus}"
diff --git a/lib/oxidized/hook/githubrepo.rb b/lib/oxidized/hook/githubrepo.rb
index 4cae4e6..e077d5d 100644
--- a/lib/oxidized/hook/githubrepo.rb
+++ b/lib/oxidized/hook/githubrepo.rb
@@ -35,21 +35,20 @@ class GithubRepo < Oxidized::Hook
     end
 
     Rugged::Commit.create(repo, {
-      parents: [repo.head.target, their_branch.target],
-      tree: merge_index.write_tree(repo),
-      message: "Merge remote-tracking branch '#{their_branch.name}'",
-      update_ref: "HEAD"
-    })
+                            parents: [repo.head.target, their_branch.target],
+                            tree: merge_index.write_tree(repo),
+                            message: "Merge remote-tracking branch '#{their_branch.name}'",
+                            update_ref: "HEAD"
+                          })
   end
 
   private
 
   def credentials
     Proc.new do |url, username_from_url, allowed_types|
-
       if cfg.has_key?('username')
         git_user = cfg.username
-      else 
+      else
         git_user = username_from_url ? username_from_url : 'git'
       end
 
diff --git a/lib/oxidized/hook/slackdiff.rb b/lib/oxidized/hook/slackdiff.rb
index e271d5f..2c5ec14 100644
--- a/lib/oxidized/hook/slackdiff.rb
+++ b/lib/oxidized/hook/slackdiff.rb
@@ -14,8 +14,8 @@ class SlackDiff < Oxidized::Hook
     return unless ctx.event.to_s == "post_store"
     log "Connecting to slack"
     Slack.configure do |config|
-       config.token = cfg.token
-       config.proxy = cfg.proxy if cfg.has_key?('proxy')
+      config.token = cfg.token
+      config.proxy = cfg.proxy if cfg.has_key?('proxy')
     end
     client = Slack::Client.new
     client.auth_test
@@ -46,7 +46,7 @@ class SlackDiff < Oxidized::Hook
       msg = format(cfg.message, :node => ctx.node.name.to_s, :group => ctx.node.group.to_s, :commitref => ctx.commitref, :model => ctx.node.model.class.name.to_s.downcase)
       log msg
       log "Posting message to #{cfg.channel}"
-      client.chat_postMessage(channel: cfg.channel, text: msg,  as_user: true)
+      client.chat_postMessage(channel: cfg.channel, text: msg, as_user: true)
     end
     log "Finished"
   end
diff --git a/lib/oxidized/hook/xmppdiff.rb b/lib/oxidized/hook/xmppdiff.rb
index 52cc0e0..6acb172 100644
--- a/lib/oxidized/hook/xmppdiff.rb
+++ b/lib/oxidized/hook/xmppdiff.rb
@@ -30,25 +30,25 @@ class XMPPDiff < Oxidized::Hook
           sleep 1
           client.auth(cfg.password)
           sleep 1
-  
+
           log "Connected"
-  
+
           m = Jabber::MUC::SimpleMUCClient.new(client)
           m.join(cfg.channel + "/" + cfg.nick)
-  
+
           log "Joined"
-  
+
           title = "#{ctx.node.name} #{ctx.node.group} #{ctx.node.model.class.name.to_s.downcase}"
           log "Posting diff as snippet to #{cfg.channel}"
-  
+
           m.say(title + "\n\n" + diff[:patch].lines.to_a[4..-1].join)
-  
+
           sleep 1
-  
+
           client.close
-  
+
           log "Finished"
-  
+
         end
       end
     rescue Timeout::Error
diff --git a/lib/oxidized/input/cli.rb b/lib/oxidized/input/cli.rb
index 660e173..d434e33 100644
--- a/lib/oxidized/input/cli.rb
+++ b/lib/oxidized/input/cli.rb
@@ -32,26 +32,25 @@ module Oxidized
         @pre_logout.each { |command, block| block ? block.call : (cmd command, nil) }
       end
 
-      def post_login _post_login=nil, &block
+      def post_login _post_login = nil, &block
         unless @exec
           @post_login << [_post_login, block]
         end
       end
 
-      def pre_logout _pre_logout=nil, &block
+      def pre_logout _pre_logout = nil, &block
         unless @exec
-          @pre_logout <<  [_pre_logout, block]
+          @pre_logout << [_pre_logout, block]
         end
       end
 
-      def username re=/^(Username|login)/
+      def username re = /^(Username|login)/
         @username or @username = re
       end
 
-      def password re=/^Password/
+      def password re = /^Password/
         @password or @password = re
       end
-
     end
   end
 end
diff --git a/lib/oxidized/input/ftp.rb b/lib/oxidized/input/ftp.rb
index cdf3688..ebe50ef 100644
--- a/lib/oxidized/input/ftp.rb
+++ b/lib/oxidized/input/ftp.rb
@@ -6,22 +6,22 @@ module Oxidized
   class FTP < Input
     RescueFail = {
       :debug => [
-        #Net::SSH::Disconnect,
+        # Net::SSH::Disconnect,
       ],
       :warn => [
-        #RuntimeError,
-        #Net::SSH::AuthenticationFailed,
+        # RuntimeError,
+        # Net::SSH::AuthenticationFailed,
       ],
     }
     include Input::CLI
 
     def connect node
-      @node       = node
+      @node = node
       @node.model.cfg['ftp'].each { |cb| instance_exec(&cb) }
       @log = File.open(Oxidized::Config::Log + "/#{@node.ip}-ftp", 'w') if Oxidized.config.input.debug?
       @ftp = Net::FTP.new(@node.ip)
       @ftp.passive = Oxidized.config.input.ftp.passive
-      @ftp.login  @node.auth[:username], @node.auth[:password]
+      @ftp.login @node.auth[:username], @node.auth[:password]
       connected?
     end
 
@@ -47,10 +47,9 @@ module Oxidized
 
     def disconnect
       @ftp.close
-    #rescue Errno::ECONNRESET, IOError
+    # rescue Errno::ECONNRESET, IOError
     ensure
       @log.close if Oxidized.config.input.debug?
     end
-
   end
 end
diff --git a/lib/oxidized/input/ssh.rb b/lib/oxidized/input/ssh.rb
index 27e81e0..9cb6a4f 100644
--- a/lib/oxidized/input/ssh.rb
+++ b/lib/oxidized/input/ssh.rb
@@ -24,20 +24,20 @@ module Oxidized
       secure = Oxidized.config.input.ssh.secure
       @log = File.open(Oxidized::Config::Log + "/#{@node.ip}-ssh", 'w') if Oxidized.config.input.debug?
       port = vars(:ssh_port) || 22
-      
+
       ssh_opts = {
-                :port => port.to_i,
-                :password => @node.auth[:password], :timeout => Oxidized.config.timeout,
-                :paranoid => secure,
-                :auth_methods => %w(none publickey password keyboard-interactive),
-                :number_of_password_prompts => 0,
-        }
+        :port => port.to_i,
+        :password => @node.auth[:password], :timeout => Oxidized.config.timeout,
+        :paranoid => secure,
+        :auth_methods => %w(none publickey password keyboard-interactive),
+        :number_of_password_prompts => 0,
+      }
 
       if proxy_host = vars(:ssh_proxy)
         proxy_command =  "ssh "
         proxy_command += "-o StrictHostKeyChecking=no " unless secure
         proxy_command += "#{proxy_host} -W %h:%p"
-        proxy =  Net::SSH::Proxy::Command.new(proxy_command)
+        proxy = Net::SSH::Proxy::Command.new(proxy_command)
         ssh_opts[:proxy] = proxy
       end
 
@@ -52,7 +52,7 @@ module Oxidized
         begin
           login
         rescue Timeout::Error
-          raise PromptUndetect, [ @output, 'not matching configured prompt', @node.prompt ].join(' ')
+          raise PromptUndetect, [@output, 'not matching configured prompt', @node.prompt].join(' ')
         end
       end
       connected?
@@ -62,7 +62,7 @@ module Oxidized
       @ssh and not @ssh.closed?
     end
 
-    def cmd cmd, expect=node.prompt
+    def cmd cmd, expect = node.prompt
       Oxidized.logger.debug "lib/oxidized/input/ssh.rb #{cmd} @ #{node.name} with expect: #{expect.inspect}"
       if @exec
         @ssh.exec! cmd
@@ -128,8 +128,8 @@ module Oxidized
       end
     end
 
-    def exec state=nil
-      state == nil ? @exec : (@exec=state) unless vars :ssh_no_exec
+    def exec state = nil
+      state == nil ? @exec : (@exec = state) unless vars :ssh_no_exec
     end
 
     def cmd_shell(cmd, expect_re)
@@ -152,6 +152,5 @@ module Oxidized
         end
       end
     end
-
   end
 end
diff --git a/lib/oxidized/input/telnet.rb b/lib/oxidized/input/telnet.rb
index a5561b9..4371e26 100644
--- a/lib/oxidized/input/telnet.rb
+++ b/lib/oxidized/input/telnet.rb
@@ -18,7 +18,7 @@ module Oxidized
               'Model'   => @node.model }
       opt['Output_log'] = Oxidized::Config::Log + "/#{@node.ip}-telnet" if Oxidized.config.input.debug?
 
-      @telnet  = Net::Telnet.new opt
+      @telnet = Net::Telnet.new opt
       if @node.auth[:username] and @node.auth[:username].length > 0
         expect username
         @telnet.puts @node.auth[:username]
@@ -28,7 +28,7 @@ module Oxidized
       begin
         expect @node.prompt
       rescue Timeout::Error
-        raise PromptUndetect, [ 'unable to detect prompt:', @node.prompt ].join(' ')
+        raise PromptUndetect, ['unable to detect prompt:', @node.prompt].join(' ')
       end
     end
 
@@ -36,7 +36,7 @@ module Oxidized
       @telnet and not @telnet.sock.closed?
     end
 
-    def cmd cmd, expect=@node.prompt
+    def cmd cmd, expect = @node.prompt
       Oxidized.logger.debug "Telnet: #{cmd} @#{@node.name}"
       args = { 'String' => cmd }
       args.merge!({ 'Match' => expect, 'Timeout' => @timeout }) if expect
@@ -64,11 +64,9 @@ module Oxidized
       rescue Errno::ECONNRESET
       end
     end
-
   end
 end
 
-
 class Net::Telnet
   ## FIXME: we just need 'line = model.expects line' to handle pager
   ## how to do this, without redefining the whole damn thing
@@ -86,7 +84,7 @@ class Net::Telnet
                  elsif options.has_key?("Prompt")
                    options["Prompt"]
                  elsif options.has_key?("String")
-                   Regexp.new( Regexp.quote(options["String"]) )
+                   Regexp.new(Regexp.quote(options["String"]))
                  end
       time_out = options["Timeout"]  if options.has_key?("Timeout")
       waittime = options["Waittime"] if options.has_key?("Waittime")
@@ -102,7 +100,7 @@ class Net::Telnet
     line = ''
     buf = ''
     rest = ''
-    until(prompt === line and not IO::select([@sock], nil, nil, waittime))
+    until prompt === line and not IO::select([@sock], nil, nil, waittime)
       unless IO::select([@sock], nil, nil, time_out)
         raise TimeoutError, "timed out while waiting for more data"
       end
@@ -114,30 +112,30 @@ class Net::Telnet
           c = rest + c
           if Integer(c.rindex(/#{IAC}#{SE}/no) || 0) <
              Integer(c.rindex(/#{IAC}#{SB}/no) || 0)
-            buf = preprocess(c[0 ... c.rindex(/#{IAC}#{SB}/no)])
-            rest = c[c.rindex(/#{IAC}#{SB}/no) .. -1]
+            buf = preprocess(c[0...c.rindex(/#{IAC}#{SB}/no)])
+            rest = c[c.rindex(/#{IAC}#{SB}/no)..-1]
           elsif pt = c.rindex(/#{IAC}[^#{IAC}#{AO}#{AYT}#{DM}#{IP}#{NOP}]?\z/no) ||
                      c.rindex(/\r\z/no)
-            buf = preprocess(c[0 ... pt])
-            rest = c[pt .. -1]
+            buf = preprocess(c[0...pt])
+            rest = c[pt..-1]
           else
             buf = preprocess(c)
             rest = ''
           end
-       else
-         # Not Telnetmode.
-         #
-         # We cannot use preprocess() on this data, because that
-         # method makes some Telnetmode-specific assumptions.
-         buf = rest + c
-         rest = ''
-         unless @options["Binmode"]
-           if pt = buf.rindex(/\r\z/no)
-             buf = buf[0 ... pt]
-             rest = buf[pt .. -1]
-           end
-           buf.gsub!(/#{EOL}/no, "\n")
-         end
+        else
+          # Not Telnetmode.
+          #
+          # We cannot use preprocess() on this data, because that
+          # method makes some Telnetmode-specific assumptions.
+          buf = rest + c
+          rest = ''
+          unless @options["Binmode"]
+            if pt = buf.rindex(/\r\z/no)
+              buf = buf[0...pt]
+              rest = buf[pt..-1]
+            end
+            buf.gsub!(/#{EOL}/no, "\n")
+          end
         end
         @log.print(buf) if @options.has_key?("Output_log")
         line += buf
diff --git a/lib/oxidized/jobs.rb b/lib/oxidized/jobs.rb
index c566778..fdc1cbf 100644
--- a/lib/oxidized/jobs.rb
+++ b/lib/oxidized/jobs.rb
@@ -6,7 +6,7 @@ module Oxidized
 
     def initialize max, interval, nodes
       @max       = max
-      # Set interval to 1 if interval is 0 (=disabled) so we don't break 
+      # Set interval to 1 if interval is 0 (=disabled) so we don't break
       # the 'ceil' function
       @interval  = interval == 0 ? 1 : interval
       @nodes     = nodes
@@ -28,7 +28,7 @@ module Oxidized
         @durations.fill AVERAGE_DURATION, @durations.size...@nodes.size
       end
       @durations.push(last).shift
-      @duration = @durations.inject(:+).to_f / @nodes.size #rolling average
+      @duration = @durations.inject(:+).to_f / @nodes.size # rolling average
       new_count
     end
 
@@ -45,9 +45,8 @@ module Oxidized
       # and  c) there is more than MAX_INTER_JOB_GAP since last one was started
       # then we want one more thread (rationale is to fix hanging thread causing HOLB)
       if @want <= size and @want < @nodes.size
-        @want +=1 if (Time.now.utc - @last) > MAX_INTER_JOB_GAP
+        @want += 1 if (Time.now.utc - @last) > MAX_INTER_JOB_GAP
       end
     end
-
   end
 end
diff --git a/lib/oxidized/manager.rb b/lib/oxidized/manager.rb
index d2ef4d2..c4523f3 100644
--- a/lib/oxidized/manager.rb
+++ b/lib/oxidized/manager.rb
@@ -7,11 +7,11 @@ module Oxidized
     class << self
       def load dir, file
         begin
-          require File.join dir, file+'.rb'
+          require File.join dir, file + '.rb'
           klass = nil
           [Oxidized, Object].each do |mod|
             klass = mod.constants.find { |const| const.to_s.downcase == file.downcase }
-            klass = mod.constants.find { |const| const.to_s.downcase == 'oxidized'+ file.downcase } unless klass
+            klass = mod.constants.find { |const| const.to_s.downcase == 'oxidized' + file.downcase } unless klass
             klass = mod.const_get klass if klass
             break if klass
           end
@@ -31,16 +31,19 @@ module Oxidized
       @source = {}
       @hook = {}
     end
+
     def add_input method
       method = Manager.load Config::InputDir, method
       return false if method.empty?
       @input.merge! method
     end
+
     def add_output method
       method = Manager.load Config::OutputDir, method
       return false if method.empty?
       @output.merge! method
     end
+
     def add_model _model
       name = _model
       _model = Manager.load File.join(Config::Root, 'model'), name
@@ -48,12 +51,14 @@ module Oxidized
       return false if _model.empty?
       @model.merge! _model
     end
+
     def add_source _source
       return nil if @source.has_key? _source
       _source = Manager.load Config::SourceDir, _source
       return false if _source.empty?
       @source.merge! _source
     end
+
     def add_hook _hook
       return nil if @hook.has_key? _hook
       name = _hook
diff --git a/lib/oxidized/model/acos.rb b/lib/oxidized/model/acos.rb
index 47649a2..a2db89c 100644
--- a/lib/oxidized/model/acos.rb
+++ b/lib/oxidized/model/acos.rb
@@ -3,7 +3,7 @@ class ACOS < Oxidized::Model
 
   comment  '! '
 
-  ##ACOS prompt changes depending on the state of the device
+  # ACOS prompt changes depending on the state of the device
   prompt /^([-\w.\/:?\[\]\(\)]+[#>]\s?)$/
 
   cmd :secret do |cfg|
@@ -30,19 +30,19 @@ class ACOS < Oxidized::Model
   end
 
   cmd 'show partition-config all' do |cfg|
-     cfg.gsub! /(Current configuration).*/, '\\1 <removed>'
-     cfg.gsub! /(Configuration last updated at).*/, '\\1 <removed>'
-     cfg.gsub! /(Configuration last saved at).*/, '\\1 <removed>'
-     cfg.gsub! /(Configuration last synchronized at).*/, '\\1 <removed>'
-     cfg
-  end  
+    cfg.gsub! /(Current configuration).*/, '\\1 <removed>'
+    cfg.gsub! /(Configuration last updated at).*/, '\\1 <removed>'
+    cfg.gsub! /(Configuration last saved at).*/, '\\1 <removed>'
+    cfg.gsub! /(Configuration last synchronized at).*/, '\\1 <removed>'
+    cfg
+  end
 
   cmd 'show running-config all-partitions' do |cfg|
-     cfg.gsub! /(Current configuration).*/, '\\1 <removed>'
-     cfg.gsub! /(Configuration last updated at).*/, '\\1 <removed>'
-     cfg.gsub! /(Configuration last saved at).*/, '\\1 <removed>'
-     cfg.gsub! /(Configuration last synchronized at).*/, '\\1 <removed>'
-     cfg
+    cfg.gsub! /(Current configuration).*/, '\\1 <removed>'
+    cfg.gsub! /(Configuration last updated at).*/, '\\1 <removed>'
+    cfg.gsub! /(Configuration last saved at).*/, '\\1 <removed>'
+    cfg.gsub! /(Configuration last synchronized at).*/, '\\1 <removed>'
+    cfg
   end
 
   cmd 'show aflex all-partitions' do |cfg|
@@ -50,7 +50,7 @@ class ACOS < Oxidized::Model
   end
 
   cmd 'show aflex all-partitions' do |cfg|
-    @partitions_aflex = cfg.lines.each_with_object({}) do |l,h|
+    @partitions_aflex = cfg.lines.each_with_object({}) do |l, h|
       h[$1] = [] if l.match /partition: (.+)/
       # only consider scripts that have passed syntax check
       h[h.keys.last] << $1 if l.match /^([\w-]+) +Check/
@@ -66,7 +66,7 @@ class ACOS < Oxidized::Model
   pre do
     unless @partitions_aflex.empty?
       out = []
-      @partitions_aflex.each do |partition,arules|
+      @partitions_aflex.each do |partition, arules|
         out << "! partition: #{partition}"
         arules.each do |name|
           cmd("show aflex #{name} partition #{partition}") do |cfg|
@@ -85,7 +85,7 @@ class ACOS < Oxidized::Model
     username  /login:/
     password  /^Password:/
   end
-  
+
   cfg :telnet, :ssh do
     # preferred way to handle additional passwords
     post_login do
@@ -98,5 +98,4 @@ class ACOS < Oxidized::Model
     post_login 'terminal width 0'
     pre_logout "exit\nexit\nY\r\n"
   end
-
 end
diff --git a/lib/oxidized/model/acsw.rb b/lib/oxidized/model/acsw.rb
index 1aee2b6..c0857b3 100644
--- a/lib/oxidized/model/acsw.rb
+++ b/lib/oxidized/model/acsw.rb
@@ -1,5 +1,4 @@
 class ACSW < Oxidized::Model
-
   prompt /([\w.@()\/\\-]+[#>]\s?)/
   comment  '! '
 
@@ -25,16 +24,13 @@ class ACSW < Oxidized::Model
     cfg
   end
 
-
   cmd 'show version' do |cfg|
     comment cfg
   end
 
-
- cmd 'show inventory' do |cfg|
-   comment cfg
- end
-
+  cmd 'show inventory' do |cfg|
+    comment cfg
+  end
 
   cmd 'show running-config' do |cfg|
     cfg = cfg.each_line.to_a[3..-1]
@@ -63,5 +59,4 @@ class ACSW < Oxidized::Model
     post_login 'terminal length 0'
     pre_logout 'exit'
   end
-
 end
diff --git a/lib/oxidized/model/aen.rb b/lib/oxidized/model/aen.rb
index 6d87433..474e6d5 100644
--- a/lib/oxidized/model/aen.rb
+++ b/lib/oxidized/model/aen.rb
@@ -16,5 +16,4 @@ class AEN < Oxidized::Model
   cfg :ssh do
     pre_logout 'exit'
   end
-
-end
\ No newline at end of file
+end
diff --git a/lib/oxidized/model/aireos.rb b/lib/oxidized/model/aireos.rb
index ba13120..a0378c7 100644
--- a/lib/oxidized/model/aireos.rb
+++ b/lib/oxidized/model/aireos.rb
@@ -1,17 +1,16 @@
 class Aireos < Oxidized::Model
-
   # AireOS (at least I think that is what it's called, hard to find data)
   # Used in Cisco WLC 5500
 
-  comment  '# '     ## this complains too, can't find real comment char
+  comment '# ' # this complains too, can't find real comment char
   prompt /^\([^\)]+\)\s>/
 
   cmd :all do |cfg|
     cfg.each_line.to_a[1..-2].join
   end
 
-  ##show sysinfo?
-  ##show switchconfig?
+  # show sysinfo?
+  # show switchconfig?
 
   cmd 'show udi' do |cfg|
     cfg = comment clean cfg
@@ -51,5 +50,4 @@ class Aireos < Oxidized::Model
     out = out.join "\n"
     out << "\n"
   end
-
 end
diff --git a/lib/oxidized/model/alteonos.rb b/lib/oxidized/model/alteonos.rb
index 9eacf4e..dec4faf 100644
--- a/lib/oxidized/model/alteonos.rb
+++ b/lib/oxidized/model/alteonos.rb
@@ -1,5 +1,4 @@
 class ALTEONOS < Oxidized::Model
-
   prompt  /^\(?.+\)?\s?[#>]/
 
   comment '! '
@@ -11,19 +10,19 @@ class ALTEONOS < Oxidized::Model
     cfg
   end
 
-  ############################################################################################## 
-  ##                                 Added to remove                                           #
-  ##                                                                                           #
-  ##/* Configuration dump taken 14:10:20 Fri Jul 28, 2017 (DST)                                #
-  ##/* Configuration last applied at 16:17:05 Fri Jul 14, 2017                                 #
-  ##/* Configuration last save at 16:17:43 Fri Jul 14, 2017                                    #
-  ##/* Version 29.0.3.12, vXXXXXXXX,  Base MAC address XXXXXXXXXXX                             #
-  ##/* To restore SSL Offloading configuration and management HTTPS access,                    #
-  ##/* it is recommended to include the private keys in the dump.                              #
-  ##                                       OR                                                  #        
-  ##/* To restore SSL Offloading configuration and management HTTPS access,it is recommended   #
-  ##/* to include the private keys in the dump.                                                #
-  ##                                                                                           #
+  ##############################################################################################
+  #                                 Added to remove                                            #
+  #                                                                                            #
+  # /* Configuration dump taken 14:10:20 Fri Jul 28, 2017 (DST)                                #
+  # /* Configuration last applied at 16:17:05 Fri Jul 14, 2017                                 #
+  # /* Configuration last save at 16:17:43 Fri Jul 14, 2017                                    #
+  # /* Version 29.0.3.12, vXXXXXXXX,  Base MAC address XXXXXXXXXXX                             #
+  # /* To restore SSL Offloading configuration and management HTTPS access,                    #
+  # /* it is recommended to include the private keys in the dump.                              #
+  #                                       OR                                                   #
+  # /* To restore SSL Offloading configuration and management HTTPS access,it is recommended   #
+  # /* to include the private keys in the dump.                                                #
+  #                                                                                            #
   ##############################################################################################
 
   cmd 'cfg/dump' do |cfg|
@@ -35,19 +34,19 @@ class ALTEONOS < Oxidized::Model
     cfg
   end
 
-  #Answer for Dispay private keys
+  # Answer for Dispay private keys
   expect /^Display private keys\?\s?\[y\/n\]\: $/ do |data, re|
     send "n\r"
     data.sub re, ''
   end
 
-  #Answer for sync to peer on exit
+  # Answer for sync to peer on exit
   expect /^Confirm Sync to Peer\s?\[y\/n\]\: $/ do |data, re|
     send "n\r"
     data.sub re, ''
   end
 
-  #Answer for  Unsaved configuration 
+  # Answer for  Unsaved configuration
   expect /^(WARNING: There are unsaved configuration changes).*/ do |data, re|
     send "n\r"
     data.sub re, ''
@@ -56,5 +55,4 @@ class ALTEONOS < Oxidized::Model
   cfg :ssh do
     pre_logout 'exit'
   end
-
 end
diff --git a/lib/oxidized/model/alvarion.rb b/lib/oxidized/model/alvarion.rb
index 7a4dcc7..8831f49 100644
--- a/lib/oxidized/model/alvarion.rb
+++ b/lib/oxidized/model/alvarion.rb
@@ -1,5 +1,4 @@
 class Alvarion < Oxidized::Model
-
   # Used in Alvarion wisp equipment
 
   # Run this command as an instance of Model so we can access node
@@ -7,9 +6,6 @@ class Alvarion < Oxidized::Model
     cmd "#{node.auth[:password]}.cfg"
   end
 
-
   cfg :tftp do
-
   end
-
 end
diff --git a/lib/oxidized/model/aos.rb b/lib/oxidized/model/aos.rb
index ec73b92..fed78c8 100644
--- a/lib/oxidized/model/aos.rb
+++ b/lib/oxidized/model/aos.rb
@@ -1,8 +1,7 @@
 class AOS < Oxidized::Model
-
   # Alcatel-Lucent Operating System
   # used in OmniSwitch
- 
+
   comment  '! '
 
   cmd :all do |cfg|
@@ -10,7 +9,7 @@ class AOS < Oxidized::Model
   end
 
   cmd 'show system' do |cfg|
-    cfg = cfg.each_line.find{|line|line.match 'Description'}
+    cfg = cfg.each_line.find { |line| line.match 'Description' }
     comment cfg.to_s.strip
   end
 
@@ -34,5 +33,4 @@ class AOS < Oxidized::Model
   cfg :telnet, :ssh do
     pre_logout 'exit'
   end
-
 end
diff --git a/lib/oxidized/model/aos7.rb b/lib/oxidized/model/aos7.rb
index 8d11066..00bee54 100644
--- a/lib/oxidized/model/aos7.rb
+++ b/lib/oxidized/model/aos7.rb
@@ -1,8 +1,7 @@
 class AOS7 < Oxidized::Model
-
   # Alcatel-Lucent Operating System Version 7 (Linux based)
   # used in OmniSwitch 6900/10k
- 
+
   comment  '! '
 
   cmd :all do |cfg, cmdstring|
@@ -11,7 +10,7 @@ class AOS7 < Oxidized::Model
   end
 
   cmd 'show system' do |cfg|
-    cfg = cfg.each_line.find{|line|line.match 'Description'}
+    cfg = cfg.each_line.find { |line| line.match 'Description' }
     comment cfg.to_s.strip + "\n"
   end
 
diff --git a/lib/oxidized/model/aosw.rb b/lib/oxidized/model/aosw.rb
index 3397305..7543353 100644
--- a/lib/oxidized/model/aosw.rb
+++ b/lib/oxidized/model/aosw.rb
@@ -1,14 +1,13 @@
 class AOSW < Oxidized::Model
-
   # AOSW Aruba Wireless, IAP, Instant Controller and Mobility Access Switches
   # Used in Alcatel OAW-4750 WLAN controller
   # Also Dell controllers
-  
+
   # HPE Aruba Switches should use a different model as the software is based on the HP Procurve line.
-  
+
   # Support for IAP & Instant Controller tested with 115, 205, 215 & 325 running 6.4.4.8-4.2.4.5_57965
   # Support for Mobility Access Switches tested with S2500-48P & S2500-24P running 7.4.1.4_54199 and S2500-24P running 7.4.1.7_57823
-  # All IAPs connected to a Instant Controller will have the same config output. Only the controller needs to be monitored. 
+  # All IAPs connected to a Instant Controller will have the same config output. Only the controller needs to be monitored.
 
   comment  '# '
   prompt /^\(?.+\)?\s[#>]/
@@ -26,11 +25,11 @@ class AOSW < Oxidized::Model
     cfg.gsub!(/ sha (\S+)/, ' sha <secret removed>')
     cfg.gsub!(/ des (\S+)/, ' des <secret removed>')
     cfg.gsub!(/mobility-manager (\S+) user (\S+) (\S+)/, 'mobility-manager \1 user \2 <secret removed>')
-    cfg.gsub!(/mgmt-user (\S+) (root|guest\-provisioning|network\-operations|read\-only|location\-api\-mgmt) (\S+)$/, 'mgmt-user \1 \2 <secret removed>') #MAS & Wireless Controler 
-    cfg.gsub!(/mgmt-user (\S+) (\S+)( (read\-only|guest\-mgmt))?$/, 'mgmt-user \1 <secret removed> \3') #IAP 
-#MAS format: mgmt-user <username> <accesslevel> <password hash>
-#IAP format (root user): mgmt-user <username> <password hash>
-#IAP format: mgmt-user <username> <password hash> <access level>
+    cfg.gsub!(/mgmt-user (\S+) (root|guest\-provisioning|network\-operations|read\-only|location\-api\-mgmt) (\S+)$/, 'mgmt-user \1 \2 <secret removed>') # MAS & Wireless Controler
+    cfg.gsub!(/mgmt-user (\S+) (\S+)( (read\-only|guest\-mgmt))?$/, 'mgmt-user \1 <secret removed> \3') # IAP
+    # MAS format: mgmt-user <username> <accesslevel> <password hash>
+    # IAP format (root user): mgmt-user <username> <password hash>
+    # IAP format: mgmt-user <username> <password hash> <access level>
     cfg.gsub!(/key (\S+)$/, 'key <secret removed>')
     cfg.gsub!(/wpa-passphrase (\S+)$/, 'wpa-passphrase <secret removed>')
     cfg.gsub!(/bkup-passwords (\S+)$/, 'bkup-passwords <secret removed>')
@@ -45,17 +44,17 @@ class AOSW < Oxidized::Model
   end
 
   cmd 'show inventory' do |cfg|
-    cfg = "" if cfg.match /(Invalid input detected at '\^' marker|Parse error)/ #Don't show for unsupported devices (IAP and MAS)
+    cfg = "" if cfg.match /(Invalid input detected at '\^' marker|Parse error)/ # Don't show for unsupported devices (IAP and MAS)
     rstrip_cfg clean cfg
   end
 
   cmd 'show slots' do |cfg|
-    cfg = "" if cfg.match /(Invalid input detected at '\^' marker|Parse error)/ #Don't show for unsupported devices (IAP and MAS)
+    cfg = "" if cfg.match /(Invalid input detected at '\^' marker|Parse error)/ # Don't show for unsupported devices (IAP and MAS)
     rstrip_cfg comment cfg
   end
 
   cmd 'show license' do |cfg|
-    cfg = "" if cfg.match /(Invalid input detected at '\^' marker|Parse error)/ #Don't show for unsupported devices (IAP and MAS)
+    cfg = "" if cfg.match /(Invalid input detected at '\^' marker|Parse error)/ # Don't show for unsupported devices (IAP and MAS)
     rstrip_cfg comment cfg
   end
 
@@ -112,5 +111,4 @@ class AOSW < Oxidized::Model
     out = comment out.join "\n"
     out << "\n"
   end
-
 end
diff --git a/lib/oxidized/model/apc_aos.rb b/lib/oxidized/model/apc_aos.rb
index 530d436..5a4d232 100644
--- a/lib/oxidized/model/apc_aos.rb
+++ b/lib/oxidized/model/apc_aos.rb
@@ -1,11 +1,8 @@
 class Apc_aos < Oxidized::Model
-
   cmd 'config.ini' do |cfg|
     cfg.gsub! /^; Configuration file\, generated on.*/, ''
   end
 
   cfg :ftp do
   end
-
 end
-
diff --git a/lib/oxidized/model/arbos.rb b/lib/oxidized/model/arbos.rb
index 389f3f6..51b269d 100644
--- a/lib/oxidized/model/arbos.rb
+++ b/lib/oxidized/model/arbos.rb
@@ -1,9 +1,8 @@
-class ARBOS  < Oxidized::Model
-
+class ARBOS < Oxidized::Model
   # Arbor OS model #
 
   prompt /^[\S\s]+\n([\w.@-]+[:\/#>]+)\s?$/
-  comment  '# '
+  comment '# '
 
   cmd 'system hardware' do |cfg|
     cfg.gsub! /^Boot\ time\:\s.+/, '' # Remove boot timer
diff --git a/lib/oxidized/model/aricentiss.rb b/lib/oxidized/model/aricentiss.rb
index 14f8502..77b78f4 100644
--- a/lib/oxidized/model/aricentiss.rb
+++ b/lib/oxidized/model/aricentiss.rb
@@ -4,7 +4,6 @@
 # 0               SSE-G48-TG4   (P2-01)           1.0.16-9
 
 class AricentISS < Oxidized::Model
-
   prompt (/^(\e\[27m)?[ \r]*[\w-]+# ?$/)
 
   cfg :ssh do
@@ -49,5 +48,4 @@ class AricentISS < Oxidized::Model
       l
     }.join.gsub(/ +$/, '')
   end
-  
 end
diff --git a/lib/oxidized/model/asa.rb b/lib/oxidized/model/asa.rb
index bea0705..dfd94b1 100644
--- a/lib/oxidized/model/asa.rb
+++ b/lib/oxidized/model/asa.rb
@@ -1,5 +1,4 @@
 class ASA < Oxidized::Model
-
   # Cisco ASA model #
   # Only SSH supported for the sake of security
 
@@ -54,48 +53,47 @@ class ASA < Oxidized::Model
     post_login 'terminal pager 0'
     pre_logout 'exit'
   end
-  
+
   def single_context
-      # Single context mode
-      cmd 'more system:running-config' do |cfg|
-        cfg = cfg.each_line.to_a[3..-1].join
-        cfg.gsub! /^: [^\n]*\n/, ''
-        # backup any xml referenced in the configuration.
-        anyconnect_profiles = cfg.scan(Regexp.new('(\sdisk0:/.+\.xml)')).flatten
-        anyconnect_profiles.each do |profile|
-            cfg << (comment profile + "\n" )
-            cmd ("more" + profile) do |xml|
-              cfg << (comment xml)
-            end
+    # Single context mode
+    cmd 'more system:running-config' do |cfg|
+      cfg = cfg.each_line.to_a[3..-1].join
+      cfg.gsub! /^: [^\n]*\n/, ''
+      # backup any xml referenced in the configuration.
+      anyconnect_profiles = cfg.scan(Regexp.new('(\sdisk0:/.+\.xml)')).flatten
+      anyconnect_profiles.each do |profile|
+        cfg << (comment profile + "\n")
+        cmd ("more" + profile) do |xml|
+          cfg << (comment xml)
         end
-        # if DAP is enabled, also backup dap.xml
-        if cfg.rindex(/dynamic-access-policy-record\s(?!DfltAccessPolicy)/)
-            cfg << (comment "disk0:/dap.xml\n")
-            cmd "more disk0:/dap.xml" do |xml|
-              cfg << (comment xml)
-            end
+      end
+      # if DAP is enabled, also backup dap.xml
+      if cfg.rindex(/dynamic-access-policy-record\s(?!DfltAccessPolicy)/)
+        cfg << (comment "disk0:/dap.xml\n")
+        cmd "more disk0:/dap.xml" do |xml|
+          cfg << (comment xml)
         end
-        cfg
       end
+      cfg
+    end
   end
 
   def multiple_context
-      # Multiple context mode
-      cmd 'changeto system' do |cfg|
-        cmd 'show running-config' do |systemcfg|
-          allcfg = "\n\n" + systemcfg + "\n\n"
-          contexts = systemcfg.scan(/^context (\S+)$/)
-          files = systemcfg.scan(/config-url (\S+)$/)
-          contexts.each_with_index do |cont, i|
-            allcfg = allcfg + "\n\n----------========== [ CONTEXT " + cont.join(" ") + " FILE " + files[i].join(" ") + " ] ==========----------\n\n"
-            cmd "more " + files[i].join(" ") do |cfgcontext|
-              allcfg = allcfg + "\n\n" + cfgcontext
-            end
+    # Multiple context mode
+    cmd 'changeto system' do |cfg|
+      cmd 'show running-config' do |systemcfg|
+        allcfg = "\n\n" + systemcfg + "\n\n"
+        contexts = systemcfg.scan(/^context (\S+)$/)
+        files = systemcfg.scan(/config-url (\S+)$/)
+        contexts.each_with_index do |cont, i|
+          allcfg = allcfg + "\n\n----------========== [ CONTEXT " + cont.join(" ") + " FILE " + files[i].join(" ") + " ] ==========----------\n\n"
+          cmd "more " + files[i].join(" ") do |cfgcontext|
+            allcfg = allcfg + "\n\n" + cfgcontext
           end
-          cfg = allcfg
         end
-        cfg
+        cfg = allcfg
       end
+      cfg
+    end
   end
-
 end
diff --git a/lib/oxidized/model/asyncos.rb b/lib/oxidized/model/asyncos.rb
index ac19e34..2857ef8 100644
--- a/lib/oxidized/model/asyncos.rb
+++ b/lib/oxidized/model/asyncos.rb
@@ -1,28 +1,27 @@
 class AsyncOS < Oxidized::Model
-
   # ESA prompt "(mail.example.com)> "
   prompt /^\r*([(][\w. ]+[)][#>]\s+)$/
-  comment  '! '
-  
-  # Select passphrase display option 
-  expect /\[\S+\]>\s/ do |data, re|  
-    send "3\n"	
+  comment '! '
+
+  # Select passphrase display option
+  expect /\[\S+\]>\s/ do |data, re|
+    send "3\n"
     data.sub re, ''
   end
-  
+
   # handle paging
-  expect /-Press Any Key For More-+.*$/ do |data, re| 
+  expect /-Press Any Key For More-+.*$/ do |data, re|
     send " "
     data.sub re, ''
   end
-  
+
   cmd 'version' do |cfg|
     comment cfg
   end
 
   cmd 'showconfig' do |cfg|
-    #Delete hour and date which change each run
-    #cfg.gsub! /\sCurrent Time: \S+\s\S+\s+\S+\s\S+\s\S+/, ' Current Time:'
+    # Delete hour and date which change each run
+    # cfg.gsub! /\sCurrent Time: \S+\s\S+\s+\S+\s\S+\s\S+/, ' Current Time:'
     # Delete select passphrase display option
     cfg.gsub! /Choose the passphrase option:/, ''
     cfg.gsub! /1. Mask passphrases \(Files with masked passphrases cannot be loaded using/, ''
@@ -30,20 +29,18 @@ class AsyncOS < Oxidized::Model
     cfg.gsub! /2. Encrypt passphrases/, ''
     cfg.gsub! /3. Plain passphrases/, ''
     cfg.gsub! /^3$/, ''
-    #Delete space 
-    cfg.gsub! /\n\s{25,26}/, '' 
-    #Delete after line
-    cfg.gsub! /([-\\\/,.\w><@]+)(\s{25,27})/,"\\1" 
-    # Add a carriage return 
-    cfg.gsub! /([-\\\/,.\w><@]+)(\s{6})([-\\\/,.\w><@]+)/,"\\1\n\\2\\3" 
+    # Delete space
+    cfg.gsub! /\n\s{25,26}/, ''
+    # Delete after line
+    cfg.gsub! /([-\\\/,.\w><@]+)(\s{25,27})/, "\\1"
+    # Add a carriage return
+    cfg.gsub! /([-\\\/,.\w><@]+)(\s{6})([-\\\/,.\w><@]+)/, "\\1\n\\2\\3"
     # Delete prompt
-    cfg.gsub! /^\r*([(][\w. ]+[)][#>]\s+)$/, '' 
+    cfg.gsub! /^\r*([(][\w. ]+[)][#>]\s+)$/, ''
     cfg
-
   end
-  
+
   cfg :ssh do
     pre_logout "exit"
   end
-                              
 end
diff --git a/lib/oxidized/model/audiocodes.rb b/lib/oxidized/model/audiocodes.rb
index b7ee70e..2c77abb 100644
--- a/lib/oxidized/model/audiocodes.rb
+++ b/lib/oxidized/model/audiocodes.rb
@@ -1,20 +1,17 @@
 class AudioCodes < Oxidized::Model
-
-# Pull config from AudioCodes Mediant devices from version > 7.0
+  # Pull config from AudioCodes Mediant devices from version > 7.0
 
   prompt /^\r?([\w.@() -]+[#>]\s?)$/
-  comment  '## '
+  comment '## '
 
   expect /\s*--MORE--$/ do |data, re|
-
     send ' '
 
     data.sub re, ''
-
   end
 
   cmd 'show running-config' do |cfg|
-   cfg
+    cfg
   end
 
   cfg :ssh do
@@ -22,11 +19,10 @@ class AudioCodes < Oxidized::Model
     password /^.+password:\s$/
     pre_logout 'exit'
   end
-  
+
   cfg :telnet do
     username /^Username:\s$/
     password /^Password:\s$/
     pre_logout 'exit'
   end
-
 end
diff --git a/lib/oxidized/model/awplus.rb b/lib/oxidized/model/awplus.rb
index 1d8fbcd..7c88d60 100644
--- a/lib/oxidized/model/awplus.rb
+++ b/lib/oxidized/model/awplus.rb
@@ -1,27 +1,26 @@
 class AWPlus < Oxidized::Model
+  # Allied Telesis Alliedware Plus Model#
+  # https://www.alliedtelesis.com/products/software/AlliedWare-Plus
 
-  #Allied Telesis Alliedware Plus Model#
-  #https://www.alliedtelesis.com/products/software/AlliedWare-Plus
-  
   prompt /^(\r?[\w.@:\/-]+[#>]\s?)$/
-  comment  '! '
+  comment '! '
 
-  #Avoids needing "term length 0" to display full config file. 
-    expect /--More--/ do |data, re|
-      send ' '
-      data.sub re, ''
-    end
+  # Avoids needing "term length 0" to display full config file.
+  expect /--More--/ do |data, re|
+    send ' '
+    data.sub re, ''
+  end
 
-  #Removes gibberish pager output e.g. VT100 escape codes
+  # Removes gibberish pager output e.g. VT100 escape codes
   cmd :all do |cfg|
     cfg.gsub! /\e\[K/, ''         # example how to handle pager - cleareol EL0
     cfg.gsub! /\e\[7m\e\[m/, ''   # example how to handle pager - Reverse SGR7
-    cfg.gsub! /\r/, ''  # Filters rogue ^M - see issue #415
+    cfg.gsub! /\r/, '' # Filters rogue ^M - see issue #415
     cfg.each_line.to_a[1..-2].join
   end
 
-  #Remove passwords from config file.
-  #Add vars "remove_secret: true" to global oxidized config file to enable. 
+  # Remove passwords from config file.
+  # Add vars "remove_secret: true" to global oxidized config file to enable.
 
   cmd :secret do |cfg|
     cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
@@ -34,52 +33,52 @@ class AWPlus < Oxidized::Model
     cfg
   end
 
-  #Adds "Show system" output to start of config. 
+  # Adds "Show system" output to start of config.
 
   cmd 'Show System' do |cfg|
-    comment cfg.insert(0,"--------------------------------------------------------------------------------! \n")
-    #Unhash below to write a comment in the config file.
-    cfg.insert(0,"Starting: Show system cmd \n")
+    comment cfg.insert(0, "--------------------------------------------------------------------------------! \n")
+    # Unhash below to write a comment in the config file.
+    cfg.insert(0, "Starting: Show system cmd \n")
     cfg << "\n \nEnding: show system cmd"
     comment cfg << "\n--------------------------------------------------------------------------------! \n \n"
-    #Removes the following lines from "show system" in output file. This ensures oxidized diffs are meaningful. 
-    comment cfg.each_line.reject { |line| 
-                                    line.match /^$\n/ or #Remove blank lines in "sh sys"
-                                    line.match /System Status\s*.*/ or
-                                    line.match /RAM\s*:.*/ or 
-                                    line.match /Uptime\s*:.*/ or 
-                                    line.match /Flash\s*:.*/ or 
-                                    line.match /Current software\s*:.*/ or 
-                                    line.match /Software version\s*:.*/ or 
-                                    line.match /Build date\s*:.*/ }.join
+    # Removes the following lines from "show system" in output file. This ensures oxidized diffs are meaningful.
+    comment cfg.each_line.reject { |line|
+              line.match /^$\n/ or # Remove blank lines in "sh sys"
+                line.match /System Status\s*.*/ or
+                line.match /RAM\s*:.*/ or
+                line.match /Uptime\s*:.*/ or
+                line.match /Flash\s*:.*/ or
+                line.match /Current software\s*:.*/ or
+                line.match /Software version\s*:.*/ or
+                line.match /Build date\s*:.*/
+            } .join
   end
-     
-  #Actually get the devices running config#
+
+  # Actually get the devices running config#
   cmd 'show running-config' do |cfg|
     cfg
   end
-  
-  #Config required for telnet to detect username prompt
+
+  # Config required for telnet to detect username prompt
   cfg :telnet do
     username /login:\s/
-    end
+  end
 
-  #Main login config
-    cfg :telnet, :ssh do
+  # Main login config
+  cfg :telnet, :ssh do
     post_login do
       if vars :enable
         send "enable\n"
         expect /^Password:\s/
         cmd vars(:enable) + "\r\n"
       else
-        cmd 'enable' # Required for Priv-Exec users without enable PW to be put into "enable mode". 
+        cmd 'enable' # Required for Priv-Exec users without enable PW to be put into "enable mode".
       end
-#      cmd 'terminal length 0' #set so the entire config is output without intervention.
+      #      cmd 'terminal length 0' #set so the entire config is output without intervention.
     end
     pre_logout do
-#      cmd 'terminal no length' #Sets term length back to default on exit. 
-      send  "exit\r\n"
+      #      cmd 'terminal no length' #Sets term length back to default on exit.
+      send "exit\r\n"
     end
-  end  
-
+  end
 end
diff --git a/lib/oxidized/model/boss.rb b/lib/oxidized/model/boss.rb
index 02201a1..cf762ee 100644
--- a/lib/oxidized/model/boss.rb
+++ b/lib/oxidized/model/boss.rb
@@ -16,7 +16,7 @@ class Boss < Oxidized::Model
     data.sub re, ''
   end
 
-  # Handle the Failed retries since last login 
+  # Handle the Failed retries since last login
   # no known way to disable other than to implement radius authentication
   expect /Press ENTER to continue/ do |data, re|
     send "\n"
@@ -29,7 +29,7 @@ class Boss < Oxidized::Model
     send "c"
     data.sub re, ''
   end
- 
+
   # needed for proper formatting
   cmd('') { |cfg| comment "#{cfg}\n" }
 
@@ -43,7 +43,7 @@ class Boss < Oxidized::Model
     cfg.gsub! /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} .*/, ''
     comment "#{cfg}\n"
   end
-  
+
   # if a stack then collect the stacking information
   cmd 'show stack-info' do |cfg|
     if @stack
@@ -72,5 +72,4 @@ class Boss < Oxidized::Model
     post_login 'terminal length 0'
     post_login 'terminal width 132'
   end
-
 end
diff --git a/lib/oxidized/model/br6910.rb b/lib/oxidized/model/br6910.rb
index df93793..1e79da3 100644
--- a/lib/oxidized/model/br6910.rb
+++ b/lib/oxidized/model/br6910.rb
@@ -1,45 +1,43 @@
-
-class BR6910 < Oxidized::Model
-
-  prompt /^([\w.@()-]+[#>]\s?)$/
-  comment  '! '
-
-  # not possible to disable paging prior to show running-config
-  expect /^((.*)Others to exit ---(.*))$/ do |data, re|
-    send 'a'
-    data.sub re, ''
-  end
-
-  cmd :all do |cfg|
-    # sometimes br6910s inserts arbitrary whitespace after commands are
-    # issued on the CLI, from run to run.  this normalises the output.
-    cfg.each_line.to_a[1..-2].drop_while { |e| e.match /^\s+$/ }.join
-  end
-
-  cmd 'show version' do |cfg|
-    comment cfg
-  end
-
-  # show flash is not possible on a brocade 6910, do dir instead 
-  # to see flash contents (includes config file names)
-  cmd 'dir' do |cfg|
-    comment cfg
-  end
-
-  cmd 'show running-config' do |cfg|
-    arr = cfg.each_line.to_a
-    arr[2..-1].join unless arr.length < 2
-  end
-
-  cfg :telnet do
-    username /^Username:/
-    password /^Password:/
-  end
-
-  # post login and post logout 
-  cfg :telnet, :ssh do
-    post_login ''
-    pre_logout 'exit'
-  end
-
-end
+
+class BR6910 < Oxidized::Model
+  prompt /^([\w.@()-]+[#>]\s?)$/
+  comment '! '
+
+  # not possible to disable paging prior to show running-config
+  expect /^((.*)Others to exit ---(.*))$/ do |data, re|
+    send 'a'
+    data.sub re, ''
+  end
+
+  cmd :all do |cfg|
+    # sometimes br6910s inserts arbitrary whitespace after commands are
+    # issued on the CLI, from run to run.  this normalises the output.
+    cfg.each_line.to_a[1..-2].drop_while { |e| e.match /^\s+$/ }.join
+  end
+
+  cmd 'show version' do |cfg|
+    comment cfg
+  end
+
+  # show flash is not possible on a brocade 6910, do dir instead
+  # to see flash contents (includes config file names)
+  cmd 'dir' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show running-config' do |cfg|
+    arr = cfg.each_line.to_a
+    arr[2..-1].join unless arr.length < 2
+  end
+
+  cfg :telnet do
+    username /^Username:/
+    password /^Password:/
+  end
+
+  # post login and post logout
+  cfg :telnet, :ssh do
+    post_login ''
+    pre_logout 'exit'
+  end
+end
diff --git a/lib/oxidized/model/c4cmts.rb b/lib/oxidized/model/c4cmts.rb
index 150029c..8ea27c6 100644
--- a/lib/oxidized/model/c4cmts.rb
+++ b/lib/oxidized/model/c4cmts.rb
@@ -1,15 +1,14 @@
 class C4CMTS < Oxidized::Model
-
   # Arris C4 CMTS
 
   prompt /^([\w.@:\/-]+[#>]\s?)$/
   comment  '! '
 
   cmd :all do |cfg|
-    cfg.each_line.to_a[1..-2].map{|line|line.delete("\r").rstrip}.join("\n") + "\n"
+    cfg.each_line.to_a[1..-2].map { |line| line.delete("\r").rstrip }.join("\n") + "\n"
   end
 
-  cmd :secret do |cfg| 
+  cmd :secret do |cfg|
     cfg.gsub! /(.+)\s+encrypted-password\s+\w+\s+(.*)/, '\\1 <secret hidden> \\2'
     cfg.gsub! /(snmp-server community)\s+".*"\s+(.*)/, '\\1 <secret hidden> \\2'
     cfg.gsub! /(tacacs.*\s+key)\s+".*"\s+(.*)/, '\\1 <secret hidden> \\2'
@@ -25,7 +24,7 @@ class C4CMTS < Oxidized::Model
 
   cmd 'show version' do |cfg|
     # remove uptime readings at char 55 and beyond
-    cfg = cfg.each_line.map{|line|line.rstrip.slice(0..54)}.join("\n") + "\n"
+    cfg = cfg.each_line.map { |line| line.rstrip.slice(0..54) }.join("\n") + "\n"
     comment cfg
   end
 
@@ -48,5 +47,4 @@ class C4CMTS < Oxidized::Model
     end
     pre_logout 'exit'
   end
-
 end
diff --git a/lib/oxidized/model/catos.rb b/lib/oxidized/model/catos.rb
index bac9eec..e97a0b6 100644
--- a/lib/oxidized/model/catos.rb
+++ b/lib/oxidized/model/catos.rb
@@ -1,5 +1,4 @@
 class Catos < Oxidized::Model
-
   prompt /^[\w.@-]+>\s?(\(enable\) )?$/
   comment '# '
 
@@ -39,5 +38,4 @@ class Catos < Oxidized::Model
     end
     pre_logout 'exit'
   end
-
 end
diff --git a/lib/oxidized/model/cisconga.rb b/lib/oxidized/model/cisconga.rb
index 73fb51c..9764351 100644
--- a/lib/oxidized/model/cisconga.rb
+++ b/lib/oxidized/model/cisconga.rb
@@ -1,5 +1,4 @@
 class CiscoNGA < Oxidized::Model
-
   comment '# '
   prompt /([\w.@-]+[#>]\s?)$/
 
@@ -10,10 +9,9 @@ class CiscoNGA < Oxidized::Model
   cmd 'show configuration' do |cfg|
     cfg
   end
-  
+
   cfg :ssh do
     post_login 'terminal length 0'
     pre_logout 'exit'
   end
-
 end
diff --git a/lib/oxidized/model/ciscosma.rb b/lib/oxidized/model/ciscosma.rb
index 6777ad5..5a34f86 100644
--- a/lib/oxidized/model/ciscosma.rb
+++ b/lib/oxidized/model/ciscosma.rb
@@ -1,45 +1,42 @@
 class CiscoSMA < Oxidized::Model
-
   # SMA prompt "mail.example.com> "
   prompt /^\r*([-\w. ]+\.[-\w. ]+\.[-\w. ]+[#>]\s+)$/
-  comment  '! '
-  
-  # Select passphrase display option 
-  expect /using loadconfig command\. \[Y\]\>/ do |data, re|  
-    send "y\n"	
+  comment '! '
+
+  # Select passphrase display option
+  expect /using loadconfig command\. \[Y\]\>/ do |data, re|
+    send "y\n"
     data.sub re, ''
   end
-  
+
   # handle paging
-  expect /-Press Any Key For More-+.*$/ do |data, re| 
+  expect /-Press Any Key For More-+.*$/ do |data, re|
     send " "
     data.sub re, ''
   end
-  
+
   cmd 'version' do |cfg|
     comment cfg
   end
 
   cmd 'showconfig' do |cfg|
-    #Delete hour and date which change each run
-    #cfg.gsub! /\sCurrent Time: \S+\s\S+\s+\S+\s\S+\s\S+/, ' Current Time:'
+    # Delete hour and date which change each run
+    # cfg.gsub! /\sCurrent Time: \S+\s\S+\s+\S+\s\S+\s\S+/, ' Current Time:'
     # Delete select passphrase display option
     cfg.gsub! /Do you want to mask the password\? Files with masked passwords cannot be loaded/, ''
     cfg.gsub! /^\s+y/, ''
-    # Delete space 
-    cfg.gsub! /\n\s{25}/, '' 
+    # Delete space
+    cfg.gsub! /\n\s{25}/, ''
     # Delete after line
-    cfg.gsub! /([\/\-,.\w><@]+)(\s{27})/,"\\1" 
-    # Add a carriage return 
-    cfg.gsub! /([\/\-,.\w><@]+)(\s{6,8})([\/\-,.\w><@]+)/,"\\1\n\\2\\3" 
+    cfg.gsub! /([\/\-,.\w><@]+)(\s{27})/, "\\1"
+    # Add a carriage return
+    cfg.gsub! /([\/\-,.\w><@]+)(\s{6,8})([\/\-,.\w><@]+)/, "\\1\n\\2\\3"
     # Delete prompt
-    cfg.gsub! /^\r*([-\w. ]+\.[-\w. ]+\.[-\w. ]+[#>]\s+)$/, '' 
+    cfg.gsub! /^\r*([-\w. ]+\.[-\w. ]+\.[-\w. ]+[#>]\s+)$/, ''
     cfg
-
   end
-  
+
   cfg :ssh do
     pre_logout "exit"
   end
-                              
 end
diff --git a/lib/oxidized/model/ciscosmb.rb b/lib/oxidized/model/ciscosmb.rb
index deb4768..ef6f4e6 100644
--- a/lib/oxidized/model/ciscosmb.rb
+++ b/lib/oxidized/model/ciscosmb.rb
@@ -1,5 +1,4 @@
 class CiscoSMB < Oxidized::Model
-
   # Cisco Small Business 300, 500, and ESW2 series switches
   # http://www.cisco.com/c/en/us/support/switches/small-business-300-series-managed-switches/products-release-notes-list.html
 
@@ -24,11 +23,11 @@ class CiscoSMB < Oxidized::Model
   cmd 'show version' do |cfg|
     comment cfg
   end
-  
+
   cmd 'show system' do |cfg|
     comment cfg
   end
-  
+
   cmd 'show bootvar' do |cfg|
     comment cfg
   end
@@ -49,8 +48,7 @@ class CiscoSMB < Oxidized::Model
     post_login 'terminal datadump' # Disable pager
     post_login 'terminal width 0'
     post_login 'terminal len 0'
-    pre_logout 'exit' #exit returns to previous priv level, no way to quit from exec(#)
+    pre_logout 'exit' # exit returns to previous priv level, no way to quit from exec(#)
     pre_logout 'exit'
   end
-
 end
diff --git a/lib/oxidized/model/comware.rb b/lib/oxidized/model/comware.rb
index 0ba26d5..f20cd4d 100644
--- a/lib/oxidized/model/comware.rb
+++ b/lib/oxidized/model/comware.rb
@@ -1,23 +1,23 @@
 class Comware < Oxidized::Model
   # HP (A-series)/H3C/3Com Comware
-  
+
   # sometimes the prompt might have a leading nul or trailing ASCII Bell (^G)
   prompt /^\0*(<[\w.-]+>).?$/
   comment '# '
 
   # example how to handle pager
-  #expect /^\s*---- More ----$/ do |data, re|
+  # expect /^\s*---- More ----$/ do |data, re|
   #  send ' '
   #  data.sub re, ''
-  #end
+  # end
 
   cmd :all do |cfg|
-    #cfg.gsub! /^.*\e\[42D/, ''        # example how to handle pager
-    #skip rogue ^M
+    # cfg.gsub! /^.*\e\[42D/, ''        # example how to handle pager
+    # skip rogue ^M
     cfg = cfg.gsub /\r/, ''
     cfg.each_line.to_a[1..-2].join
   end
- 
+
   cmd :secret do |cfg|
     cfg.gsub! /^( snmp-agent community).*/, '\\1 <configuration removed>'
     cfg.gsub! /^( password hash).*/, '\\1 <configuration removed>'
diff --git a/lib/oxidized/model/coriant8600.rb b/lib/oxidized/model/coriant8600.rb
index a48ffa5..2e8bb76 100644
--- a/lib/oxidized/model/coriant8600.rb
+++ b/lib/oxidized/model/coriant8600.rb
@@ -1,7 +1,6 @@
 class Coriant8600 < Oxidized::Model
-
   comment '# '
-  
+
   prompt /^[^\s#>]+[#>]$/
 
   cmd 'show hw-inventory' do |cfg|
@@ -11,7 +10,7 @@ class Coriant8600 < Oxidized::Model
   cmd 'show flash' do |cfg|
     comment cfg
   end
-  
+
   cmd 'show run' do |cfg|
     cfg
   end
@@ -20,11 +19,10 @@ class Coriant8600 < Oxidized::Model
     username /^user name:$/
     password /^password:$/
   end
-  
+
   cfg :telnet, :ssh do
     pre_logout 'exit'
     post_login 'enable'
     post_login 'terminal more off'
   end
-
 end
diff --git a/lib/oxidized/model/coriantgroove.rb b/lib/oxidized/model/coriantgroove.rb
index 4fc44b7..9d81e82 100644
--- a/lib/oxidized/model/coriantgroove.rb
+++ b/lib/oxidized/model/coriantgroove.rb
@@ -1,11 +1,10 @@
 class CoriantGroove < Oxidized::Model
-
   comment '# '
-  
+
   prompt /^(\w+@.*>\s*)$/
 
   cmd :all do |cfg|
-    cfg.each_line.to_a[1..-3].map{|line|line.delete("\r").rstrip}.join("\n") + "\n"
+    cfg.each_line.to_a[1..-3].map { |line| line.delete("\r").rstrip }.join("\n") + "\n"
   end
 
   cmd 'show inventory' do |cfg|
@@ -17,7 +16,7 @@ class CoriantGroove < Oxidized::Model
     cfg = cfg.each_line.to_a[0..-2].join
     comment cfg
   end
-  
+
   cmd 'show config | display commands' do |cfg|
     cfg.each_line.to_a[1..-1].join
   end
@@ -26,5 +25,4 @@ class CoriantGroove < Oxidized::Model
     post_login 'set -f cli-config cli-columns 65535'
     pre_logout 'quit -f'
   end
-
 end
diff --git a/lib/oxidized/model/corianttmos.rb b/lib/oxidized/model/corianttmos.rb
index 76603f6..bc9618e 100644
--- a/lib/oxidized/model/corianttmos.rb
+++ b/lib/oxidized/model/corianttmos.rb
@@ -1,7 +1,6 @@
 class CoriantTmos < Oxidized::Model
-
   comment '# '
-  
+
   prompt /^[^\s#]+#\s$/
 
   cmd 'show node extensive' do |cfg|
@@ -21,5 +20,4 @@ class CoriantTmos < Oxidized::Model
     pre_logout 'exit'
     post_login 'enable config terminal length 0'
   end
-  
 end
diff --git a/lib/oxidized/model/cumulus.rb b/lib/oxidized/model/cumulus.rb
index 09f3955..334e1e4 100644
--- a/lib/oxidized/model/cumulus.rb
+++ b/lib/oxidized/model/cumulus.rb
@@ -1,85 +1,81 @@
 class Cumulus < Oxidized::Model
-  
   prompt /^((\w*)@(.*)):/
-  comment  '# '
-  
-  
-  #add a comment in the final conf
+  comment '# '
+
+  # add a comment in the final conf
   def add_comment comment
-    "\n###### #{comment} ######\n" 
+    "\n###### #{comment} ######\n"
   end
 
   cmd :all do |cfg|
     cfg.each_line.to_a[1..-2].join
   end
-  
-  #show the persistent configuration
+
+  # show the persistent configuration
   pre do
     cfg = add_comment 'THE HOSTNAME'
     cfg += cmd 'cat /etc/hostname'
-    
+
     cfg += add_comment 'THE HOSTS'
     cfg += cmd 'cat /etc/hosts'
-    
+
     cfg += add_comment 'THE INTERFACES'
     cfg += cmd 'grep -r "" /etc/network/interface* | cut -d "/" -f 4-'
-    
+
     cfg += add_comment 'RESOLV.CONF'
     cfg += cmd 'cat /etc/resolv.conf'
-    
+
     cfg += add_comment 'NTP.CONF'
     cfg += cmd 'cat /etc/ntp.conf'
-    
+
     cfg += add_comment 'IP Routes'
     cfg += cmd 'netstat -rn'
-    
+
     cfg += add_comment 'SNMP settings'
     cfg += cmd 'cat /etc/snmp/snmpd.conf'
-    
+
     cfg += add_comment 'QUAGGA DAEMONS'
     cfg += cmd 'cat /etc/quagga/daemons'
-    
+
     cfg += add_comment 'QUAGGA ZEBRA'
     cfg += cmd 'cat /etc/quagga/zebra.conf'
-    
+
     cfg += add_comment 'QUAGGA BGP'
     cfg += cmd 'cat /etc/quagga/bgpd.conf'
-    
+
     cfg += add_comment 'QUAGGA OSPF'
     cfg += cmd 'cat /etc/quagga/ospfd.conf'
-    
+
     cfg += add_comment 'QUAGGA OSPF6'
     cfg += cmd 'cat /etc/quagga/ospf6d.conf'
-    
+
     cfg += add_comment 'QUAGGA CONF'
     cfg += cmd 'cat /etc/quagga/Quagga.conf'
-    
+
     cfg += add_comment 'MOTD'
     cfg += cmd 'cat /etc/motd'
-    
+
     cfg += add_comment 'PASSWD'
     cfg += cmd 'cat /etc/passwd'
-    
+
     cfg += add_comment 'SWITCHD'
     cfg += cmd 'cat /etc/cumulus/switchd.conf'
-    
+
     cfg += add_comment 'PORTS'
     cfg += cmd 'cat /etc/cumulus/ports.conf'
-    
+
     cfg += add_comment 'TRAFFIC'
     cfg += cmd 'cat /etc/cumulus/datapath/traffic.conf'
-     
+
     cfg += add_comment 'ACL'
     cfg += cmd 'iptables -L -n'
-    
+
     cfg += add_comment 'VERSION'
     cfg += cmd 'cat /etc/cumulus/etc.replace/os-release'
-    
+
     cfg += add_comment 'License'
     cfg += cmd 'cl-license'
-    
   end
-  
 
   cfg :telnet do
     username /^Username:/
@@ -89,6 +85,4 @@ class Cumulus < Oxidized::Model
   cfg :telnet, :ssh do
     pre_logout 'exit'
   end
- 
-
 end
diff --git a/lib/oxidized/model/datacom.rb b/lib/oxidized/model/datacom.rb
index 5dbc080..5d5d220 100644
--- a/lib/oxidized/model/datacom.rb
+++ b/lib/oxidized/model/datacom.rb
@@ -1,5 +1,4 @@
 class DataCom < Oxidized::Model
-
   comment '! '
 
   expect /^--More--\s+$/ do |data, re|
@@ -34,5 +33,4 @@ class DataCom < Oxidized::Model
     password /^Password:\s$/
     pre_logout 'exit'
   end
-
 end
diff --git a/lib/oxidized/model/dcnos.rb b/lib/oxidized/model/dcnos.rb
index 8506280..59e6744 100644
--- a/lib/oxidized/model/dcnos.rb
+++ b/lib/oxidized/model/dcnos.rb
@@ -5,7 +5,6 @@
 # Developed against SNR S2950-24G 7.0.3.5
 
 class DCNOS < Oxidized::Model
-
   comment '! '
 
   cmd :all do |cfg|
@@ -44,5 +43,4 @@ class DCNOS < Oxidized::Model
     post_login 'terminal length 0'
     pre_logout 'exit'
   end
-
 end
diff --git a/lib/oxidized/model/dlink.rb b/lib/oxidized/model/dlink.rb
index 0d08793..6c604fb 100644
--- a/lib/oxidized/model/dlink.rb
+++ b/lib/oxidized/model/dlink.rb
@@ -11,7 +11,7 @@ class Dlink < Oxidized::Model
   end
 
   cmd :all do |cfg|
-    cfg.each_line.to_a[2..-2].map{|line|line.delete("\r").rstrip}.join("\n") + "\n"
+    cfg.each_line.to_a[2..-2].map { |line| line.delete("\r").rstrip }.join("\n") + "\n"
   end
 
   cmd 'show switch' do |cfg|
diff --git a/lib/oxidized/model/dnos.rb b/lib/oxidized/model/dnos.rb
index 5c3cd53..e14e1a8 100644
--- a/lib/oxidized/model/dnos.rb
+++ b/lib/oxidized/model/dnos.rb
@@ -1,5 +1,4 @@
-class DNOS  < Oxidized::Model
-
+class DNOS < Oxidized::Model
   # Force10 DNOS model #
 
   comment  '! '
@@ -9,7 +8,7 @@ class DNOS  < Oxidized::Model
     cfg.each_line.to_a[2..-2].join
   end
 
-  cmd :secret do |cfg| 
+  cmd :secret do |cfg|
     cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
     cfg.gsub! /secret (\d+) (\S+).*/, '<secret hidden>'
     cfg
@@ -51,7 +50,6 @@ class DNOS  < Oxidized::Model
     post_login 'terminal length 0'
     post_login 'terminal width 0'
     pre_logout 'exit'
-    pre_logout 'exit'    
+    pre_logout 'exit'
   end
-
 end
diff --git a/lib/oxidized/model/edgecos.rb b/lib/oxidized/model/edgecos.rb
index bc205f5..3668769 100644
--- a/lib/oxidized/model/edgecos.rb
+++ b/lib/oxidized/model/edgecos.rb
@@ -1,6 +1,5 @@
 class EdgeCOS < Oxidized::Model
-  
-  comment  '! '
+  comment '! '
 
   cmd :secret do |cfg|
     cfg.gsub!(/password \d+ (\S+).*/, '<secret removed>')
@@ -9,7 +8,7 @@ class EdgeCOS < Oxidized::Model
   end
 
   cmd :all do |cfg|
-     cfg.each_line.to_a[2..-2].join
+    cfg.each_line.to_a[2..-2].join
   end
 
   cmd 'show running-config'
@@ -43,5 +42,4 @@ class EdgeCOS < Oxidized::Model
     post_login 'terminal length 0'
     pre_logout 'exit'
   end
-
 end
diff --git a/lib/oxidized/model/edgeos.rb b/lib/oxidized/model/edgeos.rb
index aa7a197..a723904 100644
--- a/lib/oxidized/model/edgeos.rb
+++ b/lib/oxidized/model/edgeos.rb
@@ -1,5 +1,4 @@
 class Edgeos < Oxidized::Model
-
   # EdgeOS #
 
   prompt /\@.*?\:~\$\s/
@@ -27,5 +26,4 @@ class Edgeos < Oxidized::Model
   cfg :telnet, :ssh do
     pre_logout 'exit'
   end
-
 end
diff --git a/lib/oxidized/model/edgeswitch.rb b/lib/oxidized/model/edgeswitch.rb
index 7f5b1ea..36c0f9f 100644
--- a/lib/oxidized/model/edgeswitch.rb
+++ b/lib/oxidized/model/edgeswitch.rb
@@ -1,6 +1,5 @@
 class EdgeSwitch < Oxidized::Model
-
-# Ubiquiti EdgeSwitch #
+  # Ubiquiti EdgeSwitch #
 
   comment '!'
 
@@ -28,5 +27,4 @@ class EdgeSwitch < Oxidized::Model
     pre_logout 'quit'
     pre_logout 'n'
   end
-
 end
diff --git a/lib/oxidized/model/enterasys.rb b/lib/oxidized/model/enterasys.rb
index 708d380..40f676d 100644
--- a/lib/oxidized/model/enterasys.rb
+++ b/lib/oxidized/model/enterasys.rb
@@ -1,5 +1,4 @@
 class Enterasys < Oxidized::Model
-
   # Enterasys B3/C3 models #
 
   prompt /^.+\w\(su\)->\s?$/
@@ -7,7 +6,7 @@ class Enterasys < Oxidized::Model
   comment  '!'
 
   cmd :all do |cfg|
-     cfg.each_line.to_a[2..-3].map{|line|line.delete("\r").rstrip}.join("\n") + "\n"
+    cfg.each_line.to_a[2..-3].map { |line| line.delete("\r").rstrip }.join("\n") + "\n"
   end
 
   cmd 'show system hardware' do |cfg|
@@ -26,5 +25,4 @@ class Enterasys < Oxidized::Model
   cfg :ssh do
     pre_logout 'exit'
   end
-
 end
diff --git a/lib/oxidized/model/eos.rb b/lib/oxidized/model/eos.rb
index a9f3ff3..f29910c 100644
--- a/lib/oxidized/model/eos.rb
+++ b/lib/oxidized/model/eos.rb
@@ -1,5 +1,4 @@
 class EOS < Oxidized::Model
-
   # Arista EOS model #
 
   prompt /^.+[#>]\s?$/
@@ -7,15 +6,15 @@ class EOS < Oxidized::Model
   comment  '! '
 
   cmd :all do |cfg|
-     cfg.each_line.to_a[1..-2].join
+    cfg.each_line.to_a[1..-2].join
   end
 
   cmd :secret do |cfg|
-     cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
-     cfg.gsub! /username (\S+) privilege (\d+) (\S+).*/, '<secret hidden>'
-     cfg.gsub! /^(enable secret).*/, '\\1 <configuration removed>'
-     cfg.gsub! /^(tacacs-server key \d+).*/, '\\1 <configuration removed>'
-     cfg
+    cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
+    cfg.gsub! /username (\S+) privilege (\d+) (\S+).*/, '<secret hidden>'
+    cfg.gsub! /^(enable secret).*/, '\\1 <configuration removed>'
+    cfg.gsub! /^(tacacs-server key \d+).*/, '\\1 <configuration removed>'
+    cfg
   end
 
   cmd 'show inventory | no-more' do |cfg|
@@ -41,5 +40,4 @@ class EOS < Oxidized::Model
     end
     pre_logout 'exit'
   end
-
 end
diff --git a/lib/oxidized/model/fabricos.rb b/lib/oxidized/model/fabricos.rb
index e6d921e..b150c51 100644
--- a/lib/oxidized/model/fabricos.rb
+++ b/lib/oxidized/model/fabricos.rb
@@ -1,22 +1,20 @@
 class FabricOS < Oxidized::Model
-
   # Brocade Fabric OS model #
   ## FIXME: Only ssh exec mode support, no telnet, no ssh screenscraping
 
   prompt /^([\w]+:+[\w]+[>]\s)$/
-  comment  '# '
+  comment '# '
 
   cmd 'chassisShow' do |cfg|
     comment cfg.each_line.reject { |line| line.match /Time Awake:/ or line.match /Power Usage \(Watts\):/ or line.match /Time Alive:/ or line.match /Update:/ }.join
   end
 
   cmd 'configShow -all' do |cfg|
-    cfg = cfg.each_line.reject { |line| line.match /date = /}.join
+    cfg = cfg.each_line.reject { |line| line.match /date = / }.join
     cfg
   end
 
   cfg :ssh do
-    exec true  # don't run shell, run each command in exec channel
+    exec true # don't run shell, run each command in exec channel
   end
-
 end
diff --git a/lib/oxidized/model/firewareos.rb b/lib/oxidized/model/firewareos.rb
index 31770dc..bd0008d 100644
--- a/lib/oxidized/model/firewareos.rb
+++ b/lib/oxidized/model/firewareos.rb
@@ -1,5 +1,4 @@
 class FirewareOS < Oxidized::Model
-
   prompt /^\[?\w*\]?\w*?(<\w*>)?(#|>)\s*$/
   comment  '-- '
 
@@ -25,6 +24,4 @@ class FirewareOS < Oxidized::Model
   cfg :ssh do
     pre_logout 'exit'
   end
-
 end
-
diff --git a/lib/oxidized/model/fortios.rb b/lib/oxidized/model/fortios.rb
index 9287dce..bbbab89 100644
--- a/lib/oxidized/model/fortios.rb
+++ b/lib/oxidized/model/fortios.rb
@@ -1,6 +1,5 @@
 class FortiOS < Oxidized::Model
-
-  comment  '# '
+  comment '# '
 
   prompt /^([-\w\.\~]+(\s[\(\w\-\.\)]+)?\~?\s?[#>$]\s?)$/
 
@@ -16,9 +15,9 @@ class FortiOS < Oxidized::Model
 
   cmd :secret do |cfg|
     cfg.gsub! /(set (?:passwd|password|psksecret|secret|key|group-password|secondary-secret|tertiary-secret|auth-password-l1|auth-password-l2|rsso|history0|history1|inter-controller-key ENC|passphrase ENC|login-passwd ENC)).*/, '\\1 <configuration removed>'
-    cfg.gsub! /(set private-key).*-+END ENCRYPTED PRIVATE KEY-*"$/m , '\\1 <configuration removed>'
-    cfg.gsub! /(set ca ).*-+END CERTIFICATE-*"$/m , '\\1 <configuration removed>'
-    cfg.gsub! /(set csr ).*-+END CERTIFICATE REQUEST-*"$/m , '\\1 <configuration removed>'
+    cfg.gsub! /(set private-key).*-+END ENCRYPTED PRIVATE KEY-*"$/m, '\\1 <configuration removed>'
+    cfg.gsub! /(set ca ).*-+END CERTIFICATE-*"$/m, '\\1 <configuration removed>'
+    cfg.gsub! /(set csr ).*-+END CERTIFICATE REQUEST-*"$/m, '\\1 <configuration removed>'
     cfg.gsub! /(Virus-DB|Extended DB|IPS-DB|IPS-ETDB|APP-DB|INDUSTRIAL-DB|Botnet DB|IPS Malicious URL Database).*/, '\\1 <configuration removed>'
     cfg.gsub! /(Cluster uptime:).*/, '\\1 <configuration removed>'
     cfg
@@ -35,19 +34,19 @@ class FortiOS < Oxidized::Model
     cfg << cmd('config global') if @vdom_enabled
 
     cfg << cmd('get hardware status') do |cfg|
-       comment cfg
+      comment cfg
     end
 
-    #default behaviour: include autoupdate output (backwards compatibility)
-    #do not include if variable "show_autoupdate" is set to false
-    if  defined?(vars(:fortios_autoupdate)).nil? || vars(:fortios_autoupdate)
-       cfg << cmd('diagnose autoupdate version') do |cfg|
-          cfg.gsub! /(FDS Address\n---------\n).*/, '\\1IP Address removed'
-          comment cfg.each_line.reject { |line| line.match /Last Update|Result/ }.join
-       end
+    # default behaviour: include autoupdate output (backwards compatibility)
+    # do not include if variable "show_autoupdate" is set to false
+    if defined?(vars(:fortios_autoupdate)).nil? || vars(:fortios_autoupdate)
+      cfg << cmd('diagnose autoupdate version') do |cfg|
+        cfg.gsub! /(FDS Address\n---------\n).*/, '\\1IP Address removed'
+        comment cfg.each_line.reject { |line| line.match /Last Update|Result/ }.join
+      end
     end
 
-cfg << cmd('end') if @vdom_enabled
+    cfg << cmd('end') if @vdom_enabled
 
     cfg << cmd('show full-configuration | grep .')
     cfg.join "\n"
@@ -61,5 +60,4 @@ cfg << cmd('end') if @vdom_enabled
   cfg :telnet, :ssh do
     pre_logout "exit\n"
   end
-
 end
diff --git a/lib/oxidized/model/ftos.rb b/lib/oxidized/model/ftos.rb
index 1c3b8b4..3ef4de6 100644
--- a/lib/oxidized/model/ftos.rb
+++ b/lib/oxidized/model/ftos.rb
@@ -1,5 +1,4 @@
-class FTOS  < Oxidized::Model
-
+class FTOS < Oxidized::Model
   # Force10 FTOS model #
 
   comment  '! '
@@ -8,7 +7,7 @@ class FTOS  < Oxidized::Model
     cfg.each_line.to_a[2..-2].join
   end
 
-  cmd :secret do |cfg| 
+  cmd :secret do |cfg|
     cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
     cfg.gsub! /secret (\d+) (\S+).*/, '<secret hidden>'
     cfg
@@ -45,5 +44,4 @@ class FTOS  < Oxidized::Model
     end
     pre_logout 'exit'
   end
-
 end
diff --git a/lib/oxidized/model/fujitsupy.rb b/lib/oxidized/model/fujitsupy.rb
index 20a78dd..a2db909 100644
--- a/lib/oxidized/model/fujitsupy.rb
+++ b/lib/oxidized/model/fujitsupy.rb
@@ -1,5 +1,4 @@
 class FujitsuPY < Oxidized::Model
-
   prompt /^(\([\w.-]*\)\s#|^\S+\#\s)$/
   comment  '! '
 
@@ -7,13 +6,13 @@ class FujitsuPY < Oxidized::Model
     cfg.each_line.to_a[1..-2].join
   end
 
-# 1Gbe switch
+  # 1Gbe switch
   cmd 'show version' do |cfg|
     cfg.gsub! /^(<ERROR> : 2 : format error)$/, ''
     comment cfg
   end
 
-# 10Gbe switch
+  # 10Gbe switch
   cmd 'show system information' do |cfg|
     cfg.gsub! /^Current-time : [\w\s:]*$/, ''
     cfg.gsub! /^(\s{33}\^)$/, ''
@@ -38,5 +37,4 @@ class FujitsuPY < Oxidized::Model
       send "n\n"
     end
   end
-
 end
diff --git a/lib/oxidized/model/gaiaos.rb b/lib/oxidized/model/gaiaos.rb
index 434e774..8f13bcb 100644
--- a/lib/oxidized/model/gaiaos.rb
+++ b/lib/oxidized/model/gaiaos.rb
@@ -1,25 +1,23 @@
 class GaiaOS < Oxidized::Model
-
   # CheckPoint - Gaia OS Model
-  
+
   # Gaia Prompt
   prompt /^([\[\]\w.@:-]+[#>]\s?)$/
 
   # Comment tag
   comment  '# '
 
-
   cmd :all do |cfg|
     cfg = cfg.each_line.to_a[1..-2].join
   end
 
   cmd :secret do |cfg|
     cfg.gsub! /^(set expert-password-hash ).*/, '\1<EXPERT PASSWORD REMOVED>'
-    cfg.gsub! /^(set user \S+ password-hash ).*/,'\1<USER PASSWORD REMOVED>'
-    cfg.gsub! /^(set ospf .* secret ).*/,'\1<OSPF KEY REMOVED>'
-    cfg.gsub! /^(set snmp community )(.*)( read-only.*)/,'\1<SNMP COMMUNITY REMOVED>\3'
-    cfg.gsub! /^(add snmp .* community )(.*)(\S?.*)/,'\1<SNMP COMMUNITY REMOVED>\3'
-    cfg.gsub! /(auth|privacy)(-pass-phrase-hashed )(\S*)/,'\1-pass-phrase-hashed <SNMP PASS-PHRASE REMOVED>'
+    cfg.gsub! /^(set user \S+ password-hash ).*/, '\1<USER PASSWORD REMOVED>'
+    cfg.gsub! /^(set ospf .* secret ).*/, '\1<OSPF KEY REMOVED>'
+    cfg.gsub! /^(set snmp community )(.*)( read-only.*)/, '\1<SNMP COMMUNITY REMOVED>\3'
+    cfg.gsub! /^(add snmp .* community )(.*)(\S?.*)/, '\1<SNMP COMMUNITY REMOVED>\3'
+    cfg.gsub! /(auth|privacy)(-pass-phrase-hashed )(\S*)/, '\1-pass-phrase-hashed <SNMP PASS-PHRASE REMOVED>'
     cfg
   end
 
@@ -36,11 +34,9 @@ class GaiaOS < Oxidized::Model
     cfg
   end
 
-
   cfg :ssh do
     # User shell must be /etc/cli.sh
     post_login 'set clienv rows 0'
     pre_logout 'exit'
   end
-
 end
diff --git a/lib/oxidized/model/gcombnps.rb b/lib/oxidized/model/gcombnps.rb
index 4a97162..e92c7ba 100644
--- a/lib/oxidized/model/gcombnps.rb
+++ b/lib/oxidized/model/gcombnps.rb
@@ -6,18 +6,18 @@ class GcomBNPS < Oxidized::Model
   #  - S5330 (aka Fiberstore S3800)
 
   prompt /^\r?([\w.@()-]+?(\(1-16 chars\))?[#>:]\s?)$/ # also match SSH password promt (post_login commands are sent after the first prompt)
-  comment  '! '
+  comment '! '
 
-# alternative to handle the SSH login, but this breaks telnet
-#  expect /^Password\(1-16 chars\):/ do |data|
-#      send @node.auth[:password] + "\n"
-#      ''
-#  end
+  # alternative to handle the SSH login, but this breaks telnet
+  #  expect /^Password\(1-16 chars\):/ do |data|
+  #      send @node.auth[:password] + "\n"
+  #      ''
+  #  end
 
   # handle pager (can't be disabled?)
   expect /^\.\.\.\.press ENTER to next line, CTRL_C to quit, other key to next page\.\.\.\.$/ do |data, re|
-   send ' '
-   data.sub re, ''
+    send ' '
+    data.sub re, ''
   end
 
   cmd :all do |cfg|
@@ -48,7 +48,6 @@ class GcomBNPS < Oxidized::Model
     comment out.join
   end
 
-
   cmd 'show version' do |cfg|
     comment cfg
   end
@@ -80,6 +79,4 @@ class GcomBNPS < Oxidized::Model
   cfg :telnet, :ssh do
     pre_logout 'exit'
   end
-
 end
-
diff --git a/lib/oxidized/model/hatteras.rb b/lib/oxidized/model/hatteras.rb
index 4192cbc..7341cc4 100644
--- a/lib/oxidized/model/hatteras.rb
+++ b/lib/oxidized/model/hatteras.rb
@@ -9,7 +9,6 @@ class Hatteras < Oxidized::Model
     data.sub re, ''
   end
 
-
   cmd :secret do |cfg|
     cfg.gsub! /^(community) \S+/, '\\1 "<configuration removed>"'
     cfg.gsub! /^(communityString) "\S+"/, '\\1 "<configuration removed>"'
@@ -22,14 +21,18 @@ class Hatteras < Oxidized::Model
   end
 
   cmd "show switch\r" do |cfg|
-    cfg = cfg.each_line.reject { |line| line.match /Switch uptime|Switch temperature|Last reset reason/ or
-                                          line.match /TermCpuUtil|^\s+\^$|ERROR: Bad command/ }.join
+    cfg = cfg.each_line.reject { |line|
+      line.match /Switch uptime|Switch temperature|Last reset reason/ or
+        line.match /TermCpuUtil|^\s+\^$|ERROR: Bad command/
+    } .join
     comment cfg
   end
 
   cmd "show card\r" do |cfg|
-    cfg = cfg.each_line.reject { |line| line.match /Card uptime|Card temperature|Last reset reason/ or
-                                          line.match /TermCpuUtil|^\s+\^$|ERROR: Bad command/ }.join
+    cfg = cfg.each_line.reject { |line|
+      line.match /Card uptime|Card temperature|Last reset reason/ or
+        line.match /TermCpuUtil|^\s+\^$|ERROR: Bad command/
+    } .join
     comment cfg
   end
 
diff --git a/lib/oxidized/model/hirschmann.rb b/lib/oxidized/model/hirschmann.rb
index 82432d7..858b198 100644
--- a/lib/oxidized/model/hirschmann.rb
+++ b/lib/oxidized/model/hirschmann.rb
@@ -1,10 +1,9 @@
 class Hirschmann < Oxidized::Model
+  prompt /^[\(\w\s\w\)]+\s[>|#]+?$/
 
-  prompt /^[\(\w\s\w\)]+\s[>|#]+?$/ 
- 
   comment '## '
- 
-  #Handle pager
+
+  # Handle pager
   expect /^--More--.*$/ do |data, re|
     send 'a'
     data.sub re, ''
@@ -22,11 +21,11 @@ class Hirschmann < Oxidized::Model
     cfg.gsub! /^Average CPU Utilization.*\n/, ""
     comment cfg
   end
- 
+
   cmd 'show running-config' do |cfg|
-    cfg.gsub! /^users.*\n/, "" 
+    cfg.gsub! /^users.*\n/, ""
     cfg
-  end    
+  end
 
   cfg :telnet do
     username /^User:/
@@ -34,8 +33,7 @@ class Hirschmann < Oxidized::Model
   end
 
   cfg :telnet, :ssh do
-   post_login 'enable'
-   pre_logout 'logout'
+    post_login 'enable'
+    pre_logout 'logout'
   end
-
 end
diff --git a/lib/oxidized/model/hpebladesystem.rb b/lib/oxidized/model/hpebladesystem.rb
index 27673de..75d2dbf 100644
--- a/lib/oxidized/model/hpebladesystem.rb
+++ b/lib/oxidized/model/hpebladesystem.rb
@@ -4,13 +4,13 @@ class HPEBladeSystem < Oxidized::Model
   prompt /.*> /
   comment '# '
 
-  #expect /^\s*--More--\s+.*$/ do |data, re|
+  # expect /^\s*--More--\s+.*$/ do |data, re|
   #   send ' '
   #   data.sub re, ''
-  #end
+  # end
 
   cmd :all do |cfg|
-    cfg = cfg.delete("\r").each_line.to_a[0..-1].map{|line|line.rstrip}.join("\n") + "\n"
+    cfg = cfg.delete("\r").each_line.to_a[0..-1].map { |line| line.rstrip }.join("\n") + "\n"
     cfg.each_line.to_a[0..-2].join
   end
 
@@ -22,7 +22,7 @@ class HPEBladeSystem < Oxidized::Model
   cmd 'show oa info' do |cfg|
     comment cfg
   end
-  
+
   cmd 'show oa network' do |cfg|
     comment cfg
   end
@@ -30,15 +30,15 @@ class HPEBladeSystem < Oxidized::Model
   cmd 'show oa certificate' do |cfg|
     comment cfg
   end
-  
+
   cmd 'show sshfingerprint' do |cfg|
     comment cfg
   end
-  
+
   cmd 'show fru' do |cfg|
     comment cfg
   end
-  
+
   cmd 'show network' do |cfg|
     cfg.gsub! /Last Update:.*$/i, ''
     comment cfg
@@ -55,15 +55,15 @@ class HPEBladeSystem < Oxidized::Model
   cmd 'show server list' do |cfg|
     comment cfg
   end
-  
+
   cmd 'show server names' do |cfg|
     comment cfg
   end
-  
+
   cmd 'show server port map all' do |cfg|
     comment cfg
   end
-  
+
   cmd 'show server info all' do |cfg|
     comment cfg
   end
@@ -72,14 +72,14 @@ class HPEBladeSystem < Oxidized::Model
     cfg.gsub! /^#(Generated on:) .*$/, '\\1 <removed>'
     cfg.gsub /^\s+/, ''
   end
-  
+
   cfg :telnet do
     username /\slogin:/
     password /^Password: /
   end
- 
-   cfg :telnet, :ssh do
-     post_login "set script mode on"
-     pre_logout "exit"
-   end
+
+  cfg :telnet, :ssh do
+    post_login "set script mode on"
+    pre_logout "exit"
+  end
 end
diff --git a/lib/oxidized/model/hpemsa.rb b/lib/oxidized/model/hpemsa.rb
index 4fe636f..68485a1 100644
--- a/lib/oxidized/model/hpemsa.rb
+++ b/lib/oxidized/model/hpemsa.rb
@@ -1,5 +1,4 @@
 class HpeMsa < Oxidized::Model
-
   prompt /^#\s?$/
 
   cmd 'show configuration'
@@ -8,6 +7,4 @@ class HpeMsa < Oxidized::Model
     post_login 'set cli-parameters pager disabled'
     pre_logout 'exit'
   end
-
 end
-
diff --git a/lib/oxidized/model/ios.rb b/lib/oxidized/model/ios.rb
index 4e7d223..8069f83 100644
--- a/lib/oxidized/model/ios.rb
+++ b/lib/oxidized/model/ios.rb
@@ -1,24 +1,23 @@
 class IOS < Oxidized::Model
-
   prompt /^([\w.@()-]+[#>]\s?)$/
   comment  '! '
 
   # example how to handle pager
-  #expect /^\s--More--\s+.*$/ do |data, re|
+  # expect /^\s--More--\s+.*$/ do |data, re|
   #  send ' '
   #  data.sub re, ''
-  #end
+  # end
 
   # non-preferred way to handle additional PW prompt
-  #expect /^[\w.]+>$/ do |data|
+  # expect /^[\w.]+>$/ do |data|
   #  send "enable\n"
   #  send vars(:enable) + "\n"
   #  data
-  #end
+  # end
 
   cmd :all do |cfg|
-    #cfg.gsub! /\cH+\s{8}/, ''         # example how to handle pager
-    #cfg.gsub! /\cH+/, ''              # example how to handle pager
+    # cfg.gsub! /\cH+\s{8}/, ''         # example how to handle pager
+    # cfg.gsub! /\cH+/, ''              # example how to handle pager
     # get rid of errors for commands that don't work on some devices
     cfg.gsub! /^% Invalid input detected at '\^' marker\.$|^\s+\^$/, ''
     cfg.each_line.to_a[1..-2].join
@@ -43,64 +42,64 @@ class IOS < Oxidized::Model
     comments = []
     comments << cfg.lines.first
     lines = cfg.lines
-    lines.each_with_index do |line,i|
-        slave = ''
-        slaveslot = ''
+    lines.each_with_index do |line, i|
+      slave = ''
+      slaveslot = ''
 
-        if line.match /^Slave in slot (\d+) is running/
-            slave = " Slave:";
-            slaveslot = ", slot #{$1}";
-        end
+      if line.match /^Slave in slot (\d+) is running/
+        slave = " Slave:";
+        slaveslot = ", slot #{$1}";
+      end
 
-        if line.match /^Compiled (.*)$/
-            comments << "Image:#{slave} Compiled: #{$1}"
-        end
+      if line.match /^Compiled (.*)$/
+        comments << "Image:#{slave} Compiled: #{$1}"
+      end
 
-        if line.match /^(?:Cisco )?IOS .* Software,? \(([A-Za-z0-9_-]*)\), .*Version\s+(.*)$/
-            comments << "Image:#{slave} Software: #{$1}, #{$2}"
-        end
+      if line.match /^(?:Cisco )?IOS .* Software,? \(([A-Za-z0-9_-]*)\), .*Version\s+(.*)$/
+        comments << "Image:#{slave} Software: #{$1}, #{$2}"
+      end
 
-        if line.match /^ROM: (IOS \S+ )?(System )?Bootstrap.*(Version.*)$/
-            comments << "ROM Bootstrap: #{$3}"
-        end
+      if line.match /^ROM: (IOS \S+ )?(System )?Bootstrap.*(Version.*)$/
+        comments << "ROM Bootstrap: #{$3}"
+      end
 
-        if line.match /^BOOTFLASH: .*(Version.*)$/
-            comments << "BOOTFLASH: #{$1}"
-        end
+      if line.match /^BOOTFLASH: .*(Version.*)$/
+        comments << "BOOTFLASH: #{$1}"
+      end
 
-        if line.match /^(\d+[kK]) bytes of (non-volatile|NVRAM)/
-            comments << "Memory: nvram #{$1}"
-        end
+      if line.match /^(\d+[kK]) bytes of (non-volatile|NVRAM)/
+        comments << "Memory: nvram #{$1}"
+      end
 
-        if line.match /^(\d+[kK]) bytes of (flash memory|flash internal|processor board System flash|ATA CompactFlash)/i
-            comments << "Memory: flash #{$1}"
-        end
+      if line.match /^(\d+[kK]) bytes of (flash memory|flash internal|processor board System flash|ATA CompactFlash)/i
+        comments << "Memory: flash #{$1}"
+      end
 
-        if line.match (/^(\d+[kK]) bytes of (Flash|ATA)?.*PCMCIA .*(slot|disk) ?(\d)/i)
-            comments << "Memory: pcmcia #{$2} #{$3}#{$4} #{$1}";
-        end
+      if line.match (/^(\d+[kK]) bytes of (Flash|ATA)?.*PCMCIA .*(slot|disk) ?(\d)/i)
+        comments << "Memory: pcmcia #{$2} #{$3}#{$4} #{$1}";
+      end
 
-        if line.match /(\S+(?:\sseries)?)\s+(?:\((\S+)\)\s+processor|\(revision[^)]+\)).*\s+with (\S+k) bytes/i
-            sproc = $1
-            cpu = $2
-            mem = $3
-            cpuxtra = ''
-            comments << "Chassis type:#{slave} #{sproc}";
-            comments << "Memory:#{slave} main #{mem}";
-            # check the next two lines for more CPU info
-            if cfg.lines[i+1].match /processor board id (\S+)/i
-                comments << "Processor ID: #{$1}";
-            end
-            if cfg.lines[i+2].match /(cpu at |processor: |#{cpu} processor,)/i
-                # change implementation to impl and prepend comma
-                cpuxtra = cfg.lines[i+2].gsub(/implementation/,'impl').gsub(/^/,', ').chomp;
-            end
-            comments << "CPU:#{slave} #{cpu}#{cpuxtra}#{slaveslot}";
+      if line.match /(\S+(?:\sseries)?)\s+(?:\((\S+)\)\s+processor|\(revision[^)]+\)).*\s+with (\S+k) bytes/i
+        sproc = $1
+        cpu = $2
+        mem = $3
+        cpuxtra = ''
+        comments << "Chassis type:#{slave} #{sproc}";
+        comments << "Memory:#{slave} main #{mem}";
+        # check the next two lines for more CPU info
+        if cfg.lines[i + 1].match /processor board id (\S+)/i
+          comments << "Processor ID: #{$1}";
         end
-
-        if line.match /^System image file is "([^\"]*)"$/
-            comments << "Image: #{$1}"
+        if cfg.lines[i + 2].match /(cpu at |processor: |#{cpu} processor,)/i
+          # change implementation to impl and prepend comma
+          cpuxtra = cfg.lines[i + 2].gsub(/implementation/, 'impl').gsub(/^/, ', ').chomp;
         end
+        comments << "CPU:#{slave} #{cpu}#{cpuxtra}#{slaveslot}";
+      end
+
+      if line.match /^System image file is "([^\"]*)"$/
+        comments << "Image: #{$1}"
+      end
     end
     comments << "\n"
     comment comments.join "\n"
@@ -143,5 +142,4 @@ class IOS < Oxidized::Model
     post_login 'terminal width 0'
     pre_logout 'exit'
   end
-
 end
diff --git a/lib/oxidized/model/iosxr.rb b/lib/oxidized/model/iosxr.rb
index ac2f798..1635e57 100644
--- a/lib/oxidized/model/iosxr.rb
+++ b/lib/oxidized/model/iosxr.rb
@@ -1,5 +1,4 @@
 class IOSXR < Oxidized::Model
-
   # IOS XR model #
 
   prompt /^(\r?[\w.@:\/-]+[#>]\s?)$/
@@ -9,7 +8,7 @@ class IOSXR < Oxidized::Model
     cfg.each_line.to_a[2..-2].join
   end
 
-  cmd :secret do |cfg| 
+  cmd :secret do |cfg|
     cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
     cfg.gsub! /secret (\d+) (\S+).*/, '<secret hidden>'
     cfg
@@ -45,5 +44,4 @@ class IOSXR < Oxidized::Model
     end
     pre_logout 'exit'
   end
-
 end
diff --git a/lib/oxidized/model/ipos.rb b/lib/oxidized/model/ipos.rb
index 938f12d..753c6b1 100644
--- a/lib/oxidized/model/ipos.rb
+++ b/lib/oxidized/model/ipos.rb
@@ -1,5 +1,4 @@
 class IPOS < Oxidized::Model
-
   # Ericsson SSR (IPOS)
   # Redback SE (SEOS)
 
@@ -54,7 +53,7 @@ class IPOS < Oxidized::Model
     post_login 'terminal length 0'
     if vars :enable
       post_login do
-        cmd "enable" 
+        cmd "enable"
         cmd vars(:enable)
       end
     end
@@ -63,5 +62,4 @@ class IPOS < Oxidized::Model
       send "n\n"
     end
   end
-
 end
diff --git a/lib/oxidized/model/ironware.rb b/lib/oxidized/model/ironware.rb
index 386d585..32dbf47 100644
--- a/lib/oxidized/model/ironware.rb
+++ b/lib/oxidized/model/ironware.rb
@@ -1,19 +1,17 @@
 class IronWare < Oxidized::Model
-
   prompt /^.*(telnet|ssh)\@.+[>#]\s?$/i
   comment  '! '
 
-  #to handle pager without enable
-  #expect /^((.*)--More--(.*))$/ do |data, re|
+  # to handle pager without enable
+  # expect /^((.*)--More--(.*))$/ do |data, re|
   #  send ' '
   #  data.sub re, ''
-  #end
-
+  # end
 
-  #to remove backspace (if handle pager without enable)
-  #expect /^((.*)[\b](.*))$/ do |data, re|
+  # to remove backspace (if handle pager without enable)
+  # expect /^((.*)[\b](.*))$/ do |data, re|
   #  data.sub re, ''
-  #end
+  # end
 
   cmd :all do |cfg|
     # sometimes ironware inserts arbitrary whitespace after commands are
@@ -22,17 +20,17 @@ class IronWare < Oxidized::Model
   end
 
   cmd 'show version' do |cfg|
-    cfg.gsub! /(^((.*)[Ss]ystem uptime(.*))$)/, '' #remove unwanted line system uptime
+    cfg.gsub! /(^((.*)[Ss]ystem uptime(.*))$)/, '' # remove unwanted line system uptime
     cfg.gsub! /(^((.*)[Tt]he system started at(.*))$)/, ''
-    cfg.gsub! /[Uu]p\s?[Tt]ime is .*/,''
+    cfg.gsub! /[Uu]p\s?[Tt]ime is .*/, ''
 
     comment cfg
   end
 
   cmd 'show chassis' do |cfg|
-    cfg.encode!("UTF-8", :invalid => :replace, :undef => :replace) #sometimes ironware returns broken encoding
-    cfg.gsub! /(^((.*)Current temp(.*))$)/, '' #remove unwanted lines current temperature
-    cfg.gsub! /Speed = [A-Z-]{2,6} \(\d{2,3}\%\)/, '' #remove unwanted lines Speed Fans
+    cfg.encode!("UTF-8", :invalid => :replace, :undef => :replace) # sometimes ironware returns broken encoding
+    cfg.gsub! /(^((.*)Current temp(.*))$)/, '' # remove unwanted lines current temperature
+    cfg.gsub! /Speed = [A-Z-]{2,6} \(\d{2,3}\%\)/, '' # remove unwanted lines Speed Fans
     cfg.gsub! /current speed is [A-Z]{2,6} \(\d{2,3}\%\)/, ''
     cfg.gsub! /Fan \d* - STATUS: OK \D*\d*./, '' # Fix for ADX Fan speed reporting
     cfg.gsub! /\d* deg C/, '' # Fix for ADX temperature reporting
@@ -73,7 +71,7 @@ class IronWare < Oxidized::Model
     password /^(Please Enter Password ?|Password):/
   end
 
-  #handle pager with enable
+  # handle pager with enable
   cfg :telnet, :ssh do
     if vars :enable
       post_login do
@@ -86,5 +84,4 @@ class IronWare < Oxidized::Model
     post_login 'terminal length 0'
     pre_logout "logout\nexit\nexit\n"
   end
-
 end
diff --git a/lib/oxidized/model/isam.rb b/lib/oxidized/model/isam.rb
index 1709500..8b8b5d5 100644
--- a/lib/oxidized/model/isam.rb
+++ b/lib/oxidized/model/isam.rb
@@ -1,6 +1,6 @@
 class ISAM < Oxidized::Model
-  #Alcatel ISAM 7302/7330 FTTN
-  
+  # Alcatel ISAM 7302/7330 FTTN
+
   prompt /^([\w.:@-]+>#\s)$/
   comment '# '
 
@@ -8,7 +8,7 @@ class ISAM < Oxidized::Model
     cfg.each_line.to_a[1..-2].join
   end
 
-  cfg :telnet do 
+  cfg :telnet do
     username /^login:\s*/
     password /^password:\s*/
   end
@@ -19,7 +19,7 @@ class ISAM < Oxidized::Model
     post_login 'environment inhibit-alarms print no-more'
     pre_logout 'logout'
   end
-  
+
   cmd 'show software-mngt oswp detail' do |cfg|
     comment cfg
   end
@@ -31,5 +31,4 @@ class ISAM < Oxidized::Model
   cmd 'info configure flat' do |cfg|
     cfg
   end
-
 end
diff --git a/lib/oxidized/model/junos.rb b/lib/oxidized/model/junos.rb
index 2ea0179..737a000 100644
--- a/lib/oxidized/model/junos.rb
+++ b/lib/oxidized/model/junos.rb
@@ -1,6 +1,5 @@
 class JunOS < Oxidized::Model
-
-  comment  '# '
+  comment '# '
 
   def telnet
     @input.class.to_s.match(/Telnet/)
@@ -8,7 +7,7 @@ class JunOS < Oxidized::Model
 
   cmd :all do |cfg|
     cfg = cfg.lines.to_a[1..-2].join if screenscrape
-    cfg.gsub!(/  scale-subscriber (\s+)(\d+)/,'  scale-subscriber                <count>')
+    cfg.gsub!(/  scale-subscriber (\s+)(\d+)/, '  scale-subscriber                <count>')
     cfg.lines.map { |line| line.rstrip }.join("\n") + "\n"
   end
 
@@ -32,7 +31,7 @@ class JunOS < Oxidized::Model
     out = ''
     case @model
     when 'mx960'
-      out << cmd('show chassis fabric reachability')  { |cfg| comment cfg }
+      out << cmd('show chassis fabric reachability') { |cfg| comment cfg }
     when /^(ex22|ex33|ex4|ex8|qfx)/
       out << cmd('show virtual-chassis') { |cfg| comment cfg }
     end
@@ -49,7 +48,7 @@ class JunOS < Oxidized::Model
   end
 
   cfg :ssh do
-    exec true  # don't run shell, run each command in exec channel
+    exec true # don't run shell, run each command in exec channel
   end
 
   cfg :telnet, :ssh do
@@ -57,5 +56,4 @@ class JunOS < Oxidized::Model
     post_login 'set cli screen-width 0'
     pre_logout 'exit'
   end
-
 end
diff --git a/lib/oxidized/model/masteros.rb b/lib/oxidized/model/masteros.rb
index 587fdc4..c03beb1 100644
--- a/lib/oxidized/model/masteros.rb
+++ b/lib/oxidized/model/masteros.rb
@@ -1,8 +1,7 @@
 class MasterOS < Oxidized::Model
-
   # MRV MasterOS model #
 
-comment '!'
+  comment '!'
 
   cmd :secret do |cfg|
     cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
@@ -43,5 +42,4 @@ comment '!'
     end
     pre_logout 'exit'
   end
-
 end
diff --git a/lib/oxidized/model/mlnxos.rb b/lib/oxidized/model/mlnxos.rb
index 49f3369..990417d 100644
--- a/lib/oxidized/model/mlnxos.rb
+++ b/lib/oxidized/model/mlnxos.rb
@@ -1,8 +1,7 @@
 class MLNXOS < Oxidized::Model
-
   prompt /([\w.@()-\[:\s\]]+[#>]\s)$/
-  comment  '## '
-  
+  comment '## '
+
   # Pager Handling
   expect /.+lines\s\d+\-\d+([\s]|\/\d+\s\(END\)\s).+$/ do |data, re|
     send ' '
@@ -11,7 +10,7 @@ class MLNXOS < Oxidized::Model
 
   cmd :all do |cfg|
     cfg.gsub! /\[\?1h=\r/, '' # Pager Handling
-    cfg.gsub! /\r\[K/,'' # Pager Handling
+    cfg.gsub! /\r\[K/, '' # Pager Handling
     cfg.gsub! /\s/, '' # Linebreak Handling
     cfg.gsub! /^CPU\ load\ averages\:\s.+/, '' # Omit constantly changing CPU info
     cfg.gsub! /^System\ memory\:\s.+/, '' # Omit constantly changing memory info
diff --git a/lib/oxidized/model/model.rb b/lib/oxidized/model/model.rb
index a2a71cb..a650560 100644
--- a/lib/oxidized/model/model.rb
+++ b/lib/oxidized/model/model.rb
@@ -7,29 +7,34 @@ module Oxidized
 
     class << self
       def inherited klass
-        klass.instance_variable_set '@cmd',   Hash.new { |h,k| h[k] = [] }
-        klass.instance_variable_set '@cfg',   Hash.new { |h,k| h[k] = [] }
-        klass.instance_variable_set '@procs', Hash.new { |h,k| h[k] = [] }
+        klass.instance_variable_set '@cmd',   Hash.new { |h, k| h[k] = [] }
+        klass.instance_variable_set '@cfg',   Hash.new { |h, k| h[k] = [] }
+        klass.instance_variable_set '@procs', Hash.new { |h, k| h[k] = [] }
         klass.instance_variable_set '@expect', []
         klass.instance_variable_set '@comment', nil
         klass.instance_variable_set '@prompt', nil
       end
-      def comment _comment='# '
+
+      def comment _comment = '# '
         return @comment if @comment
         @comment = block_given? ? yield : _comment
       end
-      def prompt _prompt=nil
+
+      def prompt _prompt = nil
         @prompt or @prompt = _prompt
       end
+
       def cfg *methods, &block
         [methods].flatten.each do |method|
           @cfg[method.to_s] << block
         end
       end
+
       def cfgs
         @cfg
       end
-      def cmd _cmd=nil, &block
+
+      def cmd _cmd = nil, &block
         if _cmd.class == Symbol
           @cmd[_cmd] << block
         else
@@ -37,12 +42,15 @@ module Oxidized
         end
         Oxidized.logger.debug "lib/oxidized/model/model.rb Added #{_cmd} to the commands list"
       end
+
       def cmds
         @cmd
       end
+
       def expect re, &block
         @expect << [re, block]
       end
+
       def expects
         @expect
       end
@@ -166,6 +174,5 @@ module Oxidized
       output.set_cmd(name)
       output
     end
-
   end
 end
diff --git a/lib/oxidized/model/mtrlrfs.rb b/lib/oxidized/model/mtrlrfs.rb
index 8baa4e9..31b4f22 100644
--- a/lib/oxidized/model/mtrlrfs.rb
+++ b/lib/oxidized/model/mtrlrfs.rb
@@ -1,5 +1,4 @@
 class Mtrlrfs < Oxidized::Model
-
   # Motorola RFS/Extreme WM
 
   comment  '# '
@@ -7,7 +6,7 @@ class Mtrlrfs < Oxidized::Model
   cmd :all do |cfg|
     # xos inserts leading \r characters and other trailing white space.
     # this deletes extraneous \r and trailing white space.
-    cfg.each_line.to_a[1..-2].map{|line|line.delete("\r").rstrip}.join("\n") + "\n"
+    cfg.each_line.to_a[1..-2].map { |line| line.delete("\r").rstrip }.join("\n") + "\n"
   end
 
   cmd 'show version' do |cfg|
@@ -32,6 +31,4 @@ class Mtrlrfs < Oxidized::Model
       send "n\n"
     end
   end
-
 end
-
diff --git a/lib/oxidized/model/ndms.rb b/lib/oxidized/model/ndms.rb
index c632bb9..1947f91 100644
--- a/lib/oxidized/model/ndms.rb
+++ b/lib/oxidized/model/ndms.rb
@@ -1,5 +1,4 @@
 class NDMS < Oxidized::Model
-
   # Pull config from Zyxel Keenetic devices from version NDMS >= 2.0
 
   comment  '! '
diff --git a/lib/oxidized/model/netgear.rb b/lib/oxidized/model/netgear.rb
index a32eb66..40b0924 100644
--- a/lib/oxidized/model/netgear.rb
+++ b/lib/oxidized/model/netgear.rb
@@ -1,5 +1,4 @@
 class Netgear < Oxidized::Model
-
   comment '!'
   prompt /^(\([\w\s\-.]+\)\s[#>])$/
 
@@ -37,5 +36,4 @@ class Netgear < Oxidized::Model
   cmd 'show running-config' do |cfg|
     cfg.gsub! /^(!.*Time).*$/, '\1'
   end
-
 end
diff --git a/lib/oxidized/model/netscaler.rb b/lib/oxidized/model/netscaler.rb
index 9ca66b6..00d1b71 100644
--- a/lib/oxidized/model/netscaler.rb
+++ b/lib/oxidized/model/netscaler.rb
@@ -1,5 +1,4 @@
 class NetScaler < Oxidized::Model
-
   prompt /^\>\s*$/
   comment '# '
 
@@ -20,5 +19,4 @@ class NetScaler < Oxidized::Model
   cfg :ssh do
     pre_logout 'exit'
   end
-
 end
diff --git a/lib/oxidized/model/nos.rb b/lib/oxidized/model/nos.rb
index ec7c818..4049aa5 100644
--- a/lib/oxidized/model/nos.rb
+++ b/lib/oxidized/model/nos.rb
@@ -1,5 +1,4 @@
 class NOS < Oxidized::Model
-
   # Brocade Network Operating System
 
   prompt /^(?:\e\[..h)?[\w.-]+# $/
@@ -38,8 +37,7 @@ class NOS < Oxidized::Model
 
   cfg :telnet, :ssh do
     post_login 'terminal length 0'
-    #post_login 'terminal width 0'
+    # post_login 'terminal width 0'
     pre_logout 'exit'
   end
-
 end
diff --git a/lib/oxidized/model/nxos.rb b/lib/oxidized/model/nxos.rb
index 60d6037..d1449dd 100644
--- a/lib/oxidized/model/nxos.rb
+++ b/lib/oxidized/model/nxos.rb
@@ -1,5 +1,4 @@
 class NXOS < Oxidized::Model
-
   prompt /^(\r?[\w.@_()-]+[#]\s?)$/
   comment '! '
 
@@ -10,7 +9,7 @@ class NXOS < Oxidized::Model
     cfg.gsub! /^(radius-server key).*/, '\\1 <secret hidden>'
     cfg
   end
-  
+
   cmd 'show version' do |cfg|
     cfg = cfg.each_line.take_while { |line| not line.match(/uptime/i) }
     comment cfg.join ""
@@ -18,7 +17,7 @@ class NXOS < Oxidized::Model
 
   cmd 'show inventory' do |cfg|
     comment cfg
-  end 
+  end
 
   cmd 'show running-config' do |cfg|
     cfg.gsub! /^!Time:[^\n]*\n/, ''
diff --git a/lib/oxidized/model/oneos.rb b/lib/oxidized/model/oneos.rb
index eeaa2ce..35332c8 100644
--- a/lib/oxidized/model/oneos.rb
+++ b/lib/oxidized/model/oneos.rb
@@ -1,24 +1,23 @@
 class OneOS < Oxidized::Model
-
   prompt /^([\w.@()-]+#\s?)$/
   comment  '! '
 
   # example how to handle pager
-  #expect /^\s--More--\s+.*$/ do |data, re|
+  # expect /^\s--More--\s+.*$/ do |data, re|
   #  send ' '
   #  data.sub re, ''
-  #end
+  # end
 
   # non-preferred way to handle additional PW prompt
-  #expect /^[\w.]+>$/ do |data|
+  # expect /^[\w.]+>$/ do |data|
   #  send "enable\n"
   #  send vars(:enable) + "\n"
   #  data
-  #end
+  # end
 
   cmd :all do |cfg|
-    #cfg.gsub! /\cH+\s{8}/, ''         # example how to handle pager
-    #cfg.gsub! /\cH+/, ''              # example how to handle pager
+    # cfg.gsub! /\cH+\s{8}/, ''         # example how to handle pager
+    # cfg.gsub! /\cH+/, ''              # example how to handle pager
     cfg.each_line.to_a[1..-2].join
   end
 
@@ -54,5 +53,4 @@ class OneOS < Oxidized::Model
     post_login 'term len 0'
     pre_logout 'exit'
   end
-
 end
diff --git a/lib/oxidized/model/opengear.rb b/lib/oxidized/model/opengear.rb
index b7c697f..e0d4c0a 100644
--- a/lib/oxidized/model/opengear.rb
+++ b/lib/oxidized/model/opengear.rb
@@ -1,7 +1,6 @@
 class OpenGear < Oxidized::Model
+  comment '# '
 
-  comment  '# '
-  
   prompt /^(\$\s)?$/
 
   cmd :secret do |cfg|
@@ -15,7 +14,6 @@ class OpenGear < Oxidized::Model
   cmd 'config -g config'
 
   cfg :ssh do
-    exec true  # don't run shell, run each command in exec channel
+    exec true # don't run shell, run each command in exec channel
   end
-
 end
diff --git a/lib/oxidized/model/opnsense.rb b/lib/oxidized/model/opnsense.rb
index b874fca..a8f7a47 100644
--- a/lib/oxidized/model/opnsense.rb
+++ b/lib/oxidized/model/opnsense.rb
@@ -1,21 +1,19 @@
 class OpnSense < Oxidized::Model
-
   # minimum required permissions: "System: Shell account access"
   # must enable SSH and password-based SSH access
-  
+
   cmd :all do |cfg|
     cfg.each_line.to_a[1..-1].join
   end
-  
+
   cmd 'cat /conf/config.xml' do |cfg|
     cfg.gsub! /\s<revision>\s*<time>\d*<\/time>\s*.*\s*.*\s*<\/revision>/, ''
     cfg.gsub! /\s<last_rule_upd_time>\d*<\/last_rule_upd_time>/, ''
     cfg
   end
-  
+
   cfg :ssh do
     exec true
     pre_logout 'exit'
   end
- 
 end
diff --git a/lib/oxidized/model/outputs.rb b/lib/oxidized/model/outputs.rb
index a668e9d..23a37f5 100644
--- a/lib/oxidized/model/outputs.rb
+++ b/lib/oxidized/model/outputs.rb
@@ -1,7 +1,6 @@
 module Oxidized
   class Model
     class Outputs
-
       def to_cfg
         type_to_str(nil)
       end
@@ -23,7 +22,7 @@ module Oxidized
       end
 
       def type type
-        @outputs.select { |out| out.type==type }
+        @outputs.select { |out| out.type == type }
       end
 
       def types
@@ -35,7 +34,6 @@ module Oxidized
       def initialize
         @outputs = []
       end
-
     end
   end
 end
diff --git a/lib/oxidized/model/panos.rb b/lib/oxidized/model/panos.rb
index 67ccaec..422a9fe 100644
--- a/lib/oxidized/model/panos.rb
+++ b/lib/oxidized/model/panos.rb
@@ -1,8 +1,7 @@
 class PanOS < Oxidized::Model
-
   # PaloAlto PAN-OS model #
 
-  comment  '! '
+  comment '! '
 
   prompt /^[\w.\@:\(\)-]+>\s?$/
 
diff --git a/lib/oxidized/model/pfsense.rb b/lib/oxidized/model/pfsense.rb
index 5849160..278a126 100644
--- a/lib/oxidized/model/pfsense.rb
+++ b/lib/oxidized/model/pfsense.rb
@@ -1,20 +1,18 @@
 class PfSense < Oxidized::Model
-
   # use other use than 'admin' user, 'admin' user cannot get ssh/exec. See issue #535
-  
+
   cmd :all do |cfg|
     cfg.each_line.to_a[1..-1].join
   end
-  
+
   cmd 'cat /cf/conf/config.xml' do |cfg|
     cfg.gsub! /\s<revision>\s*<time>\d*<\/time>\s*.*\s*.*\s*<\/revision>/, ''
     cfg.gsub! /\s<last_rule_upd_time>\d*<\/last_rule_upd_time>/, ''
     cfg
   end
-  
+
   cfg :ssh do
     exec true
     pre_logout 'exit'
   end
- 
 end
diff --git a/lib/oxidized/model/planet.rb b/lib/oxidized/model/planet.rb
index 9ce9cf9..56e688c 100644
--- a/lib/oxidized/model/planet.rb
+++ b/lib/oxidized/model/planet.rb
@@ -1,24 +1,23 @@
 class Planet < Oxidized::Model
-
   prompt /^\r?([\w.@()-]+[#>]\s?)$/
   comment  '! '
 
   # example how to handle pager
-  #expect /^\s--More--\s+.*$/ do |data, re|
+  # expect /^\s--More--\s+.*$/ do |data, re|
   # send ' '
   # data.sub re, ''
-  #end
+  # end
 
   # non-preferred way to handle additional PW prompt
-  #expect /^[\w.]+>$/ do |data|
+  # expect /^[\w.]+>$/ do |data|
   #  send "enable\n"
   #  send vars(:enable) + "\n"
   #  data
-  #end
+  # end
 
   cmd :all do |cfg|
-    #cfg.gsub! /\cH+\s{8}/, ''         # example how to handle pager
-    #cfg.gsub! /\cH+/, ''              # example how to handle pager
+    # cfg.gsub! /\cH+\s{8}/, ''         # example how to handle pager
+    # cfg.gsub! /\cH+/, ''              # example how to handle pager
     cfg.each_line.to_a[1..-2].join
   end
 
@@ -39,7 +38,7 @@ class Planet < Oxidized::Model
 
     cfg = cfg.each_line.to_a[0...-2]
 
-   # Strip system (up)time and temperature
+    # Strip system (up)time and temperature
     cfg = cfg.reject { |line| line.match /System Time\s*:.*/ }
     cfg = cfg.reject { |line| line.match /System Uptime\s*:.*/ }
     cfg = cfg.reject { |line| line.match /Temperature\s*:.*/ }
@@ -47,13 +46,12 @@ class Planet < Oxidized::Model
     comment cfg.join
   end
 
-
   cmd 'show running-config' do |cfg|
     cfg.gsub! "\n\r", "\n"
     cfg = cfg.each_line.to_a
 
     cfg = cfg.reject { |line| line.match "Building configuration..." }
-  
+
     if @planetsgs
       cfg << cmd('show transceiver detail | include transceiver detail information|found|Type|length|Nominal|wavelength|Base information') do |cfg|
         comment cfg
@@ -62,7 +60,6 @@ class Planet < Oxidized::Model
 
     cfg.join
   end
-  
 
   cfg :telnet do
     username /^Username:/
@@ -80,5 +77,4 @@ class Planet < Oxidized::Model
     end
     pre_logout 'exit'
   end
-
 end
diff --git a/lib/oxidized/model/powerconnect.rb b/lib/oxidized/model/powerconnect.rb
index ca91e60..bf36f65 100644
--- a/lib/oxidized/model/powerconnect.rb
+++ b/lib/oxidized/model/powerconnect.rb
@@ -1,12 +1,11 @@
 class PowerConnect < Oxidized::Model
-
   prompt /^([\w\s.@-]+[#>]\s?)$/ # allow spaces in hostname..dell does not limit it.. #
 
-  comment  '! '
+  comment '! '
 
   expect /^\s*--More--\s+.*$/ do |data, re|
-     send ' '
-     data.sub re, ''
+    send ' '
+    data.sub re, ''
   end
 
   cmd :all do |cfg|
@@ -52,7 +51,6 @@ class PowerConnect < Oxidized::Model
     post_login "terminal length 0"
     pre_logout "logout"
     pre_logout "exit"
-    
   end
 
   def clean cfg
@@ -76,5 +74,4 @@ class PowerConnect < Oxidized::Model
     out = comment out.join "\n"
     out << "\n"
   end
-
 end
diff --git a/lib/oxidized/model/procurve.rb b/lib/oxidized/model/procurve.rb
index 705a814..930dc53 100644
--- a/lib/oxidized/model/procurve.rb
+++ b/lib/oxidized/model/procurve.rb
@@ -1,10 +1,9 @@
 class Procurve < Oxidized::Model
-
   # some models start lines with \r
   # previous command is repeated followed by "\eE", which sometimes ends up on last line
   prompt /^\r?([\w.-]+# )$/
 
-  comment  '! '
+  comment '! '
 
   # replace next line control sequence with a new line
   expect /(\e\[1M\e\[\??\d+(;\d+)*[A-Za-z]\e\[1L)|(\eE)/ do |data, re|
@@ -87,5 +86,4 @@ class Procurve < Oxidized::Model
   cfg :ssh do
     pty_options({ chars_wide: 1000 })
   end
-
 end
diff --git a/lib/oxidized/model/quantaos.rb b/lib/oxidized/model/quantaos.rb
index 5197aa8..8dbdf3b 100644
--- a/lib/oxidized/model/quantaos.rb
+++ b/lib/oxidized/model/quantaos.rb
@@ -1,13 +1,12 @@
 class QuantaOS < Oxidized::Model
-
   prompt /^\((\w|\S)+\) (>|#)$/
   comment '! '
-  
+
   cmd 'show run' do |cfg|
     cfg.each_line.select do |line|
       not line.match /^!.*$/ and
-      not line.match /^\((\w|\S)+\) (>|#)$/ and
-      not line.match /^show run$/
+        not line.match /^\((\w|\S)+\) (>|#)$/ and
+        not line.match /^show run$/
     end.join
   end
 
@@ -31,5 +30,4 @@ class QuantaOS < Oxidized::Model
       send "n\n"
     end
   end
-
 end
diff --git a/lib/oxidized/model/routeros.rb b/lib/oxidized/model/routeros.rb
index b62a3be..c729126 100644
--- a/lib/oxidized/model/routeros.rb
+++ b/lib/oxidized/model/routeros.rb
@@ -18,8 +18,8 @@ class RouterOS < Oxidized::Model
     run_cmd = vars(:remove_secret) ? '/export hide-sensitive' : '/export'
     cmd run_cmd do |cfg|
       cfg.gsub! /\x1B\[([0-9]{1,3}((;[0-9]{1,3})*)?)?[m|K]/, '' # strip ANSI colours
-      cfg.gsub! /\\\r\n\s+/, ''   # strip new line
-      cfg.gsub! /# inactive time\r\n/, ''   # Remove time based system comment
+      cfg.gsub! /\\\r\n\s+/, '' # strip new line
+      cfg.gsub! /# inactive time\r\n/, '' # Remove time based system comment
       cfg = cfg.split("\n").reject { |line| line[/^\#\s\w{3}\/\d{2}\/\d{4}.*$/] }
       cfg.join("\n") + "\n"
     end
diff --git a/lib/oxidized/model/saos.rb b/lib/oxidized/model/saos.rb
index 5a4e79e..97547b5 100644
--- a/lib/oxidized/model/saos.rb
+++ b/lib/oxidized/model/saos.rb
@@ -1,5 +1,4 @@
 class SAOS < Oxidized::Model
-
   # Ciena SAOS switch
   # used for 6.x devices
 
diff --git a/lib/oxidized/model/screenos.rb b/lib/oxidized/model/screenos.rb
index 0258898..9b52f9f 100644
--- a/lib/oxidized/model/screenos.rb
+++ b/lib/oxidized/model/screenos.rb
@@ -1,8 +1,7 @@
-class ScreenOS  < Oxidized::Model
-
+class ScreenOS < Oxidized::Model
   # Netscreen ScreenOS model #
 
-  comment  '! '
+  comment '! '
 
   prompt /^[\w.:\(\)-]+->\s?$/
 
@@ -10,7 +9,7 @@ class ScreenOS  < Oxidized::Model
     cfg.each_line.to_a[2..-2].join
   end
 
-  cmd :secret do |cfg| 
+  cmd :secret do |cfg|
     cfg.gsub! /^(set admin name) .*|^(set admin password) .*/, '\\1 <removed>'
     cfg.gsub! /^(set admin user .* password) .* (.*)/, '\\1 <removed> \\2'
     cfg.gsub! /(secret|password|preshare) .*/, '\\1 <secret hidden>'
@@ -41,5 +40,4 @@ class ScreenOS  < Oxidized::Model
       send "n"
     end
   end
-
 end
diff --git a/lib/oxidized/model/sgos.rb b/lib/oxidized/model/sgos.rb
index 3d42a53..894e042 100644
--- a/lib/oxidized/model/sgos.rb
+++ b/lib/oxidized/model/sgos.rb
@@ -1,5 +1,4 @@
 class SGOS < Oxidized::Model
-
   comment '!- '
   prompt /\w+>|#/
 
@@ -20,14 +19,14 @@ class SGOS < Oxidized::Model
     comment cfg
   end
 
-   cmd :secret do |cfg|
+  cmd :secret do |cfg|
     cfg.gsub! /^(security hashed-enable-password).*/, '\\1 <secret hidden>'
     cfg.gsub! /^(security hashed-password).*/, '\\1 <secret hidden>'
     cfg
   end
 
   cmd 'show configuration expanded noprompts with-keyrings unencrypted' do |cfg|
-    cfg.gsub! /^(!- Local time).*/,""
+    cfg.gsub! /^(!- Local time).*/, ""
     cfg.gsub! /^(archive-configuration encrypted-password).*/, ""
     cfg.gsub! /^(download encrypted-password).*/, ""
     cfg
diff --git a/lib/oxidized/model/siklu.rb b/lib/oxidized/model/siklu.rb
index 2bdfbc3..2203bda 100644
--- a/lib/oxidized/model/siklu.rb
+++ b/lib/oxidized/model/siklu.rb
@@ -1,5 +1,4 @@
 class Siklu < Oxidized::Model
-
   # Siklu EtherHaul #
 
   prompt /^[\w-]+>$/
@@ -15,5 +14,4 @@ class Siklu < Oxidized::Model
   cfg :ssh do
     pre_logout 'exit'
   end
-
 end
diff --git a/lib/oxidized/model/slxos.rb b/lib/oxidized/model/slxos.rb
index 934da5b..1afc8b1 100644
--- a/lib/oxidized/model/slxos.rb
+++ b/lib/oxidized/model/slxos.rb
@@ -1,35 +1,34 @@
 class SLXOS < Oxidized::Model
-
   prompt /^.*[>#]\s?$/i
-  comment  '! '
+  comment '! '
 
   cmd 'show version' do |cfg|
-    cfg.gsub! /(^((.*)[Ss]ystem [Uu]ptime(.*))$)/, '' #remove unwanted line system uptime
-    cfg.gsub! /[Uu]p\s?[Tt]ime is .*/,''
+    cfg.gsub! /(^((.*)[Ss]ystem [Uu]ptime(.*))$)/, '' # remove unwanted line system uptime
+    cfg.gsub! /[Uu]p\s?[Tt]ime is .*/, ''
 
     comment cfg
   end
 
   cmd 'show chassis' do |cfg|
-    cfg.encode!("UTF-8", :invalid => :replace, :undef => :replace) #sometimes ironware returns broken encoding
-        cfg.gsub! /.*Power Usage.*/, '' #remove unwanted lines power usage
-        cfg.gsub! /Time A(live|wake).*/, '' #remove unwanted lines time alive/awake
+    cfg.encode!("UTF-8", :invalid => :replace, :undef => :replace) # sometimes ironware returns broken encoding
+    cfg.gsub! /.*Power Usage.*/, '' # remove unwanted lines power usage
+    cfg.gsub! /Time A(live|wake).*/, '' # remove unwanted lines time alive/awake
     cfg.gsub! /([\[]*)1([\]]*)<->([\[]*)2([\]]*)(<->([\[]*)3([\]]*))*/, ''
 
     comment cfg
   end
 
   cmd 'show system' do |cfg|
-        cfg.gsub! /Up Time.*/, '' #removes uptime line
-        cfg.gsub! /Current Time.*/, '' #remove current time line
-        cfg.gsub! /.*speed is.*/, '' #removes fan speed lines
+    cfg.gsub! /Up Time.*/, '' # removes uptime line
+    cfg.gsub! /Current Time.*/, '' # remove current time line
+    cfg.gsub! /.*speed is.*/, '' # removes fan speed lines
 
     comment cfg
   end
 
   cmd 'show slots' do |cfg|
     cfg.gsub! /^-*^$/, '' # some slx devices are fixed config
-        cfg.gsub! /syntax error: element does not exist/, '' # same as above
+    cfg.gsub! /syntax error: element does not exist/, '' # same as above
 
     comment cfg
   end
@@ -45,7 +44,7 @@ class SLXOS < Oxidized::Model
     password /^(Please Enter Password ?|Password):/
   end
 
-  #handle pager with enable
+  # handle pager with enable
   cfg :telnet, :ssh do
     if vars :enable
       post_login do
@@ -55,7 +54,6 @@ class SLXOS < Oxidized::Model
     end
     post_login ''
     post_login 'terminal length 0'
-        pre_logout 'exit'
+    pre_logout 'exit'
   end
-
 end
diff --git a/lib/oxidized/model/sros.rb b/lib/oxidized/model/sros.rb
index 289bed3..d809147 100644
--- a/lib/oxidized/model/sros.rb
+++ b/lib/oxidized/model/sros.rb
@@ -1,5 +1,4 @@
 class SROS < Oxidized::Model
-
   #
   # Nokia SR OS (TiMOS) (formerly TiMetra, Alcatel, Alcatel-Lucent).
   # Used in 7705 SAR, 7210 SAS, 7450 ESS, 7750 SR, 7950 XRS, and NSP.
diff --git a/lib/oxidized/model/tmos.rb b/lib/oxidized/model/tmos.rb
index 390046d..69b0e1b 100644
--- a/lib/oxidized/model/tmos.rb
+++ b/lib/oxidized/model/tmos.rb
@@ -1,5 +1,4 @@
 class TMOS < Oxidized::Model
-
   comment  '# '
 
   cmd :secret do |cfg|
@@ -46,7 +45,6 @@ class TMOS < Oxidized::Model
   cmd('cat /config/partitions/*/bigip.conf') { |cfg| comment cfg }
 
   cfg :ssh do
-    exec true  # don't run shell, run each command in exec channel
+    exec true # don't run shell, run each command in exec channel
   end
-
 end
diff --git a/lib/oxidized/model/tplink.rb b/lib/oxidized/model/tplink.rb
index bf13803..2a61fa5 100644
--- a/lib/oxidized/model/tplink.rb
+++ b/lib/oxidized/model/tplink.rb
@@ -1,26 +1,25 @@
 class TPLink < Oxidized::Model
-
   # tp-link prompt
   prompt /^\r?([\w.@()-]+[#>]\s?)$/
-  comment  '! '
+  comment '! '
 
   # handle paging
   # workaround for sometimes missing whitespaces with "\s?"
   expect /Press\s?any\s?key\s?to\s?continue\s?\(Q\s?to\s?quit\)/ do |data, re|
-   send ' '
-   data.sub re, ''
+    send ' '
+    data.sub re, ''
   end
 
   # send carriage return because \n with the command is not enough
   # checks if line ends with prompt >,# or \r,\nm otherwise send \r
   expect /[^>#\r\n]$/ do |data, re|
-   send "\r"
-   data.sub re, ''
+    send "\r"
+    data.sub re, ''
   end
 
   cmd :all do |cfg|
     # normalize linefeeds
-    cfg.gsub! /(\r|\r\n|\n\r)/,"\n"
+    cfg.gsub! /(\r|\r\n|\n\r)/, "\n"
     # remove empty lines
     cfg.each_line.reject { |line| line.match /^[\r\n\s\u0000#]+$/ }.join
   end
@@ -31,7 +30,7 @@ class TPLink < Oxidized::Model
     cfg
   end
 
-  cmd 'show system-info'  do |cfg|
+  cmd 'show system-info' do |cfg|
     comment cfg.each_line.to_a[3..-3].join
   end
 
@@ -58,8 +57,5 @@ class TPLink < Oxidized::Model
       send "exit\r"
       send "logout\r"
     end
-
   end
-
 end
-
diff --git a/lib/oxidized/model/trango.rb b/lib/oxidized/model/trango.rb
index b2aa1e7..b55b277 100644
--- a/lib/oxidized/model/trango.rb
+++ b/lib/oxidized/model/trango.rb
@@ -1,8 +1,8 @@
 class Trango < Oxidized::Model
   # take a Trangolink sysinfo output and turn it into a configuration file
-  
+
   prompt /^#>\s?/
-  comment  '# '
+  comment '# '
 
   cmd 'sysinfo' do |cfg|
     out = []
@@ -47,16 +47,15 @@ class Trango < Oxidized::Model
       end
       if line.match /\[IP\] (\S+) \[Subnet Mask\] (\S+) \[Gateway\] (\S+)/
         out << "ipconfig " + Regexp.last_match[1] + ' ' +
-                              Regexp.last_match[2] + ' ' +
-                              Regexp.last_match[3]
+               Regexp.last_match[2] + ' ' +
+               Regexp.last_match[3]
       end
-    end 
+    end
     comments.push(*out).join "\n"
-  end 
+  end
 
   cfg :telnet do
     password /Password:/
     pre_logout 'exit'
   end
- 
 end
diff --git a/lib/oxidized/model/ucs.rb b/lib/oxidized/model/ucs.rb
index a1f6c10..4418b68 100644
--- a/lib/oxidized/model/ucs.rb
+++ b/lib/oxidized/model/ucs.rb
@@ -1,5 +1,4 @@
 class UCS < Oxidized::Model
-
   prompt /^(\r?[\w.@_()-]+[#]\s?)$/
   comment '! '
 
diff --git a/lib/oxidized/model/voltaire.rb b/lib/oxidized/model/voltaire.rb
index 1e7fad2..62a62e5 100644
--- a/lib/oxidized/model/voltaire.rb
+++ b/lib/oxidized/model/voltaire.rb
@@ -1,18 +1,16 @@
 class VOLTAIRE < Oxidized::Model
-
   prompt /([\w.@()-\[:\s\]]+[#>]\s|(One or more tests have failed.*))$/
-  comment  '## '
-  
+  comment '## '
+
   # Pager Handling
   expect /.+lines\s\d+\-\d+([\s]|\/\d+\s\(END\)\s).+$/ do |data, re|
     send ' '
     data.sub re, ''
   end
 
-
   cmd :all do |cfg|
     cfg.gsub! /\[\?1h=\r/, '' # Pager Handling
-    cfg.gsub! /\r\[K/,'' # Pager Handling
+    cfg.gsub! /\r\[K/, '' # Pager Handling
     cfg.gsub! /\s/, '' # Linebreak Handling
     cfg.gsub! /^CPU\ load\ averages\:\s.+/, '' # Omit constantly changing CPU info
     cfg.gsub! /^System\ memory\:\s.+/, '' # Omit constantly changing memory info
@@ -27,7 +25,6 @@ class VOLTAIRE < Oxidized::Model
     cfg
   end
 
-
   cmd 'version show' do |cfg|
     comment cfg
   end
diff --git a/lib/oxidized/model/voss.rb b/lib/oxidized/model/voss.rb
index 6b15fb3..32958ce 100644
--- a/lib/oxidized/model/voss.rb
+++ b/lib/oxidized/model/voss.rb
@@ -10,7 +10,7 @@ class Voss < Oxidized::Model
 
   # needed for proper formatting after post_login
   cmd('') { |cfg| comment "#{cfg}\n" }
-  
+
   # Get sys-info and remove information that changes such has temperature and power
   cmd 'show sys-info' do |cfg|
     cfg.gsub! /(^((.*)SysUpTime(.*))$)/, 'removed SysUpTime'
@@ -38,5 +38,4 @@ class Voss < Oxidized::Model
     post_login 'enable'
     post_login 'terminal more disable'
   end
-
 end
diff --git a/lib/oxidized/model/vrp.rb b/lib/oxidized/model/vrp.rb
index e44f69e..42762c2 100644
--- a/lib/oxidized/model/vrp.rb
+++ b/lib/oxidized/model/vrp.rb
@@ -1,6 +1,6 @@
 class VRP < Oxidized::Model
   # Huawei VRP
-  
+
   prompt /^(<[\w.-]+>)$/
   comment '# '
 
@@ -13,13 +13,13 @@ class VRP < Oxidized::Model
   cmd :all do |cfg|
     cfg.each_line.to_a[1..-2].join
   end
- 
+
   cfg :telnet do
     username /^Username:$/
     password /^Password:$/
   end
 
-  cfg :telnet, :ssh do 
+  cfg :telnet, :ssh do
     post_login 'screen-length 0 temporary'
     pre_logout 'quit'
   end
@@ -36,5 +36,4 @@ class VRP < Oxidized::Model
   cmd 'display current-configuration all' do |cfg|
     cfg
   end
-  
 end
diff --git a/lib/oxidized/model/vyatta.rb b/lib/oxidized/model/vyatta.rb
index 57ec9d3..fb6b0d1 100644
--- a/lib/oxidized/model/vyatta.rb
+++ b/lib/oxidized/model/vyatta.rb
@@ -1,7 +1,6 @@
 class Vyatta < Oxidized::Model
-
   # Brocade Vyatta / VyOS model #
-  
+
   prompt /\@.*?\:~\$\s/
 
   cmd :all do |cfg|
@@ -27,5 +26,4 @@ class Vyatta < Oxidized::Model
   cfg :telnet, :ssh do
     pre_logout 'exit'
   end
-
 end
diff --git a/lib/oxidized/model/weos.rb b/lib/oxidized/model/weos.rb
index 1b20286..2856666 100644
--- a/lib/oxidized/model/weos.rb
+++ b/lib/oxidized/model/weos.rb
@@ -1,6 +1,5 @@
 class WEOS < Oxidized::Model
-
-  #Westell WEOS, works with Westell 8178G, Westell 8266G
+  # Westell WEOS, works with Westell 8178G, Westell 8266G
 
   prompt /^(\s[\w.@-]+[#>]\s?)$/
 
@@ -18,5 +17,4 @@ class WEOS < Oxidized::Model
     post_login 'cli more disable'
     pre_logout 'logout'
   end
-
 end
diff --git a/lib/oxidized/model/xos.rb b/lib/oxidized/model/xos.rb
index 90f6f4a..e862596 100644
--- a/lib/oxidized/model/xos.rb
+++ b/lib/oxidized/model/xos.rb
@@ -1,5 +1,4 @@
 class XOS < Oxidized::Model
-
   # Extreme Networks XOS
 
   prompt /^*?[\w .-]+# $/
@@ -8,7 +7,7 @@ class XOS < Oxidized::Model
   cmd :all do |cfg|
     # xos inserts leading \r characters and other trailing white space.
     # this deletes extraneous \r and trailing white space.
-    cfg.each_line.to_a[1..-2].map{|line|line.delete("\r").rstrip}.join("\n") + "\n"
+    cfg.each_line.to_a[1..-2].map { |line| line.delete("\r").rstrip }.join("\n") + "\n"
   end
 
   cmd 'show version' do |cfg|
@@ -23,7 +22,7 @@ class XOS < Oxidized::Model
     comment cfg
   end
 
-  cmd 'show switch'do |cfg|
+  cmd 'show switch' do |cfg|
     comment cfg.each_line.reject { |line| line.match /Time:/ or line.match /boot/i }.join
   end
 
@@ -45,5 +44,4 @@ class XOS < Oxidized::Model
       send "n\n"
     end
   end
-
 end
diff --git a/lib/oxidized/model/zhoneolt.rb b/lib/oxidized/model/zhoneolt.rb
index c50680c..ce6df29 100644
--- a/lib/oxidized/model/zhoneolt.rb
+++ b/lib/oxidized/model/zhoneolt.rb
@@ -18,7 +18,7 @@ class ZhoneOLT < Oxidized::Model
   end
 
   cmd :all do |cfg|
-    cfg.each_line.to_a[1..-2].map{|line|line.delete("\r").rstrip}.join("\n") + "\n"
+    cfg.each_line.to_a[1..-2].map { |line| line.delete("\r").rstrip }.join("\n") + "\n"
   end
 
   cmd 'swversion' do |cfg|
diff --git a/lib/oxidized/model/zynos.rb b/lib/oxidized/model/zynos.rb
index 89be8af..581d405 100644
--- a/lib/oxidized/model/zynos.rb
+++ b/lib/oxidized/model/zynos.rb
@@ -1,12 +1,10 @@
 class ZyNOS < Oxidized::Model
-
   # Used in Zyxel DSLAMs, such as SAM1316
 
-  comment  '! '
+  comment '! '
 
   cmd 'config-0'
 
   cfg :ftp do
   end
-
 end
diff --git a/lib/oxidized/node.rb b/lib/oxidized/node.rb
index 2b15d4e..27bd9a5 100644
--- a/lib/oxidized/node.rb
+++ b/lib/oxidized/node.rb
@@ -39,7 +39,7 @@ module Oxidized
         cfg_name = input.to_s.split('::').last.downcase
         next unless @model.cfg[cfg_name] and not @model.cfg[cfg_name].empty?
         @model.input = input = input.new
-        if config=run_input(input)
+        if config = run_input(input)
           Oxidized.logger.debug "lib/oxidized/node.rb: #{input.class.name} ran for #{name} successfully"
           status = :success
           break
@@ -55,7 +55,7 @@ module Oxidized
     def run_input input
       rescue_fail = {}
       [input.class::RescueFail, input.class.superclass::RescueFail].each do |hash|
-        hash.each do |level,errors|
+        hash.each do |level, errors|
           errors.each do |err|
             rescue_fail[err] = level
           end
@@ -64,9 +64,9 @@ module Oxidized
       begin
         input.connect(self) and input.get
       rescue *rescue_fail.keys => err
-        resc  = ''
+        resc = ''
         if not level = rescue_fail[err.class]
-          resc  = err.class.ancestors.find{|e|rescue_fail.keys.include? e}
+          resc  = err.class.ancestors.find { |e| rescue_fail.keys.include? e }
           level = rescue_fail[resc]
           resc  = " (rescued #{resc})"
         end
@@ -196,20 +196,20 @@ module Oxidized
       end
     end
 
-    def resolve_key key, opt, global=nil
+    def resolve_key key, opt, global = nil
       # resolve key, first get global, then get group then get node config
       key_sym = key.to_sym
       key_str = key.to_s
       value   = global
       Oxidized.logger.debug "node.rb: resolving node key '#{key}', with passed global value of '#{value}' and node value '#{opt[key_sym]}'"
 
-      #global
+      # global
       if not value and Oxidized.config.has_key?(key_str)
         value = Oxidized.config[key_str]
         Oxidized.logger.debug "node.rb: setting node key '#{key}' to value '#{value}' from global"
       end
 
-      #group
+      # group
       if Oxidized.config.groups.has_key?(@group)
         if Oxidized.config.groups[@group].has_key?(key_str)
           value = Oxidized.config.groups[@group][key_str]
@@ -217,7 +217,7 @@ module Oxidized
         end
       end
 
-      #model
+      # model
       # FIXME: warning: instance variable @model not initialized
       if Oxidized.config.models.has_key?(@model.class.name.to_s.downcase)
         if Oxidized.config.models[@model.class.name.to_s.downcase].has_key?(key_str)
@@ -226,7 +226,7 @@ module Oxidized
         end
       end
 
-      #node
+      # node
       value = opt[key_sym] || value
       Oxidized.logger.debug "node.rb: returning node key '#{key}' with value '#{value}'"
       value
@@ -239,6 +239,5 @@ module Oxidized
     def is_gitcrypt? opt
       (opt[:output] || Oxidized.config.output.default) == 'gitcrypt'
     end
-
   end
 end
diff --git a/lib/oxidized/node/stats.rb b/lib/oxidized/node/stats.rb
index 6b5719c..2c04a60 100644
--- a/lib/oxidized/node/stats.rb
+++ b/lib/oxidized/node/stats.rb
@@ -18,7 +18,7 @@ module Oxidized
 
       # @param [Symbol] status stats for specific status
       # @return [Hash,Array] Hash of stats for every status or Array of stats for specific status
-      def get status=nil
+      def get status = nil
         status ? @stats[status] : @stats
       end
 
@@ -27,7 +27,6 @@ module Oxidized
       def initialize
         @stats = {}
       end
-
     end
   end
 end
diff --git a/lib/oxidized/nodes.rb b/lib/oxidized/nodes.rb
index 3f84e15..84766f0 100644
--- a/lib/oxidized/nodes.rb
+++ b/lib/oxidized/nodes.rb
@@ -6,7 +6,7 @@ module Oxidized
   class Nodes < Array
     attr_accessor :source, :jobs
     alias :put :unshift
-    def load node_want=nil
+    def load node_want = nil
       with_lock do
         new = []
         @source = Oxidized.config.source.default
@@ -42,7 +42,6 @@ module Oxidized
       end
     end
 
-
     def list
       with_lock do
         map { |e| e.serialize }
@@ -63,7 +62,7 @@ module Oxidized
     end
 
     # @param node [String] name of the node moved into the head of array
-    def next node, opt={}
+    def next node, opt = {}
       if waiting.find_node_index(node)
         with_lock do
           n = del node
@@ -113,10 +112,10 @@ module Oxidized
 
     private
 
-    def initialize opts={}
+    def initialize opts = {}
       super()
       node = opts.delete :node
-      @mutex= Mutex.new  # we compete for the nodes with webapi thread
+      @mutex = Mutex.new # we compete for the nodes with webapi thread
       if nodes = opts.delete(:nodes)
         replace nodes
       else
@@ -129,7 +128,7 @@ module Oxidized
     end
 
     def find_index node
-      index { |e| e.name == node or e.ip == node}
+      index { |e| e.name == node or e.ip == node }
     end
 
     # @param node node which is removed from nodes list
@@ -162,7 +161,7 @@ module Oxidized
             node.stats = old[i].stats
             node.last  = old[i].last
           end
-        rescue  Oxidized::NodeNotFound
+        rescue Oxidized::NodeNotFound
         end
       end
       sort_by! { |x| x.last.nil? ? Time.new(0) : x.last.end }
diff --git a/lib/oxidized/output/file.rb b/lib/oxidized/output/file.rb
index 45f72e1..bad1b6a 100644
--- a/lib/oxidized/output/file.rb
+++ b/lib/oxidized/output/file.rb
@@ -1,59 +1,58 @@
 module Oxidized
-class OxidizedFile < Output
-  require 'fileutils'
+  class OxidizedFile < Output
+    require 'fileutils'
 
-  attr_reader :commitref
+    attr_reader :commitref
 
-  def initialize
-    @cfg = Oxidized.config.output.file
-  end
+    def initialize
+      @cfg = Oxidized.config.output.file
+    end
 
-  def setup
-    if @cfg.empty?
-      Oxidized.asetus.user.output.file.directory = File.join(Config::Root, 'configs')
-      Oxidized.asetus.save :user
-      raise NoConfig, 'no output file config, edit ~/.config/oxidized/config'
+    def setup
+      if @cfg.empty?
+        Oxidized.asetus.user.output.file.directory = File.join(Config::Root, 'configs')
+        Oxidized.asetus.save :user
+        raise NoConfig, 'no output file config, edit ~/.config/oxidized/config'
+      end
     end
-  end
 
-  def store node, outputs, opt={}
-    file = File.expand_path @cfg.directory
-    if opt[:group]
-      file = File.join File.dirname(file), opt[:group]
+    def store node, outputs, opt = {}
+      file = File.expand_path @cfg.directory
+      if opt[:group]
+        file = File.join File.dirname(file), opt[:group]
+      end
+      FileUtils.mkdir_p file
+      file = File.join file, node
+      open(file, 'w') { |fh| fh.write outputs.to_cfg }
+      @commitref = file
     end
-    FileUtils.mkdir_p file
-    file = File.join file, node
-    open(file, 'w') { |fh| fh.write outputs.to_cfg }
-    @commitref = file
-  end
 
-  def fetch node, group
-    cfg_dir   = File.expand_path @cfg.directory
-    node_name = node.name
+    def fetch node, group
+      cfg_dir   = File.expand_path @cfg.directory
+      node_name = node.name
 
-    if group # group is explicitly defined by user
-      cfg_dir = File.join File.dirname(cfg_dir), group
-      File.read File.join(cfg_dir, node_name)
-    else
-      if File.exists? File.join(cfg_dir, node_name) # node configuration file is stored on base directory
+      if group # group is explicitly defined by user
+        cfg_dir = File.join File.dirname(cfg_dir), group
         File.read File.join(cfg_dir, node_name)
       else
-        path = Dir.glob(File.join(File.dirname(cfg_dir), '**', node_name)).first # fetch node in all groups
-        File.read path
+        if File.exists? File.join(cfg_dir, node_name) # node configuration file is stored on base directory
+          File.read File.join(cfg_dir, node_name)
+        else
+          path = Dir.glob(File.join(File.dirname(cfg_dir), '**', node_name)).first # fetch node in all groups
+          File.read path
+        end
       end
+    rescue Errno::ENOENT
+      return nil
     end
-  rescue Errno::ENOENT
-    return nil
-  end
 
-  def version node, group
-    # not supported
-    []
-  end
+    def version node, group
+      # not supported
+      []
+    end
 
-  def get_version node, group, oid
-    'not supported'
+    def get_version node, group, oid
+      'not supported'
+    end
   end
-
-end
 end
diff --git a/lib/oxidized/output/git.rb b/lib/oxidized/output/git.rb
index fee0ab6..8acfd46 100644
--- a/lib/oxidized/output/git.rb
+++ b/lib/oxidized/output/git.rb
@@ -1,74 +1,73 @@
 module Oxidized
-class Git < Output
-  class GitError < OxidizedError; end
-  begin
-    require 'rugged'
-  rescue LoadError
-    raise OxidizedError, 'rugged not found: sudo gem install rugged'
-  end
-
-  attr_reader :commitref
+  class Git < Output
+    class GitError < OxidizedError; end
+    begin
+      require 'rugged'
+    rescue LoadError
+      raise OxidizedError, 'rugged not found: sudo gem install rugged'
+    end
 
-  def initialize
-    @cfg = Oxidized.config.output.git
-  end
+    attr_reader :commitref
 
-  def setup
-    if @cfg.empty?
-      Oxidized.asetus.user.output.git.user  = 'Oxidized'
-      Oxidized.asetus.user.output.git.email = 'o@example.com'
-      Oxidized.asetus.user.output.git.repo  =  File.join(Config::Root, 'oxidized.git')
-      Oxidized.asetus.save :user
-      raise NoConfig, 'no output git config, edit ~/.config/oxidized/config'
+    def initialize
+      @cfg = Oxidized.config.output.git
     end
 
-    if @cfg.repo.respond_to?(:each)
-      @cfg.repo.each do |group, repo|
-        @cfg.repo["#{group}="] = File.expand_path repo
+    def setup
+      if @cfg.empty?
+        Oxidized.asetus.user.output.git.user  = 'Oxidized'
+        Oxidized.asetus.user.output.git.email = 'o@example.com'
+        Oxidized.asetus.user.output.git.repo = File.join(Config::Root, 'oxidized.git')
+        Oxidized.asetus.save :user
+        raise NoConfig, 'no output git config, edit ~/.config/oxidized/config'
       end
-    else
-      @cfg.repo = File.expand_path @cfg.repo
-    end
-  end
 
-  def store file, outputs, opt={}
-    @msg   = opt[:msg]
-    @user  = (opt[:user]  or @cfg.user)
-    @email = (opt[:email] or @cfg.email)
-    @opt   = opt
-    @commitref = nil
-    repo   = @cfg.repo
-
-    outputs.types.each do |type|
-      type_cfg = ''
-      type_repo = File.join(File.dirname(repo), type + '.git')
-      outputs.type(type).each do |output|
-        (type_cfg << output; next) if not output.name
-        type_file = file + '--' + output.name
-        if @cfg.type_as_directory?
-          type_file = type + '/' + type_file
-          type_repo = repo
+      if @cfg.repo.respond_to?(:each)
+        @cfg.repo.each do |group, repo|
+          @cfg.repo["#{group}="] = File.expand_path repo
         end
-        update type_repo, type_file, output
+      else
+        @cfg.repo = File.expand_path @cfg.repo
       end
-      update type_repo, file, type_cfg
     end
 
-    update repo, file, outputs.to_cfg
-  end
+    def store file, outputs, opt = {}
+      @msg   = opt[:msg]
+      @user  = (opt[:user]  or @cfg.user)
+      @email = (opt[:email] or @cfg.email)
+      @opt   = opt
+      @commitref = nil
+      repo = @cfg.repo
+
+      outputs.types.each do |type|
+        type_cfg = ''
+        type_repo = File.join(File.dirname(repo), type + '.git')
+        outputs.type(type).each do |output|
+          (type_cfg << output; next) if not output.name
+          type_file = file + '--' + output.name
+          if @cfg.type_as_directory?
+            type_file = type + '/' + type_file
+            type_repo = repo
+          end
+          update type_repo, type_file, output
+        end
+        update type_repo, file, type_cfg
+      end
 
+      update repo, file, outputs.to_cfg
+    end
 
-  def fetch node, group
-    begin
-      repo, path = yield_repo_and_path(node, group)
-      repo = Rugged::Repository.new repo
-      index = repo.index
-      index.read_tree repo.head.target.tree unless repo.empty?
-      repo.read(index.get(path)[:oid]).data
-    rescue
-      'node not found'
+    def fetch node, group
+      begin
+        repo, path = yield_repo_and_path(node, group)
+        repo = Rugged::Repository.new repo
+        index = repo.index
+        index.read_tree repo.head.target.tree unless repo.empty?
+        repo.read(index.get(path)[:oid]).data
+      rescue
+        'node not found'
+      end
     end
-  end
 
     # give a hash of all oid revision for the given node, and the date of the commit
     def version node, group
@@ -80,7 +79,7 @@ class Git < Output
         walker.sorting(Rugged::SORT_DATE)
         walker.push(repo.head.target)
         i = -1
-        tab  = []
+        tab = []
         walker.each do |commit|
           if commit.diff(paths: [path]).size > 0
             hash = {}
@@ -98,18 +97,18 @@ class Git < Output
       end
     end
 
-    #give the blob of a specific revision
+    # give the blob of a specific revision
     def get_version node, group, oid
       begin
         repo, path = yield_repo_and_path(node, group)
         repo = Rugged::Repository.new repo
-        repo.blob_at(oid,path).content
+        repo.blob_at(oid, path).content
       rescue
         'version not found'
       end
     end
 
-    #give a hash with the patch of a diff between 2 revision and the stats (added and deleted lines)
+    # give a hash with the patch of a diff between 2 revision and the stats (added and deleted lines)
     def get_diff node, group, oid1, oid2
       begin
         diff_commits = nil
@@ -122,15 +121,15 @@ class Git < Output
           diff = repo.diff(commit_old, commit)
           diff.each do |patch|
             if /#{node.name}\s+/.match(patch.to_s.lines.first)
-              diff_commits = {:patch => patch.to_s, :stat => patch.stat}
+              diff_commits = { :patch => patch.to_s, :stat => patch.stat }
               break
             end
           end
         else
           stat = commit.parents[0].diff(commit).stat
-          stat = [stat[1],stat[2]]
+          stat = [stat[1], stat[2]]
           patch = commit.parents[0].diff(commit).patch
-          diff_commits = {:patch => patch, :stat => stat}
+          diff_commits = { :patch => patch, :stat => stat }
         end
 
         diff_commits
@@ -139,68 +138,67 @@ class Git < Output
       end
     end
 
-  private
+    private
 
-  def yield_repo_and_path(node, group)
-    repo, path = node.repo, node.name
+    def yield_repo_and_path(node, group)
+      repo, path = node.repo, node.name
 
-    if group and @cfg.single_repo?
-      path = "#{group}/#{node.name}"
-    end
+      if group and @cfg.single_repo?
+        path = "#{group}/#{node.name}"
+      end
 
-    [repo, path]
-  end
+      [repo, path]
+    end
 
-  def update repo, file, data
-    return if data.empty?
+    def update repo, file, data
+      return if data.empty?
 
-    if @opt[:group]
-      if @cfg.single_repo?
-        file = File.join @opt[:group], file
-      else
-        repo = if repo.is_a?(::String)
-                 File.join File.dirname(repo), @opt[:group] + '.git'
-               else
-                 repo[@opt[:group]]
-               end
+      if @opt[:group]
+        if @cfg.single_repo?
+          file = File.join @opt[:group], file
+        else
+          repo = if repo.is_a?(::String)
+                   File.join File.dirname(repo), @opt[:group] + '.git'
+                 else
+                   repo[@opt[:group]]
+                 end
+        end
       end
-    end
 
-    begin
-      repo = Rugged::Repository.new repo
-      update_repo repo, file, data, @msg, @user, @email
-    rescue Rugged::OSError, Rugged::RepositoryError => open_error
       begin
-        Rugged::Repository.init_at repo, :bare
-      rescue => create_error
-        raise GitError, "first '#{open_error.message}' was raised while opening git repo, then '#{create_error.message}' was while trying to create git repo"
+        repo = Rugged::Repository.new repo
+        update_repo repo, file, data, @msg, @user, @email
+      rescue Rugged::OSError, Rugged::RepositoryError => open_error
+        begin
+          Rugged::Repository.init_at repo, :bare
+        rescue => create_error
+          raise GitError, "first '#{open_error.message}' was raised while opening git repo, then '#{create_error.message}' was while trying to create git repo"
+        end
+        retry
       end
-      retry
     end
-  end
 
-  def update_repo repo, file, data, msg, user, email
-    oid = repo.write data, :blob
-    index = repo.index
-    index.read_tree repo.head.target.tree unless repo.empty?
-
-    tree_old = index.write_tree repo
-    index.add :path=>file, :oid=>oid, :mode=>0100644
-    tree_new = index.write_tree repo
-
-    if tree_old != tree_new
-      repo.config['user.name']  = user
-      repo.config['user.email'] = email
-      @commitref = Rugged::Commit.create(repo,
-        :tree       => index.write_tree(repo),
-        :message    => msg,
-        :parents    => repo.empty? ? [] : [repo.head.target].compact,
-        :update_ref => 'HEAD',
-      )
-
-      index.write
-      true
+    def update_repo repo, file, data, msg, user, email
+      oid = repo.write data, :blob
+      index = repo.index
+      index.read_tree repo.head.target.tree unless repo.empty?
+
+      tree_old = index.write_tree repo
+      index.add :path => file, :oid => oid, :mode => 0100644
+      tree_new = index.write_tree repo
+
+      if tree_old != tree_new
+        repo.config['user.name']  = user
+        repo.config['user.email'] = email
+        @commitref = Rugged::Commit.create(repo,
+                                           :tree       => index.write_tree(repo),
+                                           :message    => msg,
+                                           :parents    => repo.empty? ? [] : [repo.head.target].compact,
+                                           :update_ref => 'HEAD',)
+
+        index.write
+        true
+      end
     end
   end
 end
-end
diff --git a/lib/oxidized/output/gitcrypt.rb b/lib/oxidized/output/gitcrypt.rb
index 0567458..2da0179 100644
--- a/lib/oxidized/output/gitcrypt.rb
+++ b/lib/oxidized/output/gitcrypt.rb
@@ -22,7 +22,7 @@ module Oxidized
       if @cfg.empty?
         Oxidized.asetus.user.output.gitcrypt.user  = 'Oxidized'
         Oxidized.asetus.user.output.gitcrypt.email = 'o@example.com'
-        Oxidized.asetus.user.output.gitcrypt.repo  =  File.join(Config::Root, 'oxidized.git')
+        Oxidized.asetus.user.output.gitcrypt.repo = File.join(Config::Root, 'oxidized.git')
         Oxidized.asetus.save :user
         raise NoConfig, 'no output git config, edit ~/.config/oxidized/config'
       end
@@ -60,13 +60,13 @@ module Oxidized
       end
     end
 
-    def store file, outputs, opt={}
+    def store file, outputs, opt = {}
       @msg   = opt[:msg]
       @user  = (opt[:user]  or @cfg.user)
       @email = (opt[:email] or @cfg.email)
       @opt   = opt
       @commitref = nil
-      repo   = @cfg.repo
+      repo = @cfg.repo
 
       outputs.types.each do |type|
         type_cfg = ''
@@ -86,7 +86,6 @@ module Oxidized
       update repo, file, outputs.to_cfg
     end
 
-
     def fetch node, group
       begin
         repo, path = yield_repo_and_path(node, group)
@@ -115,7 +114,7 @@ module Oxidized
         unlock repo
         walker = repo.log.path(path)
         i = -1
-        tab  = []
+        tab = []
         walker.each do |commit|
           hash = {}
           hash[:date] = commit.date.to_s
@@ -131,7 +130,7 @@ module Oxidized
       end
     end
 
-    #give the blob of a specific revision
+    # give the blob of a specific revision
     def get_version node, group, oid
       begin
         repo, path = yield_repo_and_path(node, group)
@@ -145,7 +144,7 @@ module Oxidized
       end
     end
 
-    #give a hash with the patch of a diff between 2 revision and the stats (added and deleted lines)
+    # give a hash with the patch of a diff between 2 revision and the stats (added and deleted lines)
     def get_diff node, group, oid1, oid2
       begin
         diff_commits = nil
@@ -160,15 +159,15 @@ module Oxidized
           stats = [diff.stats[:files][node.name][:insertions], diff.stats[:files][node.name][:deletions]]
           diff.each do |patch|
             if /#{node.name}\s+/.match(patch.patch.to_s.lines.first)
-              diff_commits = {:patch => patch.patch.to_s, :stat => stats}
+              diff_commits = { :patch => patch.patch.to_s, :stat => stats }
               break
             end
           end
         else
           stat = commit.parents[0].diff(commit).stats
-          stat = [stat[:files][node.name][:insertions],stat[:files][node.name][:deletions]]
+          stat = [stat[:files][node.name][:insertions], stat[:files][node.name][:deletions]]
           patch = commit.parents[0].diff(commit).patch
-          diff_commits = {:patch => patch, :stat => stat}
+          diff_commits = { :patch => patch, :stat => stat }
         end
         lock repo
         diff_commits
@@ -199,10 +198,10 @@ module Oxidized
           file = File.join @opt[:group], file
         else
           repo = if repo.is_a?(::String)
-            File.join File.dirname(repo), @opt[:group] + '.git'
-          else
-            repo[@opt[:group]]
-          end
+                   File.join File.dirname(repo), @opt[:group] + '.git'
+                 else
+                   repo[@opt[:group]]
+                 end
         end
       end
 
diff --git a/lib/oxidized/output/http.rb b/lib/oxidized/output/http.rb
index 13ba300..0467261 100644
--- a/lib/oxidized/output/http.rb
+++ b/lib/oxidized/output/http.rb
@@ -7,9 +7,9 @@ module Oxidized
 
     def setup
       if @cfg.empty?
-        CFGS.user.output.http.user  = 'Oxidized'
+        CFGS.user.output.http.user = 'Oxidized'
         CFGS.user.output.http.pasword = 'secret'
-        CFGS.user.output.http.url  =  'http://localhost/web-api/oxidized'
+        CFGS.user.output.http.url = 'http://localhost/web-api/oxidized'
         CFGS.save :user
         raise NoConfig, 'no output http config, edit ~/.config/oxidized/config'
       end
@@ -17,42 +17,38 @@ module Oxidized
     require "net/http"
     require "uri"
     require "json"
-    def store node, outputs, opt={}
+    def store node, outputs, opt = {}
       @commitref = nil
       json = JSON.pretty_generate(
-          {
-              'msg' => opt[:msg],
-              'user' => opt[:user],
-              'email' => opt[:email],
-              'group' => opt[:group],
-              'node' => node,
-              'config' => outputs.to_cfg,
-              # actually we need to also iterate outputs, for other types like in gitlab. But most people don't use 'type' functionality.
-          }
+        {
+          'msg' => opt[:msg],
+          'user' => opt[:user],
+          'email' => opt[:email],
+          'group' => opt[:group],
+          'node' => node,
+          'config' => outputs.to_cfg,
+          # actually we need to also iterate outputs, for other types like in gitlab. But most people don't use 'type' functionality.
+        }
       )
       uri = URI.parse @cfg.url
       http = Net::HTTP.new uri.host, uri.port
-      #http.use_ssl = true if uri.scheme = 'https'
-      req = Net::HTTP::Post.new(uri.request_uri, initheader = { 'Content-Type' => 'application/json'})
+      # http.use_ssl = true if uri.scheme = 'https'
+      req = Net::HTTP::Post.new(uri.request_uri, initheader = { 'Content-Type' => 'application/json' })
       req.basic_auth @cfg.user, @cfg.password
       req.body = json
       response = http.request req
 
       case response.code.to_i
-        when 200 || 201
-          Oxidized.logger.info "Configuration http backup complete for #{node}"
-          p [:success]
-        when (400..499)
-          Oxidized.logger.info "Configuration http backup for #{node} failed status: #{response.body}"
-          p [:bad_request]
-        when (500..599)
-          p [:server_problems]
-          Oxidized.logger.info "Configuration http backup for #{node} failed status: #{response.body}"
+      when 200 || 201
+        Oxidized.logger.info "Configuration http backup complete for #{node}"
+        p [:success]
+      when (400..499)
+        Oxidized.logger.info "Configuration http backup for #{node} failed status: #{response.body}"
+        p [:bad_request]
+      when (500..599)
+        p [:server_problems]
+        Oxidized.logger.info "Configuration http backup for #{node} failed status: #{response.body}"
       end
-
     end
-
   end
 end
-
-
diff --git a/lib/oxidized/output/output.rb b/lib/oxidized/output/output.rb
index 1355d03..9fae7b0 100644
--- a/lib/oxidized/output/output.rb
+++ b/lib/oxidized/output/output.rb
@@ -3,8 +3,7 @@ module Oxidized
     class NoConfig < OxidizedError; end
 
     def cfg_to_str cfg
-      cfg.select{ |h| h[:type]=='cfg' }.map{ |h| h[:data] }.join
+      cfg.select { |h| h[:type] == 'cfg' }.map { |h| h[:data] }.join
     end
-
   end
 end
diff --git a/lib/oxidized/source/csv.rb b/lib/oxidized/source/csv.rb
index b61525e..ae1c0a9 100644
--- a/lib/oxidized/source/csv.rb
+++ b/lib/oxidized/source/csv.rb
@@ -1,54 +1,53 @@
 module Oxidized
-class CSV < Source
-  def initialize
-    @cfg = Oxidized.config.source.csv
-    super
-  end
-
-  def setup
-    if @cfg.empty?
-      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'
+  class CSV < Source
+    def initialize
+      @cfg = Oxidized.config.source.csv
+      super
     end
-    require 'gpgme' if @cfg.gpg?
-  end
 
-  def load
-    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|
-      next if line.match(/^\s*#/)
-      data  = line.chomp.split(@cfg.delimiter, -1)
-      next if data.empty?
-      # map node parameters
-      keys = {}
-      @cfg.map.each do |key, position|
-        keys[key.to_sym] = node_var_interpolate data[position]
+    def setup
+      if @cfg.empty?
+        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
-      keys[:model] = map_model keys[:model] if keys.has_key? :model
+      require 'gpgme' if @cfg.gpg?
+    end
 
-      # map node specific vars
-      vars = {}
-      @cfg.vars_map.each do |key, position|
-        vars[key.to_sym] = node_var_interpolate data[position]
-      end
-      keys[:vars] = vars unless vars.empty?
+    def load
+      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|
+        next if line.match(/^\s*#/)
+        data = line.chomp.split(@cfg.delimiter, -1)
+        next if data.empty?
+        # map node parameters
+        keys = {}
+        @cfg.map.each do |key, position|
+          keys[key.to_sym] = node_var_interpolate data[position]
+        end
+        keys[:model] = map_model keys[:model] if keys.has_key? :model
 
-      nodes << keys
+        # map node specific vars
+        vars = {}
+        @cfg.vars_map.each do |key, position|
+          vars[key.to_sym] = node_var_interpolate data[position]
+        end
+        keys[:vars] = vars unless vars.empty?
+
+        nodes << keys
+      end
+      nodes
     end
-    nodes
   end
-
-end
 end
diff --git a/lib/oxidized/source/http.rb b/lib/oxidized/source/http.rb
index 56a575b..4480cbb 100644
--- a/lib/oxidized/source/http.rb
+++ b/lib/oxidized/source/http.rb
@@ -1,64 +1,63 @@
 module Oxidized
-class HTTP < Source
-  def initialize
-    @cfg = Oxidized.config.source.http
-    super
-  end
-
-  def setup
-    if @cfg.url.empty?
-      raise NoConfig, 'no source http url config, edit ~/.config/oxidized/config'
+  class HTTP < Source
+    def initialize
+      @cfg = Oxidized.config.source.http
+      super
     end
-  end
-
-  require "net/http"
-  require "uri"
-  require "json"
 
-  def load
-    nodes = []
-    uri = URI.parse(@cfg.url)
-    http = Net::HTTP.new(uri.host, uri.port)
-    http.use_ssl = true if uri.scheme == 'https'
-    http.verify_mode = OpenSSL::SSL::VERIFY_NONE unless @cfg.secure
-
-    # map headers
-    headers = {}
-    @cfg.headers.each do |header, value|
-      headers[header] = value
+    def setup
+      if @cfg.url.empty?
+        raise NoConfig, 'no source http url config, edit ~/.config/oxidized/config'
+      end
     end
 
-    request = Net::HTTP::Get.new(uri.request_uri, headers)
-    if (@cfg.user? && @cfg.pass?)
-        request.basic_auth(@cfg.user,@cfg.pass)
-    end
+    require "net/http"
+    require "uri"
+    require "json"
 
-    response = http.request(request)
-    data = JSON.parse(response.body)
-    data.each do |node|
-      next if node.empty?
-      # map node parameters
-      keys = {}
-      @cfg.map.each do |key, want_position|
-        want_positions = want_position.split('.')
-        keys[key.to_sym] = node_var_interpolate node.dig(*want_positions)
+    def load
+      nodes = []
+      uri = URI.parse(@cfg.url)
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true if uri.scheme == 'https'
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE unless @cfg.secure
+
+      # map headers
+      headers = {}
+      @cfg.headers.each do |header, value|
+        headers[header] = value
       end
-      keys[:model] = map_model keys[:model] if keys.has_key? :model
 
-      # map node specific vars
-      vars = {}
-      @cfg.vars_map.each do |key, want_position|
-        want_positions = want_position.split('.')
-        vars[key.to_sym] = node_var_interpolate node.dig(*want_positions)
+      request = Net::HTTP::Get.new(uri.request_uri, headers)
+      if (@cfg.user? && @cfg.pass?)
+        request.basic_auth(@cfg.user, @cfg.pass)
       end
-      keys[:vars] = vars unless vars.empty?
 
-      nodes << keys
+      response = http.request(request)
+      data = JSON.parse(response.body)
+      data.each do |node|
+        next if node.empty?
+        # map node parameters
+        keys = {}
+        @cfg.map.each do |key, want_position|
+          want_positions = want_position.split('.')
+          keys[key.to_sym] = node_var_interpolate node.dig(*want_positions)
+        end
+        keys[:model] = map_model keys[:model] if keys.has_key? :model
+
+        # map node specific vars
+        vars = {}
+        @cfg.vars_map.each do |key, want_position|
+          want_positions = want_position.split('.')
+          vars[key.to_sym] = node_var_interpolate node.dig(*want_positions)
+        end
+        keys[:vars] = vars unless vars.empty?
+
+        nodes << keys
+      end
+      nodes
     end
-    nodes
   end
-
-end
 end
 
 if RUBY_VERSION < '2.3'
diff --git a/lib/oxidized/source/source.rb b/lib/oxidized/source/source.rb
index 9b8bc94..3bae0f6 100644
--- a/lib/oxidized/source/source.rb
+++ b/lib/oxidized/source/source.rb
@@ -11,13 +11,12 @@ module Oxidized
     end
 
     def node_var_interpolate var
-       case var
-       when "nil"   then nil
-       when "false" then false
-       when "true"  then true
-       else var
-       end
+      case var
+      when "nil"   then nil
+      when "false" then false
+      when "true"  then true
+      else var
+      end
     end
-
   end
 end
diff --git a/lib/oxidized/source/sql.rb b/lib/oxidized/source/sql.rb
index ca3bcc3..5737c93 100644
--- a/lib/oxidized/source/sql.rb
+++ b/lib/oxidized/source/sql.rb
@@ -1,63 +1,62 @@
 module Oxidized
-class SQL < Source
-  begin
-    require 'sequel'
-  rescue LoadError
-    raise OxidizedError, 'sequel not found: sudo gem install sequel'
-  end
-
-  def setup
-    if @cfg.empty?
-      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'
+  class SQL < Source
+    begin
+      require 'sequel'
+    rescue LoadError
+      raise OxidizedError, 'sequel not found: sudo gem install sequel'
     end
-  end
 
-  def load
-    nodes = []
-    db = connect
-    query = db[@cfg.table.to_sym]
-    query = query.with_sql(@cfg.query) if @cfg.query?
-    query.each do |node|
-      # map node parameters
-      keys = {}
-      @cfg.map.each { |key, sql_column| keys[key.to_sym] = node_var_interpolate node[sql_column.to_sym] }
-      keys[:model] = map_model keys[:model] if keys.has_key? :model
-
-      # map node specific vars
-      vars = {}
-      @cfg.vars_map.each do |key, sql_column|
-        vars[key.to_sym] = node_var_interpolate node[sql_column.to_sym]
+    def setup
+      if @cfg.empty?
+        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
-      keys[:vars] = vars unless vars.empty?
+    end
 
-      nodes << keys
+    def load
+      nodes = []
+      db = connect
+      query = db[@cfg.table.to_sym]
+      query = query.with_sql(@cfg.query) if @cfg.query?
+      query.each do |node|
+        # map node parameters
+        keys = {}
+        @cfg.map.each { |key, sql_column| keys[key.to_sym] = node_var_interpolate node[sql_column.to_sym] }
+        keys[:model] = map_model keys[:model] if keys.has_key? :model
+
+        # map node specific vars
+        vars = {}
+        @cfg.vars_map.each do |key, sql_column|
+          vars[key.to_sym] = node_var_interpolate node[sql_column.to_sym]
+        end
+        keys[:vars] = vars unless vars.empty?
+
+        nodes << keys
+      end
+      db.disconnect
+      nodes
     end
-    db.disconnect
-    nodes
-  end
 
-  private
+    private
 
-  def initialize
-    super
-    @cfg = Oxidized.config.source.sql
-  end
+    def initialize
+      super
+      @cfg = Oxidized.config.source.sql
+    end
 
-  def connect
-    Sequel.connect(:adapter  => @cfg.adapter,
-                   :host     => @cfg.host?,
-                   :user     => @cfg.user?,
-                   :password => @cfg.password?,
-                   :database => @cfg.database)
-  rescue Sequel::AdapterNotFound => error
-    raise OxidizedError, "SQL adapter gem not installed: " + error.message
+    def connect
+      Sequel.connect(:adapter  => @cfg.adapter,
+                     :host     => @cfg.host?,
+                     :user     => @cfg.user?,
+                     :password => @cfg.password?,
+                     :database => @cfg.database)
+    rescue Sequel::AdapterNotFound => error
+      raise OxidizedError, "SQL adapter gem not installed: " + error.message
+    end
   end
-
-end
 end
diff --git a/lib/oxidized/string.rb b/lib/oxidized/string.rb
index 8bcb082..ca4862d 100644
--- a/lib/oxidized/string.rb
+++ b/lib/oxidized/string.rb
@@ -15,11 +15,11 @@ module Oxidized
 
     # sets @cmd and @name unless @name is already set
     def set_cmd command
-      @cmd  = command
+      @cmd = command
       @name ||= @cmd.strip.gsub(/\s+/, '_')
     end
 
-    def initialize str=''
+    def initialize str = ''
       super
       if str.class == Oxidized::String
         @cmd  = str.cmd
@@ -27,6 +27,5 @@ module Oxidized
         @type = str.type
       end
     end
-
   end
 end
diff --git a/lib/oxidized/worker.rb b/lib/oxidized/worker.rb
index 4173680..7eaa888 100644
--- a/lib/oxidized/worker.rb
+++ b/lib/oxidized/worker.rb
@@ -52,7 +52,7 @@ module Oxidized
         msg += " with message '#{node.msg}'" if node.msg
         output = node.output.new
         if output.store node.name, job.config,
-                              :msg => msg, :email => node.email, :user => node.user, :group => node.group
+                        :msg => msg, :email => node.email, :user => node.user, :group => node.group
           Oxidized.logger.info "Configuration updated for #{node.group}/#{node.name}"
           Oxidized.Hooks.handle :post_store, :node => node,
                                              :job => job,
diff --git a/oxidized.gemspec b/oxidized.gemspec
index dfcaf4c..3601cce 100644
--- a/oxidized.gemspec
+++ b/oxidized.gemspec
@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'oxidized/version'
@@ -6,16 +7,16 @@ require 'oxidized/version'
 Gem::Specification.new do |s|
   s.name              = 'oxidized'
   s.version           = Oxidized::VERSION
-  s.licenses          = %w( Apache-2.0 )
+  s.licenses          = %w(Apache-2.0)
   s.platform          = Gem::Platform::RUBY
-  s.authors           = [ 'Saku Ytti', 'Samer Abdel-Hafez', 'Anton Aksola' ]
-  s.email             = %w( saku@ytti.fi sam@arahant.net aakso@iki.fi)
+  s.authors           = ['Saku Ytti', 'Samer Abdel-Hafez', 'Anton Aksola']
+  s.email             = %w(saku@ytti.fi sam@arahant.net aakso@iki.fi)
   s.homepage          = 'http://github.com/ytti/oxidized'
   s.summary           = 'feeble attempt at rancid'
   s.description       = 'software to fetch configuration from network devices and store them'
   s.rubyforge_project = s.name
   s.files             = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  s.executables       = %w( oxidized )
+  s.executables       = %w(oxidized)
   s.require_path      = 'lib'
 
   s.required_ruby_version =           '>= 2.0.0'
@@ -25,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'rugged',  '~> 0.21',  '>= 0.21.4'
 
   if defined?(RUBY_VERSION) && RUBY_VERSION > '2.3'
-      s.add_runtime_dependency 'net-telnet', '~> 0'
+    s.add_runtime_dependency 'net-telnet', '~> 0'
   end
 
   s.add_development_dependency 'pry',      '~> 0'
diff --git a/spec/cli_spec.rb b/spec/cli_spec.rb
index bf6058a..4ceb8ed 100644
--- a/spec/cli_spec.rb
+++ b/spec/cli_spec.rb
@@ -2,11 +2,11 @@ require 'spec_helper'
 require 'oxidized/cli'
 
 describe Oxidized::CLI do
-  before(:each) do 
-    @original = ARGV 
-    Oxidized.asetus = Asetus.new 
+  before(:each) do
+    @original = ARGV
+    Oxidized.asetus = Asetus.new
   end
-  
+
   after(:each) do
     ARGV.replace @original
   end
diff --git a/spec/githubrepo_spec.rb b/spec/githubrepo_spec.rb
index baa9a14..67c99f0 100644
--- a/spec/githubrepo_spec.rb
+++ b/spec/githubrepo_spec.rb
@@ -70,7 +70,7 @@ describe GithubRepo do
         repo_head.expects(:target).returns("our_target")
         merge_index.expects(:write_tree).with(repo).returns("tree")
         merge_index.expects(:conflicts?).returns(false)
-        Rugged::Commit.expects(:create).with(repo, 
+        Rugged::Commit.expects(:create).with(repo,
                                              parents: ["our_target", "their_target"],
                                              tree: "tree",
                                              message: "Merge remote-tracking branch 'origin/master'",
-- 
cgit v1.2.1


From e848b3caba1dadbb1b46ada06b074fbf796fca17 Mon Sep 17 00:00:00 2001
From: Jason Ackley <jason@ackley.net>
Date: Sun, 22 Apr 2018 14:00:42 -0500
Subject: Change the debug log fsync to a flush

fsync() can be expensive on OSes and induce timeout failures when running with input debugging of SSH sessions.
---
 lib/oxidized/input/ssh.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/oxidized/input/ssh.rb b/lib/oxidized/input/ssh.rb
index 27e81e0..37d6e75 100644
--- a/lib/oxidized/input/ssh.rb
+++ b/lib/oxidized/input/ssh.rb
@@ -100,7 +100,7 @@ module Oxidized
         ch.on_data do |_ch, data|
           if Oxidized.config.input.debug?
             @log.print data
-            @log.fsync
+            @log.flush
           end
           @output << data
           @output = @node.model.expects @output
-- 
cgit v1.2.1


From 82d67f2f337df5dbef8109fc67ddc9a86ba79bdc Mon Sep 17 00:00:00 2001
From: Wild Kat <wk@futureinquestion.net>
Date: Sun, 22 Apr 2018 22:06:23 +0200
Subject: integrate codecov

---
 .rubocop_todo.yml   | 29 -----------------------------
 README.md           |  2 +-
 oxidized.gemspec    | 27 ++++++++++++++++-----------
 spec/spec_helper.rb |  8 ++++++++
 4 files changed, 25 insertions(+), 41 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index b91409a..ac9dca5 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -6,14 +6,6 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 5
-# Cop supports --auto-correct.
-# Configuration parameters: Include, TreatCommentsAsGroupSeparators.
-# Include: **/*.gemspec
-Gemspec/OrderedDependencies:
-  Exclude:
-    - 'oxidized.gemspec'
-
 # Offense count: 1
 # Configuration parameters: Include.
 # Include: **/*.gemspec
@@ -84,12 +76,6 @@ Layout/ElseAlignment:
     - 'lib/oxidized/output/gitcrypt.rb'
     - 'lib/oxidized/source/csv.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Layout/EmptyLineAfterMagicComment:
-  Exclude:
-    - 'oxidized.gemspec'
-
 # Offense count: 17
 # Cop supports --auto-correct.
 # Configuration parameters: AllowAdjacentOneLineDefs, NumberOfEmptyLines.
@@ -338,7 +324,6 @@ Layout/SpaceInsideArrayLiteralBrackets:
   Exclude:
     - 'lib/oxidized/input/ssh.rb'
     - 'lib/oxidized/input/telnet.rb'
-    - 'oxidized.gemspec'
 
 # Offense count: 29
 # Cop supports --auto-correct.
@@ -384,12 +369,6 @@ Layout/SpaceInsideParens:
     - 'lib/oxidized/input/telnet.rb'
     - 'lib/oxidized/model/asa.rb'
 
-# Offense count: 5
-# Cop supports --auto-correct.
-Layout/SpaceInsidePercentLiteralDelimiters:
-  Exclude:
-    - 'oxidized.gemspec'
-
 # Offense count: 6
 # Cop supports --auto-correct.
 Layout/SpaceInsideRangeLiteral:
@@ -758,18 +737,11 @@ Style/EmptyMethod:
   Exclude:
     - 'lib/oxidized/hook.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/Encoding:
-  Exclude:
-    - 'oxidized.gemspec'
-
 # Offense count: 2
 # Cop supports --auto-correct.
 Style/ExpandPathArguments:
   Exclude:
     - 'bin/console'
-    - 'oxidized.gemspec'
 
 # Offense count: 6
 # Cop supports --auto-correct.
@@ -944,7 +916,6 @@ Style/PercentLiteralDelimiters:
   Exclude:
     - 'lib/oxidized/config.rb'
     - 'lib/oxidized/input/ssh.rb'
-    - 'oxidized.gemspec'
 
 # Offense count: 22
 # Cop supports --auto-correct.
diff --git a/README.md b/README.md
index 9e52792..76b9add 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Oxidized [![Build Status](https://travis-ci.org/ytti/oxidized.svg)](https://travis-ci.org/ytti/oxidized) [![Gem Version](https://badge.fury.io/rb/oxidized.svg)](http://badge.fury.io/rb/oxidized) [![Join the chat at https://gitter.im/oxidized/Lobby](https://badges.gitter.im/oxidized/Lobby.svg)](https://gitter.im/oxidized/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+# Oxidized [![Build Status](https://travis-ci.org/ytti/oxidized.svg)](https://travis-ci.org/ytti/oxidized) [![codecov.io](https://codecov.io/gh/ytti/oxidized/coverage.svg?branch=master)](https://codecov.io/gh/ytti/oxidized?branch=master) [![Gem Version](https://badge.fury.io/rb/oxidized.svg)](http://badge.fury.io/rb/oxidized) [![Join the chat at https://gitter.im/oxidized/Lobby](https://badges.gitter.im/oxidized/Lobby.svg)](https://gitter.im/oxidized/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 Oxidized is a network device configuration backup tool. It's a RANCID replacement!
 
diff --git a/oxidized.gemspec b/oxidized.gemspec
index dfcaf4c..105da7e 100644
--- a/oxidized.gemspec
+++ b/oxidized.gemspec
@@ -1,39 +1,44 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'oxidized/version'
 
 Gem::Specification.new do |s|
   s.name              = 'oxidized'
   s.version           = Oxidized::VERSION
-  s.licenses          = %w( Apache-2.0 )
+  s.licenses          = %w[Apache-2.0]
   s.platform          = Gem::Platform::RUBY
-  s.authors           = [ 'Saku Ytti', 'Samer Abdel-Hafez', 'Anton Aksola' ]
-  s.email             = %w( saku@ytti.fi sam@arahant.net aakso@iki.fi)
+  s.authors           = ['Saku Ytti', 'Samer Abdel-Hafez', 'Anton Aksola']
+  s.email             = %w[saku@ytti.fi sam@arahant.net aakso@iki.fi]
   s.homepage          = 'http://github.com/ytti/oxidized'
   s.summary           = 'feeble attempt at rancid'
   s.description       = 'software to fetch configuration from network devices and store them'
   s.rubyforge_project = s.name
   s.files             = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  s.executables       = %w( oxidized )
+  s.executables       = %w[oxidized]
   s.require_path      = 'lib'
 
   s.required_ruby_version =           '>= 2.0.0'
   s.add_runtime_dependency 'asetus',  '~> 0.1'
-  s.add_runtime_dependency 'slop',    '~> 3.5'
   s.add_runtime_dependency 'net-ssh', '~> 4.1.0'
   s.add_runtime_dependency 'rugged',  '~> 0.21',  '>= 0.21.4'
+  s.add_runtime_dependency 'slop',    '~> 3.5'
 
   if defined?(RUBY_VERSION) && RUBY_VERSION > '2.3'
       s.add_runtime_dependency 'net-telnet', '~> 0'
   end
+ 
+  s.add_development_dependency 'simplecov'
+  if ENV['CI'] == 'true'
+    s.add_development_dependency 'codecov'
+  end
 
-  s.add_development_dependency 'pry',      '~> 0'
   s.add_development_dependency 'bundler',  '~> 1.10'
-  s.add_development_dependency 'rake',     '~> 10.0'
+  s.add_development_dependency 'git',      '~> 1'
   s.add_development_dependency 'minitest', '~> 5.8'
   s.add_development_dependency 'mocha',    '~> 1.1'
-  s.add_development_dependency 'git',      '~> 1'
-  s.add_development_dependency 'rubocop',  '~> 0.55.0'
+  s.add_development_dependency 'pry',      '~> 0'
   s.add_development_dependency 'rails_best_practices', '~> 1.19'
+  s.add_development_dependency 'rake',     '~> 10.0'
+  s.add_development_dependency 'rubocop',  '~> 0.55.0'
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 2b49a6c..fc5167f 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,3 +1,11 @@
+require 'simplecov'
+SimpleCov.start
+
+if ENV['CI'] == 'true'
+  require 'codecov'
+  SimpleCov.formatter = SimpleCov::Formatter::Codecov
+end
+
 require 'minitest/autorun'
 require 'mocha/minitest'
 require 'oxidized'
-- 
cgit v1.2.1


From ffd4cc1569df3a9ad5c1ac453861544762ac4853 Mon Sep 17 00:00:00 2001
From: ytti <saku@ytti.fi>
Date: Mon, 23 Apr 2018 15:44:00 +0300
Subject: Fix Brocade links

Fixes #1302
---
 docs/Supported-OS-Types.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/Supported-OS-Types.md b/docs/Supported-OS-Types.md
index 4556946..8839cc3 100644
--- a/docs/Supported-OS-Types.md
+++ b/docs/Supported-OS-Types.md
@@ -32,12 +32,12 @@
   * [VOSS (VSP Operating System Software)](/lib/oxidized/model/voss.rb)
   * [BOSS (Baystack Operating System Software)](/lib/oxidized/model/boss.rb)
 * Brocade
-  * [FabricOS](lib/oxidized/model/fabricos.rb)
-  * [Ironware](lib/oxidized/model/ironware.rb)
-  * [NOS (Network Operating System)](lib/oxidized/model/nos.rb)
-  * [Vyatta](lib/oxidized/model/vyatta.rb)
-  * [6910](lib/oxidized/model/br6910.rb)
-  * [SLX-OS](lib/oxidized/model/slxos.rb)
+  * [FabricOS](/lib/oxidized/model/fabricos.rb)
+  * [Ironware](/lib/oxidized/model/ironware.rb)
+  * [NOS (Network Operating System)](/lib/oxidized/model/nos.rb)
+  * [Vyatta](/lib/oxidized/model/vyatta.rb)
+  * [6910](/lib/oxidized/model/br6910.rb)
+  * [SLX-OS](/lib/oxidized/model/slxos.rb)
 * Casa
   * [Casa](/lib/oxidized/model/casa.rb)
 * Check Point
-- 
cgit v1.2.1


From cb002959bfc776de117f2353041e9d40aa486585 Mon Sep 17 00:00:00 2001
From: Jason Ackley <jason@ackley.net>
Date: Tue, 24 Apr 2018 10:07:51 -0500
Subject: Add a note about database engine reserved keywords.

---
 docs/Sources.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/Sources.md b/docs/Sources.md
index 6d8e19e..eb3cd0c 100644
--- a/docs/Sources.md
+++ b/docs/Sources.md
@@ -59,6 +59,9 @@ pinentry-mode loopback
 
  Oxidized uses the `sequel` ruby gem. You can use a variety of databases that aren't explicitly listed. For more information visit https://github.com/jeremyevans/sequel Make sure you have the correct adapter!
 
+**NOTE** - Many database engines have reserved keywords that may conflict with Oxidized configuration field names (such as 'name', 'group', etc). Pay attention to any names that are used and observed proper quoting methods to avoid errors or unpredictable results.
+
+
 ## Source: MYSQL
 
 `sudo apt-get install libmysqlclient-dev`
-- 
cgit v1.2.1


From 6d9181ae1a191a9e4bfc028edfd3c5b5d0435d0e Mon Sep 17 00:00:00 2001
From: Jason Ackley <jason@ackley.net>
Date: Tue, 24 Apr 2018 10:08:58 -0500
Subject: Consistency - add a link back to Model-Notes at the bottom

---
 docs/Model-Notes/ArbOS.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/Model-Notes/ArbOS.md b/docs/Model-Notes/ArbOS.md
index f68467f..ebac997 100644
--- a/docs/Model-Notes/ArbOS.md
+++ b/docs/Model-Notes/ArbOS.md
@@ -8,3 +8,5 @@ If you are running ArbOS version 7 or lower then you may need to update the mode
     pre_logout 'exit'
   end
 ```
+
+Back to [Model-Notes](README.md)
-- 
cgit v1.2.1


From ffbc250f019fadabb7fd26b046c2a2e8e235b33c Mon Sep 17 00:00:00 2001
From: Jason Ackley <jason@ackley.net>
Date: Tue, 24 Apr 2018 10:09:28 -0500
Subject: Consistency - add a link back to Model-Notes at the bottom

---
 docs/Model-Notes/Comware.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/Model-Notes/Comware.md b/docs/Model-Notes/Comware.md
index e7a2198..048f312 100644
--- a/docs/Model-Notes/Comware.md
+++ b/docs/Model-Notes/Comware.md
@@ -10,3 +10,5 @@ info-center source default channel 1 log state off debug state off
 ```
 
 [Reference](https://github.com/ytti/oxidized/issues/1171)
+
+Back to [Model-Notes](README.md)
-- 
cgit v1.2.1


From b6f4c3665b773ae0ba95a9a6084392d47779e8fd Mon Sep 17 00:00:00 2001
From: Jason Ackley <jason@ackley.net>
Date: Tue, 24 Apr 2018 10:10:06 -0500
Subject: Netgear notes updates

Consistency - add a link back to Model-Notes at the bottom

Tag a YAML block as YAML for highlighting.
---
 docs/Model-Notes/Netgear.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/Model-Notes/Netgear.md b/docs/Model-Notes/Netgear.md
index 9bfd094..d82bdcc 100644
--- a/docs/Model-Notes/Netgear.md
+++ b/docs/Model-Notes/Netgear.md
@@ -6,7 +6,7 @@ There are several models available with CLI management via telnet (port 60000),
 ```
 Connected to 192.168.3.201.
 
-(GS748Tv4) 
+(GS748Tv4)
 Applying Interface configuration, please wait ...admin
 Password:********
 (GS748Tv4) >enable
@@ -42,7 +42,7 @@ Configuration for older/newer models: make sure you have defined variable 'enabl
 
 One possible configuration:
 - oxidized config
-```
+```yaml
 source:
   default: csv
   csv:
@@ -63,4 +63,6 @@ switchOldFW:netgear:admin:adminpw::60000
 switchNewFW:netgear:admin:adminpw:true:60000
 ```
 
-[Reference](https://github.com/ytti/oxidized/pull/1268)
\ No newline at end of file
+[Reference](https://github.com/ytti/oxidized/pull/1268)
+
+Back to [Model-Notes](README.md)
-- 
cgit v1.2.1


From d1723993e6048621f6a2428bcba51c1cd17a124e Mon Sep 17 00:00:00 2001
From: Jason Ackley <jason@ackley.net>
Date: Tue, 24 Apr 2018 10:11:24 -0500
Subject: Ruby-API.md cleanups

Refer to things as 'device' versus 'switch'

Add some example use case notes for post_login and pre_logout.

MD highlight some items in the list for clarity

misc text clarity adjustments.
---
 docs/Ruby-API.md | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/docs/Ruby-API.md b/docs/Ruby-API.md
index 8621870..a9963b3 100644
--- a/docs/Ruby-API.md
+++ b/docs/Ruby-API.md
@@ -6,7 +6,7 @@ The following objects exist in Oxidized.
 
 * gets config from nodes
 * must implement 'connect', 'get', 'cmd'
-* 'ssh', 'telnet, ftp, and tftp' implemented
+* 'ssh', 'telnet', 'ftp', and 'tftp' implemented
 
 ## Output
 
@@ -18,12 +18,12 @@ The following objects exist in Oxidized.
 
 * gets list of nodes to poll
 * must implement 'load'
-* source can have 'name', 'model', 'group', 'username', 'password', 'input', 'output', 'prompt'
-  * name - name of the devices
-  * model - model to use ios/junos/xyz, model is loaded dynamically when needed (Also default in config file)
-  * input - method to acquire config, loaded dynamically as needed (Also default in config file)
-  * output - method to store config, loaded dynamically as needed (Also default in config file)
-  * prompt - prompt used for node (Also default in config file, can be specified in model too)
+* source can have 'name', 'model', 'group', 'username', 'password', 'input', 'output', 'prompt' for each device.
+  * `name` - name of the device
+  * `model` - model to use ('ios', 'junos', etc).The model is loaded dynamically by the first node of that model type. (Also default in config file)
+  * `input` - method to acquire config, loaded dynamically as needed (Also default in config file)
+  * `output` - method to store config, loaded dynamically as needed (Also default in config file)
+  * `prompt` - prompt used for node (Also default in config file, can be specified in model too)
 * 'sql', 'csv' and 'http' (supports any format with single entry per line, like router.db)
 
 ## Model
@@ -116,16 +116,20 @@ the password prompt. If not specified, the default of `/^Password/` is used.
 #### `post_login`
 
 Used inside `cfg` invocations to specify commands to run once Oxidized has
-logged in to the switch. Takes one argument that is either a block (taking zero
+logged in to the device. Takes one argument that is either a block (taking zero
 parameters) or a string containing a command to execute.
 
+This allows `post_login` to be used for any model-specific items prior to running the regular commands. This could include disabling the output pager or timestamp outputs that would cause constant differences.
+
 #### `pre_logout`
 
 Used to specify commands to run before Oxidized closes the connection to the
-switch. Takes one argument that is either a block (taking zero parameters) or a
+device. Takes one argument that is either a block (taking zero parameters) or a
 string containing a command to execute.
 
+This allows `pre_logout` to be used to 'undo' any changes that may have been needed via `post_login` (restore pager output, etc.)
+
 #### `send`
 
 Usually used inside `expect` or blocks passed to `post_login`/`pre_logout`.
-Takes a single parameter: a string to be sent to the switch.
+Takes a single parameter: a string to be sent to the device.
-- 
cgit v1.2.1


From e383a573e6c11f7366ce52774e191f7272db114f Mon Sep 17 00:00:00 2001
From: Jason Ackley <jason@ackley.net>
Date: Tue, 24 Apr 2018 10:13:49 -0500
Subject: Misc Hooks.md cleanups

misc text clarity.

clarify timeout is in seconds
clarity the publickey/privatekey are paths - not the keys themselves.

Reorder the AWS SNS example of describing the config before the example config for consistency with the rest.
---
 docs/Hooks.md | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/docs/Hooks.md b/docs/Hooks.md
index fb80a19..ff430ca 100644
--- a/docs/Hooks.md
+++ b/docs/Hooks.md
@@ -1,6 +1,6 @@
 # Hooks
 
-You can define arbitrary number of hooks that subscribe different events. The hook system is modular and different kind of hook types can be enabled.
+You can define an arbitrary number of hooks that subscribe to different events. The hook system is modular and different kind of hook types can be enabled.
 
 ## Configuration
 
@@ -38,10 +38,10 @@ OX_REPO_COMMITREF
 OX_REPO_NAME
 ```
 
-Exec hook recognizes following configuration keys:
+Exec hook recognizes the following configuration keys:
 
-* `timeout`: hard timeout for the command execution. SIGTERM will be sent to the child process after the timeout has elapsed. Default: 60
-* `async`: influences whether main thread will wait for the command execution. Set this true for long running commands so node pull is not blocked. Default: false
+* `timeout`: hard timeout (in seconds) for the command execution. SIGTERM will be sent to the child process after the timeout has elapsed. Default: `60`
+* `async`: Execute the command in an asynchronous fashion. The main thread by default will wait for the hook command execution to complete. Set this to `true` for long running commands so node configuration pulls are not blocked. Default: `false`
 * `cmd`: command to run.
 
 ### exec hook configuration example
@@ -79,8 +79,8 @@ For ssh key-based authentication, it is possible to set the environment variable
 * `remote_repo`: the remote repository to be pushed to.
 * `username`: username for repository auth.
 * `password`: password for repository auth.
-* `publickey`: public key for repository auth.
-* `privatekey`: private key for repository auth.
+* `publickey`: public key file path for repository auth.
+* `privatekey`: private key file path for repository auth.
 
 When using groups, each group must have a unique entry in the `remote_repo` config.
 
@@ -95,7 +95,7 @@ hooks:
 
 ### githubrepo hook configuration example
 
-Authenticate with a username and a password:
+Authenticate with a username and a password without groups in use:
 
 ```yaml
 hooks:
@@ -130,6 +130,11 @@ Fields sent in the message:
 * `model`: Model name (e.g. `eos`)
 * `node`: Device hostname
 
+
+The AWS SNS hook requires the following configuration keys:
+
+* `region`: AWS Region name
+* `topic_arn`: ASN Topic reference
 ### awssns hook configuration example
 
 ```yaml
@@ -141,11 +146,6 @@ hooks:
     topic_arn: arn:aws:sns:us-east-1:1234567:oxidized-test-backup_events
 ```
 
-AWS SNS hook requires the following configuration keys:
-
-* `region`: AWS Region name
-* `topic_arn`: ASN Topic reference
-
 Your AWS credentials should be stored in `~/.aws/credentials`.
 
 ## Hook type: slackdiff
-- 
cgit v1.2.1


From 7d450963907a76b26c47082b5c482a093ba3a533 Mon Sep 17 00:00:00 2001
From: Jason Ackley <jason@ackley.net>
Date: Tue, 24 Apr 2018 10:15:45 -0500
Subject: A few Outputs.md textual cleanups

misc clarity items
---
 docs/Outputs.md | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/docs/Outputs.md b/docs/Outputs.md
index 92c672c..fab3bf8 100644
--- a/docs/Outputs.md
+++ b/docs/Outputs.md
@@ -14,7 +14,7 @@ output:
 
 This uses the rugged/libgit2 interface. So you should remember that normal Git hooks will not be executed.
 
-For a single repositories for all devices:
+For a single repository containing all devices:
 
 ```yaml
 output:
@@ -25,7 +25,7 @@ output:
     repo: "/var/lib/oxidized/devices.git"
 ```
 
-And for groups repositories:
+And for group-based repositories:
 
 ```yaml
 output:
@@ -68,7 +68,7 @@ output:
 This uses the gem git and system git-crypt interfaces. Have a look at [GIT-Crypt](https://www.agwa.name/projects/git-crypt/) documentation to know how to install it.
 Additionally to user and email informations, you have to provide the users ID that can be a key ID, a full fingerprint, an email address, or anything else that uniquely identifies a public key to GPG (see "HOW TO SPECIFY A USER ID" in the gpg man page).
 
-For a single repositories for all devices:
+For a single repository containing all devices:
 
 ```yaml
 output:
@@ -82,7 +82,7 @@ output:
       - "<user@example.com>"
 ```
 
-And for groups repositories:
+And for group-based repositories:
 
 ```yaml
 output:
@@ -130,8 +130,9 @@ Please note that user list is only updated once at creation.
 
 ## Output: Http
 
-POST a config to the specified URL
+The HTTP output will POST a config to the specified HTTP URL. Basic username/password authentication is supported.
 
+Example HTTP output configuration:
 ```yaml
 output:
   default: http
@@ -185,4 +186,4 @@ which will result in the following layout
 diff/$FQDN--show_running_config
 nodiff/$FQDN--show_version
 nodiff/$FQDN--show_inventory
-```
\ No newline at end of file
+```
-- 
cgit v1.2.1


From 90a84a79279a0bac817ef871a4992e3d7d019cef Mon Sep 17 00:00:00 2001
From: Jason Ackley <jason@ackley.net>
Date: Tue, 24 Apr 2018 10:16:38 -0500
Subject: Give some examples of smart loading

Indicate that it can be used to have local site changes or updated models from the repo.

minor text clarity on other items.
---
 docs/Creating-Models.md | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/docs/Creating-Models.md b/docs/Creating-Models.md
index d7a8155..3cb87c3 100644
--- a/docs/Creating-Models.md
+++ b/docs/Creating-Models.md
@@ -4,6 +4,8 @@ Oxidized supports a growing list of [operating system types](Supported-OS-Types.
 
 A user may wish to extend an existing model to collect the output of additional commands. Oxidized offers smart loading of models in order to facilitate this with ease, without the need to introduce changes to the upstream source code.
 
+This methodology allows local site changes to be preserved during Oxidized version updates / gem updates.
+
 ## Extending an existing model with a new command
 
 The example below can be used to extend the `JunOS` model to collect the output of `show interfaces diagnostics optics` and append the output to the configuration file as a comment. This command retrieves DOM information on pluggable optics present in a `JunOS`-powered chassis.
@@ -25,13 +27,16 @@ class JunOS
 end
 ```
 
-Due to smart loading, the user-supplied `~/.config/oxidized/model/junos.rb` file will take precedence over the model with the same name included in Oxidized. The code then uses `require` to load the included model, and extends the class defined therein with an additional command.
+Due to smart loading, the user-supplied `~/.config/oxidized/model/junos.rb` file will take precedence over the model with the same name included in the Oxidized distribution.
+
+The code then uses `require` to initially load the Oxidized-supplied model, and extends the class defined therein with an additional command.
 
 Intuitively, it is also possible to:
 
 * Completely re-define an existing model by creating a file in `~/.config/oxidized/model/` with the same name as an existing model, but not `require`-ing the upstream model file.
-* Create a named variation of an existing model, by creating a file with a new name (such as `~/.config/oxidized/model/junos-extra.rb`), Then `require` the original model and extend its base class as in the above example. The named variation can then be specified as an OS type for some devices but not others when defining sources.
+* Create a named variation of an existing model, by creating a file with a new name (such as `~/.config/oxidized/model/junos-extra.rb`), Then `require` the original model and extend its base class as in the above example. The named variation can then be specified as an OS type for specific devices that can benefit from the extra functionality. This allows for preservation of the base functionality for the default model types.
 * Create a completely new model, with a new name, for a new operating system type.
+* Testing/validation of an updated model from the [Oxidized GitHub repo models](https://github.com/ytti/oxidized/tree/master/lib/oxidized/model) by placing an updated model in the proper location without disrupting the gem-supplied model files.
 
 ## Advanced features
 
@@ -70,4 +75,4 @@ class JunOS
 end
 ```
 
-The output of the `show configuration | display set` command is marked with a new arbitrary alternative output type, `junos-set`.  The `git` output will use the output type to create a new subdirectory by the same name. In this subdirectory, the `git` output will create files with the name `<devicename>--set` that will contain the output of this command for each device.
\ No newline at end of file
+The output of the `show configuration | display set` command is marked with a new arbitrary alternative output type, `junos-set`.  The `git` output will use the output type to create a new subdirectory by the same name. In this subdirectory, the `git` output will create files with the name `<devicename>--set` that will contain the output of this command for each device.
-- 
cgit v1.2.1


From cdcecd48fd05fecd656f384d074bd06406ac2690 Mon Sep 17 00:00:00 2001
From: Jason Ackley <jason@ackley.net>
Date: Tue, 24 Apr 2018 10:17:40 -0500
Subject: clarity updates for Configuration doc

typo fixes - IP-Adress -> IP-Address
remove_secrets -> remove_secret
tag a ruby block as ruby for correct highlight
misc other small text clarity  (ssh_proxy is the proxy information etc)
---
 docs/Configuration.md | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/docs/Configuration.md b/docs/Configuration.md
index 6bbbb61..661e65a 100644
--- a/docs/Configuration.md
+++ b/docs/Configuration.md
@@ -4,7 +4,7 @@
 
 In case a model plugin doesn't work correctly (ios, procurve, etc.), you can enable live debugging of SSH/Telnet sessions. Just add a `debug` option containing the value true to the `input` section. The log files will be created depending on the parent directory of the logfile option.
 
-The following example will log an active ssh/telnet session `/home/oxidized/.config/oxidized/log/<IP-Adress>-<PROTOCOL>`. The file will be truncated on each consecutive ssh/telnet session, so you need to put a `tailf` or `tail -f` on that file!
+The following example will log an active ssh/telnet session `/home/oxidized/.config/oxidized/log/<IP-Address>-<PROTOCOL>`. The file will be truncated on each consecutive ssh/telnet session, so you need to put a `tailf` or `tail -f` on that file!
 
 ```yaml
 log: /home/oxidized/.config/oxidized/log
@@ -29,18 +29,18 @@ vars:
 
 ## Removing secrets
 
-To strip out secrets from configurations before storing them, Oxidized needs the the remove_secrets flag. You can globally enable this by adding the following snippet to the global sections of the configuration file.
+To strip out secrets from configurations before storing them, Oxidized needs the `remove_secret` flag. You can globally enable this by adding the following snippet to the global section of the configuration file.
 
 ```yaml
 vars:
   remove_secret: true
 ```
 
-Device models can contain substitution filters to remove potentially sensitive data from configs.
+Device models that contain substitution filters to remove sensitive data will now be run on any fetched configuration.
 
 As a partial example from ios.rb:
 
-```yaml
+```ruby
   cmd :secret do |cfg|
     cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
     (...)
@@ -64,7 +64,11 @@ vars:
 
 ## SSH Proxy Command
 
-Oxidized can `ssh` through a proxy as well. To do so we just need to set `ssh_proxy` variable.
+Oxidized can `ssh` through a proxy as well. To do so we just need to set `ssh_proxy` variable with the proxy host information.
+
+This can be provided on a per-node basis by mapping the proper fields from your source.
+
+An example for a `csv` input source that maps the 4th field as the `ssh_proxy` value.
 
 ```yaml
 ...
@@ -79,7 +83,7 @@ vars_map:
 
 ## FTP Passive Mode
 
-Oxidized uses ftp passive mode by default. Some devices require passive mode to be disabled. To do so, we can set `input.ftp.passive` to false
+Oxidized uses ftp passive mode by default. Some devices require passive mode to be disabled. To do so, we can set `input.ftp.passive` to false - this will make use of FTP active mode.
 
 ```yaml
 input:
@@ -192,10 +196,12 @@ rest: 10.0.0.1:8000/oxidized
 
 ## Triggered backups
 
-A node can be moved to head-of-queue via the REST API `GET/POST /node/next/[NODE]`.
+A node can be moved to head-of-queue via the REST API `GET/POST /node/next/[NODE]`. This can be useful to immediately schedule a fetch of the configuration after some other event such as a syslog message indicating a configuration update on the device.
 
-In the default configuration this node will be processed when the next job worker becomes available, it could take some time if existing backups are in progress. To execute moved jobs immediately a new job can be added:
+In the default configuration this node will be processed when the next job worker becomes available, it could take some time if existing backups are in progress. To execute moved jobs immediately a new job can be added automatically:
 
 ```yaml
 next_adds_job: true
 ```
+
+This will allow for a more timely fetch of the device configuration.
-- 
cgit v1.2.1


From ffe13443e7085f25f20447e7d1aec5569a01df5c Mon Sep 17 00:00:00 2001
From: Wild Kat <wk@futureinquestion.net>
Date: Tue, 24 Apr 2018 23:42:21 +0200
Subject: implement probot no-response

---
 .github/no-response.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 .github/no-response.yml

diff --git a/.github/no-response.yml b/.github/no-response.yml
new file mode 100644
index 0000000..983af83
--- /dev/null
+++ b/.github/no-response.yml
@@ -0,0 +1,13 @@
+# Configuration for probot-no-response - https://github.com/probot/no-response
+
+# Number of days of inactivity before an Issue is closed for lack of response
+daysUntilClose: 14
+# Label requiring a response
+responseRequiredLabel: user_pending 
+# Comment to post when closing an Issue for lack of response. Set to `false` to disable
+closeComment: >
+  This issue has been automatically closed because there has been no response
+  to our request for more information from the original author. The information 
+  that is currently in the issue is insufficient to take further action.
+  Feel free to re-open this issue if additional information becomes available,
+  or if you believe it has been closed in error.
-- 
cgit v1.2.1


From b5d0e8316e95558ada0377273f42ccd802c8401b Mon Sep 17 00:00:00 2001
From: Wild Kat <wk@futureinquestion.net>
Date: Tue, 24 Apr 2018 23:59:45 +0200
Subject: increase response countdown to 21 days to reduce churn

---
 .github/no-response.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/no-response.yml b/.github/no-response.yml
index 983af83..9c4bbaa 100644
--- a/.github/no-response.yml
+++ b/.github/no-response.yml
@@ -1,7 +1,7 @@
 # Configuration for probot-no-response - https://github.com/probot/no-response
 
 # Number of days of inactivity before an Issue is closed for lack of response
-daysUntilClose: 14
+daysUntilClose: 21
 # Label requiring a response
 responseRequiredLabel: user_pending 
 # Comment to post when closing an Issue for lack of response. Set to `false` to disable
-- 
cgit v1.2.1


From dffae0f76656a57da8f5473ce21955638cbe1f7f Mon Sep 17 00:00:00 2001
From: Wild Kat <wk@futureinquestion.net>
Date: Wed, 25 Apr 2018 14:41:47 +0200
Subject: additional touchups to catch up with master

---
 oxidized.gemspec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/oxidized.gemspec b/oxidized.gemspec
index 205d3d9..6fcd5c5 100644
--- a/oxidized.gemspec
+++ b/oxidized.gemspec
@@ -20,13 +20,13 @@ Gem::Specification.new do |s|
   s.required_ruby_version =           '>= 2.0.0'
   s.add_runtime_dependency 'asetus',  '~> 0.1'
   s.add_runtime_dependency 'net-ssh', '~> 4.1.0'
-  s.add_runtime_dependency 'rugged',  '~> 0.21',  '>= 0.21.4'
+  s.add_runtime_dependency 'rugged',  '~> 0.21', '>= 0.21.4'
   s.add_runtime_dependency 'slop',    '~> 3.5'
 
   if defined?(RUBY_VERSION) && RUBY_VERSION > '2.3'
     s.add_runtime_dependency 'net-telnet', '~> 0'
   end
- 
+
   s.add_development_dependency 'simplecov'
   if ENV['CI'] == 'true'
     s.add_development_dependency 'codecov'
-- 
cgit v1.2.1


From 8afffb852b55dfa74f2e694e5c27d9db4cc34373 Mon Sep 17 00:00:00 2001
From: ytti <saku@ytti.fi>
Date: Wed, 25 Apr 2018 16:30:52 +0300
Subject: Add option to force input string into 8bit-ascii

Essentially binary blob or UTF8

Closes #1210
---
 lib/oxidized/config.rb      | 9 +++++----
 lib/oxidized/model/model.rb | 1 +
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/oxidized/config.rb b/lib/oxidized/config.rb
index a825d39..9eb9b90 100644
--- a/lib/oxidized/config.rb
+++ b/lib/oxidized/config.rb
@@ -34,10 +34,11 @@ module Oxidized
       asetus.default.models        = {}               # model level configuration
       asetus.default.pid           = File.join(Oxidized::Config::Root, 'pid')
 
-      asetus.default.input.default    = 'ssh, telnet'
-      asetus.default.input.debug      = false # or String for session log file
-      asetus.default.input.ssh.secure = false # complain about changed certs
-      asetus.default.input.ftp.passive = true # ftp passive mode
+      asetus.default.input.default      = 'ssh, telnet'
+      asetus.default.input.debug        = false # or String for session log file
+      asetus.default.input.ssh.secure   = false # complain about changed certs
+      asetus.default.input.ftp.passive  = true  # ftp passive mode
+      asetus.default.input.utf8_encoded = true  # configuration is utf8 encoded or ascii-8bit
 
       asetus.default.output.default = 'file'  # file, git
       asetus.default.source.default = 'csv'   # csv, sql
diff --git a/lib/oxidized/model/model.rb b/lib/oxidized/model/model.rb
index a650560..438357f 100644
--- a/lib/oxidized/model/model.rb
+++ b/lib/oxidized/model/model.rb
@@ -91,6 +91,7 @@ module Oxidized
       Oxidized.logger.debug "lib/oxidized/model/model.rb Executing #{string}"
       out = @input.cmd(string)
       return false unless out
+      out = out.b unless Oxidized.config.input.utf8_encoded?
       self.class.cmds[:all].each do |all_block|
         out = instance_exec Oxidized::String.new(out), string, &all_block
       end
-- 
cgit v1.2.1


From 57348a626811688eb014d97d5aa401a10b3898bd Mon Sep 17 00:00:00 2001
From: Wild Kat <wk@futureinquestion.net>
Date: Wed, 25 Apr 2018 16:56:20 +0200
Subject: move hook tests into own directory and regen rubocop todo

---
 .rubocop_todo.yml            |  10 +--
 spec/githubrepo_spec.rb      | 170 -------------------------------------------
 spec/hook/githubrepo_spec.rb | 170 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 175 insertions(+), 175 deletions(-)
 delete mode 100644 spec/githubrepo_spec.rb
 create mode 100644 spec/hook/githubrepo_spec.rb

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index b4c59f2..db70e00 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2018-04-21 13:24:05 +0200 using RuboCop version 0.55.0.
+# on 2018-04-25 15:40:14 +0200 using RuboCop version 0.55.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -354,7 +354,7 @@ Style/EmptyMethod:
   Exclude:
     - 'lib/oxidized/hook.rb'
 
-# Offense count: 2
+# Offense count: 1
 # Cop supports --auto-correct.
 Style/ExpandPathArguments:
   Exclude:
@@ -405,7 +405,7 @@ Style/IfInsideElse:
   Exclude:
     - 'lib/oxidized/output/file.rb'
 
-# Offense count: 38
+# Offense count: 39
 # Cop supports --auto-correct.
 Style/IfUnlessModifier:
   Enabled: false
@@ -526,7 +526,7 @@ Style/ParenthesesAroundCondition:
     - 'lib/oxidized/model/powerconnect.rb'
     - 'lib/oxidized/source/http.rb'
 
-# Offense count: 9
+# Offense count: 6
 # Cop supports --auto-correct.
 # Configuration parameters: PreferredDelimiters.
 Style/PercentLiteralDelimiters:
@@ -733,7 +733,7 @@ Style/ZeroLengthPredicate:
     - 'lib/oxidized/model/ciscosmb.rb'
     - 'lib/oxidized/output/git.rb'
 
-# Offense count: 269
+# Offense count: 270
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
diff --git a/spec/githubrepo_spec.rb b/spec/githubrepo_spec.rb
deleted file mode 100644
index 67c99f0..0000000
--- a/spec/githubrepo_spec.rb
+++ /dev/null
@@ -1,170 +0,0 @@
-require 'spec_helper'
-require 'rugged'
-require 'oxidized/hook/githubrepo'
-
-describe GithubRepo do
-  let(:credentials) { mock }
-  let(:remote) { mock }
-  let(:remotes) { mock }
-  let(:repo_head) { mock }
-  let(:repo) { mock }
-  let(:gr) { GithubRepo.new }
-
-  before do
-    Oxidized.asetus = Asetus.new
-    Oxidized.config.log = '/dev/null'
-    Oxidized.setup_logger
-    Oxidized.config.output.default = 'git'
-  end
-
-  describe '#validate_cfg!' do
-    before do
-      gr.expects(:respond_to?).with(:validate_cfg!).returns(false) # `cfg=` call
-    end
-
-    it 'raise a error when `remote_repo` is not configured' do
-      Oxidized.config.hooks.github_repo_hook = { type: 'githubrepo' }
-      gr.cfg = Oxidized.config.hooks.github_repo_hook
-      proc { gr.validate_cfg! }.must_raise(KeyError)
-    end
-  end
-
-  describe "#fetch_and_merge_remote" do
-    before(:each) do
-      Oxidized.config.hooks.github_repo_hook.remote_repo = 'git@github.com:username/foo.git'
-      Proc.expects(:new).returns(credentials)
-      repo_head.expects(:name).returns('refs/heads/master')
-      gr.cfg = Oxidized.config.hooks.github_repo_hook
-    end
-
-    it "should not try to merge when there is no update in remote branch" do
-      repo.expects(:fetch).with('origin', ['refs/heads/master'], credentials: credentials).returns(Hash.new(0))
-      repo.expects(:branches).never
-      repo.expects(:head).returns(repo_head)
-      gr.fetch_and_merge_remote(repo).must_equal nil
-    end
-    describe "when there is update considering conflicts" do
-      let(:merge_index) { mock }
-      let(:their_branch) { mock }
-
-      before(:each) do
-        repo.expects(:fetch).with('origin', ['refs/heads/master'], credentials: credentials).returns(total_deltas: 1)
-        their_branch.expects(:target_id).returns(1)
-        repo_head.expects(:target_id).returns(2)
-        repo.expects(:merge_commits).with(2, 1).returns(merge_index)
-        repo.expects(:branches).returns("origin/master" => their_branch)
-      end
-
-      it "should not try merging when there's conflict" do
-        repo.expects(:head).twice.returns(repo_head)
-        their_branch.expects(:name).returns("origin/master")
-        merge_index.expects(:conflicts?).returns(true)
-        Rugged::Commit.expects(:create).never
-        gr.fetch_and_merge_remote(repo).must_equal nil
-      end
-
-      it "should merge when there is no conflict" do
-        repo.expects(:head).times(3).returns(repo_head)
-        their_branch.expects(:target).returns("their_target")
-        their_branch.expects(:name).twice.returns("origin/master")
-        repo_head.expects(:target).returns("our_target")
-        merge_index.expects(:write_tree).with(repo).returns("tree")
-        merge_index.expects(:conflicts?).returns(false)
-        Rugged::Commit.expects(:create).with(repo,
-                                             parents: ["our_target", "their_target"],
-                                             tree: "tree",
-                                             message: "Merge remote-tracking branch 'origin/master'",
-                                             update_ref: "HEAD").returns(1)
-        gr.fetch_and_merge_remote(repo).must_equal 1
-      end
-    end
-  end
-
-  describe "#run_hook" do
-    let(:group) { nil }
-    let(:ctx) { OpenStruct.new(node: node) }
-    let(:node) do
-      Oxidized::Node.new(ip: '127.0.0.1', group: group, model: 'junos', output: 'git')
-    end
-
-    before do
-      Proc.expects(:new).returns(credentials)
-      repo_head.expects(:name).twice.returns('refs/heads/master')
-      repo.expects(:head).twice.returns(repo_head)
-      repo.expects(:path).returns('/foo.git')
-      repo.expects(:fetch).with('origin', ['refs/heads/master'], credentials: credentials).returns(Hash.new(0))
-    end
-
-    describe 'when there is only one repository and no groups' do
-      before do
-        Oxidized.config.output.git.repo = '/foo.git'
-        remote.expects(:url).returns('https://github.com/username/foo.git')
-        remote.expects(:push).with(['refs/heads/master'], credentials: credentials).returns(true)
-        repo.expects(:remotes).returns('origin' => remote)
-        Rugged::Repository.expects(:new).with('/foo.git').returns(repo)
-      end
-
-      it "will push to the remote repository using https" do
-        Oxidized.config.hooks.github_repo_hook.remote_repo = 'https://github.com/username/foo.git'
-        Oxidized.config.hooks.github_repo_hook.username = 'username'
-        Oxidized.config.hooks.github_repo_hook.password = 'password'
-        Proc.expects(:new).returns(credentials)
-        gr.cfg = Oxidized.config.hooks.github_repo_hook
-        gr.run_hook(ctx).must_equal true
-      end
-
-      it "will push to the remote repository using ssh" do
-        Oxidized.config.hooks.github_repo_hook.remote_repo = 'git@github.com:username/foo.git'
-        Proc.expects(:new).returns(credentials)
-        gr.cfg = Oxidized.config.hooks.github_repo_hook
-        gr.run_hook(ctx).must_equal true
-      end
-    end
-
-    describe "when there are groups" do
-      let(:group) { 'ggrroouupp' }
-
-      before do
-        Proc.expects(:new).returns(credentials)
-        Rugged::Repository.expects(:new).with(repository).returns(repo)
-
-        repo.expects(:remotes).twice.returns(remotes)
-        remotes.expects(:[]).with('origin').returns(nil)
-        remotes.expects(:create).with('origin', create_remote).returns(remote)
-        remote.expects(:url).returns('url')
-        remote.expects(:push).with(['refs/heads/master'], credentials: credentials).returns(true)
-      end
-
-      describe 'and there are several repositories' do
-        let(:create_remote) { 'ggrroouupp#remote_repo' }
-        let(:repository) { '/ggrroouupp.git' }
-
-        before do
-          Oxidized.config.output.git.repo.ggrroouupp = repository
-          Oxidized.config.hooks.github_repo_hook.remote_repo.ggrroouupp = 'ggrroouupp#remote_repo'
-        end
-
-        it 'will push to the node group repository' do
-          gr.cfg = Oxidized.config.hooks.github_repo_hook
-          gr.run_hook(ctx).must_equal true
-        end
-      end
-
-      describe 'and has a single repository' do
-        let(:create_remote) { 'github_repo_hook#remote_repo' }
-        let(:repository) { '/foo.git' }
-
-        before do
-          Oxidized.config.output.git.repo = repository
-          Oxidized.config.hooks.github_repo_hook.remote_repo = 'github_repo_hook#remote_repo'
-          Oxidized.config.output.git.single_repo = true
-        end
-
-        it 'will push to the correct repository' do
-          gr.cfg = Oxidized.config.hooks.github_repo_hook
-          gr.run_hook(ctx).must_equal true
-        end
-      end
-    end
-  end
-end
diff --git a/spec/hook/githubrepo_spec.rb b/spec/hook/githubrepo_spec.rb
new file mode 100644
index 0000000..67c99f0
--- /dev/null
+++ b/spec/hook/githubrepo_spec.rb
@@ -0,0 +1,170 @@
+require 'spec_helper'
+require 'rugged'
+require 'oxidized/hook/githubrepo'
+
+describe GithubRepo do
+  let(:credentials) { mock }
+  let(:remote) { mock }
+  let(:remotes) { mock }
+  let(:repo_head) { mock }
+  let(:repo) { mock }
+  let(:gr) { GithubRepo.new }
+
+  before do
+    Oxidized.asetus = Asetus.new
+    Oxidized.config.log = '/dev/null'
+    Oxidized.setup_logger
+    Oxidized.config.output.default = 'git'
+  end
+
+  describe '#validate_cfg!' do
+    before do
+      gr.expects(:respond_to?).with(:validate_cfg!).returns(false) # `cfg=` call
+    end
+
+    it 'raise a error when `remote_repo` is not configured' do
+      Oxidized.config.hooks.github_repo_hook = { type: 'githubrepo' }
+      gr.cfg = Oxidized.config.hooks.github_repo_hook
+      proc { gr.validate_cfg! }.must_raise(KeyError)
+    end
+  end
+
+  describe "#fetch_and_merge_remote" do
+    before(:each) do
+      Oxidized.config.hooks.github_repo_hook.remote_repo = 'git@github.com:username/foo.git'
+      Proc.expects(:new).returns(credentials)
+      repo_head.expects(:name).returns('refs/heads/master')
+      gr.cfg = Oxidized.config.hooks.github_repo_hook
+    end
+
+    it "should not try to merge when there is no update in remote branch" do
+      repo.expects(:fetch).with('origin', ['refs/heads/master'], credentials: credentials).returns(Hash.new(0))
+      repo.expects(:branches).never
+      repo.expects(:head).returns(repo_head)
+      gr.fetch_and_merge_remote(repo).must_equal nil
+    end
+    describe "when there is update considering conflicts" do
+      let(:merge_index) { mock }
+      let(:their_branch) { mock }
+
+      before(:each) do
+        repo.expects(:fetch).with('origin', ['refs/heads/master'], credentials: credentials).returns(total_deltas: 1)
+        their_branch.expects(:target_id).returns(1)
+        repo_head.expects(:target_id).returns(2)
+        repo.expects(:merge_commits).with(2, 1).returns(merge_index)
+        repo.expects(:branches).returns("origin/master" => their_branch)
+      end
+
+      it "should not try merging when there's conflict" do
+        repo.expects(:head).twice.returns(repo_head)
+        their_branch.expects(:name).returns("origin/master")
+        merge_index.expects(:conflicts?).returns(true)
+        Rugged::Commit.expects(:create).never
+        gr.fetch_and_merge_remote(repo).must_equal nil
+      end
+
+      it "should merge when there is no conflict" do
+        repo.expects(:head).times(3).returns(repo_head)
+        their_branch.expects(:target).returns("their_target")
+        their_branch.expects(:name).twice.returns("origin/master")
+        repo_head.expects(:target).returns("our_target")
+        merge_index.expects(:write_tree).with(repo).returns("tree")
+        merge_index.expects(:conflicts?).returns(false)
+        Rugged::Commit.expects(:create).with(repo,
+                                             parents: ["our_target", "their_target"],
+                                             tree: "tree",
+                                             message: "Merge remote-tracking branch 'origin/master'",
+                                             update_ref: "HEAD").returns(1)
+        gr.fetch_and_merge_remote(repo).must_equal 1
+      end
+    end
+  end
+
+  describe "#run_hook" do
+    let(:group) { nil }
+    let(:ctx) { OpenStruct.new(node: node) }
+    let(:node) do
+      Oxidized::Node.new(ip: '127.0.0.1', group: group, model: 'junos', output: 'git')
+    end
+
+    before do
+      Proc.expects(:new).returns(credentials)
+      repo_head.expects(:name).twice.returns('refs/heads/master')
+      repo.expects(:head).twice.returns(repo_head)
+      repo.expects(:path).returns('/foo.git')
+      repo.expects(:fetch).with('origin', ['refs/heads/master'], credentials: credentials).returns(Hash.new(0))
+    end
+
+    describe 'when there is only one repository and no groups' do
+      before do
+        Oxidized.config.output.git.repo = '/foo.git'
+        remote.expects(:url).returns('https://github.com/username/foo.git')
+        remote.expects(:push).with(['refs/heads/master'], credentials: credentials).returns(true)
+        repo.expects(:remotes).returns('origin' => remote)
+        Rugged::Repository.expects(:new).with('/foo.git').returns(repo)
+      end
+
+      it "will push to the remote repository using https" do
+        Oxidized.config.hooks.github_repo_hook.remote_repo = 'https://github.com/username/foo.git'
+        Oxidized.config.hooks.github_repo_hook.username = 'username'
+        Oxidized.config.hooks.github_repo_hook.password = 'password'
+        Proc.expects(:new).returns(credentials)
+        gr.cfg = Oxidized.config.hooks.github_repo_hook
+        gr.run_hook(ctx).must_equal true
+      end
+
+      it "will push to the remote repository using ssh" do
+        Oxidized.config.hooks.github_repo_hook.remote_repo = 'git@github.com:username/foo.git'
+        Proc.expects(:new).returns(credentials)
+        gr.cfg = Oxidized.config.hooks.github_repo_hook
+        gr.run_hook(ctx).must_equal true
+      end
+    end
+
+    describe "when there are groups" do
+      let(:group) { 'ggrroouupp' }
+
+      before do
+        Proc.expects(:new).returns(credentials)
+        Rugged::Repository.expects(:new).with(repository).returns(repo)
+
+        repo.expects(:remotes).twice.returns(remotes)
+        remotes.expects(:[]).with('origin').returns(nil)
+        remotes.expects(:create).with('origin', create_remote).returns(remote)
+        remote.expects(:url).returns('url')
+        remote.expects(:push).with(['refs/heads/master'], credentials: credentials).returns(true)
+      end
+
+      describe 'and there are several repositories' do
+        let(:create_remote) { 'ggrroouupp#remote_repo' }
+        let(:repository) { '/ggrroouupp.git' }
+
+        before do
+          Oxidized.config.output.git.repo.ggrroouupp = repository
+          Oxidized.config.hooks.github_repo_hook.remote_repo.ggrroouupp = 'ggrroouupp#remote_repo'
+        end
+
+        it 'will push to the node group repository' do
+          gr.cfg = Oxidized.config.hooks.github_repo_hook
+          gr.run_hook(ctx).must_equal true
+        end
+      end
+
+      describe 'and has a single repository' do
+        let(:create_remote) { 'github_repo_hook#remote_repo' }
+        let(:repository) { '/foo.git' }
+
+        before do
+          Oxidized.config.output.git.repo = repository
+          Oxidized.config.hooks.github_repo_hook.remote_repo = 'github_repo_hook#remote_repo'
+          Oxidized.config.output.git.single_repo = true
+        end
+
+        it 'will push to the correct repository' do
+          gr.cfg = Oxidized.config.hooks.github_repo_hook
+          gr.run_hook(ctx).must_equal true
+        end
+      end
+    end
+  end
+end
-- 
cgit v1.2.1


From 60c3408bfc0f6aa5a89013f99e0763719440f29b Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Wed, 25 Apr 2018 19:09:40 +0300
Subject: set version from git

you still need to bump version.rb, as 'rake tag' will use that to create
git tag, which we need :>
---
 lib/oxidized/cli.rb     |  2 +-
 lib/oxidized/version.rb | 11 +++++++++++
 oxidized.gemspec        |  1 +
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/lib/oxidized/cli.rb b/lib/oxidized/cli.rb
index c29e269..23cc28c 100644
--- a/lib/oxidized/cli.rb
+++ b/lib/oxidized/cli.rb
@@ -44,7 +44,7 @@ module Oxidized
         on 'd', 'debug', 'turn on debugging'
         on 'daemonize',  'Daemonize/fork the process'
         on 'v', 'version', 'show version' do
-          puts Oxidized::VERSION
+          puts Oxidized::VERSION_FULL
           Kernel.exit
         end
       end
diff --git a/lib/oxidized/version.rb b/lib/oxidized/version.rb
index 9a92133..0d90e34 100644
--- a/lib/oxidized/version.rb
+++ b/lib/oxidized/version.rb
@@ -1,3 +1,14 @@
 module Oxidized
   VERSION = '0.21.0'
+  VERSION_FULL = '0.21.0-175-gcc22060'
+  def self.version_set
+    Oxidized.send(:remove_const, :VERSION_FULL)
+    const_set(:VERSION_FULL, %x(git describe --tags).chop)
+    Oxidized.send(:remove_const, :VERSION)
+    const_set(:VERSION, %x(git describe --tags --abbrev=0).chop)
+    file = File.readlines(__FILE__)
+    file[1] = "  VERSION = '%s'\n" % VERSION
+    file[2] = "  VERSION_FULL = '%s'\n" % VERSION_FULL
+    File.write(__FILE__, file.join)
+  end
 end
diff --git a/oxidized.gemspec b/oxidized.gemspec
index 6fcd5c5..06e1af9 100644
--- a/oxidized.gemspec
+++ b/oxidized.gemspec
@@ -1,6 +1,7 @@
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'oxidized/version'
+Oxidized.version_set
 
 Gem::Specification.new do |s|
   s.name              = 'oxidized'
-- 
cgit v1.2.1


From 5e31f4bc028f0e0bd6aade771fe10a3cc6d2a5fa Mon Sep 17 00:00:00 2001
From: Wild Kat <wk@futureinquestion.net>
Date: Wed, 25 Apr 2018 18:43:23 +0200
Subject: fine tune rubocop to yttis exacting specifications

---
 .rubocop.yml                   | 11 +++++++++++
 lib/oxidized/hook/slackdiff.rb |  2 +-
 oxidized.gemspec               |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index bc013cd..f43ca42 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -17,6 +17,17 @@ Style/PreferredHashMethods:
 Style/Not:
   Enabled: false
 
+# comply with @ytti's exacting specifications 
+Style/CommandLiteral:
+  EnforcedStyle: percent_x
+
+Style/FormatString:
+  EnforcedStyle: percent
+
+Style/FormatStringToken:
+  EnforcedStyle: unannotated
+
+# Do not attempt to police vendored code, and exclude special cases
 AllCops:
   Exclude:
     - 'vendor/**/*'
diff --git a/lib/oxidized/hook/slackdiff.rb b/lib/oxidized/hook/slackdiff.rb
index 2c5ec14..baaf291 100644
--- a/lib/oxidized/hook/slackdiff.rb
+++ b/lib/oxidized/hook/slackdiff.rb
@@ -43,7 +43,7 @@ class SlackDiff < Oxidized::Hook
     # message custom formatted - optional
     if cfg.has_key?('message') == true
       log cfg.message
-      msg = format(cfg.message, :node => ctx.node.name.to_s, :group => ctx.node.group.to_s, :commitref => ctx.commitref, :model => ctx.node.model.class.name.to_s.downcase)
+      msg = cfg.message % { :node => ctx.node.name.to_s, :group => ctx.node.group.to_s, :commitref => ctx.commitref, :model => ctx.node.model.class.name.to_s.downcase }
       log msg
       log "Posting message to #{cfg.channel}"
       client.chat_postMessage(channel: cfg.channel, text: msg, as_user: true)
diff --git a/oxidized.gemspec b/oxidized.gemspec
index 06e1af9..bf90d00 100644
--- a/oxidized.gemspec
+++ b/oxidized.gemspec
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.summary           = 'feeble attempt at rancid'
   s.description       = 'software to fetch configuration from network devices and store them'
   s.rubyforge_project = s.name
-  s.files             = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  s.files             = %x(git ls-files -z).split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   s.executables       = %w[oxidized]
   s.require_path      = 'lib'
 
-- 
cgit v1.2.1


From 8aa0cc45e50daa19b0418207ba4bcf5c0e664b7a Mon Sep 17 00:00:00 2001
From: Wild Kat <wk@futureinquestion.net>
Date: Wed, 25 Apr 2018 18:48:34 +0200
Subject: regenerate .rubocop_todo.yml

---
 .rubocop.yml      |  2 +-
 .rubocop_todo.yml | 23 +++--------------------
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index f43ca42..60b4e11 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -17,7 +17,7 @@ Style/PreferredHashMethods:
 Style/Not:
   Enabled: false
 
-# comply with @ytti's exacting specifications 
+# comply with @ytti's exacting specifications
 Style/CommandLiteral:
   EnforcedStyle: percent_x
 
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index db70e00..77c1026 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2018-04-25 15:40:14 +0200 using RuboCop version 0.55.0.
+# on 2018-04-25 18:47:11 +0200 using RuboCop version 0.55.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -336,7 +336,7 @@ Style/ConditionalAssignment:
     - 'lib/oxidized/hook/githubrepo.rb'
     - 'lib/oxidized/model/model.rb'
 
-# Offense count: 143
+# Offense count: 144
 Style/Documentation:
   Enabled: false
 
@@ -360,23 +360,6 @@ Style/ExpandPathArguments:
   Exclude:
     - 'bin/console'
 
-# Offense count: 6
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: format, sprintf, percent
-Style/FormatString:
-  Exclude:
-    - 'lib/oxidized/node.rb'
-    - 'lib/oxidized/nodes.rb'
-
-# Offense count: 16
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: annotated, template, unannotated
-Style/FormatStringToken:
-  Exclude:
-    - 'lib/oxidized/node.rb'
-    - 'lib/oxidized/nodes.rb'
-
 # Offense count: 13
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
@@ -441,7 +424,7 @@ Style/MultilineIfThen:
   Exclude:
     - 'lib/oxidized/model/aricentiss.rb'
 
-# Offense count: 8
+# Offense count: 9
 # Cop supports --auto-correct.
 Style/MutableConstant:
   Exclude:
-- 
cgit v1.2.1


From 75765bedae8a8511260d43ec7f46edc994899c7c Mon Sep 17 00:00:00 2001
From: Wild Kat <wk@futureinquestion.net>
Date: Wed, 25 Apr 2018 19:06:19 +0200
Subject: fix cli_spec.rb to reflect new version output

---
 spec/cli_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/cli_spec.rb b/spec/cli_spec.rb
index 4ceb8ed..8b9b792 100644
--- a/spec/cli_spec.rb
+++ b/spec/cli_spec.rb
@@ -21,7 +21,7 @@ describe Oxidized::CLI do
         File.expects(:expand_path)
         Kernel.expects(:exit)
 
-        assert_output("#{Oxidized::VERSION}\n") { Oxidized::CLI.new }
+        assert_output("#{Oxidized::VERSION_FULL}\n") { Oxidized::CLI.new }
       end
     end
   end
-- 
cgit v1.2.1


From 9b22dfeebd5d5f30a8e15be28a00ff84534e9998 Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Wed, 25 Apr 2018 21:14:40 +0300
Subject: only set version when building packege

---
 Rakefile                | 7 +++++++
 lib/oxidized/version.rb | 2 +-
 oxidized.gemspec        | 1 -
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Rakefile b/Rakefile
index 6f792d5..25948a2 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,5 +1,6 @@
 require 'bundler/gem_tasks'
 require 'rake/testtask'
+require_relative 'lib/oxidized/version'
 
 gemspec = eval(File.read(Dir['*.gemspec'].first))
 file    = [gemspec.name, gemspec.version].join('-') + '.gem'
@@ -31,6 +32,12 @@ task :test do
   end
 end
 
+task :build => :version_set
+task :version_set do
+  Oxidized.version_set
+  Bundler::GemHelper.instance.gemspec.version = Oxidized::VERSION
+end
+
 ## desc 'Install gem'
 ## task :install => :build do
 ##   system "sudo -Es sh -c \'umask 022; gem install gems/#{file}\'"
diff --git a/lib/oxidized/version.rb b/lib/oxidized/version.rb
index 0d90e34..de99d5f 100644
--- a/lib/oxidized/version.rb
+++ b/lib/oxidized/version.rb
@@ -1,6 +1,6 @@
 module Oxidized
   VERSION = '0.21.0'
-  VERSION_FULL = '0.21.0-175-gcc22060'
+  VERSION_FULL = '0.21.0-180-g9691008'
   def self.version_set
     Oxidized.send(:remove_const, :VERSION_FULL)
     const_set(:VERSION_FULL, %x(git describe --tags).chop)
diff --git a/oxidized.gemspec b/oxidized.gemspec
index bf90d00..8a126bb 100644
--- a/oxidized.gemspec
+++ b/oxidized.gemspec
@@ -1,7 +1,6 @@
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'oxidized/version'
-Oxidized.version_set
 
 Gem::Specification.new do |s|
   s.name              = 'oxidized'
-- 
cgit v1.2.1


From 128e14caea19d283adcf814df39b9aa7440e8c09 Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Wed, 25 Apr 2018 21:32:24 +0300
Subject: Use rake instead of gem to build package

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 76b9add..d5c4b9b 100644
--- a/README.md
+++ b/README.md
@@ -119,8 +119,7 @@ pkg install rubygem-oxidized rubygem-oxidized-script rubygem-oxidized-web
 ```shell
 git clone https://github.com/ytti/oxidized.git
 cd oxidized/
-gem build *.gemspec
-gem install pkg/*.gem
+rake install
 ```
 
 ### Running with Docker
-- 
cgit v1.2.1


From 0b120ee56759ef0299882ceb766954b1a73abf33 Mon Sep 17 00:00:00 2001
From: Wild Kat <wk@futureinquestion.net>
Date: Wed, 25 Apr 2018 21:14:45 +0200
Subject: change docker build process to use rake

---
 Dockerfile | 7 +++----
 README.md  | 1 +
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 07adc0f..c928a2d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,7 +23,7 @@ LABEL maintainer="Samer Abdel-Hafez <sam@arahant.net>"
 
 # set up dependencies for the build process
 RUN apt-get -yq update && \
-    apt-get -yq install ruby2.3 ruby2.3-dev libsqlite3-dev libssl-dev pkg-config make cmake libssh2-1-dev git g++ libffi-dev
+    apt-get -yq install ruby2.3 ruby2.3-dev libsqlite3-dev libssl-dev pkg-config make cmake libssh2-1-dev git g++ libffi-dev ruby-bundler
 
 # upgrade libssh2 to self-built backport from stage 1
 COPY --from=libssh2-backport \
@@ -39,8 +39,7 @@ RUN gem install aws-sdk slack-api xmpp4r
 COPY . /tmp/oxidized/
 WORKDIR /tmp/oxidized
 
-RUN gem build oxidized.gemspec
-RUN gem install oxidized-*.gem
+RUN rake install
 
 # web interface
 RUN gem install oxidized-web --no-ri --no-rdoc
@@ -49,7 +48,7 @@ RUN gem install oxidized-web --no-ri --no-rdoc
 WORKDIR /
 RUN rm -rf /tmp/oxidized
 RUN rm /tmp/*.deb
-RUN apt-get -yq --purge autoremove ruby-dev pkg-config make cmake
+RUN apt-get -yq --purge autoremove ruby-dev pkg-config make cmake ruby-bundler
 
 # add runit services
 ADD extra/oxidized.runit /etc/service/oxidized/run
diff --git a/README.md b/README.md
index d5c4b9b..04c9137 100644
--- a/README.md
+++ b/README.md
@@ -119,6 +119,7 @@ pkg install rubygem-oxidized rubygem-oxidized-script rubygem-oxidized-web
 ```shell
 git clone https://github.com/ytti/oxidized.git
 cd oxidized/
+gem install bundler
 rake install
 ```
 
-- 
cgit v1.2.1


From 377faa395d79c485ce9dfea6a0483067684d8ada Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Thu, 26 Apr 2018 00:26:27 +0300
Subject: safe guard version for environment without git

---
 lib/oxidized/version.rb | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/lib/oxidized/version.rb b/lib/oxidized/version.rb
index de99d5f..a5422fd 100644
--- a/lib/oxidized/version.rb
+++ b/lib/oxidized/version.rb
@@ -2,13 +2,17 @@ module Oxidized
   VERSION = '0.21.0'
   VERSION_FULL = '0.21.0-180-g9691008'
   def self.version_set
-    Oxidized.send(:remove_const, :VERSION_FULL)
-    const_set(:VERSION_FULL, %x(git describe --tags).chop)
-    Oxidized.send(:remove_const, :VERSION)
-    const_set(:VERSION, %x(git describe --tags --abbrev=0).chop)
-    file = File.readlines(__FILE__)
-    file[1] = "  VERSION = '%s'\n" % VERSION
-    file[2] = "  VERSION_FULL = '%s'\n" % VERSION_FULL
-    File.write(__FILE__, file.join)
+    version_full = %x(git describe --tags).chop rescue ""
+    version      = %x(git describe --tags --abbrev=0).chop rescue ""
+    if [version, version_full].none? &:empty?
+      Oxidized.send(:remove_const, :VERSION)
+      Oxidized.send(:remove_const, :VERSION_FULL)
+      const_set(:VERSION, version)
+      const_set(:VERSION_FULL, version_full)
+      file = File.readlines(__FILE__)
+      file[1] = "  VERSION = '%s'\n" % VERSION
+      file[2] = "  VERSION_FULL = '%s'\n" % VERSION_FULL
+      File.write(__FILE__, file.join)
+    end
   end
 end
-- 
cgit v1.2.1


From ce155146656ee8b5f06a175f793a9461c05134ee Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Thu, 26 Apr 2018 00:31:21 +0300
Subject: fix rubocop being anal

---
 lib/oxidized/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/oxidized/version.rb b/lib/oxidized/version.rb
index a5422fd..1ca2f55 100644
--- a/lib/oxidized/version.rb
+++ b/lib/oxidized/version.rb
@@ -4,7 +4,7 @@ module Oxidized
   def self.version_set
     version_full = %x(git describe --tags).chop rescue ""
     version      = %x(git describe --tags --abbrev=0).chop rescue ""
-    if [version, version_full].none? &:empty?
+    if [version, version_full].none?(&:empty?)
       Oxidized.send(:remove_const, :VERSION)
       Oxidized.send(:remove_const, :VERSION_FULL)
       const_set(:VERSION, version)
-- 
cgit v1.2.1


From f27a0762b0effecbbc64c1e9e221aab6ebba38b2 Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Thu, 26 Apr 2018 00:40:07 +0300
Subject: praise be

---
 .rubocop.yml            |  3 +++
 lib/oxidized/version.rb | 21 +++++++++++----------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 60b4e11..20567f4 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -27,6 +27,9 @@ Style/FormatString:
 Style/FormatStringToken:
   EnforcedStyle: unannotated
 
+Style/RescueModifier:
+  Enabled: false
+
 # Do not attempt to police vendored code, and exclude special cases
 AllCops:
   Exclude:
diff --git a/lib/oxidized/version.rb b/lib/oxidized/version.rb
index 1ca2f55..b607e12 100644
--- a/lib/oxidized/version.rb
+++ b/lib/oxidized/version.rb
@@ -4,15 +4,16 @@ module Oxidized
   def self.version_set
     version_full = %x(git describe --tags).chop rescue ""
     version      = %x(git describe --tags --abbrev=0).chop rescue ""
-    if [version, version_full].none?(&:empty?)
-      Oxidized.send(:remove_const, :VERSION)
-      Oxidized.send(:remove_const, :VERSION_FULL)
-      const_set(:VERSION, version)
-      const_set(:VERSION_FULL, version_full)
-      file = File.readlines(__FILE__)
-      file[1] = "  VERSION = '%s'\n" % VERSION
-      file[2] = "  VERSION_FULL = '%s'\n" % VERSION_FULL
-      File.write(__FILE__, file.join)
-    end
+
+    return false unless [version, version_full].none?(&:empty?)
+
+    Oxidized.send(:remove_const, :VERSION)
+    Oxidized.send(:remove_const, :VERSION_FULL)
+    const_set(:VERSION, version)
+    const_set(:VERSION_FULL, version_full)
+    file = File.readlines(__FILE__)
+    file[1] = "  VERSION = '%s'\n" % VERSION
+    file[2] = "  VERSION_FULL = '%s'\n" % VERSION_FULL
+    File.write(__FILE__, file.join)
   end
 end
-- 
cgit v1.2.1


From 4ffe710f6fa5d48777f0b5e881013b95c9b85c69 Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Thu, 26 Apr 2018 02:56:36 +0300
Subject: unshallow docker git checkout

---
 Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index c928a2d..b4bdae9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -39,6 +39,8 @@ RUN gem install aws-sdk slack-api xmpp4r
 COPY . /tmp/oxidized/
 WORKDIR /tmp/oxidized
 
+# docker automated build gets shallow copy, but non-shallow copy cannot be unshallowed
+RUN git --fetch unshallow || true
 RUN rake install
 
 # web interface
-- 
cgit v1.2.1


From d03dca1a7b69b309b1b4a597a921b0b5b45f0e8f Mon Sep 17 00:00:00 2001
From: Wild Kat <wk@users.noreply.github.com>
Date: Thu, 26 Apr 2018 10:27:40 +0200
Subject: Use actual git commands that exist

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index b4bdae9..0ba8b7f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -40,7 +40,7 @@ COPY . /tmp/oxidized/
 WORKDIR /tmp/oxidized
 
 # docker automated build gets shallow copy, but non-shallow copy cannot be unshallowed
-RUN git --fetch unshallow || true
+RUN git fetch --unshallow || true
 RUN rake install
 
 # web interface
-- 
cgit v1.2.1


From cf770c557fc5d55786b56a31e389ff6d629315b4 Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Fri, 27 Apr 2018 11:32:47 +0300
Subject: Add SSH keepalive

Closes #1276
---
 lib/oxidized/input/ssh.rb | 11 ++++++-----
 spec/input/ssh_spec.rb    | 11 ++++++++---
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/lib/oxidized/input/ssh.rb b/lib/oxidized/input/ssh.rb
index 05c33c0..dc1eb27 100644
--- a/lib/oxidized/input/ssh.rb
+++ b/lib/oxidized/input/ssh.rb
@@ -26,11 +26,12 @@ module Oxidized
       port = vars(:ssh_port) || 22
 
       ssh_opts = {
-        :port => port.to_i,
-        :password => @node.auth[:password], :timeout => Oxidized.config.timeout,
-        :paranoid => secure,
-        :auth_methods => %w(none publickey password keyboard-interactive),
-        :number_of_password_prompts => 0,
+        port:         port.to_i,
+        paranoid:     secure,
+        keepalive:    true,
+        auth_methods: %w(none publickey password keyboard-interactive),
+        password:     @node.auth[:password], :timeout => Oxidized.config.timeout,
+        number_of_password_prompts: 0,
       }
 
       if proxy_host = vars(:ssh_proxy)
diff --git a/spec/input/ssh_spec.rb b/spec/input/ssh_spec.rb
index 2d1f5ce..9e08cea 100644
--- a/spec/input/ssh_spec.rb
+++ b/spec/input/ssh_spec.rb
@@ -27,9 +27,14 @@ describe Oxidized::SSH do
 
       proxy = mock
       Net::SSH::Proxy::Command.expects(:new).with("ssh test.com -W %h:%p").returns(proxy)
-      Net::SSH.expects(:start).with('93.184.216.34', 'alma',  :port => 22, :password => 'armud', :timeout => Oxidized.config.timeout,
-                                                              :paranoid => Oxidized.config.input.ssh.secure, :auth_methods => ['none', 'publickey', 'password', 'keyboard-interactive'],
-                                                              :number_of_password_prompts => 0, :proxy => proxy)
+      Net::SSH.expects(:start).with('93.184.216.34', 'alma',  port:      22,
+                                                              timeout:   Oxidized.config.timeout,
+                                                              paranoid:  Oxidized.config.input.ssh.secure,
+                                                              keepalive: true,
+                                                              proxy:     proxy,
+                                                              password: 'armud',
+                                                              number_of_password_prompts: 0,
+                                                              auth_methods: ['none', 'publickey', 'password', 'keyboard-interactive'])
 
       ssh.instance_variable_set("@exec", true)
       ssh.connect(@node)
-- 
cgit v1.2.1


From c65bbfe28eaafa21e7660b51758fafcdafc42bab Mon Sep 17 00:00:00 2001
From: Neil Lathwood <neil@lathwood.co.uk>
Date: Fri, 27 Apr 2018 10:55:47 +0100
Subject: travis fixes

---
 lib/oxidized/source/http.rb | 2 +-
 lib/oxidized/source/sql.rb  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/oxidized/source/http.rb b/lib/oxidized/source/http.rb
index 6d7dce3..55dcd4c 100644
--- a/lib/oxidized/source/http.rb
+++ b/lib/oxidized/source/http.rb
@@ -15,7 +15,7 @@ module Oxidized
     require "uri"
     require "json"
 
-    def load node_want=nil
+    def load node_want = nil
       nodes = []
       uri = URI.parse(@cfg.url)
       http = Net::HTTP.new(uri.host, uri.port)
diff --git a/lib/oxidized/source/sql.rb b/lib/oxidized/source/sql.rb
index dfcd7b4..8d321a0 100644
--- a/lib/oxidized/source/sql.rb
+++ b/lib/oxidized/source/sql.rb
@@ -18,7 +18,7 @@ module Oxidized
       end
     end
 
-    def load node_want=nill
+    def load node_want = nil
       nodes = []
       db = connect
       query = db[@cfg.table.to_sym]
-- 
cgit v1.2.1


From 137314377bbc15b651228a0394caf45e6fa8bcbc Mon Sep 17 00:00:00 2001
From: Neil Lathwood <neil@lathwood.co.uk>
Date: Fri, 27 Apr 2018 10:58:19 +0100
Subject: Another travis fix

---
 lib/oxidized/source/sql.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/oxidized/source/sql.rb b/lib/oxidized/source/sql.rb
index 8d321a0..c5fe650 100644
--- a/lib/oxidized/source/sql.rb
+++ b/lib/oxidized/source/sql.rb
@@ -25,7 +25,7 @@ module Oxidized
       query = query.with_sql(@cfg.query) if @cfg.query?
 
       if node_want
-        query = query.where(@cfg.map.name.to_sym=>node_want)
+        query = query.where(@cfg.map.name.to_sym => node_want)
       end
 
       query.each do |node|
-- 
cgit v1.2.1


From 91caa88b868decb8e063e95cfe63100dd990d2e7 Mon Sep 17 00:00:00 2001
From: Wild Kat <wk@futureinquestion.net>
Date: Fri, 27 Apr 2018 13:00:48 +0200
Subject: confucious say: man who rebases broken test of another simply
 shifting blame

---
 spec/input/ssh_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/input/ssh_spec.rb b/spec/input/ssh_spec.rb
index 9e08cea..3c33cd8 100644
--- a/spec/input/ssh_spec.rb
+++ b/spec/input/ssh_spec.rb
@@ -34,7 +34,7 @@ describe Oxidized::SSH do
                                                               proxy:     proxy,
                                                               password: 'armud',
                                                               number_of_password_prompts: 0,
-                                                              auth_methods: ['none', 'publickey', 'password', 'keyboard-interactive'])
+                                                              auth_methods: %w[none publickey password])
 
       ssh.instance_variable_set("@exec", true)
       ssh.connect(@node)
-- 
cgit v1.2.1


From 7701ee6ba338348acce08c8fc941244b909842cf Mon Sep 17 00:00:00 2001
From: Neil Lathwood <neil@lathwood.co.uk>
Date: Fri, 27 Apr 2018 12:14:36 +0100
Subject: updated tests

---
 spec/input/ssh_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/input/ssh_spec.rb b/spec/input/ssh_spec.rb
index 9e08cea..3f86c08 100644
--- a/spec/input/ssh_spec.rb
+++ b/spec/input/ssh_spec.rb
@@ -34,7 +34,7 @@ describe Oxidized::SSH do
                                                               proxy:     proxy,
                                                               password: 'armud',
                                                               number_of_password_prompts: 0,
-                                                              auth_methods: ['none', 'publickey', 'password', 'keyboard-interactive'])
+                                                              auth_methods: ['none', 'publickey', 'password'])
 
       ssh.instance_variable_set("@exec", true)
       ssh.connect(@node)
-- 
cgit v1.2.1


From f530a50a949310aa9996d764eeaaba7458b7d6b6 Mon Sep 17 00:00:00 2001
From: ytti <saku@ytti.fi>
Date: Fri, 27 Apr 2018 14:51:58 +0300
Subject: Add license

---
 LICENSE | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 201 insertions(+)
 create mode 100644 LICENSE

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..261eeb9
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
-- 
cgit v1.2.1