aio_elin 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dc376260ef7b6941766c63d9065a5dfdca7ab8b331f5b6c7d261b536e2899c9
-  data.tar.gz: bb4e56cbcd6dfa81f724fe03d845f6b0fa3b8d35d3d18c4b9a2ae10b76cb288e
+  metadata.gz: ec78b85511d7bf50150105a4a9c4668ce103ea9f4440b5536e1af0c2be9d309f
+  data.tar.gz: ca257da733025cf4ccb5dc2297da2ea088b286bf27375fb8c2e53e58c0575020
 SHA512:
-  metadata.gz: 8c589c05598e29ab273e5d886acbdc48f6876b4b1f0d421f38be29045aaf6b1391c6f04a8dd71f7268917b3064d6cde80d05f6a14c1565897c3ae4823ce1e6c9
-  data.tar.gz: f7a265cc7c2d00d6d2340e0df5ae29712241061543305555fed0d4cef9fc3111003c2266d53b897980050323d7ce02648aa11134ebacaa88b08111f770c3f302
+  metadata.gz: f90bd170d42af4e816ab04fc345a9b54bee66ea65c757c432290ca692997b4713299f1b0f8b2f18e83707774790a0a7e0460891b41e2c48c0629329d781d943a
+  data.tar.gz: ee6f3299b774d705de437a1a7fcadd4428e665630a9656ad80860e954e1a21d2198a982d7314c19ca2ffd3fab2870eef06ff7d8b9192894018d1ba5834a5ba18

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

@@ -138,6 +138,14 @@ module Aio::Base::Toolkit
         (old_line || new_line).text
       end
 
+      def old_text
+        old_line.text
+      end
+
+      def new_text
+        new_line.text
+      end
+
       def empty?
         (old_line.empty? and new_line.empty?)
       end

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

@@ -3,220 +3,221 @@
 require "aio/core"
 
 class Aio::Module::InputStyle::Console < Aio::Module::InputStyle
-	include Aio::Module
-	include Aio::Ui::Verbose
-
-	class Machine
-
-		attr_accessor :regs, :state
-
-		def initialize
-			@cmd_state = CmdState.new(self)
-			@context_state = ContextState.new(self)
-			@empty_state = EmptyState.new(self)
-			@cmd_context = CmdContext.new
-
-			@state = @empty_state
-		end
-
-		def state
-			@state.class
-		end
-
-		def cmd_context
-			@cmd_context
-		end
-
-		def to_cmd_state
-			@state = @cmd_state
-		end
-
-		def to_context_state
-			@state = @context_state
-		end
-
-		def to_empty_state
-			@state = @empty_state
-		end
-
-		def parse_line(line)
-			@state.parse_line(line)
-		end
-	end
-
-	class CmdContext
-
-		attr_accessor :device_name, :cmd, :context
-
-		# all_info = [[device_name, cmd, context] ... ]
-		attr_accessor :all_info
-
-		def initialize
-			@device_name = ""
-			@cmd = ""
-			@context = []
-			@all_info = []
-		end
-
-		def done
-			# 当之前有cmd内容的时候,比较两个的长度
-			# 长的保留
-			info_idx = has_cmd?
-			if info_idx
-				if @all_info[info_idx][2].size < context.size
-					@all_info[info_idx][2] = context
-				end
-			else
-				
-				# 如果都没有,那么就直接添加
-				@all_info << [device_name, cmd, context]
-			end
-			self.clear
-		end
-
-		def has_cmd?
-			@all_info.each_with_index do |info, idx|
-				next unless info[1] == device_name
-				return idx if info[2] == cmd
-			end
-
-			return nil
-		end
-
-		def clear
-			@device_name = ""
-			@cmd = ""
-			@context = []
-		end
-	end
-
-	class State
-
-		include Aio::Ui::Verbose
-
-		def initialize(machine)
-			@machine = machine
-		end
-
-		def cmd_context
-			@machine.cmd_context
-		end
-	end
-
-	class EmptyState < State
-		def parse_line(line)
-
-			# 当前是空的状态
-			# 判断当前行有没有模块中的命令
-			line = Aio::Base::Toolkit::String.safe(line)
-			return unless @machine.regs.match(line)
-
-			@machine.to_cmd_state
-			@machine.parse_line(line)
-		end
-	end
-
-	class CmdState < State
-		def parse_line(line)
-			# 判断是不是cmd命令行
-			res = /^[\[|<]?(?<name>.*)(#|>|\])(?<cmd>.*)/.match(line)
-			if res.nil?
-				@machine.to_empty_state
-				return
-			end
-
-			# 当已经发现了是cmd行,那么紧接下来就是收集文本内容
-			cmd_context.device_name = res[:name]
-			cmd_context.cmd = res[:cmd]
-			@machine.to_context_state
-		end
-	end
-
-	class ContextState < State
-
-		def parse_line(line)
-			# 如果这行是命令行格式,那么就代表上一个cmd内容结束
-			tmp_reg = ::Regexp.new "^[\\[|<]?#{cmd_context.device_name}(#|>|\\])"
-
-			# 可能会出现UTF-8识别不出摄氏度符号的问题
-			# 已经通过安全字符解决
-			begin
-				if tmp_reg.match(line)
-					cmd_context.done
-					
-					# 完成后将状态设置为空,并且重新分析这一行
-					# 毕竟如果这行也cmd行呢
-					@machine.to_empty_state
-					return @machine.parse_line(line)
-				end
-			rescue => e
-				print_error cmd_context.device_name + " 设备巡检信息编码出现问题"
-				print_error line + " : " + e.message
-			end
-
-
-			cmd_context.context << line
-		end
-	end
-			
-	def initialize
-		super({
-			:author				=> "Elin",
-			:description 	=> "这个模块用于对命令行格式的输入处理",
-			:platform 		=> "all",
-		})
-		@machine = Machine.new
-	end
-
-	def parse
-		dir = self.input_file
-		dir_pn = Pathname.new(dir)
-
-		# 加载所有的cmd正则表达式
-		@machine.regs = merge_regs(ext_info[:cmds_reg])
-
-		# 如果是单个文件的话,直接进入文件解析模式
-		if dir_pn.file?
-			parse_file(dir_pn)
-		else
-		
-			# 如果是文件夹的话,那么就对每个文件进行解析
-			Find.find(dir) do |file|
-				fn = Pathname.new(file)
-				parse_file(file) if fn.file?
-			end
-		end
-
-		@machine.cmd_context.all_info.each do |info|
-			yield info[0], info[1], info[2]
-		end
-	end
-
-	def parse_file(file)
-		fo = File.open(file, "r+", :encoding => "utf-8")
-		
-		fo.each_line do |line|
-			begin 
-				line = Aio::Base::Toolkit::String.safe(line)
-				line = line.strip
-			rescue => e
-				print_error line + " : " + e.message
-			end
-
-			@machine.parse_line(line)
-		end
-		
-		# 如果最后没有done结束,则手动结束
-		if @machine.state == ContextState
-			@machine.cmd_context.done 
-		end
-	end
-
-	def merge_regs(arr_regs)
-		regs = Aio::Base::Toolkit::Regexp.merge(arr_regs).to_s
-		regs.gsub!('(^', '(')
-		::Regexp.new(regs)
-	end
+  include Aio::Module
+  include Aio::Ui::Verbose
+
+  class Machine
+
+    attr_accessor :regs, :state
+
+    def initialize
+      @cmd_state = CmdState.new(self)
+      @context_state = ContextState.new(self)
+      @empty_state = EmptyState.new(self)
+      @cmd_context = CmdContext.new
+
+      @state = @empty_state
+    end
+
+    def state
+      @state.class
+    end
+
+    def cmd_context
+      @cmd_context
+    end
+
+    def to_cmd_state
+      @state = @cmd_state
+    end
+
+    def to_context_state
+      @state = @context_state
+    end
+
+    def to_empty_state
+      @state = @empty_state
+    end
+
+    def parse_line(line)
+      @state.parse_line(line)
+    end
+  end
+
+  class CmdContext
+
+    attr_accessor :device_name, :cmd, :context
+
+    # all_info = [[device_name, cmd, context] ... ]
+    attr_accessor :all_info
+
+    def initialize
+      @device_name = ""
+      @cmd = ""
+      @context = []
+      @all_info = []
+    end
+
+    def done
+      # 当之前有cmd内容的时候,比较两个的长度
+      # 长的保留
+      info_idx = has_cmd?
+      if info_idx
+        if @all_info[info_idx][2].size < context.size
+          @all_info[info_idx][2] = context
+        end
+      else
+
+        # 如果都没有,那么就直接添加
+        @all_info << [device_name, cmd, context]
+      end
+      self.clear
+    end
+
+    def has_cmd?
+      @all_info.each_with_index do |info, idx|
+        next unless info[0] == device_name
+        return idx if info[1] == cmd
+      end
+
+      return nil
+    end
+
+    def clear
+      @device_name = ""
+      @cmd = ""
+      @context = []
+    end
+  end
+
+  class State
+
+    include Aio::Ui::Verbose
+
+    def initialize(machine)
+      @machine = machine
+    end
+
+    def cmd_context
+      @machine.cmd_context
+    end
+  end
+
+  class EmptyState < State
+    def parse_line(line)
+
+      # 当前是空的状态
+      # 判断当前行有没有模块中的命令
+      line = Aio::Base::Toolkit::String.safe(line)
+      return unless @machine.regs.match(line)
+
+      @machine.to_cmd_state
+      @machine.parse_line(line)
+    end
+  end
+
+  class CmdState < State
+    def parse_line(line)
+      # 判断是不是cmd命令行
+      res = /^[\[|<]?(?<name>.*)(#|>|\])(?<cmd>.*)/.match(line)
+      if res.nil?
+        @machine.to_empty_state
+        return
+      end
+
+      # 当已经发现了是cmd行,那么紧接下来就是收集文本内容
+      cmd_context.device_name = res[:name]
+      cmd_context.cmd = res[:cmd]
+      @machine.to_context_state
+    end
+  end
+
+  class ContextState < State
+
+    def parse_line(line)
+      # 如果这行是命令行格式,那么就代表上一个cmd内容结束
+      tmp_reg = ::Regexp.new "^[\\[|<]?#{cmd_context.device_name}(#|>|\\])"
+
+      # 可能会出现UTF-8识别不出摄氏度符号的问题
+      # 已经通过安全字符解决
+      begin
+        if tmp_reg.match(line)
+          cmd_context.done
+
+          # 完成后将状态设置为空,并且重新分析这一行
+          # 毕竟如果这行也cmd行呢
+          @machine.to_empty_state
+          return @machine.parse_line(line)
+        end
+      rescue => e
+        print_error cmd_context.device_name + " 设备巡检信息编码出现问题"
+        print_error line + " : " + e.message
+      end
+
+
+      cmd_context.context << line
+    end
+  end
+
+  def initialize
+    super({
+      :author				=> "Elin",
+      :description 	=> "这个模块用于对命令行格式的输入处理",
+      :platform 		=> "all",
+    })
+    @machine = Machine.new
+  end
+
+  def parse
+    dir = self.input_file
+    dir_pn = Pathname.new(dir)
+
+    # 加载所有的cmd正则表达式
+    @machine.regs = merge_regs(ext_info[:cmds_reg])
+
+    # 如果是单个文件的话,直接进入文件解析模式
+    if dir_pn.file?
+      parse_file(dir_pn)
+    else
+
+      # 如果是文件夹的话,那么就对每个文件进行解析
+      Find.find(dir) do |file|
+        fn = Pathname.new(file)
+        parse_file(file) if fn.file?
+      end
+    end
+
+    @machine.cmd_context.all_info.each do |info|
+      yield info[0], info[1], info[2]
+    end
+  end
+
+  def parse_file(file)
+    fo = File.open(file, "r+", :encoding => "utf-8")
+
+    fo.each_line do |line|
+      begin 
+        line = Aio::Base::Toolkit::String.safe(line)
+        line = line.strip
+      rescue => e
+        print_error line + " : " + e.message
+      end
+
+      @machine.parse_line(line)
+    end
+
+    # 如果最后没有done结束,则手动结束
+    if @machine.state == ContextState
+      @machine.cmd_context.done 
+      @machine.to_cmd_state
+    end
+  end
+
+  def merge_regs(arr_regs)
+    regs = Aio::Base::Toolkit::Regexp.merge(arr_regs).to_s
+    regs.gsub!('(^', '(')
+    ::Regexp.new(regs)
+  end
 end
 
 

metadata

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