oxidized-ssh 0.1.2.1 → 0.1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5eb0a4dc218d5fccfe56a5f13f2c38bd9e59853
-  data.tar.gz: 779d692e5d09167e25cde4d88050fbc4f4aee186
+  metadata.gz: b18031bbbc9ee47891b6021cfeb63260348bd705
+  data.tar.gz: fa02a18838c054605a00a4f26f884d76f9e5efe0
 SHA512:
-  metadata.gz: bf731536ad899827c49ea3599ce47e29c434bbf10a6cfa99b18a0c58e9c909a122240ee6ab61ddff9a7a4ea120a853373ec3b8bb91fcc1b2f32d9d428530b859
-  data.tar.gz: 696696aa68b44a25253f0c25e8155f8344628ed9dc8cb2c975b90a5cb2705baf28cefa57eb69003404e464c0f71f3361f4b48e64861becbb2f282437d0971dc0
+  metadata.gz: 60677583298cbd23ea1d910422670c2e2b77d997b67cb956d3f00cab3f2feb25b1ad67a3b9dfa32181908d06a8becdf0105c4c9b5a48519d4602904666e08b10
+  data.tar.gz: f2ea26f9d2a16497a02cb233037daf38039ee99a720897b5c4131ed2eeae66f1b36384b8e77045cdd31f5f4ff0f3bfdf2deaf5bf8e50b3191d300b4ac44842e1

data/lib/oxidized/ssh/version.rb

@@ -1,5 +1,5 @@
 module Oxidized
   module Ssh
-    VERSION = "0.1.2.1"
+    VERSION = "0.1.2.3"
   end
 end

data/lib/oxidized/ssh.rb

@@ -7,14 +7,15 @@ module Oxidized
   class SSH
 
       attr_reader :connection, :ip, :username, :password
-      attr_reader :prompt, :verbosity, :exec, :pty_options
+      attr_reader :prompt, :debug, :exec, :pty_options
       attr_reader :port, :output, :session
       
       def initialize(options)
         @ip = options[:ip]
         @username = options[:username]
         @password = options[:password]
-        @verbosity = options[:verbosity]
+        @verbose = options[:verbose]
+        @debug = options[:debug]
         @prompt = options[:prompt]
         @exec = options[:exec]
         @pty_options = options[:pty_options] ||= { term: "vt100" }
@@ -26,7 +27,7 @@ module Oxidized
       
       def start
         raise "MissingSSHLibrary" if !defined? Net::SSH
-        @connection = Net::SSH.start(@ip, @username, password: @password, verbose: @verbosity, port: @port)
+        @connection = Net::SSH.start(@ip, @username, password: @password, verbose: @verbose, port: @port)
         return yield self if block_given?
         return (@connection and not @connection.closed?)
       end
@@ -34,7 +35,9 @@ module Oxidized
       def exec!(params)
         check_for_connection
         exec(params)
-        @output.gsub(/\r\n/,"\n")
+        sanitize_output_buffer("\n", /\r\n/)
+        sanitize_output_buffer('', @prompt, params)
+        @output
       end
       
       def check_for_connection
@@ -42,7 +45,7 @@ module Oxidized
       end
       
       def exec(params)
-        @logger.debug "sending command #{params} with expectation of #{@prompt}"
+        @logger.debug "sending command #{params} with expectation of #{@prompt}" if @debug
         if @exec
           @connection.exec!(params)
         else
@@ -70,7 +73,7 @@ module Oxidized
       
       def expect *regexps
         regexps = [regexps].flatten
-        @logger.debug "expecting #{regexps.inspect} at #{@ip}"
+        @logger.debug "expecting #{regexps.inspect} at #{@ip}" if @debug
         @connection.loop(0.1) do
           sleep 0.1
           match = regexps.find { |regexp| @output.match regexp }
@@ -101,7 +104,7 @@ module Oxidized
       
       def set_data_hook(ch)
         ch.on_data do |_ch, data|
-          # @logger.debug "received #{data}"
+          @logger.debug "received #{data}" if @debug
           @output << data
           @output = expectation_list_handler(@output) if @expectation_handler
         end
@@ -127,6 +130,11 @@ module Oxidized
         @output = ''
       end
       
+      def sanitize_output_buffer sub, *regexs
+        @logger.debug "sanitizing #{regexs.join("|")} with #{sub}" if @debug
+        @output.gsub!(/#{regexs.join("|")}/, sub)
+      end
+      
       def disconnect
         Timeout::timeout(5) { @connection.loop }
         rescue Errno::ECONNRESET, Net::SSH::Disconnect, IOError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oxidized-ssh
 version: !ruby/object:Gem::Version
-  version: 0.1.2.1
+  version: 0.1.2.3
 platform: ruby
 authors:
 - Schylar