Give up after timeout on SSH#expect

2 files changed, 7 insertions, 4 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 3003aa8..1dd5c2e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oxidized (0.0.33)
+    oxidized (0.0.34)
       grit
       haml
       net-ssh
diff --git a/lib/oxidized/input/ssh.rb b/lib/oxidized/input/ssh.rb
index 24401dd..a0a5916 100644
--- a/lib/oxidized/input/ssh.rb
+++ b/lib/oxidized/input/ssh.rb
@@ -1,5 +1,6 @@
 module Oxidized
   require 'net/ssh'
+  require 'timeout'
   require 'oxidized/input/cli'
   class SSH < Input
     RescueFail = {
@@ -83,9 +84,11 @@ module Oxidized
     end
 
     def expect regexp
-      @ssh.loop(0.1) do
-        sleep 0.1
-        not @output.match regexp
+      Timeout::timeout(CFG.timeout) do
+        @ssh.loop(0.1) do
+          sleep 0.1
+          not @output.match regexp
+        end
       end
     end