xlogin 0.6.8 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95893b3808428acd30e3bc7f48ea6d4b38771c97
-  data.tar.gz: 257cdc2bfb9c90785fe629586c4d1eaccb18f285
+  metadata.gz: 75d402374e5972bce07f0ac01e3820b5dc2fefce
+  data.tar.gz: 090694e751d61df9fd82171cccc3c30cd1d7a39c
 SHA512:
-  metadata.gz: c73ab2e886935518c13cb8be9aa085854745ecdc61c5eaa171fc4400a43ae68f9e230d8feb3f753da4ad1b1f221b11830492d2cc9b42d668c7f11f1f2eeb1afb
-  data.tar.gz: 7603d4a210ff9b6f549833a9271d320c2cb5b6dbd19308727eafa2b5411e58a400de8cc4a37fd2cb4f2ce111fce7e6a775ffa256ba91d6ceb2e9a926efb1da06
+  metadata.gz: 2c889806f57f4ad19aed91669d0da9d7705971c36ea7286892cc7ef698efc909d8021e9c2e2fb4f648356e1022e847ecd268b44b77a5aafd6ccaa13dbcfbe2c5
+  data.tar.gz: acee4ae670d5b8af241703b1d0f896446d22482ca787ccc411a9ba9cbce1b1259c03ac86ebeb0cad2160c106ef117e2b75ac3468249ec234e9acb2023fa46eca

data/lib/xlogin/cli.rb

@@ -35,7 +35,7 @@ module Xlogin
       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 to the template files.') { |v| config.templates += Dir.glob(File.join(v, '*.rb')) }
-      parser.on('-l [DIRECTORY]', '--log',        String, 'The DIRECTORY to the output log file (default: $PWD/log).') { |v| config.logdir = v || Dir.pwd }
+      parser.on('-l [DIRECTORY]', '--log',        String, 'The DIRECTORY to the output log file (default: $PWD/log).') { |v| config.logdir = v || ENV['PWD'] }
 
       parser.on('-p NUM', '--parallels',  Integer,   'The NUM of the threads. (default: 5).') { |v| config.parallels  = v }
       parser.on('-e',     '--enable',     TrueClass, 'Try to gain enable priviledge.')        { |v| config.enable = v }

data/lib/xlogin/factory.rb

@@ -51,7 +51,7 @@ module Xlogin
     end
 
     def get_template(name)
-      @templates[name.to_s.downcase] ||= Xlogin::Template.new
+      @templates[name.to_s.downcase] ||= Xlogin::Template.new(name)
     end
 
     def list_templates

data/lib/xlogin/session.rb

@@ -23,10 +23,10 @@ module Xlogin
                 end
 
       @username, @password = uri.userinfo.to_s.split(':')
-      raise ArgumentError.new('Device hostname or port not specified.') unless @host && @port
+      raise ArgumentError.new("Invalid URI - '#{uri}'") unless @host && @port
 
-      @output_logs = opts.log
-      @output_loggers = prebuild_loggers
+      @output_logs    = opts.log
+      @output_loggers = build_loggers
 
       ssh_tunnel(opts.via) if opts.via
       max_retry = opts.retry || 1
@@ -46,6 +46,10 @@ module Xlogin
       end
     end
 
+    def type
+      @template.name
+    end
+
     def prompt
       cmd('').lines.last.chomp
     end
@@ -63,14 +67,14 @@ module Xlogin
     end
 
     def respond_to_missing?(name, _)
-      @template.methods[name]
+      !!@template.methods[name]
     end
 
     def waitfor(*expect, &block)
       return waitfor(Regexp.union(*@template.prompt.map(&:first)), &block) if expect.empty?
 
       line = super(*expect) do |recvdata|
-        output(recvdata, &block)
+        output_log(recvdata, &block)
       end
 
       _, process = @template.prompt.find { |r, p| r =~ line && p }
@@ -89,22 +93,22 @@ module Xlogin
 
     def dup
       uri = URI::Generic.build(@scheme, [@username, @password].compact.join(':'), @host, @port)
-      self.class.new(@template, uri, **opts.to_h)
+      @template.build(uri, **opts.to_h)
     end
 
     def enable_log(out = $stdout)
-      @output_loggers = prebuild_loggers(@output_logs + [out])
+      @output_loggers = build_loggers(@output_logs + [out])
       if block_given?
         yield
-        @output_loggers = prebuild_loggers
+        @output_loggers = build_loggers
       end
     end
 
     def disable_log(out = $stdout)
-      @output_loggers = prebuild_loggers(@output_logs - [out])
+      @output_loggers = build_loggers(@output_logs - [out])
       if block_given?
         yield
-        @output_loggers = prebuild_loggers
+        @output_loggers = build_loggers
       end
     end
 
@@ -126,11 +130,11 @@ module Xlogin
       end
     end
 
-    def output(text, &block)
+    def output_log(text, &block)
       [*@output_loggers, block].compact.each { |logger| logger.call(text) }
     end
 
-    def prebuild_loggers(output_logs = @output_logs)
+    def build_loggers(output_logs = @output_logs)
       [output_logs].flatten.compact.uniq.map do |output_log|
         logger = case output_log
                  when String

data/lib/xlogin/ssh.rb

@@ -4,7 +4,7 @@ require 'xlogin/session'
 module Xlogin
   class Ssh < Net::SSH::Telnet
 
-    include SessionModule
+    prepend SessionModule
 
     def interact!
       raise 'Not implemented'

data/lib/xlogin/telnet.rb

@@ -16,8 +16,8 @@ module Xlogin
       super(params)
 
       if username || password
-        return login(username, password) if respond_to?(:login)
-        telnet_login(username, password)
+        return login(*[username, password].compact) if respond_to?(:login)
+        telnet_login(*[username, password].compact)
       end
     end
 

data/lib/xlogin/template.rb

@@ -7,11 +7,12 @@ module Xlogin
 
     DEFAULT_TIMEOUT  = 10
     DEFAULT_PROMPT   = /[$%#>] ?\z/n
-    BINDABLE_METHODS = %i( login logout enable delegate )
+    RESERVED_METHODS = %i( login logout enable delegate )
 
     attr_reader :methods
 
-    def initialize
+    def initialize(name)
+      @name    = name
       @timeout = DEFAULT_TIMEOUT
       @prompts = Array.new
       @methods = Hash.new
@@ -45,7 +46,7 @@ module Xlogin
     end
 
     def method_missing(name, *, &block)
-      super unless BINDABLE_METHODS.include? name
+      super unless RESERVED_METHODS.include? name
       bind(name) { |*args| instance_exec(*args, &block) }
     end
   end

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-  VERSION = "0.6.8"
+  VERSION = "0.6.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-25 00:00:00.000000000 Z
+date: 2017-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-telnet
@@ -164,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.4.5.2
 signing_key: 
 specification_version: 4
 summary: rancid clogin alternative