xlogin 0.14.3 → 0.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b7da6393c7979c4716280dc7b867aa091ea500b1c94594451681f654429c41d
-  data.tar.gz: b726972429831ac6169691c974f7bffcf74ff1526d2aa7402537bcfbe423b385
+  metadata.gz: 902803f4f718b2af77d3d89721eb0d2f140735b173b1174b58cdfec530502750
+  data.tar.gz: 57a6a00bb8912363f8479ce7f2de1a3b86fff6180d242409431320af3021e11f
 SHA512:
-  metadata.gz: a65049cdb3360bcb51eceb7c3275ee3db21da38c455bf95fc7d0e20e505efd3b95edac6f5a35fb245b5493df78b736a9c6bc81e5fddfb88a4fc5d349bf496e08
-  data.tar.gz: d5b37ee384e0c2feb4b330dee8c4ce1e65f1d6b9138a6ecbec7ac5541d225a8d6fc0aa4dd5cd82010b4686dd99398e33aba8e9a16c6673d2cb887740d861f091
+  metadata.gz: b2bb034bb516dfe3994dd246d1effdcf6d68dd8cdd5fe49539941b34447b4f8b8eafb69b3467aa92b6fc3e43898355f55a620652855d24fc37ee3b5f754a534e
+  data.tar.gz: e1ac9a80f9e8e2473e9def3f6cca08dbe1cbb6daedd664ad63fee765dcd4cb45ab0e5d0c1f82e7e4d5f146928123d9c6a4359331105990c6bafc09f26a7b2c2d

data/lib/xlogin.rb

@@ -34,21 +34,19 @@ module Xlogin
                 when Hash   then factory.build(**args.merge(**opts))
                 when String then factory.build_from_hostname(args, **opts)
                 else
-                  raise SessionError.new("Invalid argument: '#{args}'")
+                  raise Xlogin::Error.new("Invalid argument: '#{args}'")
                 end
 
       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/cli.rb

@@ -91,6 +91,7 @@ module Xlogin
         template *config[:template].map { |e| File.expand_path(e, ENV['PWD']) }
       end
 
+      raise Xlogin::Error.new("Invalid host pattern: '#{config[:patterns].join(' ')}'") if Xlogin.list(*config[:patterns]).empty?
       config[:runner].call(config)
     rescue => e
       $stderr.puts e, '', parser

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
 
@@ -34,9 +34,9 @@ module Xlogin
           key, val = 'name', key if val.nil?
           @inventory.values.select{ |e| File.fnmatch(val, e[key.to_sym]) }
         end
-        values2.reduce(&:&)
+        values2.reduce(&:&) || []
       end
-      values1.reduce(&:|)
+      values1.reduce(&:|) || []
     end
 
     def set_template(name, text = nil, &block)
@@ -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,11 @@ 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, prefix: "[ERROR]", chomp: true, color: :red) if session
+      if Rake.application.options.always_multitasK
+        $stderr.print log_text(buffer.string + "\n").colorize(color: :red) unless buffer.string.empty?
+        $stderr.print log_text(e.to_s + "\n").colorize(color: :red)
+      end
 
       return false
     ensure

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.3"
+	VERSION = "0.15.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.14.3
+  version: 0.15.2
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-04 00:00:00.000000000 Z
+date: 2020-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-telnet