xlogin 0.15.9 → 0.16.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ed377f5d1478cfca33b257304579edbbdbe8cb513d5613ab488698a872d3fe7
-  data.tar.gz: 5c4d51a3f685d0cc9c5f6f27e61344dc9ec295b15a28374121ed77c94a95b69e
+  metadata.gz: d805b70c4f761cbca785e8fa6aeed4af49144e7d7ceff3b84f1d0bcea1f03ea3
+  data.tar.gz: fd9c8a12f3ed2cb279ec1ddd9121a4ef286ca13a1835f39ff5e0f078df12d8a5
 SHA512:
-  metadata.gz: 0f0cdce3afb728a5686b4d6a287cc98723ca0f2eedb4c0101c1fc64eb5301d933a2dbb97b0de6e7d0f4dab8aaca4f36bcaaa3053acebe80b438d09ed4ed2168a
-  data.tar.gz: cd0e7896daff69587f61ebe08afcd6aae6e4a952359bf70bf4c87446bd840b450a9e2b93763e6ed16c86d5c84c5348122bcd88c959e3674748ea32a58dc0f45a
+  metadata.gz: d0ead74a4a9d12aa71be4f87957d5725719e3dfebae3d5d285fcf781852859f2a579e5d67063944d7e1308ec652ab9c6e942fa19ecbe0b304eb6002fe0b39589
+  data.tar.gz: 46817a1959cf69e89d80d0162713f9640de2e679431d472ce5e40454e49ea2c1f6e5efa33e4f165249aa10deda9b082159db06847cb1ce0d3aa02ab0b8b81d53

data/lib/xlogin.rb

@@ -21,31 +21,25 @@ 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))
-                when String then factory.build_from_hostname(args, **opts)
-                else
-                  raise Xlogin::Error.new("Invalid argument: '#{args}'")
-                end
-
-      return session unless block
-      begin block.call(session) ensure session.close end
+      case args
+      when Hash   then factory.build(**args.merge(**opts), &block)
+      when String then factory.build_from_hostname(args, **opts, &block)
+      else
+        raise Xlogin::Error.new("Invalid argument: '#{args}'")
+      end
     end
 
     def pool(args, **opts, &block)
-      pool = factory.build_pool(args, **opts)
-
-      return pool unless block
-      begin block.call(pool) ensure pool.close end
+      factory.build_pool(args, **opts, &block)
     end
 
     def configure(&block)

data/lib/xlogin/factory.rb

@@ -26,7 +26,7 @@ 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|
@@ -93,22 +93,26 @@ module Xlogin
       end
     end
 
-    def build(type:, **opts)
+    def build(type:, **opts, &block)
       template = get_template(type)
       raise Xlogin::Error.new("Template not found: '#{type}'") unless template
 
-      template.build(uri(opts), **opts)
+      session = template.build(uri(opts), **opts)
+      return session unless block
+      begin block.call(session) ensure session.close end
     end
 
-    def build_pool(args, **opts)
-      Xlogin::SessionPool.new(args, **opts)
+    def build_pool(args, **opts, &block)
+      pool = Xlogin::SessionPool.new(args, **opts)
+      return pool unless block
+      begin block.call(pool) ensure pool.close end
     end
 
-    def build_from_hostname(args, **opts)
+    def build_from_hostname(args, **opts, &block)
       hostinfo = get_hostinfo(args)
       raise Xlogin::Error.new("Host not found: '#{args}'") unless hostinfo
 
-      build(**hostinfo.merge(**opts))
+      build(**hostinfo.merge(**opts), &block)
     end
 
     def method_missing(method_name, *args, **opts, &block)

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
@@ -59,8 +66,10 @@ module Xlogin
 
     private
     def define
-      mkdir_p(File.dirname(log),  verbose: Rake.application.options.trace) if log
-      mkdir_p(File.dirname(lock), verbose: Rake.application.options.trace) if lock
+      self.log  = File.join(Dir.pwd, 'log',  name + '.log')   if self.log  == true
+      self.lock = File.join(Dir.pwd, 'lock', name_with_scope) if self.lock == true
+      mkdir_p(File.dirname(self.log),  verbose: Rake.application.options.trace) if self.log
+      mkdir_p(File.dirname(self.lock), verbose: Rake.application.options.trace) if self.lock
 
       if lock
         task(name => lock)
@@ -78,41 +87,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

@@ -10,9 +10,9 @@ module Xlogin
 
     def initialize(template, uri, **opts)
       @uri  = uri
-      @host = uri.host
-      @port = uri.port
-      @port ||= case @uri.scheme
+      @host = opts[:host] || uri.host
+      @port = opts[:port] || uri.port
+      @port ||= case opts[:scheme] || uri.scheme
                 when 'ssh'    then 22
                 when 'telnet' then 23
                 end
@@ -25,7 +25,7 @@ module Xlogin
       @host, @port = Xlogin.factory.open_tunnel(@tunnel, @host, @port) if @tunnel
 
       num_try = 0
-      username, password = uri.userinfo.to_s.split(':')
+      username, password = (opts[:userinfo] || uri.userinfo).to_s.split(':')
 
       begin
         args = Hash.new
@@ -45,7 +45,7 @@ module Xlogin
       rescue => e
         unless (num_try += 1) > (@config.retry || 0)
           sleep 2.0 ** (num_try)
-          retry 
+          retry
         end
         raise e
       end
@@ -64,11 +64,9 @@ module Xlogin
       Regexp.union(*@template.prompts.map(&:first))
     end
 
-    def duplicate(type: @template.name, **args)
-      template = Xlogin::Factory.instance.get_template(type)
-      raise Xlogin::Error.new("Template not found: '#{type}'") unless template
-
-      template.build(@uri, **@config.to_h.merge(args))
+    def duplicate(type: @template.name, uri: @uri.dup, **args, &block)
+      args = @config.to_h.merge(args)
+      Xlogin::Factory.instance.build(type: type, uri: uri, **args, &block)
     end
 
     def puts(string = '', &block)
@@ -84,7 +82,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 +121,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.9"
+	VERSION = "0.16.4"
 end

metadata

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