aio_elin 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec78b85511d7bf50150105a4a9c4668ce103ea9f4440b5536e1af0c2be9d309f
-  data.tar.gz: ca257da733025cf4ccb5dc2297da2ea088b286bf27375fb8c2e53e58c0575020
+  metadata.gz: c983dc7e327c673b8fc3c28129e9831d7577abad0773f99f6f5720c192eba531
+  data.tar.gz: d2c98d1325451c6a011acde48c2fd5d4b0abc2eeca135c008fb0df99eeb5bb33
 SHA512:
-  metadata.gz: f90bd170d42af4e816ab04fc345a9b54bee66ea65c757c432290ca692997b4713299f1b0f8b2f18e83707774790a0a7e0460891b41e2c48c0629329d781d943a
-  data.tar.gz: ee6f3299b774d705de437a1a7fcadd4428e665630a9656ad80860e954e1a21d2198a982d7314c19ca2ffd3fab2870eef06ff7d8b9192894018d1ba5834a5ba18
+  metadata.gz: c8270e9ea0e6adca9755d6513ff90140769c383c63ad534c98872e81a2dcc65889e1df4529dc191aa6e6b79718d43b5f10b4af6ba951d5fc1a408ca3a9dc41c4
+  data.tar.gz: b49bff6caca4f13752c3063d9b84df26577d7f50fdb0c8a2833c9bedd229c829566a9f48a811bcacb8ba34348299fbf7cba3abbabf04b710123910b9c72dd726

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

@@ -1,28 +1,34 @@
 module Aio::Base::Toolkit::String
-	class << self
+  class << self
 
-		# 终极解决方案
+    # 终极解决方案
     # 遇到了 invalid byte sequence in UTF-8 (ArgumentError) 问题
     # 解决办法参考 https://stackoverflow.com/questions/29877310/invalid-byte-sequence-in-utf-8-argumenterror
-		def safe(str)
-			case Aio::Base::Toolkit::OS.os_family
-			when "unix"
-				if ! str.valid_encoding?
-					str = str.encode("UTF-16be", :invalid=>:replace, :replace=>"?").encode('UTF-8')
-				end 
-			when "windows"
-				#str = str.force_encoding("UTF-8")
-				str = str.encode("UTF-16be", :invalid=>:replace, :replace=>"?").encode('UTF-8')
-			end
+    def safe(str)
+      case Aio::Base::Toolkit::OS.os_family
+      when "unix"
+        if ! str.valid_encoding?
+          str = str.encode("UTF-16be", :invalid=>:replace, :replace=>"?").encode('UTF-8')
+        end 
+
+        # UTF-8 编码前缀删除
+        # 参考: https://estl.tech/of-ruby-and-hidden-csv-characters-ef482c679b35
+        str.sub!("\xEF\xBB\xBF", '')
+
+      when "windows"
+        #str = str.force_encoding("UTF-8")
+        str = str.encode("UTF-16be", :invalid=>:replace, :replace=>"?").encode('UTF-8')
+        str.sub!("\xEF\xBB\xBF", '')
+      end
       return str 
-		end 
+    end 
 
-		# 改写成安全的Windows书写方式
-		def safe_path(path)
-			if Aio::Base::Toolkit::OS.windows?
-				path.gsub!("/", "\\")
-			end
-		end
-	end
+    # 改写成安全的Windows书写方式
+    def safe_path(path)
+      if Aio::Base::Toolkit::OS.windows?
+        path.gsub!("/", "\\")
+      end
+    end
+  end
 end
-	
+

data/lib/aio/core/parse/parser.rb

@@ -28,6 +28,7 @@ module Aio::Parse
     # 通过巡检文件的方式获得关键信息，并按cmd模块逐个解析
     def parse_by_module
 
+      debugger
       # 注意这里manager_ip可有可无, 没有的话默认为nil
       print_good "正在加载信息..."
       @input_klass.parse do |device_name, cmd, context, manager_ip|

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

@@ -136,8 +136,8 @@ class Aio::Module::InputStyle::Console < Aio::Module::InputStyle
 
     def parse_line(line)
       # 如果这行是命令行格式,那么就代表上一个cmd内容结束
-      tmp_reg = ::Regexp.new "^[\\[|<]?#{cmd_context.device_name}(#|>|\\])"
-
+      #tmp_reg = ::Regexp.new "^[\\[|<]{0,1}#{cmd_context.device_name}[#|>|\\]]{1}"
+      tmp_reg = ::Regexp.new "^[\\[|<]?#{cmd_context.device_name}[#|>|\\]]{1}"
       # 可能会出现UTF-8识别不出摄氏度符号的问题
       # 已经通过安全字符解决
       begin
@@ -197,6 +197,7 @@ class Aio::Module::InputStyle::Console < Aio::Module::InputStyle
 
     fo.each_line do |line|
       begin 
+        debugger if line =~ /more off/
         line = Aio::Base::Toolkit::String.safe(line)
         line = line.strip
       rescue => e

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aio_elin
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Elin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-04 00:00:00.000000000 Z
+date: 2018-12-06 00:00:00.000000000 Z
 dependencies: []
 description: 网络设备巡检工具
 email: 365433079@qq.com