easy-serve 0.8 → 0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03c328ab82c8bb6aebbc3b9e6e5c9a50a3895a5c
-  data.tar.gz: be6c2705dc58ee78cf2ce725f0bdb885dac96378
+  metadata.gz: 2d1ef7c230f25e932ca33c4acbf8836789aeba20
+  data.tar.gz: 6003abf5645a32b1aadee49e711fbed4cfe8a8f4
 SHA512:
-  metadata.gz: d91ad208ac5237e50d2e03ca0d1524a2a8005753f78fa1ccf192b7486baa8ce70abca4c2b8ca7ecfaa25c2d364f1d0f5a6dcf6759fb2916557a3b9e9ca31b64f
-  data.tar.gz: 22d93a3d940daf5e2ecf4810896f9f13fbef3d49e8cad7f7f2b9a1a07991f1d4bb106163e55dfaf9d70f7a8dec8ed0bbc0a6b5a76b3856c74fbafa50e7e76491
+  metadata.gz: 0618e996740b75fefef23d2fda92fc2f39a1e13d8e6d66d6d18c61f613c44aefd7419e49587b909bbc2c1aa86e9e605588c4f4f59d6b1311dfe18a87da77c448
+  data.tar.gz: 579718d353ad19562bb10a0dfdd0e9574476eeba4116844328a04e53ee0b13bf454cafa94a8194419a29eab912342e42297b2c778edf3c542cc623f0fbfcf2df

data/lib/easy-serve.rb

@@ -6,7 +6,7 @@ require 'fileutils'
 require 'easy-serve/service'
 
 class EasyServe
-  VERSION = "0.8"
+  VERSION = "0.9"
   
   class EasyFormatter < Logger::Formatter
     Format = "%s: %s: %s\n"

data/lib/easy-serve/accessible-services.rb

@@ -16,17 +16,34 @@ class EasyServe
         end
 
       fwd = "0:#{service_host}:#{service.port}"
-      out = `ssh -O forward -R #{fwd} #{host}`
+      remote_port = nil
+      tries = 10
+      1.times do
+        out = `ssh -O forward -R #{fwd} #{host}`
+        begin
+          remote_port = Integer(out)
+        rescue
+          log.error "Unable to set up dynamic ssh port forwarding. " +
+            "Please check if ssh -v is at least 6.0."
+          raise
+        end
 
-      begin
-        remote_port = Integer(out)
-      rescue
-        log.error "Unable to set up dynamic ssh port forwarding. " +
-          "Please check if ssh -v is at least 6.0."
-        raise
+        if remote_port == 0
+          log.warn "race condition in ssh selection of remote_port"
+          tries -= 1
+          if tries > 0
+            sleep 0.1
+            log.info "retrying ssh selection of remote_port"
+            redo
+          end
+          raise "ssh did not assign remote_port"
+        end
       end
 
-      at_exit {system "ssh -O cancel -R #{fwd} #{host}"}
+      # This breaks with multiple forward requests, and it would be too hard
+      # to coordinate among all requesting processes, so let's leave the
+      # forwarding open:
+      #at_exit {system "ssh -O cancel -R #{fwd} #{host}"}
 
       TCPService.new service.name, connect_host: "localhost", port: remote_port
     end

data/lib/easy-serve/service.rb

@@ -2,7 +2,26 @@ class EasyServe
   # Refers to a named service. Use the #serve method to start the service.
   # Encapsulates current location and identity, including pid and address. A
   # Service object can be serialized to a remote process so it can #connect to
-  # the service. 
+  # the service.
+  #
+  # The scheme for referencing hosts is as follows:
+  #
+  #      bind host  |              connect host
+  #                 +------------------------------------------------------
+  #                 |  local           remote TCP            SSH tunnel
+  #      -----------+------------------------------------------------------
+  #
+  #      localhost     'localhost'     X                     'localhost'
+  #
+  #      0.0.0.0       'localhost'     hostname(*)           'localhost'
+  #
+  #      hostname      hostname        hostname              'localhost'(**)
+  #
+  #      * use hostname as best guess, can override; append ".local" if
+  #        hostname not qualified
+  #
+  #      ** forwarding set up to hostname[.local] instead of localhost
+  #
   class Service
     attr_reader :name
     attr_reader :pid

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy-serve
 version: !ruby/object:Gem::Version
-  version: '0.8'
+  version: '0.9'
 platform: ruby
 authors:
 - Joel VanderWerf