xlogin 0.16.4 → 0.16.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d805b70c4f761cbca785e8fa6aeed4af49144e7d7ceff3b84f1d0bcea1f03ea3
-  data.tar.gz: fd9c8a12f3ed2cb279ec1ddd9121a4ef286ca13a1835f39ff5e0f078df12d8a5
+  metadata.gz: 930939a4963bb9965bf46dc7b9483ce005162a7617afd5c72bafa601b9b68450
+  data.tar.gz: 70208dee6029554aff44bc6d69a2b0b827bd0a202e59a00227bc7372fb16baa7
 SHA512:
-  metadata.gz: d0ead74a4a9d12aa71be4f87957d5725719e3dfebae3d5d285fcf781852859f2a579e5d67063944d7e1308ec652ab9c6e942fa19ecbe0b304eb6002fe0b39589
-  data.tar.gz: 46817a1959cf69e89d80d0162713f9640de2e679431d472ce5e40454e49ea2c1f6e5efa33e4f165249aa10deda9b082159db06847cb1ce0d3aa02ab0b8b81d53
+  metadata.gz: 76123781d2d14c27071ac279bb70628566a67e1c0a6f642e1593f2a9497ca18870ec1abb401bf34eef8304d7e3a441820fafb7e6d261f77469f2f04a2952151e
+  data.tar.gz: c75f987ace037ea7701180e1e46aea9979ae7810e2bac8febe09b781c106e829e97e956e22c9b515c32edd985e6abc22ba943579d5e1bd3ec1ca94e6a6dfc6c8

data/lib/xlogin/cli.rb

@@ -42,7 +42,7 @@ module Xlogin
           loggers << ((jobs > 1)? buffer : $stdout)
           loggers << File.expand_path(File.join(config[:logdir], "#{info[:name]}.log"), ENV['PWD']) if config[:logdir]
 
-          session = Xlogin.get(info.merge(log: loggers))
+          session = Xlogin.get(info.merge(log: loggers, **config[:env]))
           session.enable(session.config.enable) if session.config.enable && Xlogin.settings.enable?
 
           command_lines = config[:command].flat_map { |e| e.to_s.split(';').map(&:strip) }
@@ -60,7 +60,7 @@ module Xlogin
 
     def run(args)
       config = Hash.new
-      config[:env]       = []
+      config[:env]       = {}
       config[:inventory] = []
       config[:template]  = []
       config[:command]   = []
@@ -70,23 +70,21 @@ module Xlogin
       parser.banner  = "#{File.basename($0)} HOST_PATTERN [Options]"
       parser.version = Xlogin::VERSION
 
-      parser.on('-i PATH', '--inventory', String, 'The PATH to the inventory file.')            { |v| config[:inventory] << v }
-      parser.on('-t PATH', '--template',  String, 'The PATH to the template file or directory.'){ |v| config[:template]  << v }
-      parser.on('-L PATH', '--log-dir',   String, 'The PATH to the log directory.')             { |v| config[:logdir]     = v }
-
-      parser.on('-l',         '--list',   TrueClass, 'List the inventory.')       { |v| config[:runner] = self.method(:list) }
+      parser.on('-i PATH', '--inventory', String,  'The PATH to the inventory file.')            { |v| config[:inventory] << v }
+      parser.on('-t PATH', '--template',  String,  'The PATH to the template file or directory.'){ |v| config[:template]  << v }
+      parser.on('-L PATH', '--log-dir',   String,  'The PATH to the log directory.')             { |v| config[:logdir]     = v }
+      parser.on('-j NUM',  '--jobs',      Integer, 'The NUM of jobs to execute in parallel.')    { |v| config[:jobs] = v }
+      parser.on(           '--enable',    TrueClass, 'Automatically enable privilege mode.')     { |v| config[:enable] = v }
+      parser.on('-l',      '--list',      TrueClass, 'List the inventory.')       { |v| config[:runner] = self.method(:list) }
       parser.on('-e COMMAND', '--exec',   String,    'Execute commands and quit.'){ |v| config[:runner] = self.method(:exec); config[:command] << v }
-
-      parser.on('-E KEY=VAL', '--env',    /(\w+=\w+)+/, 'Environment variables.')                 { |v| config[:env] << v }
-      parser.on('-j NUM',     '--jobs',   Integer,      'The NUM of jobs to execute in parallel.'){ |v| config[:jobs] = v }
+      parser.on('-E KEY=VAL', '--env',    /\w+=[^=]+/, 'Environment variables.')  { |v| v.split('=').tap{ |k, v| config[:env].update(k.to_sym => v) } }
 
       config[:patterns]  = parser.parse!(args)
       config[:inventory] << DEFAULT_INVENTORY if config[:inventory].empty?
       config[:template]  << DEFAULT_TEMPLATE  if config[:template].empty?
 
       Xlogin.configure do
-        set Hash[config[:env].map{ |v| v.split('=') }]
-
+        set enable: config[:enable]
         source   *config[:inventory].map{ |e| File.expand_path(e, ENV['PWD']) }
         template *config[:template].map { |e| File.expand_path(e, ENV['PWD']) }
       end

data/lib/xlogin/factory.rb

@@ -6,6 +6,10 @@ require 'xlogin/session_pool'
 require 'xlogin/template'
 
 module Xlogin
+
+  # gateway tunnel
+  Tunnel = Struct.new('Tunnel', :gateway, :ports)
+
   class Factory
 
     include Singleton
@@ -70,7 +74,7 @@ module Xlogin
               port: uri.port || 22
             )
 
-             @tunnels[name] = Struct.new('Tunnel', :gateway, :ports).new(gateway, [])
+             @tunnels[name] = Xlogin::Tunnel.new(gateway, [])
           end
         end
 

data/lib/xlogin/rake_task.rb

@@ -10,21 +10,21 @@ module Xlogin
     class << self
       include Rake::DSL
 
-      def all(*patterns, &block)
+      def all(*patterns, **opts, &block)
         description = Rake.application.last_description
         task all: Xlogin.list(*patterns).map{ |e| e[:name] }
 
         desc description
-        generate(*patterns, &block)
+        generate(*patterns, **opts, &block)
       end
 
-      def generate(*patterns, &block)
+      def generate(*patterns, **opts, &block)
         description = Rake.application.last_description
 
         hostnames = Xlogin.list(*patterns).map{ |e| e[:name] }
         hostnames.each do |hostname|
           desc "#{description} - #{hostname}" if description
-          RakeTask.new(hostname, &block)
+          RakeTask.new(hostname, **opts, &block)
         end
       end
 
@@ -40,14 +40,13 @@ module Xlogin
     attr_reader   :name
     attr_accessor :log
     attr_accessor :lock
-    attr_accessor :timeout
     attr_accessor :silent
     attr_accessor :fail_on_error
 
-    def initialize(name)
+    def initialize(name, **opts)
       @name     = name
+      @opts     = opts
       @runner   = nil
-      @timeout  = nil
       @silent ||= Rake.application.options.silent
       @fail_on_error = true
 
@@ -91,7 +90,7 @@ module Xlogin
       loggers << log    if log
       loggers << STDOUT if !silent && !Rake.application.options.always_multitask
 
-      session = Xlogin.get(name, log: loggers, timeout: timeout)
+      session = Xlogin.get(name, log: loggers, **@opts)
       instance_exec(session, &@runner)
 
       print(buffer.string) if !silent && Rake.application.options.always_multitask
@@ -100,27 +99,25 @@ module Xlogin
       RakeTask.shutdown! if fail_on_error
 
       session.log_message(e.to_s.colorize(color: :red)) if session
-      print(buffer.string + "\n", color: :red) if Rake.application.options.always_multitask
+      print(buffer.string.colorize(color: :red) + "\n") if Rake.application.options.always_multitask
       return false
     ensure
       session.close rescue nil
     end
 
-    def puts(text, **opts)
-      return text.each { |e| puts(e, **opts) } if text.kind_of?(Array)
-
-      text = text.to_s
-      text = text + "\n" unless text[-1] == "\n"
-      print(text, **opts)
+    def puts(text)
+      strio = StringIO.new.tap{ |io| io.puts text }
+      print(strio.string)
     end
 
-    def print(text, **opts)
-      text = text.to_s
+    def print(text)
+      text = text.to_s.gsub("\r", '')
       return if text.empty?
 
-      text = text.gsub("\r", '')
-      text = text.lines.map{ |text| "#{name}\t|#{text}" }.join if Rake.application.options.always_multitask
-      text = text.colorize(**opts)
+      if Rake.application.options.always_multitask
+        strio = StringIO.new.tap{ |io| io.puts text.lines.map{ |line| "#{name}\t|#{line}" } }
+        text = strio.string
+      end
       $stdout.print(text)
     end
 

data/lib/xlogin/session.rb

@@ -25,7 +25,7 @@ module Xlogin
       @host, @port = Xlogin.factory.open_tunnel(@tunnel, @host, @port) if @tunnel
 
       num_try = 0
-      username, password = (opts[:userinfo] || uri.userinfo).to_s.split(':')
+      username, password = (opts[:userinfo] || ENV['USERINFO'] || uri.userinfo).to_s.split(':')
 
       begin
         args = Hash.new

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-	VERSION = "0.16.4"
+	VERSION = "0.16.8"
 end

metadata

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