xlogin 0.6.31 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6cecc1941f217b65d75839af8ec66dbd3c6fa53
-  data.tar.gz: f45469b1160d246c5f065671e65e6f9945c642d5
+  metadata.gz: e52a4f4381c261ea82398f6a6d149b4fd13dd5b7
+  data.tar.gz: f917f99d366e5987dd64927864e4e19b62bbad54
 SHA512:
-  metadata.gz: b6c5e727b05904282986743645fe5bd2a0fcfa44a2e61365266b668ebde2655e07e0d359cf7064bea351a557a2b32a33d1668bb4f7e116ddff760f335de5104c
-  data.tar.gz: 7975f93f7df0c6900cc36839b3b61b186a600fb8233b7133e5cd14e7a586390063997ec229d64f3f34b98f9534a5df53a5ddf4957a0761f48f1f9af3bd4d075c
+  metadata.gz: ab506f21664b25a45e6af2495ae0086d1b6ec0f13e55470e1464af88abc8813708ed5d0dcb87f1c3876ba59fadd73990c4955ccff25a6e4c5348fe21a61d62a4
+  data.tar.gz: bbb5fc16a1935524cf241994926878480fc97e166215cb25c403f96eb1fed3dc06908f9f100b74596d343b78f0510db7a27ebe23b9b01d0d609dde5f68ddf98a

data/lib/xlogin/cli.rb

@@ -116,8 +116,7 @@ module Xlogin
           loggers << File.join(config.logdir, "#{hostname}.log") if config.logdir
 
           session = Xlogin.factory.build(hostinfo.merge(log: loggers))
-          session.enable(session.opts.enable) if config.enable && session.respond_to?(:enable)
-          session.cmd('')
+          session.enable if session.config.enable
 
           block.call(session)
         rescue => e

data/lib/xlogin/factory.rb

@@ -9,6 +9,7 @@ module Xlogin
     def initialize
       @database  = Hash.new
       @templates = Hash.new
+      @pools     = Hash.new
       @group     = nil
     end
 
@@ -19,9 +20,9 @@ module Xlogin
       end
     end
 
-    def set(**params)
-      name = params[:name]
-      @database[name] = params if name
+    def set(**opts)
+      name = opts[:name]
+      @database[name] = opts if name
     end
 
     def get(name)
@@ -58,6 +59,23 @@ module Xlogin
       @templates.keys
     end
 
+    def set_pool(args, **opts)
+      name = case args
+             when String then args
+             when Hash   then URI(args[:uri]).host
+             end
+
+      @pools[name] = SessionPool.new(args, **opts)
+    end
+
+    def get_pool(name)
+      @pools[name]
+    end
+
+    def list_pools
+      @pools.keys
+    end
+
     def group(group_name)
       current_group = @group
       @group = [current_group, group_name.to_s].compact.join(':')
@@ -65,18 +83,18 @@ module Xlogin
       @group = current_group
     end
 
-    def build(type:, uri:, **params)
+    def build(type:, uri:, **opts)
       template = get_template(type)
       raise Xlogin::TemplateError.new("Template not found: '#{type}'") unless template
 
-      template.build(uri, **params)
+      template.build(uri, **opts)
     end
 
-    def build_from_hostname(hostname, **params)
+    def build_from_hostname(hostname, **opts)
       hostinfo = get(hostname)
       raise Xlogin::SessionError.new("Host not found: '#{hostname}'") unless hostinfo
 
-      build(hostinfo.merge(**params)).tap { |s| s.name = hostname }
+      build(hostinfo.merge(**opts)).tap { |s| s.name = hostname }
     end
 
     def method_missing(method_name, *args, &block)

data/lib/xlogin/rake_task.rb

@@ -72,6 +72,7 @@ module Xlogin
 
       begin
         session = Xlogin.factory.build_from_hostname(name, log: loggers, timeout: timeout)
+        session.enable if session.config.enable
         @runner.call(session)
         session.close if session
       rescue => e

data/lib/xlogin/session.rb

@@ -1,23 +1,26 @@
+require 'connection_pool'
+require 'delegate'
 require 'fileutils'
 require 'net/ssh/gateway'
 require 'ostruct'
 require 'stringio'
+require 'thread'
 
 module Xlogin
   module SessionModule
 
     attr_accessor :name
-    attr_accessor :opts
+    attr_accessor :config
 
-    def initialize(template, uri, **params)
+    def initialize(template, uri, **opts)
       @template = template
-      @scheme   = uri.scheme
-      @opts     = OpenStruct.new(params)
+      @config   = OpenStruct.new(opts)
 
+      @uri  = uri
       @host = uri.host
       @name = uri.host
       @port = uri.port
-      @port ||= case @scheme
+      @port ||= case @uri.scheme
                 when 'ssh'    then 22
                 when 'telnet' then 23
                 end
@@ -25,23 +28,27 @@ module Xlogin
       @username, @password = uri.userinfo.to_s.split(':')
       raise ArgumentError.new("Invalid URI - '#{uri}'") unless @host && @port
 
-      @output_logs    = [opts.log]
-      @output_loggers = build_loggers
+      ssh_tunnel(@config.via) if @config.via
+      max_retry = @config.retry || 1
 
-      ssh_tunnel(opts.via) if opts.via
-      max_retry = opts.retry || 1
+      @mutex  = Mutex.new
+      @closed = false
+      @output_logs    = [@config.log]
+      @output_loggers = build_loggers
 
       begin
-        return super(
+        super(
           'Host'     => @host,
           'Port'     => @port,
           'Username' => @username,
           'Password' => @password,
-          'Timeout'  => @opts.timeout || @template.timeout || false,
+          'Timeout'  => @config.timeout || @template.timeout || false,
           'Prompt'   => Regexp.union(*@template.prompt.map(&:first)),
+          'FailEOF'  => true,
         )
       rescue => e
         retry if (max_retry -= 1) > 0
+        @closed = true
         raise e
       end
     end
@@ -54,47 +61,51 @@ module Xlogin
       cmd('').lines.last.chomp
     end
 
-    def puts(line, &block)
-      line = instance_exec(line, &@template.interrupt) if @template.interrupt
-      super(line, &block)
+    def cmd(*args)
+      @mutex.synchronize { super(*args) }
     end
 
-    def enable(*args)
-      args.push(opts.enable) if args.empty?
-      super(args)
+    def puts(*args, &block)
+      args = instance_exec(*args, &@template.interrupt) if @template.interrupt
+      super(*args, &block)
     end
 
-    def waitfor(*expect, &block)
-      return waitfor(Regexp.union(*@template.prompt.map(&:first)), &block) if expect.empty?
+    def waitfor(*args, &block)
+      return waitfor(Regexp.union(*@template.prompt.map(&:first)), &block) if args.empty?
 
-      line = super(*expect) do |recvdata|
+      line = super(*args) do |recvdata|
         output_log(recvdata, &block)
       end
 
       _, process = @template.prompt.find { |r, p| r =~ line && p }
       if process
         instance_eval(&process)
-        line += waitfor(*expect, &block)
+        line += waitfor(*args, &block)
       end
 
       line
+    rescue EOFError
+      @closed = true
     end
 
-    def close(*args)
-      logout(*args) if respond_to?(:logout)
-      @gateway.shutdown! if @gateway
-      @output_loggers.each do |output_log, logger|
-        next unless logger
-        logger.close if output_log.kind_of?(String)
+    def close
+      @mutex.synchronize do
+        @output_loggers.each do |output_log, logger|
+          next unless logger
+          logger.close if output_log.kind_of?(String)
+        end
+        @gateway.shutdown! if @gateway
+        super
+        @closed = true
       end
-    rescue
-    ensure
-      super
     end
 
-    def dup
-      uri = URI::Generic.build(@scheme, [@username, @password].compact.join(':'), @host, @port)
-      @template.build(uri, **opts.to_h)
+    def closed?
+      @closed
+    end
+
+    def duplicate
+      @template.build(@uri, **config.to_h)
     end
 
     def enable_log(out = $stdout)
@@ -155,4 +166,48 @@ module Xlogin
       end
     end
   end
+
+  class SessionPool
+    def initialize(args, **opts)
+      temp = case args
+             when Hash   then args
+             when String then opts
+             end
+
+      @opts = temp.select { |k, v| %i(size timeout).member?(k) && !v.nil? }
+      @pool = ConnectionPool.new(**@opts) { Wrapper.new(args, **opts) }
+    end
+
+    def with(**opts)
+      @pool.with(**opts) do |session|
+        session.repair if session.closed?
+        session.aging_time(opts[:aging]) if opts[:aging]
+
+        yield session
+      end
+    end
+
+    class Wrapper
+      def initialize(*args)
+        @session = Xlogin.get(*args)
+        @agetime = nil
+      end
+
+      def repair
+        @session = @session.duplicate
+      end
+
+      def aging_time(time = @session.config.timeout)
+        @agetime = Time.now + time
+        Thread.start do
+          sleep(time)
+          @session.close if Time.now > @agetime
+        end
+      end
+
+      def method_missing(name, *args, &block)
+        @session.send(name, *args, &block)
+      end
+    end
+  end
 end

data/lib/xlogin/telnet.rb

@@ -10,10 +10,10 @@ module Xlogin
     alias_method :telnet_login, :login
     undef_method :login
 
-    def initialize(params)
-      username = params.delete('Username')
-      password = params.delete('Password')
-      super(params)
+    def initialize(args)
+      username = args.delete('Username')
+      password = args.delete('Password')
+      super(args)
 
       if username || password
         return login(*[username, password].compact) if respond_to?(:login)

data/lib/xlogin/template.rb

@@ -40,21 +40,21 @@ module Xlogin
       @interrupt = block
     end
 
-    def build(uri, **params)
+    def build(uri, **opts)
       uri   = URI(uri.to_s)
       klass = Class.new(Xlogin.const_get(uri.scheme.capitalize))
       klass.class_exec(@methods) do |methods|
         methods.each do |name, block|
           case name
           when :enable
-            define_method(name) { |pass = nil| instance_exec(pass || params[:enable], &block) }
+            define_method(name) { |password = opts[:enable]| instance_exec(password, &block) }
           else
             define_method(name, &block)
           end
         end
       end
 
-      klass.new(self, uri, **params)
+      klass.new(self, uri, **opts)
     end
 
     def method_missing(name, *, &block)

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-  VERSION = "0.6.31"
+  VERSION = "0.7.2"
 end

data/lib/xlogin.rb

@@ -19,18 +19,30 @@ module Xlogin
       @factory ||= Xlogin::Factory.instance
     end
 
-    def get(hostname, args = {})
-      session = factory.build_from_hostname(hostname, args)
+    def get(args, **opts, &block)
+      session = case args
+                when Hash   then factory.build(**args.merge(**opts))
+                when String then factory.build_from_hostname(args, **opts)
+                end
+
+      return session unless block
+      begin block.call(session) ensure session.close end
+    end
 
-      if block_given?
-        begin yield session ensure session.close end
-      else
-        session
-      end
+    def get_pool(args, **opts, &block)
+      pool = factory.set_template(args, **opts)
+
+      return pool unless block
+      block.call(pool)
     end
 
     def configure(&block)
-      instance_eval(&block)
+      if block
+        instance_eval(&block)
+      else
+        source
+        template_dir
+      end
     end
 
     def authorized?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.6.31
+  version: 0.7.2
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-12 00:00:00.000000000 Z
+date: 2018-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-telnet