xlogin 0.9.2 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7920c6bfed2e33fd3aa7e60128ae9b01b2464dec
-  data.tar.gz: 6304076fbb457c60020f8fd8875ea147bd162d85
+  metadata.gz: dc4d67ac6c0e9c9200dedef6fe1713a7e481f336
+  data.tar.gz: 64126ee1abd9cbd9ecf1704038d421bd34556a55
 SHA512:
-  metadata.gz: e9a8f8cbf8ae3eed54beeca00efbbdaf080f98fea77f7c1064d1b904c6d9f2b58fa34e287b406d20327690cb2d01ba4d493f7b1d9da531cb3b7cd9628a3b8535
-  data.tar.gz: 03ee0f923e53ddc0f10fc7b37ddd7b20f279da1fe2bbb3db202aeffef6ba3c6b49d93f27c51aab095a2b24f0c7367ecc4d06f16e6df4f74134da7b81011ab9d3
+  metadata.gz: a9932d0cb772b18af766cc9beffaee17495dd2d80fd28cfa7fd4e8569dc13146ad0a6f3d29f68972a6763962583b467a35b76001972151a6ffb5f35185dac516
+  data.tar.gz: bd13b83f29bea5522ae2aeb911010a616c5843fef8c41590fe5b0625dbfe137452b1230fe60d423f01f3748d0fcf4de1bdef1bca9532d825614ba56aaa9b1e1e

data/lib/xlogin/factory.rb

@@ -8,8 +8,9 @@ module Xlogin
     include Singleton
 
     def initialize
-      @inventory = Hash.new
-      @templates = Hash.new
+      @inventory    = Hash.new
+      @templates    = Hash.new
+      @session_pool = Hash.new
     end
 
     def set_inventory(**opts)
@@ -49,16 +50,17 @@ module Xlogin
 
     def build(type:, **opts)
       template = get_template(type)
-      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
+      template.build(uri(opts), **opts)
+    end
+
+    def build_pool(args, **opts)
+      uri = case args
+            when Hash   then uri(args)
+            when String then uri(get_inventory(args))
+            else return
+            end
+
+      @session_pool[uri] ||= Xlogin::SessionPool.new(args, **opts)
     end
 
     def build_from_hostname(args, **opts)
@@ -68,8 +70,16 @@ module Xlogin
       build(hostinfo.merge(name: args, **opts))
     end
 
-    def build_pool(args, **opts)
-      Xlogin::SessionPool.new(args, **opts)
+    private
+    def uri(**opts)
+      return opts[:uri] if opts.key?(:uri)
+
+      scheme   = opts[:scheme]
+      address  = opts.values_at(:host, :port).compact.join(':')
+      userinfo = opts[:userinfo]
+      userinfo ||= opts.values_at(:username, :password).compact.join(':')
+
+      "#{scheme}://" + [userinfo, address].compact.join('@')
     end
 
   end

data/lib/xlogin/session.rb

@@ -55,7 +55,7 @@ module Xlogin
     end
 
     def prompt
-      cmd('').lines.last.chomp
+      cmd('').to_s.lines.last&.chomp
     end
 
     def duplicate
@@ -112,8 +112,7 @@ module Xlogin
         instance_eval(&process)
         line += _waitfor(*args, &block)
       end
-    rescue EOFError
-    ensure
+
       return line
     end
 

data/lib/xlogin/session_pool.rb

@@ -25,7 +25,7 @@ module Xlogin
 
       begin
         session.prompt
-      rescue Errno::ECONNABORTED, Errno::ECONNREFUSED, Errno::ECONNRESET
+      rescue IOError, EOFError, Errno::ECONNABORTED, Errno::ECONNREFUSED, Errno::ECONNRESET
         session.close rescue nil
         @created -= 1
         session = try_create

data/lib/xlogin/version.rb

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

metadata

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