xlogin 0.7.8 → 0.7.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e899806293bae462ec44aa3d981d4a56901ff9b
-  data.tar.gz: 8eb1dcfaa353557a891334df4a9378a25752aa6d
+  metadata.gz: 16ee3834f35038d07a026c8a7a75cdd9c5b7e073
+  data.tar.gz: cad0b549fc1ddc90867e2013c3257ad18fed5ec0
 SHA512:
-  metadata.gz: be071c6557ba454f789db96bb4eecc0591ee194362d1cd1b84fe6f35d043466150c698ca4519f17c97a45aa7ef0850197b47abc9103255b092358aace17acf44
-  data.tar.gz: e4ac69529298a51f8c79ce9b2c03da294aa83cff710ce2635751b03556392ab9c4f4dbeee1e54b7e3aeec5b293515d0d3d41be037c2811ae2c2135a315d0e3f0
+  metadata.gz: 6adaa86538aaa1fd7c5fa59b951ec80221dd58b1348ac0b30e2a9c7ad58ab6d28ad48a00caf40e4310f0a32ba6cd3b67869c0041d0fc22997a3662de14142f51
+  data.tar.gz: 2e39a4485161afdcdec728d35035473632220fd673abe15feace7def8411a65729a855f555fe44beabaded183df1c8f00e5a700f2f58e27cbd1974bc71188b6f

data/lib/xlogin/factory.rb

@@ -69,8 +69,6 @@ module Xlogin
       Xlogin.configure { template_dir } if @templates.empty?
 
       template = get_template(type)
-      raise Xlogin::TemplateError.new("Template not found: '#{type}'") unless template
-
       template.build(uri, **opts)
     end
 

data/lib/xlogin/session.rb

@@ -61,8 +61,8 @@ module Xlogin
       cmd('').lines.last.chomp
     end
 
-    def cmd(*args)
-      @mutex.synchronize { super(*args) }
+    def cmd(*args, &block)
+      @mutex.synchronize { super(*args, &block) }
     end
 
     def puts(*args, &block)
@@ -71,21 +71,20 @@ module Xlogin
     end
 
     def waitfor(*args, &block)
+      line = ''
       return waitfor(Regexp.union(*@template.prompt.map(&:first)), &block) if args.empty?
 
-      line = super(*args) do |recvdata|
-        output_log(recvdata, &block)
-      end
+      line = super(*args, &block)
 
       _, process = @template.prompt.find { |r, p| r =~ line && p }
       if process
         instance_eval(&process)
         line += waitfor(*args, &block)
       end
-
-      line
     rescue EOFError
       @closed = true
+    ensure
+      return line
     end
 
     def close
@@ -142,8 +141,7 @@ module Xlogin
       end
     end
 
-    def output_log(text, &block)
-      block.call(text) if block
+    def output_log(text)
       @output_loggers.each do |_, logger|
         next unless logger
         logger.syswrite(text)

data/lib/xlogin/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.7.11
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-07 00:00:00.000000000 Z
+date: 2018-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-telnet
@@ -178,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.5.2
 signing_key: 
 specification_version: 4
 summary: rancid clogin alternative