xlogin 0.15.5 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72f04ff3e418dcd7b8498dad0913266a091e9775da6f3cbe620d8d5525a02fbf
-  data.tar.gz: 933cc35fcf553e81df5d21505fdd7489579fe3aae38928ee7e0b91c3266fc559
+  metadata.gz: aae85b41321af336f469aa967987f88912d22087748c6b646adb699688c0b17f
+  data.tar.gz: 26dcf9ed1c173bc43d247ab1a1339c8df0586c9734ea0679f5dd5e7fd70bd83a
 SHA512:
-  metadata.gz: bb94c967fffcf04d61b0fe387d9ce56c40cbb6e0d62e89f8af93eec4b3c6eb49371b3a053691938a0a55a2d546e553c894e60b0843db1eb7c9119910c7dbcc60
-  data.tar.gz: 590da1a22f0e5d7b3b4022719716d05b98ad9105d1ce13fbf4399be64be961ee7b5308b446be2afaae1b73733000c729bf1ca49e0f0631ca4b0236b72beebc11
+  metadata.gz: f7eeeecc2b10c5bb0a6bbca0ba80a7b71611cb04733d59271370641930c391aa604bdd06ca96cfbbfad05b32a745d62869688a3e703330a1742f7bab5df5c59c
+  data.tar.gz: a27419c164f9387f8633fa7610c7507d5febd8f9ae1d1d3eb77bf2ab6b04a96133c83e40265192927432b92994c02c3c8386b1088882fc5679041aea9d6f9134

data/lib/xlogin.rb

@@ -21,14 +21,14 @@ module Xlogin
   end
 
   class << self
-    def list(*patterns)
-      factory.list_hostinfo(*patterns)
-    end
-
     def find(*patterns)
       list(*patterns).first
     end
 
+    def list(*patterns)
+      factory.list_hostinfo(*patterns)
+    end
+
     def get(args, **opts, &block)
       session = case args
                 when Hash   then factory.build(**args.merge(**opts))

data/lib/xlogin/factory.rb

@@ -26,14 +26,14 @@ module Xlogin
     end
 
     def list_hostinfo(*patterns)
-      patterns = patterns.flat_map{ |e| e.split(/\s+/) }.compact
+      patterns = patterns.compact.flat_map{ |e| e.split(/\s+/) }
       return @inventory.values if patterns.empty?
 
       values1 = patterns.map do |pattern|
         values2 = pattern.split(',').map do |entry|
           key, val = entry.to_s.split(':')
           key, val = 'name', key if val.nil?
-          @inventory.values.select{ |e| File.fnmatch(val, e[key.to_sym]) }
+          @inventory.values.select{ |e| File.fnmatch(val, e[key.to_sym], File::FNM_EXTGLOB) }
         end
         values2.reduce(&:&) || []
       end

data/lib/xlogin/rake_task.rb

@@ -78,41 +78,36 @@ module Xlogin
 
     def run_task
       buffer  = StringIO.new
-      loggers = []
-      loggers << log     if log
-      loggers << $stdout if !silent && !Rake.application.options.always_multitask
-      loggers << buffer
+      loggers = [buffer]
+      loggers << log    if log
+      loggers << STDOUT if !silent && !Rake.application.options.always_multitask
 
       session = Xlogin.get(name, log: loggers, timeout: timeout)
+      instance_exec(session, &@runner)
 
-      @runner.call(session)
-      $stdout.print log_text(buffer.string) if !silent && Rake.application.options.always_multitask
-
+      print(buffer.string) if !silent && Rake.application.options.always_multitask
       return true
     rescue => e
       RakeTask.shutdown! if fail_on_error
 
-      session.comment(e.to_s, lf: false, color: :red) if session
-      if Rake.application.options.always_multitask && !buffer.string.empty?
-        $stderr.print log_text(buffer.string + "\n").colorize(color: :red)
-      end
-
+      session.log_message(e.to_s.colorize(color: :red)) if session
+      print(buffer.string + "\n", color: :red) if Rake.application.options.always_multitask
       return false
     ensure
       session.close rescue nil
     end
 
-    def log_text(text)
-      text.lines.map{ |line| "#{Time.now.iso8601} #{name}\t|#{line.gsub(/^.*\r/, '')}" }.join
+    def puts(text, **opt)
+      print(text + "\n", **opt)
     end
 
-  end
-
-  module SessionModule
+    def print(text, **opt)
+      return if text.empty?
 
-    def comment(line, lf: true, **color)
-      write_log(line.chomp.colorize({color: :light_white}.merge(**color)))
-      cmd('') if lf
+      text = text.gsub("\r", '')
+      text = text.lines.map{ |line| "#{name}\t|#{line}" }.join if Rake.application.options.always_multitask
+      text = text.colorize(**opt)
+      $stdout.print(text)
     end
 
   end

data/lib/xlogin/session.rb

@@ -43,7 +43,10 @@ module Xlogin
 
         super(args)
       rescue => e
-        retry unless (num_try += 1) > (@config.retry || 0)
+        unless (num_try += 1) > (@config.retry || 0)
+          sleep 2.0 ** (num_try)
+          retry
+        end
         raise e
       end
     end
@@ -81,7 +84,7 @@ module Xlogin
       return waitfor(prompt_pattern) if args.empty?
 
       line = super(*args) do |recv|
-        write_log(recv)
+        log_message(recv)
         block.call(recv) if block
       end
 
@@ -120,11 +123,11 @@ module Xlogin
       end
     end
 
-    private
-    def write_log(text)
+    def log_message(text)
       @loggers.each{ |_, logger| logger.syswrite(text) if logger }
     end
 
+    private
     def build_log(log)
       case log
       when String

data/lib/xlogin/session_pool.rb

@@ -25,7 +25,7 @@ module Xlogin
       session = deq
       Thread.handle_interrupt(Exception => :immediate){ yield session }
     ensure
-      enq session
+      enq session if session
     end
 
     def close
@@ -38,8 +38,9 @@ module Xlogin
     def deq
       @mutex.synchronize do
         if @queue.empty? && @count < @size
+          session = Xlogin.get(@args, **@opts)
           @count += 1
-          return Xlogin.get(@args, **@opts)
+          return session
         end
       end
 

data/lib/xlogin/telnet.rb

@@ -38,7 +38,7 @@ module Xlogin
             @sock.syswrite(bs)
           when @sock
             begin
-              write_log(fh.readpartial(1024))
+              log_message(fh.readpartial(1024))
             rescue Errno::EAGAIN
               retry
             end

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-	VERSION = "0.15.5"
+	VERSION = "0.16.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.15.5
+  version: 0.16.0
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-21 00:00:00.000000000 Z
+date: 2021-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-telnet