net-ssh-cli 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e89dcb750ca04e0f861e75a15f7b43f5c18a9409857bd1c44e1458227d2e153
-  data.tar.gz: f9e6ac90efa410f49401c04a4f66fa26e5977739005feba233b200d3336a41cf
+  metadata.gz: edf3e84c80ca5ee2c6b67efee26c5f5b4f4b51a6c3425c4b7093e1d20eee4816
+  data.tar.gz: 59b804e5249298c0f6de5debb26a89eacc3221e0a7d1bf3fe47aa08c5c2e89fa
 SHA512:
-  metadata.gz: d71c9a4d883426849d939b49505c84d336fdcf26a3bce7ef1cae364f903881d6de2654091da2061d0ebb50e806ab56fea71b090b591c0924388976944b0aff27
-  data.tar.gz: a25df68ad93832c42767a88e6e14800160301e2ce36e4e938efb65954dbf2b8c5fdcd92a1cabab57b2ec06482cdf27a14936f101fa120914ae656fe828f0bd3c
+  metadata.gz: 0d1046b9eab50cf26d5a1acab9d9301fa90225204df55168c64dcb9d985310aacdee023fe2c4ce2628cf016847e891feed6f94da3c0423c6555f41f3727262da
+  data.tar.gz: 2c70b909d56f711d972b8381f4eef838e785b1b78d63d11786fded541b00d0b03b487fa66418b791965d4c13c0a02c28f65751cab5fa917a459c5ccdffa00ae6

data/lib/net/ssh/cli.rb

@@ -174,11 +174,15 @@ module Net
       def read_till(prompt: current_prompt, timeout: read_till_timeout, **_opts)
         raise Error::UndefinedMatch, 'no prompt given or default_prompt defined' unless prompt
 
-        ::Timeout.timeout(timeout + 0.5, Error::ReadTillTimeout) do
+        hard_timeout = timeout
+        hard_timeout += 0.5 if timeout
+        ::Timeout.timeout(hard_timeout, Error::ReadTillTimeout) do
           with_prompt(prompt) do
-            soft_timeout = Time.now + timeout 
+            soft_timeout = Time.now + timeout if timeout
             until stdout[current_prompt] do
-              raise Error::ReadTillTimeout, "Timeout after #{timeout}s, #{current_prompt.inspect} never matched #{stdout.inspect}" if soft_timeout < Time.now
+              if timeout and soft_timeout < Time.now
+                raise Error::ReadTillTimeout, "Timeout after #{timeout}s, #{current_prompt.inspect} never matched #{stdout.inspect}"
+              end
               process
               sleep 0.1
             end

data/lib/net/ssh/cli/version.rb

@@ -3,7 +3,7 @@
 module Net
   module SSH
     module CLI
-      VERSION = '1.3.0'
+      VERSION = '1.3.1'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-ssh-cli
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Fabian Stillhart