xlogin 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f42c5865068748beef0105170a86a417541a2e5795bd2255c8922a8a087580df
-  data.tar.gz: 58fc9bd6cc07cfb251cf296d002337b4fefcd44f558ffcc6a3ccbc18a2c06dfc
+  metadata.gz: '0086c05feba32e88bf808e6192b10e7a960876aa47d2091310a3fed7c1297fc7'
+  data.tar.gz: b82299076bf25526406a516c762cdfa5add6c33d768aceced613691213630140
 SHA512:
-  metadata.gz: 3a05591f833bf303edf41aca096d3c79bf8367fc4d97efdd9ce32b86016d63fb2b57932c716039c1566ded07b831c88a666a60fadc5001331a22db91e3d40cf9
-  data.tar.gz: 1f4288e96bdb275dae475772dd3c3e161a0ad48916ed1ce8e90b5e93afec6cc550b09271d8cb3232053cd4997c2dfa6b3e9931988302ce68c25e8143fc60b7fc
+  metadata.gz: 15b2680b9c90bee421c20c5af86bc1fa338b06d69f39b3bdbbb0890738214238e4bfe08fb13b40dcfe2adcaae6a3e3b196a09bd5ac491fdcec9b7fa0fd5287a0
+  data.tar.gz: 41b40ad9811148bbf294cd00ff18bccaaa347bf51f13b6f8fe5776a2d70556708e17228ab536ca32ab1b16290437e919f505fed6f8b16428155326ffa07bbd6a

data/lib/xlogin/cli.rb

@@ -7,19 +7,19 @@ require 'readline'
 require 'stringio'
 
 module Xlogin
-  class CLI
+	class CLI
 
-    DEFAULT_INVENTORY_FILE = File.join(ENV['HOME'], '.xloginrc')
-    DEFAULT_TEMPLATE_DIR   = File.join(ENV['HOME'], '.xlogin.d')
+		DEFAULT_INVENTORY_FILE = File.join(ENV['HOME'], '.xloginrc')
+		DEFAULT_TEMPLATE_DIR   = File.join(ENV['HOME'], '.xlogin.d')
 
-    def self.run(args = ARGV)
-      config = getopts(args)
-      client = Xlogin::CLI.new
+		def self.run(args = ARGV)
+			config = getopts(args)
+			client = Xlogin::CLI.new
 			client.method(config.task.first).call(config)
-    end
+		end
 
-    def self.getopts(args)
-      config = OpenStruct.new(
+		def self.getopts(args)
+			config = OpenStruct.new(
 				jobs: 1,
 				auth: false,
 				task: [:tty, nil],
@@ -27,21 +27,21 @@ module Xlogin
 				template_dir: DEFAULT_TEMPLATE_DIR,
 			)
 
-      parser = OptionParser.new
-      parser.banner  = "#{File.basename($0)} HOST_PATTERN [Options]"
-      parser.version = Xlogin::VERSION
+			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('-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 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('-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('-j NUM', '--jobs', Integer, 'The NUM of jobs to execute in parallel(default: 1).') { |v| config.jobs = v }
-      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.on('-j NUM', '--jobs', Integer, 'The NUM of jobs to execute in parallel(default: 1).') { |v| config.jobs = v }
+			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
@@ -53,58 +53,58 @@ module Xlogin
 			config.hosts = Xlogin.list(*args)
 			raise "No host found: `#{args.join(', ')}`" if config.hosts.empty?
 
-      return config
+			return config
 		rescue => e
 			$stderr.puts e, '', parser
 			exit 1
-    end
+		end
 
-    def list(config)
-      $stdout.puts config.hosts.map { |e| e[:name] }.sort.uniq
-    end
+		def list(config)
+			$stdout.puts config.hosts.map { |e| e[:name] }.sort.uniq
+		end
 
-    def tty(config)
-      Signal.trap(:INT) { exit 0 }
+		def tty(config)
+			Signal.trap(:INT) { exit 0 }
 
 			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
-
-        $stdout.puts "Trying #{hostinfo[:name]}...", "Escape character is '^]'."
+					case resp = Readline.readline(">> #{hostinfo[:name]}(Y/n)? ", false).strip
+					when /^y(es)?$/i, ''
+					when /^n(o)?$/i then next
+					else redo
+					end
+				end
+
+				$stdout.puts "Trying #{hostinfo[:name]}...", "Escape character is '^]'."
 				tty_config = OpenStruct.new(config.to_h.merge(jobs: 1, hosts: [hostinfo]))
 
-        session, _ = exec(tty_config)
-        session.interact!
-      end
-    end
+				session, _ = exec(tty_config)
+				session.interact!
+			end
+		end
 
-    def exec(config)
-      Signal.trap(:INT) { exit 0 }
+		def exec(config)
+			Signal.trap(:INT) { exit 0 }
 
-      max_width = config.hosts.map { |e| e[:name].length }.max
-      Parallel.map(config.hosts, in_threads: config.jobs) do |hostinfo|
-        session = nil
-        error   = nil
+			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
+				begin
+					buffer   = StringIO.new
 
-          loggers  = []
-          loggers << ((config.jobs > 1)? buffer : $stdout)
-          loggers << File.expand_path(File.join(config.logdir, "#{hostinfo[:name]}.log"), ENV['PWD']) if config.logdir
+					loggers  = []
+					loggers << ((config.jobs > 1)? buffer : $stdout)
+					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]
+					session = Xlogin.get(hostinfo.merge(log: loggers))
+					session.enable(hostinfo[:enable]) if config.enable && hostinfo[:enable]
 
 					command_lines = ['', *config.task.last.to_s.split(';').map(&:strip)]
-          command_lines.each { |line| session.cmd(line) }
-        rescue => err
-          error = err
+					command_lines.each { |line| session.cmd(line) }
+				rescue => err
+					error = err
 				end
 
 				if config.jobs > 1
@@ -116,9 +116,9 @@ module Xlogin
 					$stderr.print "[Error] #{error}\n" if error
 				end
 
-        session
-      end
-    end
+				session
+			end
+		end
 
-  end
+	end
 end

data/lib/xlogin/session.rb

@@ -10,7 +10,6 @@ module Xlogin
   module SessionModule
 
     attr_accessor :name
-    attr_accessor :config
 
     def initialize(template, uri, **opts)
       @uri  = uri
@@ -52,11 +51,6 @@ module Xlogin
       @template.name
     end
 
-    def enable(*args)
-      return super(*args) unless args.empty?
-      super(@config.enable)
-    end
-
     def prompt
       cmd('').to_s.lines.last&.chomp
     end

data/lib/xlogin/template.rb

@@ -42,7 +42,12 @@ module Xlogin
       klass = Class.new(Xlogin.const_get(uri.scheme.capitalize))
       klass.class_exec(@methods) do |methods|
         methods.each do |name, block|
-          define_method(name, &block)
+					case name.to_s
+					when 'enable'
+						define_method(name) { |args = nil| instance_exec(args || opts[:enable], &block) }
+					else
+						define_method(name, &block)
+					end
         end
       end
 

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-	VERSION = "0.11.1"
+	VERSION = "0.11.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - haccht