xlogin 0.15.7 → 0.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7b8fd89987339e341998c05917253187ab98bf73001b307eefcd4fa6f5db15c
-  data.tar.gz: adc3c1a866e2cc9437ad90d7938ed9076b2eb21f1d9a37c81b62d58ea1e85bad
+  metadata.gz: 342f00cdb5f923c597cf7f40c1d4cf35c8cb7ecb596caa8457c05b09c9b7bd2d
+  data.tar.gz: 4a7f6f3041a53b942ea434a8417b6b150397fed622e1a2f7a3b7dc0148f87865
 SHA512:
-  metadata.gz: b0c4de1d7d7d30d47edf174c393968b218a9937f1bb535a2b3f888428f52b13535b15787d0464c2489a0005ccb2f36d41648b5e8cb668f489ee9bfa88154fbf9
-  data.tar.gz: 10971772a9085d3afdab205e73b6a1f85273256d43e4ee099348fab381a157cae7a7f0fcfbe73811ab0692856bb7e4374c0bf4ef179da0372210295aa50e9e2b
+  metadata.gz: 7bb500f47f1b95b5f29c3f10083df805a1dd09cb23ce3696719a8bcffe00812cd947b3001743085663e698628c1d7ed78aa1c2db9c77e434791ad2bf32f0acb9
+  data.tar.gz: abeccd10d1efca609233477172d1926bd3003f05ac4faec3d81b8750c096f7745f0c886fe3801143a52d09afabfcafecbd5c253480ec4c899e0b60bf1d5f7236

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

@@ -10,13 +10,20 @@ module Xlogin
     class << self
       include Rake::DSL
 
-      def generate(*patterns, **opts, &block)
+      def all(*patterns, &block)
         description = Rake.application.last_description
-        hostnames   = Xlogin.list(*patterns).map{ |e| e[:name] }
+        task all: Xlogin.list(*patterns).map{ |e| e[:name] }
 
-        task 'all' => hostnames unless opts[:all] == false
+        desc description
+        generate(*patterns, &block)
+      end
+
+      def generate(*patterns, &block)
+        description = Rake.application.last_description
+
+        hostnames = Xlogin.list(*patterns).map{ |e| e[:name] }
         hostnames.each do |hostname|
-          desc "#{description} with #{hostname}"
+          desc "#{description} - #{hostname}" if description
           RakeTask.new(hostname, &block)
         end
       end
@@ -78,41 +85,41 @@ 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
-    end
+    def puts(text, **opts)
+      return text.each { |e| puts(e, **opts) } if text.kind_of?(Array)
 
-  end
+      text = text.to_s
+      text = text + "\n" unless text[-1] == "\n"
+      print(text, **opts)
+    end
 
-  module SessionModule
+    def print(text, **opts)
+      text = text.to_s
+      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{ |text| "#{name}\t|#{text}" }.join if Rake.application.options.always_multitask
+      text = text.colorize(**opts)
+      $stdout.print(text)
     end
 
   end

data/lib/xlogin/session.rb

@@ -44,8 +44,8 @@ module Xlogin
         super(args)
       rescue => e
         unless (num_try += 1) > (@config.retry || 0)
-          sleep 1.0
-          retry 
+          sleep 2.0 ** (num_try)
+          retry
         end
         raise e
       end
@@ -84,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
 
@@ -123,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/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.7"
+	VERSION = "0.16.2"
 end

metadata

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