xlogin 0.16.1 → 0.16.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2be71cfa9759e1335b4d8fb3e7c4716d0659c16fa9bc029ecfd0f27df345fea9
-  data.tar.gz: aa0573d7f09586135a5f95bf5c64febe48436d174ec52233604fd1ed182cc9b1
+  metadata.gz: f7bc26b26eaaf13f1577ebe322b44a888dd5c83426f81d484372e582bb8a1182
+  data.tar.gz: d3bfdb0e28a4857f2411c59567e0a54e70b94dc580f64b6c963b8e439919f85f
 SHA512:
-  metadata.gz: 7741a7cdb6aa44f52ebad609ef4ecba0fa8308834ff27f548565ed865045ca73808de07526d669ce9ddc89d174c4dd07513634d45f7b5b4e52a64c3e8804a5dc
-  data.tar.gz: bbfc0ab5da188614ab3364653bbf15a8ea924cf4504435f02a8433b0a3b97cc7b1dfc4e62742971360bca812bb1fc4406196cb7ba440cd1690badcfbcb1e9f6b
+  metadata.gz: 15af0c59968c287bcfb69f422e21de121ae893848b98c6bd6629d33809d4c0939a7a70ed88dd1a49da9e00a02e67bc01cddcce6119ac97396e672a523148a1db
+  data.tar.gz: 49794803c350a64a7f70d13223ad736b5950eab2e53ff4c090d2673f5fb179b979040c66a67514c9a86881b0954de93a3fe68d1872241e3ac2c1555ca71afd87

data/lib/xlogin.rb

@@ -30,22 +30,16 @@ module Xlogin
     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/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

@@ -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,18 +10,23 @@ module Xlogin
     class << self
       include Rake::DSL
 
-      def all(*patterns, &block)
-        patterns    = patterns.empty? ? ENV['target'] : patterns
-        hostnames   = Xlogin.list(*patterns).map{ |e| e[:name] }
+      def all(*patterns, **opts, &block)
         description = Rake.application.last_description
+        task all: Xlogin.list(*patterns).map{ |e| e[:name] }
 
-        task 'all' => hostnames
+        desc description
+        generate(*patterns, **opts, &block)
+      end
+
+      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
-      alias_method :generate, :all
 
       def shutdown!
         @stop = true
@@ -35,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
 
@@ -61,8 +65,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)
@@ -84,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
@@ -93,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

@@ -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
@@ -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)

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-	VERSION = "0.16.1"
+	VERSION = "0.16.6"
 end

metadata

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