xlogin 0.4.13 → 0.4.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a84117cf243901542377439588814867063f606f
-  data.tar.gz: 9ae1b629e907bb8d098e675c614b448f8cc441cb
+  metadata.gz: 6d941fe4495b8ed1f28b816a25771e8eb5bf54c6
+  data.tar.gz: 33099f53dc53986179ce61f340a7109e27e2488b
 SHA512:
-  metadata.gz: f9f5ca361ced4a41f624be0dcd397b1d0840be0e7f74dd7ce12a42c9f52ca4e8f64f1606c6d009a2aca272976a10e4db325f1ff04f3b471382138029c11cf2de
-  data.tar.gz: 97d1d8831eb885401d4afec33c9e0c7bb85a7e40070fbd6d567b63043523f781be4c225866ed052a0932f9c3ea166cdf0e2ebb623755815dcf48f6de24bba730
+  metadata.gz: eb5634e09f8267227e0302367f44452c330bb7cd06152f2550574d28075398e58482b0bd49ff67baca7b807a3af2ac85c66a78dda7ed72272adf8e5ada93845f
+  data.tar.gz: 95c7b3a2a772dc46971d42ee32d0da759317a8abf8769966c6b8fa324353917166ef7f4fa682aa35c8990246502a528ab1cb3d22c10aa3a2ce4dae37d1387de7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    xlogin (0.4.13)
+    xlogin (0.4.14)
       net-ssh
       net-ssh-gateway
       net-ssh-telnet

data/bin/cmd_exec

@@ -1,123 +1,10 @@
 #! /usr/bin/env ruby
 
-require 'optparse'
-require 'readline'
-require 'stringio'
-require 'thread'
 require 'xlogin'
+require 'xlogin/cli'
 
-module Xlogin
+PLUGIN_TEMPLATES = Dir.glob(File.join(File.dirname(__FILE__), 'templates', '*.rb'))
+Xlogin.load_templates(*PLUGIN_TEMPLATES)
 
-  class ThreadPool
-
-    def initialize(size)
-      @jobs = Array.new
-      @lock = Queue.new
-
-      @size = size
-      @size.times { @lock.push :token }
-
-      begin yield(self) ensure join end if block_given?
-    end
-
-    def run
-      @jobs << Thread.new do
-        token = @lock.pop
-        yield
-        @lock.push token
-      end
-    end
-
-    def join
-      @jobs.each { |job| job.join }
-    end
-
-  end
-
-  class CLI
-
-    def self.getopts(args)
-      options = Hash.new
-
-      opt = OptionParser.new
-      opt.on('-F', '--force',  'Automatically reply "yes" if confirmed.') { |v| options[:F] = v }
-      opt.on('-e', '--enable', 'Try to gain enable priviledge.')          { |v| options[:e] = v }
-      opt.on('-l', '--log',    'Enable logging.')                         { |v| options[:l] = v }
-      opt.on('-H', 'Display hostnames for each response.')   { |v| options[:H] = v }
-
-      opt.on('-f FILE',  'Read target hostnames from FILE.') { |v| options[:f] = v }
-
-      opt.on('-x VALUE', 'Read commands from VALUE.')        { |v| options[:x] = v }
-      opt.on('-c VALUE')                                     { |v| options[:c] = v }
-
-      opt.on('-p VALUE', 'Specify concurrency pool size.')   { |v| options[:p] = v }
-      opt.on('-i VALUE', 'Specify interval time [sec].')     { |v| options[:i] = v }
-
-      opt.banner += ' HOST...'
-      opt.summary_width = 16
-
-      self.class.module_eval do
-        define_method(:usage) do |msg = nil|
-          puts opt.to_s
-          puts "error: #{msg}" if msg
-          exit 1
-        end
-      end
-
-      opt.parse!(args)
-      return options, args
-    end
-
-    def self.run(args = ARGV)
-      options, args = getopts(args)
-      usage if options[:x].nil? and options[:c].nil?
-      usage if options[:f].nil? && args.empty?
-
-      source_dirs  = [ENV['HOME'], Dir.pwd]
-      source_files = source_dirs.flat_map { |dir| [File.join(dir, '_xloginrc'), File.join(dir, '.xloginrc')] }
-      Xlogin.factory.source(*source_files)
-
-      size     = (options[:p] || 1).to_i
-      interval = (options[:i] || 0).to_i
-      commands = ((options[:x] == '-') ? $stdin.read : options[:x]).split(/[;\n]/) if options[:x]
-
-      nodes  = args.dup
-      nodes += IO.readlines(options[:f]).map(&:chomp) if options[:f]
-
-      ThreadPool.new(size) do |pool|
-        nodes.each do |node|
-          next if node =~ /^\s*#/
-
-          pool.run do
-            begin
-              resp    = StringIO.new
-              force   = options[:F] || false
-              loggers = []
-              loggers << $stdout unless size > 1
-              loggers << (URI.regexp =~ node ? URI(node).host : node) + ".log" if options[:l]
-
-
-              session = Xlogin.get(node, force: force, log: loggers)
-              session.enable if options[:e] && session.respond_to?(:enable)
-
-              if options[:x]
-                ['', *commands].map { |command| resp.print session.cmd(command) }
-              elsif options[:c]
-                resp.puts session.send(options[:c].to_sym)
-              end
-
-              content = resp.string
-              content = content.lines.map { |line| "#{node}: #{line}" }.join if options[:H]
-
-              $stdout.puts content if size > 1
-            rescue => e
-              $stderr.puts "Something goes wrong with '#{node}' - #{e}"
-            end
-          end
-        end
-      end
-    end
-  end
-end
-
-Xlogin::CLI.run if $0 == __FILE__
+Xlogin.source
+Xlogin::ExecCLI.run

data/bin/xlogin

@@ -1,64 +1,10 @@
 #! /usr/bin/env ruby
 
-require 'optparse'
-require 'readline'
 require 'xlogin'
+require 'xlogin/cli'
 
-module Xlogin
-  class CLI
-    def self.getopts(args)
-      options = Hash.new
+PLUGIN_TEMPLATES = Dir.glob(File.join(File.dirname(__FILE__), 'templates', '*.rb'))
+Xlogin.load_templates(*PLUGIN_TEMPLATES)
 
-      opt = OptionParser.new
-      opt.on('-e', '--enable', 'Try to gain enable priviledge.') { |v| options[:e] = v }
-      opt.on('-l', '--log',    'Enable logging.')                { |v| options[:l] = v }
-
-      opt.on(      '--list',   'List all devices.')              { |v| options[:list] = v }
-
-      opt.banner += ' HOST'
-      opt.summary_width = 16
-
-      self.class.module_eval do
-        define_method(:usage) do |msg = nil|
-          puts opt.to_s
-          puts "error: #{msg}" if msg
-          exit 1
-        end
-      end
-
-      opt.parse!(args)
-      return options, args
-    end
-
-    def self.run(args = ARGV)
-      options, args = getopts(args)
-
-      source_dirs  = [ENV['HOME'], Dir.pwd]
-      source_files = source_dirs.flat_map { |dir| [File.join(dir, '_xloginrc'), File.join(dir, '.xloginrc')] }
-      Xlogin.factory.source(*source_files)
-
-      if options[:list]
-        puts Xlogin.factory.list.map { |e| "#{e[:name]}\t#{e[:type]}" }
-        exit 0
-      end
-
-      target = args.shift
-      usage unless target
-
-      loggers = [$stdout]
-      loggers.push("#{target}.log") if options[:l]
-
-      puts "Trying #{target}..."
-      puts "Escape character is '^]'."
-
-      session = Xlogin.get(target, force_grant: options[:e], log: loggers)
-      session.interact!
-    rescue => e
-      $stderr.puts("#{e}\n\n")
-      raise
-    end
-
-  end
-end
-
-Xlogin::CLI.run if $0 == __FILE__
+Xlogin.source
+Xlogin::CLI.run

data/lib/xlogin/cli.rb

@@ -0,0 +1,168 @@
+#! /usr/bin/env ruby
+
+require 'optparse'
+require 'readline'
+require 'stringio'
+require 'thread'
+
+module Xlogin
+
+  class ThreadPool
+
+    def initialize(size)
+      @jobs = Array.new
+      @lock = Queue.new
+
+      @size = size
+      @size.times { @lock.push :token }
+
+      begin yield(self) ensure join end if block_given?
+    end
+
+    def run
+      @jobs << Thread.new do
+        token = @lock.pop
+        yield
+        @lock.push token
+      end
+    end
+
+    def join
+      @jobs.each { |job| job.join }
+    end
+
+  end
+
+  class CLI
+
+    def self.getopts(args)
+      options = Hash.new
+
+      opt = OptionParser.new
+      opt.on('-e', '--enable', 'Try to gain enable priviledge.') { |v| options[:e] = v }
+      opt.on('-l', '--log',    'Enable logging.')                { |v| options[:l] = v }
+
+      opt.on(      '--list',   'List all devices.')              { |v| options[:list] = v }
+
+      opt.banner += ' HOST'
+      opt.summary_width = 16
+
+      self.class.module_eval do
+        define_method(:usage) do |msg = nil|
+          puts opt.to_s
+          puts "error: #{msg}" if msg
+          exit 1
+        end
+      end
+
+      opt.parse!(args)
+      return options, args
+    end
+
+    def self.run(args = ARGV)
+      options, args = getopts(args)
+
+      if options[:list]
+        puts Xlogin.factory.list.map { |e| "#{e[:name]}\t#{e[:type]}" }
+        exit 0
+      end
+
+      target = args.shift
+      usage unless target
+
+      loggers = [$stdout]
+      loggers.push("#{target}.log") if options[:l]
+
+      puts "Trying #{target}..."
+      puts "Escape character is '^]'."
+
+      session = Xlogin.get(target, force_grant: options[:e], log: loggers)
+      session.interact!
+    rescue => e
+      $stderr.puts("#{e}\n\n")
+      raise
+    end
+
+  end
+
+  class ExecCLI
+
+    def self.getopts(args)
+      options = Hash.new
+
+      opt = OptionParser.new
+      opt.on('-F', '--force',  'Automatically reply "yes" if confirmed.') { |v| options[:F] = v }
+      opt.on('-e', '--enable', 'Try to gain enable priviledge.')          { |v| options[:e] = v }
+      opt.on('-l', '--log',    'Enable logging.')                         { |v| options[:l] = v }
+      opt.on('-H', 'Display hostnames for each response.')   { |v| options[:H] = v }
+
+      opt.on('-f FILE',  'Read target hostnames from FILE.') { |v| options[:f] = v }
+
+      opt.on('-x VALUE', 'Read commands from VALUE.')        { |v| options[:x] = v }
+      opt.on('-c VALUE')                                     { |v| options[:c] = v }
+
+      opt.on('-p VALUE', 'Specify concurrency pool size.')   { |v| options[:p] = v }
+      opt.on('-i VALUE', 'Specify interval time [sec].')     { |v| options[:i] = v }
+
+      opt.banner += ' HOST...'
+      opt.summary_width = 16
+
+      self.class.module_eval do
+        define_method(:usage) do |msg = nil|
+          puts opt.to_s
+          puts "error: #{msg}" if msg
+          exit 1
+        end
+      end
+
+      opt.parse!(args)
+      return options, args
+    end
+
+    def self.run(args = ARGV)
+      options, args = getopts(args)
+      usage if options[:x].nil? and options[:c].nil?
+      usage if options[:f].nil? && args.empty?
+
+      size     = (options[:p] || 1).to_i
+      interval = (options[:i] || 0).to_i
+      commands = ((options[:x] == '-') ? $stdin.read : options[:x]).split(/[;\n]/) if options[:x]
+
+      nodes  = args.dup
+      nodes += IO.readlines(options[:f]).map(&:chomp) if options[:f]
+
+      ThreadPool.new(size) do |pool|
+        nodes.each do |node|
+          next if node =~ /^\s*#/
+
+          pool.run do
+            begin
+              resp    = StringIO.new
+              force   = options[:F] || false
+              loggers = []
+              loggers << $stdout unless size > 1
+              loggers << (URI.regexp =~ node ? URI(node).host : node) + ".log" if options[:l]
+
+
+              session = Xlogin.get(node, force: force, log: loggers)
+              session.enable if options[:e] && session.respond_to?(:enable)
+
+              if options[:x]
+                ['', *commands].map { |command| resp.print session.cmd(command) }
+              elsif options[:c]
+                resp.puts session.send(options[:c].to_sym)
+              end
+
+              content = resp.string
+              content = content.lines.map { |line| "#{node}: #{line}" }.join if options[:H]
+
+              $stdout.puts content if size > 1
+            rescue => e
+              $stderr.puts "Something goes wrong with '#{node}' - #{e}"
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/xlogin/firmware.rb

@@ -53,17 +53,18 @@ module Xlogin
       end
 
       if grant = opts.delete(:grant)
-        open, password, close = grant.split(':')
-        klass.class_exec(open, password, close) do |open, password, close|
-          alias_method "original_#{open}".to_sym, open.to_sym
-          define_method(open) do |arg = password, &block|
-            send("original_#{open}", arg)
+        mod_open, password, mod_close= grant.split(':')
+        klass.class_exec(mod_open, password, mod_close) do |mod_open, password, mod_close|
+          alias_method "__#{mod_open}".to_sym, mod_open.to_sym
+          define_method(mod_open) do |*args, &block|
+            args = [*args, password] unless password.empty?
+            send("__#{mod_open}", *args)
             if block
               block.call
-              cmd(close)
+              cmd(mod_close)
             end
           end
-          alias_method :enable, open
+          alias_method :enable, mod_open unless mod_open.to_sym == :enable
         end
       end
 

data/lib/xlogin/firmware_factory.rb

@@ -39,12 +39,6 @@ module Xlogin
     end
 
     def source(*files)
-      if files.empty?
-        files += [ENV['HOME'], Dir.pwd].flat_map do |dir|
-          [File.join(dir, '_xloginrc'), File.join(dir, '.xloginrc')]
-        end
-      end
-
       files.compact.uniq.each do |file|
         next unless File.exist?(file)
         instance_eval(IO.read(file))
@@ -64,7 +58,7 @@ module Xlogin
     end
 
     def build(args)
-      type     = args.delete(:type)
+      type = args.delete(:type)
       template = get_template(type)
       raise Xlogin::GeneralError.new("Template not defined: #{type}") unless template
 
@@ -72,8 +66,7 @@ module Xlogin
       opts = args.reduce({}) { |a, (k, v)| a.merge(k.to_s.downcase.to_sym => v) }
       raise Xlogin::GeneralError.new("Host not found: #{args}") unless uri
 
-      session = template.dup.run(uri, opts)
-      session
+      template.dup.run(uri, opts)
     end
 
     def build_from_hostname(hostname, **args)

data/lib/xlogin/rake_task.rb

@@ -13,7 +13,7 @@ module Xlogin
         @mutex ||= Mutex.new
       end
 
-      def source(file, &block)
+      def load(file, &block)
         Xlogin.factory.source(file)
         hostnames = Xlogin.factory.list.map { |e| e[:name] }
         bulk(hostnames, &block)

data/lib/xlogin/session.rb

@@ -13,7 +13,7 @@ module Xlogin
       @host     = @opts[:host]
       @name     = @opts[:name] || @host
       @port     = @opts[:port]
-      @userinfo = @opts[:userinfo].to_s.split(':')
+      @userinfo = @opts[:userinfo].to_s
       raise Xlogin::GeneralError.new('Argument error.') unless @host && @port
 
       @prompts  = @opts[:prompts] || [[/[$%#>] ?\z/n, nil]]
@@ -21,8 +21,6 @@ module Xlogin
 
       @loglist  = [@opts[:log]].flatten.compact
       @logger   = update_logger
-
-      @mutex    = Mutex.new
     end
 
     def waitfor(*expect)
@@ -39,26 +37,27 @@ module Xlogin
       end
     end
 
+    def dup(opts = @opts)
+      self.class.new(opts)
+    end
+
     def lock(timeout: @timeout)
-      granted = false
+      @mutex ||= Mutex.new
 
       begin
         Timeout.timeout(timeout) { @mutex.lock }
-        granted = true
         yield self
       ensure
-        @mutex.unlock if @mutex.locked? && granted
+        @mutex.unlock if @mutex.locked?
       end
     end
 
     def with_retry(max_retry: 1)
-      retry_count = 0
-
       begin
         yield self
       rescue => e
         renew if respond_to?(:renew)
-        raise e if (retry_count += 1) > max_retry
+        raise e if (max_retry -= 1) < 0
         retry
       end
     end

data/lib/xlogin/ssh.rb

@@ -8,7 +8,7 @@ module Xlogin
 
     def initialize(**opts)
       configure_session(opts.merge(port: opts[:port] || 22))
-      username, password = @userinfo
+      username, password = @userinfo.split(':')
 
       super(
         'Host'     => @host,

data/lib/xlogin/telnet.rb

@@ -17,11 +17,7 @@ module Xlogin
         'Prompt'  => Regexp.union(*@prompts.map(&:first))
       )
 
-      login(*@userinfo) if respond_to?(:login) && !@userinfo.empty?
-    end
-
-    def renew(opts = @opts)
-      self.class.new(opts).tap { |s| @sock = s.sock }
+      login(*@userinfo.split(':')) if respond_to?(:login) && !@userinfo.empty?
     end
 
     def interact!

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-  VERSION = "0.4.13"
+  VERSION = "0.4.14"
 end

data/lib/xlogin.rb

@@ -8,14 +8,16 @@ module Xlogin
 
   class GeneralError < StandardError; end
 
-  BUILDIN_TEMPLATES = Dir.glob(File.join(File.dirname(__FILE__), 'xlogin', 'templates', '*.rb'))
+  BUILTIN_TEMPLATES = Dir.glob(File.join(File.dirname(__FILE__), 'xlogin', 'templates', '*.rb'))
 
   class << self
     def factory
-      @factory ||= load_templates(*BUILDIN_TEMPLATES)
+      @factory ||= load_templates
     end
 
     def load_templates(*template_files)
+      template_files += BUILTIN_TEMPLATES if template_files.empty?
+
       @loaded_template_files ||= []
       Xlogin::FirmwareFactory.instance.tap do |factory|
         files = template_files - @loaded_template_files
@@ -25,6 +27,12 @@ module Xlogin
     end
 
     def source(*source_files)
+      if source_files.empty?
+        source_dirs   = [ENV['HOME'], Dir.pwd]
+        source_names  = ['_xloginrc', '.xloginrc']
+        source_files += source_dirs.product(source_names).map { |d, n| File.join(d, n) }
+      end
+
       _factory = Xlogin::FirmwareFactory.instance
       _factory.source(*source_files)
     end
@@ -42,6 +50,7 @@ module Xlogin
     end
 
     def get(hostname, args = {})
+      source if factory.list.empty?
       session = factory.build_from_hostname(hostname, args)
 
       if block_given?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.4.13
+  version: 0.4.14
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-25 00:00:00.000000000 Z
+date: 2017-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-telnet
@@ -113,6 +113,7 @@ files:
 - bin/setup
 - bin/xlogin
 - lib/xlogin.rb
+- lib/xlogin/cli.rb
 - lib/xlogin/delegator.rb
 - lib/xlogin/firmware.rb
 - lib/xlogin/firmware_factory.rb