xlogin 0.16.4 → 0.16.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d805b70c4f761cbca785e8fa6aeed4af49144e7d7ceff3b84f1d0bcea1f03ea3
-  data.tar.gz: fd9c8a12f3ed2cb279ec1ddd9121a4ef286ca13a1835f39ff5e0f078df12d8a5
+  metadata.gz: 6ef44033bfbc542654526a3a009b4400b813b3919beeac902aa38b4a68937ed6
+  data.tar.gz: 5d71ff7e0f4acd38e0370fec946ed13165615bfc4d955047fb29a8f63296cef9
 SHA512:
-  metadata.gz: d0ead74a4a9d12aa71be4f87957d5725719e3dfebae3d5d285fcf781852859f2a579e5d67063944d7e1308ec652ab9c6e942fa19ecbe0b304eb6002fe0b39589
-  data.tar.gz: 46817a1959cf69e89d80d0162713f9640de2e679431d472ce5e40454e49ea2c1f6e5efa33e4f165249aa10deda9b082159db06847cb1ce0d3aa02ab0b8b81d53
+  metadata.gz: 47d8c407ed8167173641c237eb07a0874d995b53b96191104961a29628b0514caa5bfc5b1c547afceba3bbf388fd31c64ae301e7e7dd4068ee744ed3825c3fb8
+  data.tar.gz: 7a42ce312379c15c7faf1845dbd76dc29c9c1b407bfcdd684ba9563d259f201ef06a3feadab90139c490ca2bdf952efcbd4695cd302b5e8bfb577dba19cbc8e9

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/rake_task.rb

@@ -100,27 +100,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/version.rb

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

metadata

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