xlogin 0.14.2 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 547e74e0f0fa2ffc7c30a9d809e7459eea4776c7a902e7f30f1c2e109e7b9a6a
-  data.tar.gz: e810cb9efb8098ce1acd8063f7de24f63876676b03819a06a329a04e010c588c
+  metadata.gz: 3c42dda50faff8d019ae126b4283df85aeca1007e119fe486882b06092090168
+  data.tar.gz: 5d15694b3a53acdecca601e99039e9121b83d111e5e5070eaaa7fa353936d57a
 SHA512:
-  metadata.gz: 17373511e6a0f038ca63e6c7721d45eb3e1f8ef2c8a0f02ae287a0eeb0af51bc59f302ae7aaf27ae2b0d8f6c99673426744c33a1cb052d13d3d6b63a81a130cf
-  data.tar.gz: f0258f43d91d1043c5cf55ead1e71aba4e25df7cee36c2f6f3e34b528f66c62702280bfa5802840ab985e3a03988b1f0c89da69cd50a09d27d02c2842a7eae68
+  metadata.gz: 9ce8c023c0be12b67a33be6ca9fa84eabdc78aa1832d9311b0dd9a55cc82627260effeecdb6395c397fa74f1799b6d3b8382a95e35eeb83099bbca7be903f0c1
+  data.tar.gz: ff604b3256270f0b81ddcf455a6f62b77fdc44d5d6f136de86225ecc4fae452d2dee55001c3eee94817d01bdfbfb87f7ee256fa66106b29d5ecd3c4c10a79ea6

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)
@@ -59,7 +57,7 @@ module Xlogin
     end
 
     def generate_templates(dir)
-      FileUtils.mkdir_p(dir) unless Dir.exist?(dir)
+      FileUtils.mkdir_p(dir)
       builtin_templates = Dir.glob(File.join(File.dirname(__FILE__), 'xlogin', 'templates', '*.rb'))
       builtin_templates.each{ |file| FileUtils.cp(file, DEFAULT_TEMPLATE_DIR) }
     end

data/lib/xlogin/cli.rb

@@ -25,7 +25,7 @@ module Xlogin
     end
 
     def exec(config)
-      Signal.trap(:INT){ exit 0 }
+      Signal.trap(:INT){ exit 1 }
 
       jobs  = config[:jobs] || 1
       hosts = Xlogin.list(*config[:patterns])
@@ -48,9 +48,9 @@ module Xlogin
           command_lines = config[:command].flat_map { |e| e.to_s.split(';').map(&:strip) }
           command_lines.each{ |line| session.cmd(line) }
 
-          buffer.string.lines.each{ |line| print prefix + line.gsub("\r", '') } if jobs > 1
+          buffer.string.lines.each{ |line| print prefix + line.gsub(/^.*\r/, '') } if jobs > 1
         rescue => e
-          buffer.string.lines.each{ |line| print prefix + line.gsub("\r", '') } if jobs > 1
+          buffer.string.lines.each{ |line| print prefix + line.gsub(/^.*\r/, '') } if jobs > 1
           raise e
         end
 
@@ -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
 
@@ -26,18 +26,17 @@ module Xlogin
     end
 
     def list_hostinfo(*patterns)
-      return [] if patterns == [nil]
       return @inventory.values if patterns.empty?
 
-      values1 = patterns.map do |pattern|
+      values1 = patterns.compact.map do |pattern|
         values2 = pattern.split(',').map do |entry|
           key, val = entry.to_s.split(':')
           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)
@@ -55,32 +54,40 @@ 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
+        unless @tunnels[name]
+          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,7 +92,7 @@ module Xlogin
     rescue => e
       RakeTask.shutdown! if fail_on_error
 
-      session.comment(e.to_s, prefix: "[ERROR]", chomp: true, color: :white, background: :red)
+      session.comment(e.to_s, prefix: "[ERROR]", chomp: true, color: :white, background: :red) if session
       $stderr.print log_text(buffer.string + "\n").colorize(color: :light_red) if Rake.application.options.always_multitask
 
       return false
@@ -101,7 +101,7 @@ module Xlogin
     end
 
     def log_text(text)
-      text.lines.map{ |line| "#{Time.now.iso8601} - #{name}\t|#{line.gsub(/^\s*[\r]+/, '')}" }.join
+      text.lines.map{ |line| "#{Time.now.iso8601} - #{name}\t|#{line.gsub(/^.*\r/, '')}" }.join
     end
 
   end
@@ -109,7 +109,7 @@ module Xlogin
   module SessionModule
 
     def comment(line, prefix: "[INFO]", chomp: false, **color)
-      write_log("#{prefix} #{line}".colorize(**color))
+      write_log("#{prefix} #{line}".colorize({color: :light_white}.merge(**color)))
       cmd('') unless chomp
     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/telnet.rb

@@ -38,7 +38,7 @@ module Xlogin
             @sock.syswrite(bs)
           when @sock
             begin
-              log(fh.readpartial(1024))
+              write_log(fh.readpartial(1024))
             rescue Errno::EAGAIN
               retry
             end
@@ -47,7 +47,7 @@ module Xlogin
       end
     rescue EOFError, Errno::ECONNRESET
       $stdout.puts "\r\n", "Conneciton closed.", "\r\n"
-      self.close
+      close
     ensure
       $stdin.cooked!
     end

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-	VERSION = "0.14.2"
+	VERSION = "0.15.1"
 end

metadata

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