xlogin 0.10.9 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3f7a65ed48d5aa25928be4d31714657faa282f21fe317908c6da68f61ce9ab9
-  data.tar.gz: 4fc355338732d7df48ef787a152171460c334c3e9494c251e3472c4c892af84a
+  metadata.gz: 7597d72f3e0fa7ac0983b0a40841d05e97d4ca089586e941dc4d9fa832d33ffe
+  data.tar.gz: 6db438d3ef936a944eeca47856e62f1d0838b80d9b1e5327e37ed2245a5fb7bb
 SHA512:
-  metadata.gz: 13df83043b60975e0e17a505b0568aec8c779ff321ba512fbecf1bc654a80d044a5221ca9b69db048c3f1b6412706da05cc013b9ec5ff8c82fcadbb76988202f
-  data.tar.gz: '063955b5da490638837d0bc04f35c867ba4fe4861d56862854a06939f11d56b94afafec329c0bebc339894e649b34ee509b94b95cb07dfe859c2de9d272f48e6'
+  metadata.gz: 4755b483886ba979e6e8fb040923b5b7c53f6e8364eff68184dccb96011d62a39e23570825bcad3e45980318e7b1b6e91797568466f632b16f580ae03decd472
+  data.tar.gz: a68ea30752d1f4c0223dedd8a5e4d4b279d5230231b6c45a57d382a5b0009c4c3ff8285a1ea2a88aecd95759087099e854d6cb41346276963675769fa2d9eb1c

data/lib/xlogin/cli.rb

@@ -4,7 +4,6 @@ require 'optparse'
 require 'ostruct'
 require 'parallel'
 require 'readline'
-require 'socket'
 require 'stringio'
 
 module Xlogin
@@ -16,154 +15,106 @@ module Xlogin
     def self.run(args = ARGV)
       config = getopts(args)
       client = Xlogin::CLI.new
-      client.method(config.taskname).call(config)
+			client.method(config.task.first).call(config)
     end
 
     def self.getopts(args)
       config = OpenStruct.new(
-        jobs: 1,
-        port: 8080,
-        taskname: :tty,
-        inventory: nil,
-        templates: [],
-      )
+				jobs: 1,
+				auth: false,
+				task: [:tty, nil],
+				inventory:    DEFAULT_INVENTORY_FILE,
+				template_dir: DEFAULT_TEMPLATE_DIR,
+			)
 
       parser = OptionParser.new
       parser.banner  = "#{File.basename($0)} HOST_PATTERN [Options]"
       parser.version = Xlogin::VERSION
 
-      parser.on('-i PATH',        '--inventory',    String, 'The PATH to the inventory file(default: $HOME/.xloginrc).') { |v| config.inventory = v }
-      parser.on('-t PATH',        '--template',     String, 'The PATH to the template file.') { |v| config.templates << v }
-      parser.on('-T DIRECTORY',   '--template-dir', String, 'The DIRECTORY of the template files.') { |v| config.templates += Dir.glob(File.join(v, '*.rb')) }
-      parser.on('-L [DIRECTORY]', '--log-dir',      String, 'The DIRECTORY of the log files(default: $PWD).') { |v| config.logdir = v || '.' }
+      parser.on('-i PATH',        '--inventory',    String, 'The PATH to the inventory file (default: $HOME/.xloginrc).') { |v| config.inventory    = v }
+			parser.on('-T PATH',        '--template',     String, 'The PATH to the template dir (default: $HOME/.xlogin.d).')   { |v| config.template_dir = v }
+			parser.on('-L [DIRECTORY]', '--log-dir',      String, 'The PATH to the log dir (default: $PWD).')                   { |v| config.logdir = v || '.' }
 
-      parser.on('-l', '--list', TrueClass, 'List all available devices.') { |v| config.taskname = :list }
-      parser.on('-e', '--exec', TrueClass, 'Execute commands and quit.') { |v| config.taskname = :exec }
-      parser.on('-t', '--tty',  TrueClass, 'Allocate a pseudo-tty.') { |v| config.taskname = :tty }
+      parser.on('-l', '--list', TrueClass, 'List the inventory.')     { |v| config.task = [:list, nil] }
+      parser.on('-t', '--tty',  TrueClass, 'Allocate a pseudo-tty.')  { |v| config.task = [:tty,  nil] }
+      parser.on('-e COMMAND', '--exec', 'Execute commands and quit.') { |v| config.task = [:exec, v] }
 
-      parser.on('-p NUM', '--port', Integer, 'Run as server on specified port(default: 8080).') { |v| config.taskname = :listen; config.port = v }
       parser.on('-j NUM', '--jobs', Integer, 'The NUM of jobs to execute in parallel(default: 1).') { |v| config.jobs = v }
-
-      parser.on('-E',     '--enable',     TrueClass, 'Try to gain enable priviledge.') { |v| config.enable = v }
-      parser.on('-y',     '--assume-yes', TrueClass, 'Automatically answer yes to prompts.') { |v| config.authorize = v }
-
-      begin
-        args = parser.parse!(args)
-        host = args.shift
-        config.args = args
-
-        Xlogin.configure do
-          config.inventory ||= DEFAULT_INVENTORY_FILE
-          if config.templates.empty?
-            generate_templates(DEFAULT_TEMPLATE_DIR) unless File.exist?(DEFAULT_TEMPLATE_DIR)
-            config.templates += Dir.glob(File.join(DEFAULT_TEMPLATE_DIR, '*.rb'))
-          end
-
-          authorize(config.authorize)
-          source(File.expand_path(config.inventory, ENV['PWD']))
-          template_file(*config.templates.map { |file| File.expand_path(file, ENV['PWD']) })
-        end
-
-        config.hostlist  = Xlogin.list(*host.to_s.split(/\s+/))
-        raise "No host found: `#{host}`" if config.hostlist.empty?
-      rescue => e
-        $stderr.puts e, '', parser
-        exit 1
-      end
-
-      config
+      parser.on('-y',     '--assume-yes', TrueClass, 'Automatically answer yes to prompts.')        { |v| config.auth = v }
+      parser.on('-E',     '--enable',     TrueClass, 'Try to gain enable priviledge.')              { |v| config.enable = v }
+
+			parser.parse!(args)
+			Xlogin.configure do
+				authorize(config.auth)
+				source(File.expand_path(config.inventory, ENV['PWD']))
+				template_dir(File.expand_path(config.template_dir, ENV['PWD']))
+			end
+
+			config.hosts = Xlogin.list(*args)
+			raise "No host found: `#{args.join(', ')}`" if config.hosts.empty?
+
+      return config
+		rescue => e
+			$stderr.puts e, '', parser
+			exit 1
     end
 
     def list(config)
-      list = config.hostlist.map { |e| e[:name] }.uniq.sort
-      $stdout.puts list
+      $stdout.puts config.hosts.map { |e| e[:name] }.sort.uniq
     end
 
     def tty(config)
       Signal.trap(:INT) { exit 0 }
 
-      list = config.hostlist.sort_by { |e| e[:name] }
-      list.each do |target|
-        unless list.size == 1
-          case resp = Readline.readline(">> #{target[:name]}(Y/n)? ", false).strip
+			config.hosts.each do |hostinfo|
+				unless config.hosts.size == 1
+          case resp = Readline.readline(">> #{hostinfo[:name]}(Y/n)? ", false).strip
           when /^y(es)?$/i, ''
           when /^n(o)?$/i then next
           else redo
           end
         end
 
-        config.jobs = 1
-        config.hostlist = [target]
+        $stdout.puts "Trying #{hostinfo[:name]}...", "Escape character is '^]'."
+				tty_config = OpenStruct.new(config.to_h.merge(jobs: 1, hosts: [hostinfo]))
 
-        $stdout.puts "Trying #{target[:name]}...", "Escape character is '^]'."
-        session, _ = exec(config)
+        session, _ = exec(tty_config)
         session.interact!
       end
     end
 
-    def listen(config)
-      Signal.trap(:INT) { exit 0 }
-      config.jobs = config.hostlist.size
-
-      width    = config.hostlist.map { |e| e[:name].length }.max
-      sessions = exec(config).compact
-
-      $stdout.puts "", ""
-      $stdout.puts "=> Started xlogin server on port=#{config.port}"
-      $stdout.puts "=> Ctrl-C to shutdown"
-
-      server = TCPServer.open(config.port)
-      socket = server.accept
-      while line = socket.gets
-        Parallel.each(sessions, in_threads: sessions.size) do |session|
-          resp   = session.cmd(line.chomp)
-          prefix = "#{session.name.to_s.ljust(width)} |"
-          output = resp.to_s.lines.map { |line| prefix + line.chomp.gsub("\r", '') + "\n" }.join
-          socket.print  output
-          $stdout.print output if config.jobs > 1
-        end
-      end
-    ensure
-      socket.close if socket
-      server.close if server
-    end
-
-    def exec(config, &block)
+    def exec(config)
       Signal.trap(:INT) { exit 0 }
 
-      width = config.hostlist.map { |e| e[:name].length }.max
-      Parallel.map(config.hostlist, in_threads: config.jobs) do |hostinfo|
+      max_width = config.hosts.map { |e| e[:name].length }.max
+      Parallel.map(config.hosts, in_threads: config.jobs) do |hostinfo|
         session = nil
         error   = nil
 
         begin
           buffer   = StringIO.new
-          hostname = hostinfo[:name]
 
           loggers  = []
           loggers << ((config.jobs > 1)? buffer : $stdout)
-          loggers << File.expand_path(File.join(config.logdir, "#{hostname}.log"), ENV['PWD']) if config.logdir
+          loggers << File.expand_path(File.join(config.logdir, "#{hostinfo[:name]}.log"), ENV['PWD']) if config.logdir
 
           session = Xlogin.get(hostinfo.merge(log: loggers))
           session.enable if config.enable && hostinfo[:enable]
 
-          command_lines = ['', *config.args.flat_map { |e| e.split(';') }].map(&:strip)
+					command_lines = ['', *config.task.last.to_s.split(';').map(&:strip)]
           command_lines.each { |line| session.cmd(line) }
-
-          block.call(session) if block
-        rescue => e
-          error = e
-        ensure
-          if config.jobs > 1
-            prefix = "#{hostname.to_s.ljust(width)} |"
-            output = buffer.string.lines.map { |line| prefix + line.chomp.gsub("\r", '') + "\n" }.join
-            $stdout.print output
-            $stderr.print prefix + "[Error] #{error}\n" if error
-          else
-            $stderr.print "[Error] #{error}\n" if error
-          end
-
-        end
+        rescue => err
+          error = err
+				end
+
+				if config.jobs > 1
+					prefix = "#{hostinfo[:name].to_s.ljust(max_width)} |"
+					output = buffer.string.lines.map { |line| prefix + line.chomp.gsub("\r", '') + "\n" }.join
+					$stdout.print output
+					$stderr.print prefix + "[Error] #{error}\n" if error
+				else
+					$stderr.print "[Error] #{error}\n" if error
+				end
 
         session
       end

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-  VERSION = "0.10.9"
+	VERSION = "0.11.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.10.9
+  version: 0.11.0
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-23 00:00:00.000000000 Z
+date: 2019-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-telnet