xlogin 0.16.3 → 0.16.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 275b3d2ef47b42378243799768a5654d993a3a3f1d3c64b893367c41ea714598
-  data.tar.gz: a4deb367df7c2c42e7330d53f4b2abfe7266d96a59dd3b4e8de0160cbe8125c9
+  metadata.gz: d805b70c4f761cbca785e8fa6aeed4af49144e7d7ceff3b84f1d0bcea1f03ea3
+  data.tar.gz: fd9c8a12f3ed2cb279ec1ddd9121a4ef286ca13a1835f39ff5e0f078df12d8a5
 SHA512:
-  metadata.gz: 45bfb93bf676763536cb996f1f775035c14e6561888245d5d3a34eda6769da01270facb941f4c84c9a167c72cfa1440ade59c6d2bd4485d2acfeec06a138c57c
-  data.tar.gz: 351d88211a993c21930f2e30f6435c245ee920190ba6705664cc953c79ef0640bca465b466fc10344d1e3003257adaca58001d47ec03d9bf5e3d19e5f8bfb98b
+  metadata.gz: d0ead74a4a9d12aa71be4f87957d5725719e3dfebae3d5d285fcf781852859f2a579e5d67063944d7e1308ec652ab9c6e942fa19ecbe0b304eb6002fe0b39589
+  data.tar.gz: 46817a1959cf69e89d80d0162713f9640de2e679431d472ce5e40454e49ea2c1f6e5efa33e4f165249aa10deda9b082159db06847cb1ce0d3aa02ab0b8b81d53

data/lib/xlogin.rb

@@ -30,22 +30,16 @@ module Xlogin
     end
 
     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)
-                else
-                  raise Xlogin::Error.new("Invalid argument: '#{args}'")
-                end
-
-      return session unless block
-      begin block.call(session) ensure session.close end
+      case args
+      when Hash   then factory.build(**args.merge(**opts), &block)
+      when String then factory.build_from_hostname(args, **opts, &block)
+      else
+        raise Xlogin::Error.new("Invalid argument: '#{args}'")
+      end
     end
 
     def pool(args, **opts, &block)
-      pool = factory.build_pool(args, **opts)
-
-      return pool unless block
-      begin block.call(pool) ensure pool.close end
+      factory.build_pool(args, **opts, &block)
     end
 
     def configure(&block)

data/lib/xlogin/factory.rb

@@ -93,22 +93,26 @@ module Xlogin
       end
     end
 
-    def build(type:, **opts)
+    def build(type:, **opts, &block)
       template = get_template(type)
       raise Xlogin::Error.new("Template not found: '#{type}'") unless template
 
-      template.build(uri(opts), **opts)
+      session = template.build(uri(opts), **opts)
+      return session unless block
+      begin block.call(session) ensure session.close end
     end
 
-    def build_pool(args, **opts)
-      Xlogin::SessionPool.new(args, **opts)
+    def build_pool(args, **opts, &block)
+      pool = Xlogin::SessionPool.new(args, **opts)
+      return pool unless block
+      begin block.call(pool) ensure pool.close end
     end
 
-    def build_from_hostname(args, **opts)
+    def build_from_hostname(args, **opts, &block)
       hostinfo = get_hostinfo(args)
       raise Xlogin::Error.new("Host not found: '#{args}'") unless hostinfo
 
-      build(**hostinfo.merge(**opts))
+      build(**hostinfo.merge(**opts), &block)
     end
 
     def method_missing(method_name, *args, **opts, &block)

data/lib/xlogin/session.rb

@@ -10,9 +10,9 @@ module Xlogin
 
     def initialize(template, uri, **opts)
       @uri  = uri
-      @host = uri.host
-      @port = uri.port
-      @port ||= case @uri.scheme
+      @host = opts[:host] || uri.host
+      @port = opts[:port] || uri.port
+      @port ||= case opts[:scheme] || uri.scheme
                 when 'ssh'    then 22
                 when 'telnet' then 23
                 end
@@ -25,7 +25,7 @@ module Xlogin
       @host, @port = Xlogin.factory.open_tunnel(@tunnel, @host, @port) if @tunnel
 
       num_try = 0
-      username, password = uri.userinfo.to_s.split(':')
+      username, password = (opts[:userinfo] || uri.userinfo).to_s.split(':')
 
       begin
         args = Hash.new
@@ -64,11 +64,9 @@ module Xlogin
       Regexp.union(*@template.prompts.map(&:first))
     end
 
-    def duplicate(type: @template.name, **args)
-      template = Xlogin::Factory.instance.get_template(type)
-      raise Xlogin::Error.new("Template not found: '#{type}'") unless template
-
-      template.build(@uri, **@config.to_h.merge(args))
+    def duplicate(type: @template.name, uri: @uri.dup, **args, &block)
+      args = @config.to_h.merge(args)
+      Xlogin::Factory.instance.build(type: type, uri: uri, **args, &block)
     end
 
     def puts(string = '', &block)

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-	VERSION = "0.16.3"
+	VERSION = "0.16.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.16.3
+  version: 0.16.4
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-20 00:00:00.000000000 Z
+date: 2021-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-telnet