testbot 0.7.11 → 0.7.12

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODljYWYyOTMwNjg1YmM0NWZlYTA0MTllZTE5NjAzYjAyYmQ0ZjAwNw==
+    NDliMDM2NjM2YTU3M2FmNjFhYjEwYWY0NWFlMTcwZmYzYjk2MjEyYw==
   data.tar.gz: !binary |-
-    Zjc3YzcyMDg2MTY1OTk2Y2JiMjdjMTQxNmMxOGNiMzhiOWU5ZDlmYg==
+    MTNiNjJiOGI0MGNiMmM3YzcwYzcwYjdjZDZlMzdlM2IxNTY0Njg2MQ==
 SHA512:
   metadata.gz: !binary |-
-    MGI5OWQxMjI2ODJjZGVlNjc4OGQ0MGM3MGZhZWM0OTIwMzU2M2MyYTI2YTBk
-    ZjZhYmQwOTRkMjg2NTE0M2FkMGZlOTcwZTRmYWU2NGQ2YzBjMDU3Zjk1ZTcw
-    ZmFhNDMwZjBiZTY1N2YxZjg3ZDFlN2E3OWZlM2M5YTNjYWEzNmU=
+    NDNlMzMwZGY5M2UwN2IyYjVjZDQ0Njc2NWNhNWY2MmI5MmRlMGE3NzFkZTlk
+    ZDFkNzQ1ZWNhYmY3NzJhYWYzN2NkYjQyOTI4NzVkM2M3OTc5ZDMyMzYyNjZj
+    MzgzODIyYjI4YzIyMWU3MDJiMzFiOTJlMzkwZTRkMmQ3NjEyZjA=
   data.tar.gz: !binary |-
-    ZjNlNmZiOWIzMDQ0OTdiY2EzZDA2NGFlOGRmYTA4MjYzNTZiMGY3NzQ0YTQ0
-    YjNiNzA4ODY1MzkzMDJmZjIwZDY1YTg3NTQ1YjAyZTQ4YjliMDJiZWU0MDRi
-    OTMxMGEwMDYxOGIyMTRiZjhhNTNhYWJiYTNlYzcxNWQ3MGEwYzk=
+    ZTAxOGJiZjg1MTZhMTE2OTU3YjMxMTI0MWMzOWYwYzNiOGIwODU4NTJmNDY2
+    MDQ2OWZjMWEyOGYxNWU4YTg3MDE0ZTAyYzc2YmQzNGE4YzJjZTZjYWIzM2M4
+    ZmYzZDY4OTEzMjhiMjBlYmE3NTdlZmJlMWVjNDljOTBiMDU2YzM=

data/CHANGELOG

@@ -1,3 +1,7 @@
+0.7.12
+
+Adjust SSH timeout to decrease risk of undesired parallel connections.
+
 0.7.11
 
 Longer SSH timeout to work better on poorer connections.

data/README.markdown

@@ -67,7 +67,7 @@ Using testbot with Rails 2:
 
     # Add testbot to your Gemfile if you use bundler. You also need the plugin because
     # Rails 2 does not load raketasks from gems.
-    ruby script/plugin install git://github.com/joakimk/testbot.git -r 'refs/tags/v0.7.11'
+    ruby script/plugin install git://github.com/joakimk/testbot.git -r 'refs/tags/v0.7.12'
     script/generate testbot --connect 192.168.0.100
 
     rake testbot:spec (or :rspec, :test, :features)

data/lib/shared/ssh_tunnel.rb

@@ -2,8 +2,10 @@ require 'rubygems'
 require 'net/ssh'
 
 class SSHTunnel
-  # 10 seconds was too short for users with poorer connections.
-  TIMEOUT_SECONDS = 15
+  # We want a small number so this fails quickly when unreachable. But not too small: a lower value caused false negatives on a poor connection.
+  # We want the inner timeout (the SSH connection) to trigger before the outer (loop), to avoid the situation where we make two connections in parallel.
+  INNER_TIMEOUT_SECONDS = 15
+  OUTER_TIMEOUT_SECONDS = INNER_TIMEOUT_SECONDS + 1
 
   def initialize(host, user, local_port = 2288)
     @host, @user, @local_port = host, user, local_port
@@ -17,7 +19,7 @@ class SSHTunnel
       break if @up
       sleep 0.5
 
-      if Time.now - start_time > TIMEOUT_SECONDS
+      if Time.now - start_time > OUTER_TIMEOUT_SECONDS
         puts "SSH connection failed, trying again... (#{@user}@#{@host})"
         start_time = Time.now
         connect
@@ -28,7 +30,7 @@ class SSHTunnel
   def connect
     @thread.kill if @thread
     @thread = Thread.new do
-      Net::SSH.start(@host, @user, { :timeout => TIMEOUT_SECONDS }) do |ssh|
+      Net::SSH.start(@host, @user, { :timeout => INNER_TIMEOUT_SECONDS }) do |ssh|
         ssh.forward.local(@local_port, 'localhost', Testbot::SERVER_PORT)
         ssh.loop {  @up = true }
       end

data/lib/shared/version.rb

@@ -1,7 +1,7 @@
 module Testbot
   # Don't forget to update readme and changelog
   def self.version
-    version = "0.7.11"
+    version = "0.7.12"
     dev_version_file = File.join(File.dirname(__FILE__), '..', '..', 'DEV_VERSION')
     if File.exists?(dev_version_file)
       version += File.read(dev_version_file)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: testbot
 version: !ruby/object:Gem::Version
-  version: 0.7.11
+  version: 0.7.12
 platform: ruby
 authors:
 - Joakim Kolsjö
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-27 00:00:00.000000000 Z
+date: 2016-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra