xlogin 0.13.11 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac93486a9931ac8646625ffff38c05956666aed0d14f60d9a0f1fbcddcf2ef8e
-  data.tar.gz: bf861069b1b5f508c9143ce97fad0ba6040efb3fd78540936da1050e871ff264
+  metadata.gz: bbc5c0255a1328038a84dc96b4e99c1b252c998ece79c03f7e23d22b7c5eba2d
+  data.tar.gz: a605c1f6a0bb730e3aab19c13401c902416aee1e985a34a4d3132c014bc36f43
 SHA512:
-  metadata.gz: 3249c1f47125e78e490883c9f36a1bc766d16e1810e9fecbaecba9855da2263137889b3887fae6e3335be6c226ea8c8aa2d6b8edad8c3c1c83cbc849c31eea6c
-  data.tar.gz: becd77aacc551b16d55d8bce42761daa06c7fbf56a11b4399057b9cb3177e445aa49ede693a1561c60b00cd1d19a8b92c36c5aa8cec82982d23538539324aee6
+  metadata.gz: c077a17025b8131927de93b9602bc1d8957f4545b38bf2ec58c95d460faf3320d55770c8efc65cce4796eeb11fa5d3e4d3bcd7acbd9b35b44e7beffc1da55b5e
+  data.tar.gz: 665cb8e5a6ebde87623135a31ca21d5f2e25408e31e4fc12560fa4ce6095459a686a32317c1a0dabb4eace83224b828999be069a5c84f225fa4dad9dc174a44b

data/lib/xlogin.rb

@@ -61,14 +61,14 @@ module Xlogin
     def generate_templates(dir)
       FileUtils.mkdir_p(dir) unless Dir.exist?(dir)
       builtin_templates = Dir.glob(File.join(File.dirname(__FILE__), 'xlogin', 'templates', '*.rb'))
-      builtin_templates.each { |file| FileUtils.cp(file, DEFAULT_TEMPLATE_DIR) }
+      builtin_templates.each{ |file| FileUtils.cp(file, DEFAULT_TEMPLATE_DIR) }
     end
 
-    private
     def factory
       @factory ||= Xlogin::Factory.instance
     end
 
+    private
     def set(opts = {})
       @settings ||= {}
       opts.each do |key, val|

data/lib/xlogin/cli.rb

@@ -15,7 +15,7 @@ module Xlogin
     end
 
     def list(config)
-      puts Xlogin.list(*config[:pattern]).map { |e| e[:name] }.sort.uniq
+      puts Xlogin.list(*config[:pattern]).map{ |e| e[:name] }.sort.uniq
     end
 
     def tty(config)
@@ -26,11 +26,11 @@ module Xlogin
     end
 
     def exec(config)
-      Signal.trap(:INT) { exit 0 }
+      Signal.trap(:INT){ exit 0 }
 
       jobs  = config[:jobs] || 1
       hosts = Xlogin.list(*config[:pattern])
-      width = hosts.map { |e| e[:name].length }.max
+      width = hosts.map{ |e| e[:name].length }.max
 
       Parallel.map(hosts, in_threads: jobs) do |info|
         buffer  = StringIO.new
@@ -43,14 +43,14 @@ module Xlogin
           loggers << File.expand_path(File.join(config[:"log-dir"], "#{info[:name]}.log"), ENV['PWD']) if config[:"log-dir"]
 
           session = Xlogin.get(info.merge(log: loggers))
-          session.enable(info[:enable]) if info[:enable] && Xlogin.settings.enable?
+          session.enable(session.config.enable) if session.config.enable && Xlogin.settings.enable?
 
           command_lines = ['', *config[:exec].to_s.split(';').map(&:strip)]
-          command_lines.each { |line| session.cmd(line) }
+          command_lines.each{ |line| session.cmd(line) }
 
-          buffer.string.lines.each { |line| print prefix + line.gsub("\r", '') } if jobs > 1
+          buffer.string.lines.each{ |line| print prefix + line.gsub("\r", '') } if jobs > 1
         rescue => e
-          buffer.string.lines.each { |line| print prefix + line.gsub("\r", '') } if jobs > 1
+          buffer.string.lines.each{ |line| print prefix + line.gsub("\r", '') } if jobs > 1
           raise e
         end
 
@@ -71,10 +71,10 @@ module Xlogin
 
       parser.on('-i PATH', '--inventory', String, 'The PATH to the inventory file.')
       parser.on('-t PATH', '--template',  String, 'The PATH to the template file or directory.')
-      parser.on('-L PATH', '--log-dir',   String, 'The PATH to the log directory.') { |v| v || '.' }
+      parser.on('-L PATH', '--log-dir',   String, 'The PATH to the log directory.'){ |v| 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); 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); v }
 
       parser.on('-E KEY=VAL', '--env',    /(\w+=\w+)+/, 'Environment variables.')
       parser.on('-j NUM',     '--jobs',   Integer,      'The NUM of jobs to execute in parallel.')

data/lib/xlogin/factory.rb

@@ -1,5 +1,6 @@
 require 'addressable/uri'
 require 'singleton'
+require 'thread'
 require 'xlogin/session_pool'
 require 'xlogin/template'
 
@@ -9,8 +10,10 @@ module Xlogin
     include Singleton
 
     def initialize
-      @inventory    = Hash.new
-      @templates    = Hash.new
+      @inventory = Hash.new
+      @templates = Hash.new
+      @gateways  = Hash.new
+      @mutex     = Mutex.new
     end
 
     def set_inventory(name, **opts)
@@ -28,7 +31,7 @@ module Xlogin
         values2 = pattern.split(',').map do |entry|
           key, val = entry.to_s.split(':')
           key, val = 'name', key if val.nil?
-          @inventory.values.select { |e| File.fnmatch(val, e[key.to_sym]) }
+          @inventory.values.select{ |e| File.fnmatch(val, e[key.to_sym]) }
         end
         values2.reduce(&:&)
       end
@@ -50,6 +53,35 @@ module Xlogin
       @templates.keys
     end
 
+    def open_tunnel(tunnel, host, port)
+      @mutex.synchronize do
+        unless @gateways[tunnel]
+          gateway_uri = Addressable::URI.parse(tunnel)
+          case gateway_uri.scheme
+          when 'ssh'
+            username, password = *gateway_uri.userinfo.split(':')
+            @gateways[tunnel] = Net::SSH::Gateway.new(
+              gateway_uri.host,
+              username,
+              password: password,
+              port: gateway_uri.port || 22
+            )
+          end
+        end
+
+        gateway = @gateways[tunnel]
+        return host, port unless gateway
+        return '127.0.0.1', gateway.open(host, port)
+      end
+    end
+
+    def close_tunnel(tunnel, port)
+      @mutex.synchronize do
+        gateway = @gateways[tunnel]
+        gateway.close(port) if gateway
+      end
+    end
+
     def build(type:, **opts)
       template = get_template(type)
       raise Xlogin::Error.new("Template not found: '#{type}'") unless template

data/lib/xlogin/rake_task.rb

@@ -13,7 +13,7 @@ module Xlogin
 
       def generate(*patterns, **opts, &block)
         description = Rake.application.last_description
-        hostnames   = Xlogin.list(*patterns).map { |e| e[:name] }
+        hostnames   = Xlogin.list(*patterns).map{ |e| e[:name] }
 
         task 'all' => hostnames unless opts[:all] == false
         hostnames.each do |hostname|
@@ -111,7 +111,7 @@ module Xlogin
   end
 
   module SessionModule
-    def msg(text, prefix: "[INFO]", chomp: false, **color)
+    def log_message(text, prefix: "[INFO]", chomp: false, **color)
       default_color = { color: :green }
 
       log("\n")

data/lib/xlogin/session.rb

@@ -22,16 +22,16 @@ module Xlogin
                 end
 
       @name     = opts[:name] || @host
+      @tunnel   = opts[:tunnel] || opts[:via]
       @config   = ReadOnlyStruct.new(opts)
       @template = template
       @username, @password = uri.userinfo.to_s.split(':')
 
-      forward = @config.forward || @config.via
-      ssh_tunnel(forward) if forward
       max_retry = @config.retry || 1
+      @host, @port = Xlogin.factory.open_tunnel(@tunnel, @host, @port) if @tunnel
 
       @mutex   = Mutex.new
-      @loggers = [@config.log].flatten.uniq.reduce({}) { |a, e| a.merge(e => build_logger(e)) }
+      @loggers = [@config.log].flatten.uniq.reduce({}){ |a, e| a.merge(e => build_logger(e)) }
 
       begin
         args = Hash.new
@@ -73,13 +73,13 @@ module Xlogin
     end
 
     def puts(*args, &block)
-      args = args.flat_map { |arg| instance_exec(arg, &@template.interrupt!) }.compact if @template.interrupt!
+      args = args.flat_map{ |arg| instance_exec(arg, &@template.interrupt!) }.compact if @template.interrupt!
       args.empty? ? super('', &block) : super(*args, &block)
     end
 
     def waitfor(*args, &block)
       args = [prompt_pattern] if args.empty?
-      @mutex.synchronize { _waitfor(*args, &block) }
+      @mutex.synchronize{ _waitfor(*args, &block) }
     end
 
     def close
@@ -90,17 +90,13 @@ module Xlogin
           logger.close
         end
 
-        if @gateway
-          @gateway.close(@port)
-          @gateway.shutdown!
-        end
-
+        Xlogin.factory.close_tunnel(@tunnel, @port) if @tunnel
         super
       end
     end
 
     def log(text)
-      @loggers.each { |_, logger| logger.syswrite(text) if logger }
+      @loggers.each{ |_, logger| logger.syswrite(text) if logger }
     end
 
     def enable_log(log = $stdout)
@@ -127,7 +123,7 @@ module Xlogin
         block.call(recv) if block
       end
 
-      _, process = @template.prompt.find { |r, p| r =~ line && p }
+      _, process = @template.prompt.find{ |r, p| r =~ line && p }
       if process
         instance_eval(&process)
         line += _waitfor(*args, &block)
@@ -136,23 +132,6 @@ module Xlogin
       return line
     end
 
-    def ssh_tunnel(gateway)
-      gateway_uri = Addressable::URI.parse(gateway)
-      case gateway_uri.scheme
-      when 'ssh'
-        username, password = *gateway_uri.userinfo.split(':')
-        @gateway = Net::SSH::Gateway.new(
-          gateway_uri.host,
-          username,
-          password: password,
-          port: gateway_uri.port || 22
-        )
-
-        @port = @gateway.open(@host, @port)
-        @host = '127.0.0.1'
-      end
-    end
-
     def build_logger(log)
       case log
       when String

data/lib/xlogin/session_pool.rb

@@ -22,16 +22,16 @@ module Xlogin
     end
 
     def size=(val)
-      @mutex.synchronize { @size = val }
+      @mutex.synchronize{ @size = val }
     end
 
     def idle=(val)
-      @mutex.synchronize { @idle = val }
+      @mutex.synchronize{ @idle = val }
     end
 
     def with
       session = deq
-      Thread.handle_interrupt(Exception => :immediate) { yield session }
+      Thread.handle_interrupt(Exception => :immediate){ yield session }
     ensure
       enq session
     end

data/lib/xlogin/template.rb

@@ -47,12 +47,12 @@ module Xlogin
       klass = Class.new(Xlogin.const_get(uri.scheme.capitalize))
       klass.class_exec(self) do |template|
         scopes = [*opts[:scope]].compact
-        scopes.each { |scope| template.instance_eval(&template.scopes[scope]) }
+        scopes.each{ |scope| template.instance_eval(&template.scopes[scope]) }
 
         template.methods.each do |name, block|
           case name.to_s
           when 'enable'
-            define_method(name) { |args = nil| instance_exec(args || opts[:enable], &block) }
+            define_method(name){ |args = nil| instance_exec(args || opts[:enable], &block) }
           else
             define_method(name, &block)
           end
@@ -64,7 +64,7 @@ module Xlogin
 
     def method_missing(name, *, &block)
       super unless RESERVED_METHODS.include?(name)
-      bind(name) { |*args| instance_exec(*args, &block) }
+      bind(name){ |*args| instance_exec(*args, &block) }
     end
 
   end

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-	VERSION = "0.13.11"
+	VERSION = "0.14.1"
 end

metadata

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