aio_elin 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ff4b79d8dfb0eee95b68a8fb9ea60048d8334ba960ed423f96bf0243b7a22ca
-  data.tar.gz: ff4eabfe6f0d01ad5eb6b6d256373db776e0c5b0748766af5eb130a5268f4d89
+  metadata.gz: 68c2ed869316871e0aab1200b4d0575cd6bdfe498cf5706593dd6911363e1a2b
+  data.tar.gz: cef51f752f5664902c3cbf529e09fccb122644a117bc2579c2f32d25263128d8
 SHA512:
-  metadata.gz: c1e41c44d5d6ee7af92a666415755076b6111df2601bf76f95e5e2bf07b10eafff8c76d8ca780f3cee702ee84fdb69b02c323abbcebda578b6735334a0253d31
-  data.tar.gz: 3a23240a7853a3258c292ebdf77abff04aa128cbbfa5fada3e76b8894b64635e019bbea0b6d300e40f1c3b674652d4324aadbe4983b7c8df89e0284a6d7bfba7
+  metadata.gz: 3e040c8c52896dbb809bb13bb47a995b947e7126eb45e800e678329ddd26e4e14e5c44a41782f7d5298ee805ae2be3b06c9cf4a619f63c0a8ae38961b5947f9f
+  data.tar.gz: 586f9b5db9b782731d71679c6d56ce0812ef5d8053bda2ed17fde5227cad6a8307b4d2c64bc8b8fe53cb0e67c1ba05abd130fcbfcdc2f61a8e49c25853257281

data/lib/aio/base/toolkit/regexp.rb

@@ -1,32 +1,32 @@
 module Aio::Base::Toolkit
-	module Regexp
-		class << self
-			def to_reg(cmd)
-				res = cmd.gsub(' ', '([^\s]*)\s+')
-				res.insert(0, '^')
-				res.insert(-1, '([^\s]*)$')
-				return ::Regexp.new(res)
-			end
+  module Regexp
+    class << self
+      def to_reg(cmd)
+        res = cmd.gsub(' ', '([^\s]*)\s+')
+        res.insert(0, '^')
+        res.insert(-1, '([^\s]*)$')
+        return ::Regexp.new(res)
+      end
 
-			def blank
-				return /^[\t]*$/
-			end
+      def blank
+        return /^[\t]*$/
+      end
 
-			# 产生一个安全的正则表达式
-			def safe(reg)
-				res = reg.to_s.gsub(' ', '\s+')
-				return ::Regexp.new(res)
-			end
+      # 产生一个安全的正则表达式
+      def safe(reg)
+        res = reg.to_s.gsub(' ', '\s+')
+        return ::Regexp.new(res)
+      end
 
-			# 将一个数组的正则表达式合并成为一个正则表达式
-			def merge(arr_regs)
-				str_arr = []
-				arr_regs.each {|x| str_arr << x.to_s}
-				new_reg = str_arr.join("|").gsub("?-mix:", "")
-				new_reg = ::Regexp.new(new_reg)
-				return new_reg
-			end
-		end
-	end
+      # 将一个数组的正则表达式合并成为一个正则表达式
+      def merge(arr_regs)
+        str_arr = []
+        arr_regs.each {|x| str_arr << x.to_s}
+        new_reg = str_arr.join("|").gsub("?-mix:", "")
+        new_reg = ::Regexp.new(new_reg)
+        return new_reg
+      end
+    end
+  end
 end
-		
+

data/lib/modules/input/style/console.rb

@@ -109,6 +109,7 @@ class Aio::Module::InputStyle::Console < Aio::Module::InputStyle
       # 当前是空的状态
       # 判断当前行有没有模块中的命令
       line = Aio::Base::Toolkit::String.safe(line)
+      return if line.include?('Command is')
       return unless @machine.regs.match(line)
 
       @machine.to_cmd_state
@@ -127,7 +128,7 @@ class Aio::Module::InputStyle::Console < Aio::Module::InputStyle
 
       # 当已经发现了是cmd行,那么紧接下来就是收集文本内容
       cmd_context.device_name = res[:name]
-      cmd_context.cmd = res[:cmd]
+      cmd_context.cmd = res[:cmd].strip
       @machine.to_context_state
     end
   end
@@ -138,6 +139,7 @@ class Aio::Module::InputStyle::Console < Aio::Module::InputStyle
       # 如果这行是命令行格式,那么就代表上一个cmd内容结束
       #tmp_reg = ::Regexp.new "^[\\[|<]{0,1}#{cmd_context.device_name}[#|>|\\]]{1}"
       tmp_reg = ::Regexp.new "^[\\[|<]?#{cmd_context.device_name}[#|>|\\]]{1}"
+
       # 可能会出现UTF-8识别不出摄氏度符号的问题
       # 已经通过安全字符解决
       begin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aio_elin
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Elin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-10 00:00:00.000000000 Z
+date: 2019-01-15 00:00:00.000000000 Z
 dependencies: []
 description: 网络设备巡检工具
 email: 365433079@qq.com