localtunnel 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a4bde484c6c8c5080e9c4d0bd18248ef8ff62c6
-  data.tar.gz: 1f33eca4f0c3281bbcf90216bb8522df94dfff11
+  metadata.gz: 38f2d1bbde7fd341eff4cdc738d6dbefbbbf3587
+  data.tar.gz: 586aabaee94ae8fe0541bc165063beff1a690317
 SHA512:
-  metadata.gz: 2f8d30e20b6cf805fbce77cb355e64fc63e3d8328bf4c0b7f2d20d1640c414380065652aa0c8269186492af433edd9a505d27a871da4ba6a964dd5eaf5fbf6ab
-  data.tar.gz: f9f08b7ecd6754a139b3f0889ea8b0be3ec4f97eb86906e3844b5861132761f1d5e437fc55f3bf5b13f79a71e724f79e21b905b7b523023c7a5594c7040be16c
+  metadata.gz: 5e139a5442b7f386ffb44581b2bac1888464efcfb0520d58ad60e97c148602f3917575ee663337449fd4c2593b0d6c93e2c8219ad3e56977e11709a28aafae29
+  data.tar.gz: 4f1f9e3e3808fe22de86dd8845c22e2585a99c09df460fe71a0b65a2a2a6138eb2fac9b5d27eafb023ac4e109e5c46b7a71a58bebed950201f2a0eb0c58e0bf0

data/lib/localtunnel/client.rb

@@ -12,20 +12,18 @@ module Localtunnel
 
       log = Tempfile.new("localtunnel")
       @@pid = Process.spawn(execution_string(log, options))
-      @@url = parse_url!(log)
 
       at_exit { stop } # Ensure process is killed if Ruby exits.
 
-      return # Explicitly return nil.
+      @@url = parse_url!(log)
     end
 
     def self.stop
       return unless running?
 
       `kill -9 #{@@pid} 1>/dev/null 2>&1` # Can't use Process.kill, since JRuby on Raspbian doesn't support it.
-      @@pid = nil
 
-      return # Explicitly return nil.
+      @@pid = nil
     end
 
     def self.running?
@@ -48,22 +46,24 @@ module Localtunnel
       s << " -s '#{options[:subdomain]}'" if options.key?(:subdomain)
       s << " -h '#{options[:remote_host]}'" if options.key?(:remote_host)
       s << " -l '#{options[:local_host]}'" if options.key?(:local_host)
-      s << " > #{log.path}"
+      s << " > #{log.path} 2>&1"
     end
 
     def self.parse_url!(log, max_seconds = 10)
       max_seconds.times do
         sleep 1
-        raise ClientConnectionFailedError unless running?
-
         log.rewind
-        if match_data = log.read.match(/^your url is: (.*)$/)
-          return match_data.captures[0]
+        log_data = log.read
+
+        if match_data = log_data.match(/^your url is: (.*)$/)
+          return match_data.captures.first
+        elsif log_data.match(/^Error: (.*)$/)
+          raise ClientConnectionFailedError
         end
       end
 
       stop
-      raise ClientConnectionFailedError
+      raise ClientConnectionFailedError # Timeout.
     end
   end
 

data/lib/localtunnel/version.rb

@@ -1,3 +1,3 @@
 module Localtunnel
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: localtunnel
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Swinburne Software Innovation Lab