xlogin 0.5.9 → 0.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5742f26a175da199356781f6b0f098533aaa2acf
-  data.tar.gz: 61694269069e235f3c5024f1be88682a32dcd9c4
+  metadata.gz: 74571de0b0cfd2927444299ac5501950732998f9
+  data.tar.gz: c123722cc6b42fa4bde1f52ae0ca0815987ac4bf
 SHA512:
-  metadata.gz: fdd07176cf852b39f1c1d123a5f347cb0913e0d54c5f1bceb30e963e27e163a7b52d52560d654b3c72f1b35bd6d8626b2f8ba71d2a3ca71601c3aa176930672c
-  data.tar.gz: b926e383726dfe008ad4c6f2942896eca461cb5f96e9e49b9dfb87ecff5fa955b4e25e5c2b1ff2b72715b2603a61f54e74cd699aedfd7ca75286f1a566bf17f8
+  metadata.gz: be01886a787bc8f6ee0b60affbc977d7941bcf8049054948dc6a7e97b92e984b92481c0ae2b3c03d8af6b611ac32a422e3f33fe95dc8b339f977215f2e2c7a52
+  data.tar.gz: 6fa942ccb22a3c6e99f6b4455e360b6ac457a01b24ddb507154c94fafcab38bf5042bb675c15b3d5e9d0fe6224e99d91871fad49c5414f0f816721c8237595a6

data/Gemfile.lock

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

data/lib/xlogin.rb

@@ -71,10 +71,6 @@ module Xlogin
       factory.set_template(name, template)
     end
 
-    def alias(new_name, name)
-      factory.alias_template(new_name, name)
-    end
-
   end
 
 end

data/lib/xlogin/firmware_factory.rb

@@ -11,7 +11,6 @@ module Xlogin
     def initialize
       @database  = Hash.new
       @templates = Hash.new
-      @aliases   = Hash.new
       @group     = nil
     end
 
@@ -19,28 +18,24 @@ module Xlogin
       files.each do |file|
         file = File.expand_path(file)
         next unless File.exist?(file) && file =~ /.rb$/
-        require file
+
+        name = File.basename(file, '.rb').scan(/\w+/).join.downcase
+        Xlogin.configure(name) { |firmware| firmware.instance_eval(IO.read(file)) }
       end
     end
 
     def get_template(name)
-      name = @aliases[name.to_s.downcase] || name.to_s.downcase
-      @templates[name]
+      @templates[name.to_s.downcase]
     end
 
     def set_template(name, template)
-      name = @aliases[name.to_s.downcase] || name.to_s.downcase
-      @templates[name] = template
+      @templates[name.to_s.downcase] = template
     end
 
     def list_templates
       @templates.keys
     end
 
-    def alias_template(new_name, name)
-      @aliases[new_name.to_s.downcase] = name.to_s.downcase
-    end
-
     def source(file)
       file = File.expand_path(file)
       return unless File.exist?(file)

data/lib/xlogin/templates/ios.rb

@@ -1,18 +1,16 @@
-Xlogin.configure :ios do |os|
-  os.timeout(300)
-  os.prompt(/[>$#]/)
-  os.prompt(/yes \/ no: /) do
-    puts (Xlogin.authorized?)? 'y' : 'n'
-  end
+timeout(300)
+prompt(/[>$#]/)
+prompt(/yes \/ no: /) do
+  puts (Xlogin.authorized?)? 'y' : 'n'
+end
 
-  os.bind(:login) do |password|
-    waitfor(/Password: /) && puts(password)
-    waitfor
-  end
+bind(:login) do |password|
+  waitfor(/Password: /) && puts(password)
+  waitfor
+end
 
-  os.bind(:enable) do |password|
-    puts('enable')
-    waitfor(/Password: /) && puts(password)
-    waitfor
-  end
+bind(:enable) do |password|
+  puts('enable')
+  waitfor(/Password: /) && puts(password)
+  waitfor
 end

data/lib/xlogin/templates/iosxr.rb

@@ -1,21 +1,19 @@
-Xlogin.configure :iosxr do |os|
-  os.timeout(300)
-  os.prompt(/#\z/)
+timeout(300)
+prompt(/#\z/)
 
-  os.bind(:login) do |*args|
-    username, password = *args
-    waitfor(/Username: /) && puts(username)
-    waitfor(/Password: /) && puts(password)
-    waitfor
-  end
-
-  os.hook do |command|
-    if command =~ /^(?:adm |admi |admin )?\s*(?:con|rel|red|cle|hw|ro)/
-      # commands: configure, reload, redundancy, clear, hw-module, rollback
-      #   with or without admin prefix is prihibited if not authorized.
-      raise Xlogin::AuthorizationError.new("prohibited command: #{command}") unless Xlogin.authorized?
-    end
+bind(:login) do |*args|
+  username, password = *args
+  waitfor(/Username: /) && puts(username)
+  waitfor(/Password: /) && puts(password)
+  waitfor
+end
 
-    pass(command)
+hook do |command|
+  if command =~ /^(?:adm |admi |admin )?\s*(?:con|rel|red|cle|hw|ro)/
+    # commands: configure, reload, redundancy, clear, hw-module, rollback
+    #   with or without admin prefix is prihibited if not authorized.
+    raise Xlogin::AuthorizationError.new("prohibited command: #{command}") unless Xlogin.authorized?
   end
+
+  pass(command)
 end

data/lib/xlogin/templates/junos.rb

@@ -1,11 +1,9 @@
-Xlogin.configure :junos do |os|
-  os.timeout(300)
-  os.prompt(/[>#] \z/)
+timeout(300)
+prompt(/[>#] \z/)
 
-  os.bind(:login) do |*args|
-    username, password = *args
-    waitfor(/login:\s/)  && puts(username)
-    waitfor(/Password:/) && puts(password)
-    waitfor
-  end
+bind(:login) do |*args|
+  username, password = *args
+  waitfor(/login:\s/)  && puts(username)
+  waitfor(/Password:/) && puts(password)
+  waitfor
 end

data/lib/xlogin/templates/sros.rb

@@ -1,20 +1,18 @@
-Xlogin.configure :sros do |os|
-  os.timeout(300)
-  os.prompt(/[>$#] /)
-  os.prompt(/y\/n:/) do
-    puts (Xlogin.authorized?)? 'y' : 'n'
-  end
+timeout(300)
+prompt(/[>$#] /)
+prompt(/y\/n:/) do
+  puts (Xlogin.authorized?)? 'y' : 'n'
+end
 
-  os.bind(:login) do |*args|
-    username, password = *args
-    waitfor(/Login:\s?/)    && puts(username)
-    waitfor(/Password:\s?/) && puts(password)
-    waitfor
-  end
+bind(:login) do |*args|
+  username, password = *args
+  waitfor(/Login:\s?/)    && puts(username)
+  waitfor(/Password:\s?/) && puts(password)
+  waitfor
+end
 
-  os.bind(:enable_admin) do |password|
-    puts('enable-admin')
-    waitfor(/Password:\s?/) && puts(password)
-    waitfor
-  end
+bind(:enable_admin) do |password|
+  puts('enable-admin')
+  waitfor(/Password:\s?/) && puts(password)
+  waitfor
 end

data/lib/xlogin/templates/vyos.rb

@@ -1,10 +1,8 @@
-Xlogin.configure :vyos do |os|
-  os.prompt(/[$#] (?:\e\[K)?\z/n)
+prompt(/[$#] (?:\e\[K)?\z/n)
 
-  os.bind(:login) do |*args|
-    username, password = *args
-    waitfor(/login:\s/)    && puts(username)
-    waitfor(/Password:\s/) && puts(password)
-    waitfor
-  end
+bind(:login) do |*args|
+  username, password = *args
+  waitfor(/login:\s/)    && puts(username)
+  waitfor(/Password:\s/) && puts(password)
+  waitfor
 end

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-  VERSION = "0.5.9"
+  VERSION = "0.5.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.5.10
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-15 00:00:00.000000000 Z
+date: 2017-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-telnet