oxidized-ssh 0.1.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe298db180b2633f350b7725072152ee36fcd47c
-  data.tar.gz: a69a0590baa1b41365a5dd18f562aa52e6c2a768
+  metadata.gz: 0c45bf726f7d3c22eb878169ae8592d04f34d3b8
+  data.tar.gz: 9820acba3c7bad72fc906b83b308c44e02b452d7
 SHA512:
-  metadata.gz: 4ee8e960477b6240a4c3bfaffb665feafb26f4f609e487288cef1575b6251ca5f217de4d26dae07e786228a375d6ed57f54007682075a5d50cfafe80b37ba63b
-  data.tar.gz: f85cd8cd83f1689f67cd738aeb4b93c6a9d176b43cb901a36665d01efa1b2e1c3d2dfc77eb4e668c0e91d4fcdcbb8b702e882ed222f6c3845c9437decdb71531
+  metadata.gz: dc2fa8e5687d2bc8ac2d15568dd880de213d97bf28a05354faeaa054a2ff9a96099e62499a46e96a4b25c7f377cbad2c644deb8410758871c902b715027d9032
+  data.tar.gz: 63dbb43e27c3e0ab9f1cdf24933f1501cbc517aea7b5b3e53cf0a46ead67e6c544f79c5bd530f507ac6f111d3b08c98ba2ec8dc5e972117d841d2b684dabf40b

data/lib/oxidized/ssh.rb

@@ -1,10 +1,11 @@
 require_relative "ssh/version"
 require 'net/ssh'
-require 'timeout'
+require 'timeout'
+require 'awesome_print'
 
 module Oxidized
-  class Ssh
-
+  class SSH
+
       attr_reader :connection, :ip, :username, :password
       attr_reader :prompt, :verbosity, :exec, :pty_options
       attr_reader :port, :output, :session
@@ -18,8 +19,9 @@ module Oxidized
         @exec = options[:exec]
         @pty_options = options[:pty_options] ||= { term: "vt100" }
         @port = options[:port] ||= 22
-        @output = String.new
+        @output = String.new
         @logger = options[:logger] ||= Logger.new(STDOUT)
+        @expectation_handler = options[:expectation_handler]
       end
       
       def start
@@ -32,14 +34,14 @@ module Oxidized
       def exec!(params)
         check_for_connection
         exec(params)
-        @output.gsub(/\r\n/,/\n/)
+        @output.gsub(/\r\n/,"\n")
       end
       
       def check_for_connection
         prep_connection unless @session
       end
       
-      def exec(params)
+      def exec(params)
         @logger.debug "sending command #{params} with expectation of #{@prompt}"
         if @exec
           @connection.exec!(params)
@@ -49,19 +51,24 @@ module Oxidized
       end
       
       def collect_output(params)
-        send_data(params + "\n")
+        send_data((params + "\n"))
         return @output
       end
       
       def send_data(params)
         expect @prompt
         reset_output_buffer
-        @session.send_data params
+        send(params)
         @session.process
         expect @prompt
+        @output
+      end
+      
+      def send(params)
+        @session.send_data params
       end
       
-      def expect *regexps
+      def expect *regexps
         regexps = [regexps].flatten
         @logger.debug "expecting #{regexps.inspect} at #{@ip}"
         @connection.loop(0.1) do
@@ -94,8 +101,17 @@ module Oxidized
       
       def set_data_hook(ch)
         ch.on_data do |_ch, data|
+          @logger.debug "received #{data}"
           @output << data
+          @output = expectation_list_handler(@output) if @expectation_handler
+        end
+      end
+      
+      def expectation_list_handler(data)
+        @expectation_handler.each_slice(2) do |handler, meth|
+          handler.method(meth.to_sym).call(self, data)
         end
+        @output
       end
       
       def request_channels(ch)

data/lib/oxidized/ssh/version.rb

@@ -1,5 +1,5 @@
-module Oxidized
-  module Ssh
-    VERSION = "0.1.1.1"
-  end
-end
+module Oxidized
+  module Ssh
+    VERSION = "0.1.2"
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oxidized-ssh
 version: !ruby/object:Gem::Version
-  version: 0.1.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Schylar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-10 00:00:00.000000000 Z
+date: 2017-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh