ssh-manager 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bae04d01539a4942368e8ed92e65e2b712c7e40c
-  data.tar.gz: a653408283b84ab48557156da1ff54aa43ce0711
+  metadata.gz: e5af85955007e2593df5116944b84b2717970120
+  data.tar.gz: e351a66da23b679499a4bf02ca6cbe419574d406
 SHA512:
-  metadata.gz: 7a4b9ed662ba509680dde00e147f3d85025c655a0a004c5648a23fa0a140c4cf24f867ef85acf853301a2851b7d269ec99ad66f96f7383e031fb6a7b221c5aaa
-  data.tar.gz: 18ef55d2787eae8c57762ccf3a4c5f682adc13e40c6906d56f15f3fcf1b3f7282393b0b6e4927b7db7b505283dcbb6281f2aac74d68281bea63fadf7fd7d8c64
+  metadata.gz: 62898e31deff1153afb52b62b57daed6cf9345cf1b0b32daf14568f5cfa8421a972e6cdeb7d5d0ccfa86331330d247cde3d9e2a6dd95642add24ac12140df995
+  data.tar.gz: f71c40faa623b177c278621f926bc27591bdf9fda204a49aa94518392e6cf24083209d9909d1441b9d5c6d3625ae8123ee8a23006473d34589c773868e426f75

data/lib/ssh/manager/cli.rb

@@ -14,7 +14,7 @@ module SSH
         @options = opts
       end
 
-      def check_term(ip, user)
+      def check_term(ip, user, via)
         if CONFIG['terminal'] == "xfce4-terminal" || CONFIG['terminal'] == "gnome-terminal"
           if CONFIG['tabbed'] == 'true'
             command = "--title=#{user}@#{ip} --tab --command="
@@ -24,7 +24,11 @@ module SSH
           #TODO: add title --title='connection name to identify '
           #TODO: bug when no terminal is open => wants to open 2 terms
           #TODO: dnslookup
-          %x(#{CONFIG['terminal']} #{command}"ssh #{user}@#{ip}")
+          if via.nil? 
+            %x(#{CONFIG['terminal']} #{command}"ssh #{user}@#{ip}")
+          else
+            %x(#{CONFIG['terminal']} #{command}"ssh -A -t #{via} ssh -A -t #{user}@#{ip}")
+          end
         elsif CONFIG['terminal'] == "xterm" || CONFIG['terminal'] == "urxvt"
           %x(#{CONFIG['terminal']} -e "ssh #{user}@#{ip}")
         else
@@ -38,12 +42,12 @@ module SSH
         if via.nil?
           @ip = DATABASE.get_connection_data[id.to_i-1][0]
           @user = DATABASE.get_connection_data[id.to_i-1][1]
-          check_term(@ip, @user)
+          check_term(@ip, @user, via)
         else
           @ip = DATABASE.get_connection_data[id.to_i-1][0]
           @user = DATABASE.get_connection_data[id.to_i-1][1]
           via = DATABASE.get_connection_data[id.to_i-1][-1]
-          %x(gnome-terminal --command="ssh -A -t #{via} ssh -A -t #{@user}@#{@ip}") 
+          check_term(@ip, @user, via)
         end
         #TODO: check for options
         #TODO: if db[secure_login] = false => http://linuxcommando.blogspot.de/2008/10/how-to-disable-ssh-host-key-checking.html
@@ -151,7 +155,7 @@ module SSH
       def multiple_connection(term)
         DATABASE.search_for(term).each do |x|
           x.all.each do |dataset|
-            check_term(dataset[:ip], dataset[:user])
+            check_term(dataset[:ip], dataset[:user], dataset[:connect_via])
             #TODO: Add terminalposition
           end
         end

data/lib/ssh/manager/version.rb

@@ -1,5 +1,5 @@
 module SSH
   module Manager
-    VERSION = "1.0.4"
+    VERSION = "1.0.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ssh-manager
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Joshua Schmid