Strip off trailing whitespace from ztag string before parsing

Author: kaushalmodi

p4ztag_to_json.nimble

@@ -1,6 +1,6 @@
 # Package
 
-version       = "0.9.1"
+version       = "0.9.2"
 author        = "Kaushal Modi"
 description   = "Convert Helix Version Control / Perforce (p4) -ztag output to JSON"
 license       = "MIT"

src/p4ztag_to_json.nim

@@ -180,7 +180,7 @@ proc ztagFileToJson*(filename: string) =
   populateJArr(filename.lines)
   changeFileExt(filename, "json").writeFile(jArr.pretty)
 
-proc ztagStringToJson*(ztag: string): string =
+proc ztagStringToJson*(ztagStr: string): string =
   ## Convert input ztag string to JSON.
   ##
   runnableExamples:
@@ -202,7 +202,7 @@ proc ztagStringToJson*(ztag: string): string =
 ]"""
     doAssert ztagString.ztagStringToJson() == jsonString
   ##
-  populateJArr(ztag.splitLines())
+  populateJArr(ztagStr.strip().splitLines())
   return jArr.pretty()
 
 when isMainModule:
@@ -213,7 +213,7 @@ when isMainModule:
   #   # prints the converted JSON to the stdout
   if not isatty(stdin):
     let
-      stdinData = readAll(stdin).strip()
+      stdinData = readAll(stdin)
     echo stdinData.ztagStringToJson()
   else:
     let

tests/test1.nim

@@ -61,4 +61,7 @@ suite "ztag to json":
 
   test "parse non-ztag data output by p4 just before the ztag stream":
     doCheck("ztag_header")
-    doCheck("ztag_header2")
+    doCheck("ztag_header2")
+
+  test "check that the trialing blank line does not convert to a newline in json string":
+    doCheck("trailing_blank_line")

tests/trailing_blank_line.ref.json

@@ -0,0 +1,23 @@
+[
+  {
+    "depotFile": "//vqp/sykjf/om/WQJEO/datl/dx/b.pjp",
+    "clientFile": "/gopm/jvjdh/fxppl/pa/kacl/eh/a.lgn",
+    "haveRev": "none",
+    "oldAction": "add",
+    "action": "abandoned"
+  },
+  {
+    "depotFile": "//djr/spdox/qm/DDPWA/pjrr/qm/a.lex",
+    "clientFile": "/kwdr/hxyhf/aletc/eq/vayl/df/j.bgu",
+    "haveRev": "none",
+    "oldAction": "add",
+    "action": "abandoned"
+  },
+  {
+    "depotFile": "//wgx/jjaot/qy/TTBGD/ebhm/wv/e.kka",
+    "clientFile": "/dsaf/msbgb/nvdgi/lb/jtro/yf/v.xtv",
+    "haveRev": "none",
+    "oldAction": "add",
+    "action": "abandoned"
+  }
+]

tests/trailing_blank_line.ztag

@@ -0,0 +1,19 @@
+... depotFile //vqp/sykjf/om/WQJEO/datl/dx/b.pjp
+... clientFile /gopm/jvjdh/fxppl/pa/kacl/eh/a.lgn
+... haveRev none
+... oldAction add
+... action abandoned
+
+... depotFile //djr/spdox/qm/DDPWA/pjrr/qm/a.lex
+... clientFile /kwdr/hxyhf/aletc/eq/vayl/df/j.bgu
+... haveRev none
+... oldAction add
+... action abandoned
+
+... depotFile //wgx/jjaot/qy/TTBGD/ebhm/wv/e.kka
+... clientFile /dsaf/msbgb/nvdgi/lb/jtro/yf/v.xtv
+... haveRev none
+... oldAction add
+... action abandoned
+
+