xlogin 0.14.4 → 0.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdbb386674deee491268f35a9d5ca46c721391068d693a68d9a3e289e0168f97
-  data.tar.gz: b6afba886c65c3744253d58e0d8eccda3c265cf168159d95f3504408962127ce
+  metadata.gz: 9f70683b7d62c67930ee2b1d751e8b08de39e1ab9501c7c3941f65c58dcb4230
+  data.tar.gz: 5e2aec6727af661463c755f4c730f74d1c35a6381e269a172090759372ede5db
 SHA512:
-  metadata.gz: edf8a747bff259718090617554b0d0868a3a3f321c287b328be882ac4dc68f9cbd2943755e55a1772525647bbfc485e849ac56495bed49a92b3a76cfb5bb4d1d
-  data.tar.gz: 5d699b1d3982c7cf1a7bd4cd19ef174acf27885ac5e38fc4f10f746efd99b8e1e3deea523f52b901f9d4cdb80440aae5dd532abde1d41aa09c7548e07198a838
+  metadata.gz: 8b405fd67ab614bfead70cd94be9de78119b53291f8e111809a749cfcc36061bbb85d7ee7bd4e4858d53fc51264d9399ecf145fde13939662deac5e51b4df54e
+  data.tar.gz: b1750b6fa4ec8636535866e0de63c479890422e2b6026ed0724276c4fee3531c146286aafec6534fe07f371f95641efa3673f95e24ce87b059e4d3a840849009

data/lib/xlogin.rb

@@ -40,15 +40,13 @@ module Xlogin
       return session unless block
       begin block.call(session) ensure session.close end
     end
-    alias_method :create, :get
 
-    def get_pool(args, **opts, &block)
+    def pool(args, **opts, &block)
       pool = factory.build_pool(args, **opts)
 
       return pool unless block
       begin block.call(pool) ensure pool.close end
     end
-    alias_method :create_pool, :get_pool
 
     def configure(&block)
       instance_eval(&block)

data/lib/xlogin/factory.rb

@@ -13,7 +13,7 @@ module Xlogin
     def initialize
       @inventory = Hash.new
       @templates = Hash.new
-      @gateways  = Hash.new
+      @tunnels   = Hash.new
       @mutex     = Mutex.new
     end
 
@@ -54,32 +54,41 @@ module Xlogin
       @templates.keys
     end
 
-    def open_tunnel(tunnel, host, port)
+    def open_tunnel(name, host, port)
       @mutex.synchronize do
-        unless @gateways[tunnel]
-          gateway_uri = Addressable::URI.parse(tunnel)
-          case gateway_uri.scheme
+        tunnel = @tunnels[name]
+        unless tunnel && tunnel.gateway.active?
+          uri = Addressable::URI.parse(name)
+          case uri.scheme
           when 'ssh'
-            username, password = *gateway_uri.userinfo.split(':')
-            @gateways[tunnel] = Net::SSH::Gateway.new(
-              gateway_uri.host,
+            username, password = *uri.userinfo.split(':')
+            gateway = Net::SSH::Gateway.new(
+              uri.host,
               username,
               password: password,
-              port: gateway_uri.port || 22
+              port: uri.port || 22
             )
+
+             @tunnels[name] = Struct.new('Tunnel', :gateway, :ports).new(gateway, [])
           end
         end
 
-        gateway = @gateways[tunnel]
-        return host, port unless gateway
-        return '127.0.0.1', gateway.open(host, port)
+        if tunnel = @tunnels[name]
+          port = tunnel.gateway.open(host, port)
+          host = '127.0.0.1'
+          tunnel.ports << port
+        end
+        return host, port
       end
     end
 
-    def close_tunnel(tunnel, port)
+    def close_tunnel(name, port)
       @mutex.synchronize do
-        gateway = @gateways[tunnel]
-        gateway.close(port) if gateway
+        if tunnel = @tunnels[name]
+          tunnel.ports.delete(port)
+          tunnel.gateway.close(port)
+          tunnel.gateway.shutdown! if tunnel.ports.empty?
+        end
       end
     end
 

data/lib/xlogin/rake_task.rb

@@ -92,8 +92,10 @@ module Xlogin
     rescue => e
       RakeTask.shutdown! if fail_on_error
 
-      session.comment(e.to_s, prefix: "[ERROR]", chomp: true, color: :white, background: :red)
-      $stderr.print log_text(buffer.string + "\n").colorize(color: :light_red) if Rake.application.options.always_multitask
+      session.comment(e.to_s, lf: false, color: :red) if session
+      if Rake.application.options.always_multitask && !buffer.string.empty?
+        $stderr.print log_text(buffer.string + "\n").colorize(color: :red)
+      end
 
       return false
     ensure
@@ -101,16 +103,16 @@ module Xlogin
     end
 
     def log_text(text)
-      text.lines.map{ |line| "#{Time.now.iso8601} - #{name}\t|#{line.gsub(/^.*\r/, '')}" }.join
+      text.lines.map{ |line| "#{Time.now.iso8601} #{name}\t|#{line.gsub(/^.*\r/, '')}" }.join
     end
 
   end
 
   module SessionModule
 
-    def comment(line, prefix: "[INFO]", chomp: false, **color)
-      write_log("#{prefix} #{line}".colorize({color: :light_white}.merge(**color)))
-      cmd('') unless chomp
+    def comment(line, lf: true, **color)
+      write_log(line.chomp.colorize({color: :light_white}.merge(**color)))
+      cmd('') if lf
     end
 
   end

data/lib/xlogin/session_pool.rb

@@ -7,7 +7,7 @@ module Xlogin
     DEFAULT_POOL_SIZE = 1
     DEFAULT_POOL_IDLE = 60
 
-    attr_reader :size, :idle
+    attr_accessor :size, :idle
 
     def initialize(args, **opts)
       @args = args
@@ -18,15 +18,7 @@ module Xlogin
 
       @mutex = Mutex.new
       @queue = Queue.new
-      @created  = 0
-    end
-
-    def size=(val)
-      @mutex.synchronize{ @size = val }
-    end
-
-    def idle=(val)
-      @mutex.synchronize{ @idle = val }
+      @count = 0
     end
 
     def with
@@ -38,20 +30,22 @@ module Xlogin
 
     def close
       until @queue.empty?
-        session, _ = @queue.deq
+        session, _, _ = @queue.deq
         destroy(session)
       end
     end
 
     def deq
       @mutex.synchronize do
-        if @queue.empty? && @created < @size
-          @created += 1
+        if @queue.empty? && @count < @size
+          @count += 1
           return Xlogin.get(@args, **@opts)
         end
       end
 
-      session, last_used = @queue.deq
+      session, last_used, watch_dog = @queue.deq
+
+      watch_dog.kill
       if Time.now - last_used > @idle
         destroy(session)
         return deq
@@ -59,23 +53,24 @@ module Xlogin
 
       begin
         raise IOError if session&.sock&.closed?
+        return session
       rescue IOError, EOFError, Errno::ECONNABORTED, Errno::ECONNREFUSED, Errno::ECONNRESET
         destroy(session)
         return deq
       end
-
-      session
     end
 
     def enq(session)
       last_used = Time.now
-      @queue.enq [session, last_used]
+      watch_dog = Thread.new(session){ |s| sleep(@idle * 1.5) && s.close rescue nil }
+      @queue.enq [session, last_used, watch_dog]
     end
 
+    private
     def destroy(session)
       @mutex.synchronize do
         session.close rescue nil
-        @created -= 1
+        @count -= 1
       end
     end
 

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-	VERSION = "0.14.4"
+	VERSION = "0.15.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.14.4
+  version: 0.15.3
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-16 00:00:00.000000000 Z
+date: 2020-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-telnet