xlogin 0.7.11 → 0.7.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16ee3834f35038d07a026c8a7a75cdd9c5b7e073
-  data.tar.gz: cad0b549fc1ddc90867e2013c3257ad18fed5ec0
+  metadata.gz: db5dac91935e8ed2bf468c8628fe4dd817087042
+  data.tar.gz: 9cccb35b91f483fc5825bb9a197aa0c5c247e7e3
 SHA512:
-  metadata.gz: 6adaa86538aaa1fd7c5fa59b951ec80221dd58b1348ac0b30e2a9c7ad58ab6d28ad48a00caf40e4310f0a32ba6cd3b67869c0041d0fc22997a3662de14142f51
-  data.tar.gz: 2e39a4485161afdcdec728d35035473632220fd673abe15feace7def8411a65729a855f555fe44beabaded183df1c8f00e5a700f2f58e27cbd1974bc71188b6f
+  metadata.gz: 59a9746e814e56e2e4d4fea2d260b9e5ce5ff24ad560510993e4d7e7ccb4efd7e9ec2d467385693ede380897a17c662657e9383fe070763c370746196675841d
+  data.tar.gz: a880c5a4155e87855cf3f09c87f32af0f8871a6da8ea0cb2c9ca3e649196f5b5e5c2d0edd84616638bdd0c511cd9db38a1eb2c5cd820d74f60823e55bab8d103

data/lib/xlogin.rb

@@ -1,5 +1,6 @@
 $:.unshift File.dirname(__FILE__)
 
+require 'thread'
 require 'xlogin/factory'
 require 'xlogin/version'
 
@@ -30,7 +31,7 @@ module Xlogin
     end
 
     def get_pool(args, **opts, &block)
-      pool = SessionPool.new(args, **opts)
+      pool = factory.pool(args, **opts)
 
       return pool unless block
       block.call(pool)

data/lib/xlogin/cli.rb

@@ -115,7 +115,7 @@ module Xlogin
           loggers << $stdout if config.parallels == 1
           loggers << File.join(config.logdir, "#{hostname}.log") if config.logdir
 
-          session = Xlogin.factory.build(hostinfo.merge(log: loggers))
+          session = Xlogin.get(hostinfo.merge(log: loggers))
           session.enable if session.config.enable
 
           block.call(session)

data/lib/xlogin/factory.rb

@@ -65,20 +65,20 @@ module Xlogin
       @group = current_group
     end
 
-    def build(type:, uri:, **opts)
-      Xlogin.configure { template_dir } if @templates.empty?
+    def pool(args, **opts)
+      SessionPool.new(args, **opts)
+    end
 
+    def build(type:, uri:, **opts)
       template = get_template(type)
       template.build(uri, **opts)
     end
 
     def build_from_hostname(hostname, **opts)
-      Xlogin.configure { source } if @database.empty?
-
       hostinfo = get(hostname)
       raise Xlogin::SessionError.new("Host not found: '#{hostname}'") unless hostinfo
 
-      build(hostinfo.merge(**opts)).tap { |s| s.name = hostname }
+      build(hostinfo.merge(name: hostname, **opts))
     end
 
     def method_missing(method_name, *args, &block)

data/lib/xlogin/session.rb

@@ -13,21 +13,21 @@ module Xlogin
     attr_accessor :config
 
     def initialize(template, uri, **opts)
-      @template = template
-      @config   = OpenStruct.new(opts)
-
       @uri  = uri
       @host = uri.host
-      @name = uri.host
       @port = uri.port
       @port ||= case @uri.scheme
                 when 'ssh'    then 22
                 when 'telnet' then 23
                 end
 
-      @username, @password = uri.userinfo.to_s.split(':')
       raise ArgumentError.new("Invalid URI - '#{uri}'") unless @host && @port
 
+      @name     = opts.delete(:name) || @host
+      @config   = OpenStruct.new(opts)
+      @template = template
+      @username, @password = uri.userinfo.to_s.split(':')
+
       ssh_tunnel(@config.via) if @config.via
       max_retry = @config.retry || 1
 
@@ -71,10 +71,11 @@ module Xlogin
     end
 
     def waitfor(*args, &block)
-      line = ''
-      return waitfor(Regexp.union(*@template.prompt.map(&:first)), &block) if args.empty?
-
-      line = super(*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
@@ -94,6 +95,7 @@ module Xlogin
           logger.close if output_log.kind_of?(String)
         end
         @gateway.shutdown! if @gateway
+
         super
         @closed = true
       end
@@ -153,11 +155,10 @@ module Xlogin
         case output_log
         when String
           FileUtils.mkdir_p(File.dirname(output_log))
-          logger = File.open(output_log, 'a+')
-          logger.binmode
-          logger.sync = true
-
-          loggers[output_log] = logger
+          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
         end
@@ -168,12 +169,12 @@ module Xlogin
   class SessionPool
 
     def initialize(args, **opts)
-      temp = case args
-             when String then opts.select { |k, v| %i(size timeout).member?(k) && !v.nil? }
-             when Hash   then args.select { |k, v| %i(size timeout).member?(k) && !v.nil? }
-             end
+      pool_opts = case args
+                  when String then opts.select { |k, v| %i(size timeout).member?(k) && !v.nil? }
+                  when Hash   then args.select { |k, v| %i(size timeout).member?(k) && !v.nil? }
+                  end
 
-      @pool = ConnectionPool.new(**temp) { Wrapper.new(args, **opts) }
+      @pool = ConnectionPool.new(**pool_opts) { Wrapper.new(args, **opts) }
     end
 
     def with(**opts)

data/lib/xlogin/telnet.rb

@@ -7,18 +7,12 @@ module Xlogin
 
     prepend SessionModule
 
-    alias_method :telnet_login, :login
-    undef_method :login
-
     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)
-        telnet_login(*[username, password].compact)
-      end
+      super(args)
+      login(*[username, password].compact) if username || password
     end
 
     def interact!

data/lib/xlogin/template.rb

@@ -47,7 +47,7 @@ module Xlogin
         methods.each do |name, block|
           case name
           when :enable
-            define_method(name) { |password = opts[:enable]| instance_exec(password, &block) }
+            define_method(name) { |args = opts[:enable]| instance_exec(args, &block) }
           else
             define_method(name, &block)
           end

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-  VERSION = "0.7.11"
+  VERSION = "0.7.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.7.11
+  version: 0.7.12
 platform: ruby
 authors:
 - haccht