xlogin 0.9.0 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21cb559588f816c0f1497df58f3f3dfe819943e8
-  data.tar.gz: f7742b32f267dddad2afa23cdd0a7928e2a6c589
+  metadata.gz: 7920c6bfed2e33fd3aa7e60128ae9b01b2464dec
+  data.tar.gz: 6304076fbb457c60020f8fd8875ea147bd162d85
 SHA512:
-  metadata.gz: 92d5465fa016af9b0a93338c6826741d75fe153a1c0ad6fb567ee5a89a9e5f658e977d3112d99d17eb6644db33b358e3705c158f6a79238e99d8c54d609a2b7c
-  data.tar.gz: afe1f174a3e785a8ee8d1d2bcc09d63478e804f1f698f8615611c95c8efa59ca84c2a77d88b0c197b1f6142a95d0aa1495fc379ce202528dad12ba9661742072
+  metadata.gz: e9a8f8cbf8ae3eed54beeca00efbbdaf080f98fea77f7c1064d1b904c6d9f2b58fa34e287b406d20327690cb2d01ba4d493f7b1d9da531cb3b7cd9628a3b8535
+  data.tar.gz: 03ee0f923e53ddc0f10fc7b37ddd7b20f279da1fe2bbb3db202aeffef6ba3c6b49d93f27c51aab095a2b24f0c7367ecc4d06f16e6df4f74134da7b81011ab9d3

data/lib/xlogin.rb

@@ -27,11 +27,11 @@ module Xlogin
     end
 
     def list(*patterns)
-      factory.list_info(*patterns)
+      factory.list_inventory(*patterns)
     end
 
     def get_pool(args, **opts, &block)
-      pool = Xlogin::SessionPool.new(args, **opts)
+      pool = factory.build_pool(args, **opts)
 
       return pool unless block
       block.call(pool)
@@ -57,7 +57,7 @@ module Xlogin
     end
 
     def register(**args)
-      factory.set_info(**args)
+      factory.set_inventory(**args)
     end
 
     def source(*source_files)

data/lib/xlogin/delegator.rb

@@ -9,7 +9,7 @@ module Xlogin
         target_host = params.delete(:relay)
         return super(uri, **params) unless target_host
 
-        target_info = Xlogin.factory.get_info(target_host)
+        target_info = Xlogin.factory.get_inventory(target_host)
         target_temp = Xlogin.factory.get_template(target_info[:type])
         target_uri  = Addressable::URI.parse(target_info[:uri])
 

data/lib/xlogin/factory.rb

@@ -1,3 +1,4 @@
+require 'addressable/uri'
 require 'singleton'
 require 'xlogin/template'
 
@@ -11,17 +12,16 @@ module Xlogin
       @templates = Hash.new
     end
 
-    def set_info(**opts)
-      name = opts[:name]
-      return unless name
-      @inventory[name] = (get_info(name) || {}).merge(opts)
+    def set_inventory(**opts)
+      return unless name = opts[:name]
+      @inventory[name] = (get_inventory(name) || {}).merge(opts)
     end
 
-    def get_info(name)
+    def get_inventory(name)
       @inventory[name]
     end
 
-    def list_info(*patterns)
+    def list_inventory(*patterns)
       return @inventory.values if patterns.empty?
 
       values = patterns.map do |pattern|
@@ -47,16 +47,29 @@ module Xlogin
       @templates.keys
     end
 
-    def build(type:, uri:, **opts)
+    def build(type:, **opts)
       template = get_template(type)
-      template.build(uri, **opts)
+      if opts[:uri]
+        template.build(opts[:uri], **opts)
+      else
+        scheme   = opts[:scheme]
+        address  = opts.values_at(:host, :port).compact.join(':')
+        userinfo = opts[:userinfo]
+        userinfo ||= opts.values_at(:username, :password).compact.join(':')
+
+        template.build("#{scheme}://" + [userinfo, address].compact.join('@'), **opts)
+      end
     end
 
-    def build_from_hostname(hostname, **opts)
-      hostinfo = get_info(hostname)
-      raise SessionError.new("Host not found: '#{hostname}'") unless hostinfo
+    def build_from_hostname(args, **opts)
+      hostinfo = get_inventory(args)
+      raise SessionError.new("Host not found: '#{args}'") unless hostinfo
+
+      build(hostinfo.merge(name: args, **opts))
+    end
 
-      build(hostinfo.merge(name: hostname, **opts))
+    def build_pool(args, **opts)
+      Xlogin::SessionPool.new(args, **opts)
     end
 
   end

data/lib/xlogin/session.rb

@@ -23,7 +23,7 @@ module Xlogin
 
       raise SessionError.new("Invalid URI - '#{uri}'") unless @host && @port
 
-      @name     = opts.delete(:name) || @host
+      @name     = opts[:name] || @host
       @config   = OpenStruct.new(opts)
       @template = template
       @username, @password = uri.userinfo.to_s.split(':')
@@ -31,10 +31,8 @@ module Xlogin
       ssh_tunnel(@config.via) if @config.via
       max_retry = @config.retry || 1
 
-      @mutex  = Mutex.new
-      @closed = false
-      @output_logs    = [@config.log]
-      @output_loggers = build_loggers
+      @mutex   = Mutex.new
+      @loggers = [@config.log].flatten.uniq.reduce({}) { |a, e| a.merge(e => build_logger(e)) }
 
       begin
         super(
@@ -48,7 +46,6 @@ module Xlogin
         )
       rescue => e
         retry if (max_retry -= 1) > 0
-        @closed = true
         raise e
       end
     end
@@ -61,71 +58,65 @@ module Xlogin
       cmd('').lines.last.chomp
     end
 
-    def cmd(*args, &block)
-      @mutex.synchronize { super(*args, &block) }
+    def duplicate
+      @template.build(@uri, **@config.to_h)
     end
 
     def puts(*args, &block)
-      args = instance_exec(*args, &@template.interrupt) if @template.interrupt
+      args = [instance_exec(*args, &@template.interrupt)].flatten if @template.interrupt
       super(*args, &block)
     end
 
     def waitfor(*args, &block)
-      args << Regexp.union(*@template.prompt.map(&:first)) if args.empty?
-      line = super(*args) do |recv|
-        block.call(recv) if block
-        output_log(recv)
-      end
-
-      _, process = @template.prompt.find { |r, p| r =~ line && p }
-      if process
-        instance_eval(&process)
-        line += waitfor(*args, &block)
-      end
-    rescue EOFError
-      @closed = true
-    ensure
-      return line
+      @mutex.synchronize { _waitfor(*args, &block) }
     end
 
     def close
       @mutex.synchronize do
-        @output_loggers.each do |output_log, logger|
-          next unless logger
-          logger.close if output_log.kind_of?(String)
+        @loggers.values.each do |logger|
+          next if logger.nil? || [$stdout, $stderr].include?(logger)
+          logger.close
         end
         @gateway.shutdown! if @gateway
 
         super
-        @closed = true
       end
     end
 
-    def closed?
-      @closed
-    end
-
-    def duplicate
-      @template.build(@uri, **config.to_h)
-    end
-
-    def enable_log(out = $stdout)
-      @output_loggers = build_loggers(@output_logs + [out])
+    def enable_log(log = $stdout)
+      @loggers.update(log => build_loggers(log))
       if block_given?
         yield
-        @output_loggers = build_loggers
+        disable_log(log)
       end
     end
 
-    def disable_log(out = $stdout)
-      @output_loggers = build_loggers(@output_logs - [out])
+    def disable_log(log = $stdout)
+      @loggers.delete(log)
       if block_given?
         yield
-        @output_loggers = build_loggers
+        enable_log(log)
       end
     end
 
     private
+    def _waitfor(*args, &block)
+      args << Regexp.union(*@template.prompt.map(&:first)) if args.empty?
+      line = method(:waitfor).super_method.call(*args) do |recv|
+        block.call(recv) if block
+        output_log(recv)
+      end
+
+      _, process = @template.prompt.find { |r, p| r =~ line && p }
+      if process
+        instance_eval(&process)
+        line += _waitfor(*args, &block)
+      end
+    rescue EOFError
+    ensure
+      return line
+    end
+
     def ssh_tunnel(gateway)
       gateway_uri = Addressable::URI.parse(gateway)
       case gateway_uri.scheme
@@ -144,24 +135,19 @@ module Xlogin
     end
 
     def output_log(text)
-      @output_loggers.each do |_, logger|
-        next unless logger
-        logger.syswrite(text)
-      end
+      @loggers.values.each { |logger| logger.syswrite(text) if logger }
     end
 
-    def build_loggers(output_logs = @output_logs)
-      [output_logs].flatten.uniq.each.with_object({}) do |output_log, loggers|
-        case output_log
-        when String
-          FileUtils.mkdir_p(File.dirname(output_log))
-          loggers[output_log] = File.open(output_log, 'a+').tap do |logger|
-            logger.binmode
-            logger.sync = true
-          end
-        when IO, StringIO
-          loggers[output_log] = output_log
+    def build_logger(log)
+      case log
+      when String
+        FileUtils.mkdir_p(File.dirname(log))
+        File.open(log, 'a+').tap do |logger|
+          logger.binmode
+          logger.sync = true
         end
+      when IO, StringIO
+        log
       end
     end
   end

data/lib/xlogin/session_pool.rb

@@ -5,76 +5,57 @@ module Xlogin
   class SessionPool
 
     DEFAULT_SIZE = 1
-    DEFAULT_IDLE = false
 
     def initialize(args, **opts)
-      @args  = args
-      @opts  = opts
+      @args = args
+      @opts = opts
+      @size = case @args
+              when String then @opts.delete(:size) || DEFAULT_SIZE
+              when Hash   then @args.delete(:size) || DEFAULT_SIZE
+              end
 
       @mutex = Mutex.new
       @queue = Queue.new
 
       @created  = 0
-      @watchdog = Hash.new
-    end
-
-    def size
-      case @args
-      when String then @opts[:size] || DEFAULT_SIZE
-      when Hash   then @args[:size] || DEFAULT_SIZE
-      end
-    end
-
-    def idle
-      case @args
-      when String then @opts[:idle] || DEFAULT_IDLE
-      when Hash   then @args[:idle] || DEFAULT_IDLE
-      end
     end
 
     def with
       session = deq
+
       begin
-        Thread.handle_interrupt(Exception => :immediate) { yield session }
-      ensure
-        enq(session)
+        session.prompt
+      rescue Errno::ECONNABORTED, Errno::ECONNREFUSED, Errno::ECONNRESET
+        session.close rescue nil
+        @created -= 1
+        session = try_create
       end
+
+      Thread.handle_interrupt(Exception => :immediate) { yield session }
+    ensure
+      enq session
     end
 
     private
     def deq
       session = try_create
-      unless session
-        session, updated = @queue.deq
-        session = session.duplicate if idle && updated + idle.to_f < Time.now
-      end
-
+      session = @queue.deq unless session
       session
     end
 
     def enq(session)
-      @mutex.synchronize { update_watchdog(session) }
-      @queue.enq [session, Time.now]
+      @queue.enq session
     end
 
     def try_create
       @mutex.synchronize do
-        return unless @created < size
-
-        session = Xlogin.get(@args, **@opts)
-        update_watchdog(session)
+        return unless @created < @size
 
         @created += 1
-        session
+        Xlogin.get(@args, **@opts)
       end
     end
 
-    def update_watchdog(session)
-      return unless idle
-
-      @watchdog[session].tap { |th| th.kill if th }
-      @watchdog[session] = Thread.new(session) { |s| sleep(idle.to_f + 1) && s.close }
-    end
   end
 
 end

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-  VERSION = "0.9.0"
+  VERSION = "0.9.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.2
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-15 00:00:00.000000000 Z
+date: 2018-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-telnet