xlogin 0.6.18 → 0.6.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25a8fe59917ea8d5ae3e02e0e3f836242a6d0072
-  data.tar.gz: 94288f372cf3a2be910954a2de793fb6061a4573
+  metadata.gz: 0c0f860703052537d54eff6d9fdb935b26e3303b
+  data.tar.gz: 0628b284f64719f4ec0dacde5d5e359cbc3d701b
 SHA512:
-  metadata.gz: 63d861e3a0f2e54ade3198d95551e9b7304f421d9e0741206cda4bd0f9344c8bf6e16768145d01d9e8b9b7190de919198dc8ebb7a811796908cb5c4f528dbd49
-  data.tar.gz: 5b07d914d65cfbcfee4b19065458d8b6228e9ebe19e2d8f77a3d37554a516965704710884a7ee78cee82125dbe40bac6e984fa74d815812d4611ecc9d385d5ec
+  metadata.gz: 43c4049184dec2b4bd4bb4d41ef5a294037028fd8b668904f923c8d001946f7f0ab2ceb4ad2e5f31c76af2757b64eec9c6a4c672ccb15f1c232b2de9f4514b89
+  data.tar.gz: 022bb0bfa0c00af6880684bd7cd5758921f930e64fd5930c1237be3dd45a1eb49f0921cf47e5f8683d08eb42f637407024fe3764098cad4d5e1ff8433b96c765

data/lib/xlogin/session.rb

@@ -88,6 +88,10 @@ module Xlogin
 
     def close
       @gateway.shutdown! if @gateway
+      @output_loggers.each do |output_log, logger|
+        next unless logger
+        logger.close if output_log.kind_of?(String)
+      end
       super
     end
 
@@ -131,25 +135,27 @@ module Xlogin
     end
 
     def output_log(text, &block)
-      [*@output_loggers, block].compact.each { |logger| logger.call(text) }
+      block.call(text) if block
+      @output_loggers.each do |_, logger|
+        next unless logger
+        logger.syswrite(text)
+      end
     end
 
     def build_loggers(output_logs = @output_logs)
-      [output_logs].flatten.compact.uniq.map do |output_log|
-        logger = case output_log
-                 when String
-                   FileUtils.mkdir_p(File.dirname(output_log))
-                   File.open(output_log, 'a+').tap do |file|
-                     file.binmode
-                     file.sync = true
-                   end
-                 when IO, StringIO
-                   output_log
-                 end
-
-        lambda { |c| logger.syswrite c if logger }
+      [output_logs].flatten.uniq.each.with_object({}) do |output_log, loggers|
+        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
+        when IO, StringIO
+          loggers[output_log] = output_log
+        end
       end
     end
-
   end
 end

data/lib/xlogin/telnet.rb

@@ -23,7 +23,7 @@ module Xlogin
 
     def interact!
       $stdin.raw!
-      disable_log($stdout)
+      enable_log($stdout)
 
       loop do
         rs, _ = IO.select([$stdin, @sock])
@@ -45,7 +45,6 @@ module Xlogin
           when @sock
             begin
               bs = fh.readpartial(1024)
-              $stdout.syswrite(bs)
               output_log(bs)
             rescue Errno::EAGAIN
               retry

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-  VERSION = "0.6.18"
+  VERSION = "0.6.19"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.6.18
+  version: 0.6.19
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-17 00:00:00.000000000 Z
+date: 2017-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-telnet