canals 0.8.6 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c5a0098eb37586fc451b6ded6e126205695f128
-  data.tar.gz: cdda79e8d846034aba75aec28266cedd3d1ff029
+  metadata.gz: 2179ce68e3cee069eb408e8c56e62f1d337d4d1d
+  data.tar.gz: 4ab74cae9daa9230751e6d97268047eee0a8ee60
 SHA512:
-  metadata.gz: 3c6825603f60c7768e126a119b838fc2c5bbf47087dacf956b1154cec4ed0aaec69b49f8ac92206e8351d4398e8108976c67ba125b7b4f914cd841843ed95a42
-  data.tar.gz: 80c3806fd808fffe57d718d04eb277ebd5ea2977b484f7bf5117774d1baef42478f51972d38760216bbe6da3893bf9efab9d977a876051f8d15333544b7388c6
+  metadata.gz: 734ff1e2b875610c63750e3fcc41d2249bd962ea126ac1b8b0348949fe053879c9e5f54409727fd3816cd3a0d2fa32008f2b947d32cb066bbdcc4690f898bce7
+  data.tar.gz: 7c21330f7e538c8d12f73c52f0cd21814b6e5686bfa8f0ca47aa826da35962d41048a4a38b2e5bc52d8f8fe1612ff506dae394e31ff6f5a2092f12a05a7a4ed0

data/lib/canals/cli/helpers.rb

@@ -16,6 +16,11 @@ module Canals
         tunnel = Canals.repository.get(name)
         say "Created tunnel #{name.inspect} with pid #{pid}. You can access it using '#{tunnel.bind_address}:#{tunnel.local_port}'"
         pid
+      rescue Canals::Exception => e
+        tunnel = Canals.repository.get(name)
+        isalive = Canals.isalive? tunnel
+        say "Unable to create tunnel #{name.inspect}#{isalive ? ', A tunnel for ' + name.inspect + ' Already exists.' : ''}", :red
+        0
       end
 
       def trestart(name)

data/lib/canals/core.rb

@@ -1,6 +1,9 @@
 require 'open3'
 
 module Canals
+
+  class Exception < ::RuntimeError; end
+
   class << self
 
     def create_tunnel(tunnel_opts)
@@ -11,7 +14,8 @@ module Canals
       if tunnel_opts.instance_of? String
         tunnel_opts = Canals.repository.get(tunnel_opts)
       end
-      tunnel_start(tunnel_opts)
+      exit_code = tunnel_start(tunnel_opts)
+      raise Canals::Exception, "could not start tunnel" unless exit_code.success?
       pid = tunnel_pid(tunnel_opts)
       Canals.session.add({name: tunnel_opts.name, pid: pid, socket: socket_file(tunnel_opts)})
       pid.to_i
@@ -45,8 +49,9 @@ module Canals
 
     def tunnel_start(tunnel_opts)
       FileUtils.mkdir_p("/tmp/canals")
-      cmd = "ssh -M -S #{socket_file(tunnel_opts)} -fnNT -L #{tunnel_opts.bind_address}:#{tunnel_opts.local_port}:#{tunnel_opts.remote_host}:#{tunnel_opts.remote_port} #{tunnel_opts.proxy}"
+      cmd = "ssh -M -S #{socket_file(tunnel_opts)} -o 'ExitOnForwardFailure yes' -fnNT -L #{tunnel_opts.bind_address}:#{tunnel_opts.local_port}:#{tunnel_opts.remote_host}:#{tunnel_opts.remote_port} #{tunnel_opts.proxy}"
       system(cmd)
+      $?
     end
 
     def tunnel_check(tunnel_opts)

data/lib/canals/version.rb

@@ -1,6 +1,6 @@
 module Canals
 
   # Canals gem current version
-  VERSION = "0.8.6"
+  VERSION = "0.8.7"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canals
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.7
 platform: ruby
 authors:
 - Ido Abramovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-07 00:00:00.000000000 Z
+date: 2017-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor