Load config file from OXIDIZED_HOME env var location.

lib/oxidized/config.rb

@@ -14,7 +14,7 @@ class Config
     Sleep     = 1
 
     def self.load(cmd_opts = {})
-      asetus = Asetus.new(name: 'oxidized', load: false, key_to_s: true)
+      asetus = Asetus.new(name: 'oxidized', load: false, key_to_s: true, usrdir: Oxidized::Config::Root)
       Oxidized.asetus = asetus
 
       asetus.default.username      = 'username'

lib/oxidized/input/ssh.rb

@@ -134,23 +134,13 @@ def make_ssh_opts
       ssh_opts[:auth_methods] = auth_methods
       Oxidized.logger.debug "AUTH METHODS::#{auth_methods}"
 
-      proxy_host = vars(:ssh_proxy)
-      if ( defined?(proxy_host) && !proxy_host.nil? && !proxy_host.empty? )
-        proxy_command =  "ssh "
-        proxy_command += "-o StrictHostKeyChecking=no " unless secure
-        if (proxy_port = vars(:ssh_proxy_port))
-          proxy_command += "-p #{proxy_port} "
-        end
-        proxy_command += "#{proxy_host} -W [%h]:%p"
-        proxy = Net::SSH::Proxy::Command.new(proxy_command)
-        ssh_opts[:proxy] = proxy
-      end
+      ssh_opts[:proxy] = make_ssh_proxy_command(vars(:ssh_proxy), vars(:ssh_proxy_port), secure) if vars(:ssh_proxy)
 
-      ssh_opts[:keys]       = [vars(:ssh_keys)].flatten if vars(:ssh_keys)
-      ssh_opts[:kex]        = vars(:ssh_kex).split(/,\s*/) if vars(:ssh_kex)
+      ssh_opts[:keys]       = [vars(:ssh_keys)].flatten           if vars(:ssh_keys)
+      ssh_opts[:kex]        = vars(:ssh_kex).split(/,\s*/)        if vars(:ssh_kex)
       ssh_opts[:encryption] = vars(:ssh_encryption).split(/,\s*/) if vars(:ssh_encryption)
-      ssh_opts[:host_key]   = vars(:ssh_host_key).split(/,\s*/) if vars(:ssh_host_key)
-      ssh_opts[:hmac]       = vars(:ssh_hmac).split(/,\s*/) if vars(:ssh_hmac)
+      ssh_opts[:host_key]   = vars(:ssh_host_key).split(/,\s*/)   if vars(:ssh_host_key)
+      ssh_opts[:hmac]       = vars(:ssh_hmac).split(/,\s*/)       if vars(:ssh_hmac)
 
       if Oxidized.config.input.debug?
         ssh_opts[:logger]  = Oxidized.logger
@@ -159,5 +149,16 @@ def make_ssh_opts
 
       ssh_opts
     end
+
+    def make_ssh_proxy_command(proxy_host, proxy_port, secure)
+      return nil unless !proxy_host.nil? && !proxy_host.empty?
+
+      proxy_command =  "ssh "
+      proxy_command += "-o StrictHostKeyChecking=no " unless secure
+      proxy_command += "-p #{proxy_port} "            if proxy_port
+      proxy_command += "#{proxy_host} -W [%h]:%p"
+      proxy = Net::SSH::Proxy::Command.new(proxy_command)
+      proxy
+    end
   end
 end

lib/oxidized/model/enterasys.rb

@@ -3,7 +3,7 @@ class Enterasys < Oxidized::Model
 
   prompt /^.+\w\((su|rw)\)->\s?$/
 
-  comment  '!'
+  comment '!'
 
   # Handle paging
   expect /^--More--.*$/ do |data, re|

lib/oxidized/model/model.rb

@@ -194,7 +194,7 @@ def xmlcomment(str)
       # with '- '
       data = ''
       str.each_line do |line|
-        data << '<!-- ' << str.gsub(/-(?=-)/, '- ').chomp << " -->\n"
+        data << '<!-- ' << line.gsub(/-(?=-)/, '- ').chomp << " -->\n"
       end
       data
     end