xlogin 0.12.3 → 0.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7bce41012494be0a8efad4624674f5677a0830b7d3ebff88df664a2cbe5131e
-  data.tar.gz: 4f08a126e596f227ae6ff97361995ef48e3a588f2cf13746979cddf379851f32
+  metadata.gz: 40a19a8c4be89c5b57af233605e059b2cb835c293e8ad6db1a52ed568b1968c7
+  data.tar.gz: 96d9bda304dd69d4a1c2962336af11c68862924987b7661af417ebc566be39ab
 SHA512:
-  metadata.gz: 848c4161be59adabd9931374d26deec1e67efa9a0be44c50f58237c96c7c84857987213ea5c34ded3ca683e971dbdfa3e2bb68dd83e243286aac612c15833068
-  data.tar.gz: ab6627e2a78435ee709d19e8cb230ac9b3645da9fe991cbc879667e62355985efdbaf63a544afa9318ce12733b11c9ac5b58a372a113c1888386c0e9ddbb9ffa
+  metadata.gz: 0f0720e0bb78e942f01d360e9a9e0cfb9fcaddcf4b324bac18052ef44d59a95e41e5925814b257be4604154cebed065b57589546d34a66c74f7aa1ab5e0a4b91
+  data.tar.gz: 89c7788c08960f365eacfdfc1c74b0e52a136faa84f60045da97939af8206b0d9739e7b19d51dfffb7de7bf771843c59156831f0c408f2d750047195ae451343

data/README.md

@@ -34,7 +34,8 @@ login do |username, password|
 end
 ```
 
-Some other example are in [lib/xlogin/templates](https://github.com/haccht/xlogin/tree/master/lib/xlogin/templates).
+Some other examples are in [lib/xlogin/templates](https://github.com/haccht/xlogin/tree/master/lib/xlogin/templates).  
+You can just load these built-in templates by adding `require "xlogin/template"` in your script.
 
 Beside template files, you need to prepare an inventory file `~/.xloginrc`.
 In this file, you need to write all information required to login each device.

data/lib/xlogin/session_pool.rb

@@ -31,13 +31,6 @@ module Xlogin
 
     def with
       session = deq
-      begin
-        raise IOError if session.sock.closed?
-      rescue IOError, EOFError, Errno::ECONNABORTED, Errno::ECONNREFUSED, Errno::ECONNRESET
-        destroy(session)
-        session = deq
-      end
-
       Thread.handle_interrupt(Exception => :immediate) { yield session }
     ensure
       enq session
@@ -50,7 +43,6 @@ module Xlogin
       end
     end
 
-    private
     def deq
       @mutex.synchronize do
         if @queue.empty? && @created < @size
@@ -65,6 +57,13 @@ module Xlogin
         return deq
       end
 
+      begin
+        raise IOError if session.sock.closed?
+      rescue IOError, EOFError, Errno::ECONNABORTED, Errno::ECONNREFUSED, Errno::ECONNRESET
+        destroy(session)
+        session = deq
+      end
+
       session
     end
 

data/lib/xlogin/templates/ios.rb

@@ -1,7 +1,4 @@
 prompt(/[>$#]/)
-prompt(/yes \/ no: /) do
-  puts (Xlogin.authorized?)? 'y' : 'n'
-end
 
 login do |password|
   waitfor(/Password: /) && puts(password)

data/lib/xlogin/templates/sros.rb

@@ -1,7 +1,4 @@
 prompt(/[>$#] /)
-prompt(/y\/n:/) do
-  puts (Xlogin.authorized?)? 'y' : 'n'
-end
 
 login do |*args|
   username, password = *args

data/lib/xlogin/templates.rb

@@ -0,0 +1,4 @@
+# load built-in templates
+Xlogin.configure do
+  template File.join(__dir__, 'templates')
+end

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-	VERSION = "0.12.3"
+	VERSION = "0.12.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.12.4
 platform: ruby
 authors:
 - haccht
@@ -166,6 +166,7 @@ files:
 - lib/xlogin/ssh.rb
 - lib/xlogin/telnet.rb
 - lib/xlogin/template.rb
+- lib/xlogin/templates.rb
 - lib/xlogin/templates/ios.rb
 - lib/xlogin/templates/iosxr.rb
 - lib/xlogin/templates/junos.rb