network-utility 1.1.24 → 1.1.26

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: cb5f03d9092ba5cbdf265169d19f06e124b6c8ebdfcb42c03c1d04176417bbfe
4
- data.tar.gz: 7ba4c50e0d0a307e490c83101fe493c69d78f8ff59b113ad1fe440fc518ecbf2
3
+ metadata.gz: dddb5ef87fcf77347bd4fe83824094aac1176a46f262665fd9e28e8aa97627c8
4
+ data.tar.gz: 8864d580b9816f9cbbd67bcd02e02164ae0e19ebcb92159a76b79c673a3c2b85
5
5
  SHA512:
6
- metadata.gz: ac2a99c8f158a0aeed479261bc8fea3d150205ca36ead67bbf2d8ef9035158f9c232d769b6f28d3ddde700641e71de89f8574c5e934c4ce06fe121d7174257f2
7
- data.tar.gz: 823ff7f38258b244cc590c688c93f453b722e78c01cb08c401cce296754acd0fa0d91d68da21b6fcc3ff4dfa2dffc6b5bd89aed522a44d39c49274604a6d4817
6
+ metadata.gz: 7b481dba22b7ca7218fcb210d71200983dae8513fa3b01c043b1477df01ac19f76f38ba894e712ab219c8a89dc5d418d1ef1ac900c234494677f6c0f7d5dda50
7
+ data.tar.gz: 8cef0b797c129f6d0d0db83fc657438e5a30ec516d870586f9773234a0c4c0ad778cd8dde95c2fed0b2956e577fd54324e7022b30039dea578f488f7436d47fb
data/document/config.md CHANGED
@@ -1037,17 +1037,24 @@ module T8000_18
1037
1037
  return new_raw.join("\n")
1038
1038
  end
1039
1039
 
1040
+ def connect preline, postline
1041
+ connect = ' '
1042
+ connect = '' if preline.include?('ip-host')
1043
+ connect = '' if /[\d+|\.|\-|\_]$/.match(preline)
1044
+ connect = '' if /^[\d+|\.|\-|\_]/.match(postline)
1045
+ return connect
1046
+ end
1047
+
1040
1048
  def 配置解析 raw,*guards
1041
1049
  cfg = {}
1042
1050
  newraw = []; flag = false
1043
1051
  raw.split("\n").each_with_index do|line,index|
1044
- if line.size==80
1052
+ if flag && line[0..1]!='!<'
1053
+ newraw[-1] = newraw[-1] + connect(newraw[-1],line) + line
1054
+ else
1045
1055
  newraw << line
1046
- flag = true
1047
- elsif flag
1048
- newraw[-1] = newraw[-1] + " " +line
1049
- flag = line.size==80
1050
1056
  end
1057
+ flag = line.size==80
1051
1058
  end
1052
1059
  raw = newraw.join("\n")
1053
1060
  hostname = guards[0] || self.preprocess(raw).split("\n").find{|line|line.include?("hostname ")}.to_s.split("hostname ")[1]
@@ -1090,17 +1097,24 @@ module ZXCTN9000_8EA
1090
1097
  return new_raw.join("\n")
1091
1098
  end
1092
1099
 
1100
+ def connect preline, postline
1101
+ connect = ' '
1102
+ connect = '' if preline.include?('ip-host')
1103
+ connect = '' if /[\d+|\.|\-|\_]$/.match(preline)
1104
+ connect = '' if /^[\d+|\.|\-|\_]/.match(postline)
1105
+ return connect
1106
+ end
1107
+
1093
1108
  def 配置解析 raw,*guards
1094
1109
  cfg = {}
1095
1110
  newraw = []; flag = false
1096
1111
  raw.split("\n").each_with_index do|line,index|
1097
- if line.size==80
1112
+ if flag && line[0..1]!='!<'
1113
+ newraw[-1] = newraw[-1] + connect(newraw[-1],line) + line
1114
+ else
1098
1115
  newraw << line
1099
- flag = true
1100
- elsif flag
1101
- newraw[-1] = newraw[-1] + " " +line
1102
- flag = line.size==80
1103
1116
  end
1117
+ flag = line.size==80
1104
1118
  end
1105
1119
  raw = newraw.join("\n")
1106
1120
  hostname = guards[0] || self.preprocess(raw).split("\n").find{|line|line.include?("hostname ")}.to_s.split("hostname ")[1]
@@ -1143,17 +1157,24 @@ module ZXCTN9000_18EA
1143
1157
  return new_raw.join("\n")
1144
1158
  end
1145
1159
 
1160
+ def connect preline, postline
1161
+ connect = ' '
1162
+ connect = '' if preline.include?('ip-host')
1163
+ connect = '' if /[\d+|\.|\-|\_]$/.match(preline)
1164
+ connect = '' if /^[\d+|\.|\-|\_]/.match(postline)
1165
+ return connect
1166
+ end
1167
+
1146
1168
  def 配置解析 raw,*guards
1147
1169
  cfg = {}
1148
1170
  newraw = []; flag = false
1149
1171
  raw.split("\n").each_with_index do|line,index|
1150
- if line.size==80
1172
+ if flag && line[0..1]!='!<'
1173
+ newraw[-1] = newraw[-1] + connect(newraw[-1],line) + line
1174
+ else
1151
1175
  newraw << line
1152
- flag = true
1153
- elsif flag
1154
- newraw[-1] = newraw[-1] + " " +line
1155
- flag = line.size==80
1156
1176
  end
1177
+ flag = line.size==80
1157
1178
  end
1158
1179
  raw = newraw.join("\n")
1159
1180
  hostname = guards[0] || self.preprocess(raw).split("\n").find{|line|line.include?("hostname ")}.to_s.split("hostname ")[1]
@@ -1196,17 +1217,24 @@ module V6000
1196
1217
  return new_raw.join("\n")
1197
1218
  end
1198
1219
 
1220
+ def connect preline, postline
1221
+ connect = ' '
1222
+ connect = '' if preline.include?('ip-host')
1223
+ connect = '' if /[\d+|\.|\-|\_]$/.match(preline)
1224
+ connect = '' if /^[\d+|\.|\-|\_]/.match(postline)
1225
+ return connect
1226
+ end
1227
+
1199
1228
  def 配置解析 raw,*guards
1200
1229
  cfg = {}
1201
1230
  newraw = []; flag = false
1202
1231
  raw.split("\n").each_with_index do|line,index|
1203
- if line.size==80
1232
+ if flag && line[0..1]!='!<'
1233
+ newraw[-1] = newraw[-1] + connect(newraw[-1],line) + line
1234
+ else
1204
1235
  newraw << line
1205
- flag = true
1206
- elsif flag
1207
- newraw[-1] = newraw[-1] + " " +line
1208
- flag = line.size==80
1209
1236
  end
1237
+ flag = line.size==80
1210
1238
  end
1211
1239
  raw = newraw.join("\n")
1212
1240
  hostname = guards[0] || self.preprocess(raw).split("\n").find{|line|line.include?("hostname ")}.to_s.split("hostname ")[1]