xlogin 0.12.8 → 0.12.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f6d90f1c6962fa4cc37ea57f8a651e58aefa5d404f7d0c585f295d3b65923ff
-  data.tar.gz: b02c711b8d055c5c883ac9736682083860598299d60075fafc43c3d6e12c468f
+  metadata.gz: 3372a9d3f0372508e953e54d2e9d1b2be4f1eefe78b9e35f3357592f19864d65
+  data.tar.gz: 9abac3f616288b6d269407445e871a7d79be7798307ee87811ac3badedd0c0f3
 SHA512:
-  metadata.gz: 460907878676426a67d607a6594f2597b42c1a3b76a9e26ecdb47c7aab2f6a21ed997020fc265e4176ad8f277b5955be870099d10acc246a3608f52a7ca3718e
-  data.tar.gz: 67e2b8497b0f1605dc720d9cb0d06ce3661ef2fa2b222bee1fa8e2eab09a062b0fccf6906a80816d23a1831c1667ea0a012734713a27aa63b26f246846894870
+  metadata.gz: 1c55eaf08ef9377a62b0c7955298b09d860ce081fd8b8ba50838088480a62af497aed1c40f750531ae9ce9d68fb4167ed8916c10f35caad2850531387717c13d
+  data.tar.gz: ab7699c7648457ce1fc59d787d9a22a2ead92fd2c91fff1ff8e738b532e13a18e962fe16de7c943bb8b6664f60a2218266ae4407dcb5fac01939b6a0ad86d25c

data/lib/xlogin/session.rb

@@ -38,7 +38,7 @@ module Xlogin
           'Username' => @username,
           'Password' => @password,
           'Timeout'  => @config.timeout || @template.timeout || false,
-          'Prompt'   => Regexp.union(*@template.prompt.map(&:first)),
+          'Prompt'   => prompt_pattern,
           'FailEOF'  => true,
         )
       rescue => e
@@ -56,17 +56,21 @@ module Xlogin
       text.chomp if text
     end
 
+    def prompt_pattern
+      Regexp.union(*@template.prompt.map(&:first))
+    end
+
     def duplicate
       @template.build(@uri, **@config.to_h)
     end
 
     def puts(*args, &block)
-      args = [instance_exec(*args, &@template.interrupt!)].flatten.compact if @template.interrupt!
+      args = args.flat_map { |arg| instance_exec(arg, &@template.interrupt!) }.compact if @template.interrupt!
       args.empty? ? super('', &block) : super(*args, &block)
     end
 
     def waitfor(*args, &block)
-      args = [Regexp.union(*@template.prompt.map(&:first))] if args.empty?
+      args = [prompt_pattern] if args.empty?
       @mutex.synchronize { _waitfor(*args, &block) }
     end
 

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-	VERSION = "0.12.8"
+	VERSION = "0.12.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.12.8
+  version: 0.12.10
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-09 00:00:00.000000000 Z
+date: 2019-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-telnet