WIP: Refactor for Nim 2.x

.gitignore

@@ -1,3 +1,2 @@
-.*.sw?
 log_happy
 nimcache/

log_happy.nim

@@ -2,17 +2,30 @@
 ## =========
 ##
 ## Little tool to extract expected information from log streams.
-import json, ncurses, os, osproc, sequtils, streams, strutils, threadpool
-import nre except toSeq
+import std/[json, logging, os, osproc, sequtils, streams, strutils]
+import std/nre except toSeq
+import docopt, malebolgia, ncurses
 
 import private/ncurses_ext
 
+from posix import signal
+
 type
   Expectation* = ref object
     label: string
     pattern: Regex
     expected, found: bool
 
+  SourceKind = enum skStdIn, skFile, skCmd
+  InSource = object
+    case kind: SourceKind
+    of skStdIn:
+      discard
+    of skFile:
+      filename: string
+    of skCmd:
+      cmdInvocation: string
+
 let expPattern = re"^-([eE])([^;]+);(.+)$"
 
 var msgChannel: Channel[string]
@@ -22,18 +35,19 @@ proc exitErr(msg: string): void =
   quit(QuitFailure)
 
 proc readStream(stream: Stream): void =
-  var line = TaintedString""
+  var line: string
   try:
     while stream.readLine(line): msgChannel.send(line)
   except: discard ""
 
 when isMainModule:
   var cmdProc: Process
-  var inStream: Stream
+  var source = InSource(kind: skStdIn)
   var outFile: File
+  var threadMaster = createMaster()
 
   try:
-    let VERSION = "0.2.1"
+    let VERSION = "0.2.0"
     let usage = """
 Usage:
   log_happy [options]
@@ -114,7 +128,7 @@ Expectations JSON definitions follow this format:
           if not fileExists(filename):
             exitErr "no such file (" & filename & ")"
 
-          inStream = newFileStream(filename)
+          source = InSource(kind: skFile, filename: filename)
         except:
           exitErr "could not open file (" & filename & "):\t\n" &
             getCurrentExceptionMsg()
@@ -155,7 +169,7 @@ Expectations JSON definitions follow this format:
       inStream = cmdProc.outputStream
 
     open(msgChannel)
-    spawn readStream(inStream)
+    threadMaster.spawn readStream(inStream)
 
     # Init ncurses
     let stdscr = initscr()
@@ -270,5 +284,6 @@ Expectations JSON definitions follow this format:
       if not inStream.isNil: close(inStream)
     if not outFile.isNil: close(outFile)
 
+    threadMaster.cancel()
     close(msgChannel)
     endwin()

log_happy.nimble

@@ -1,6 +1,6 @@
 # Package
 
-version       = "0.2.1"
+version       = "0.2.0"
 author        = "Jonathan Bernard"
 description   = "Scan logs for regex-defined events and report on what was found."
 license       = "MIT"
@@ -8,4 +8,4 @@ bin           = @["log_happy"]
 
 # Dependencies
 
-requires @["nim >= 0.16.1", "docopt >= 0.6.4", "ncurses"]
+requires @["nim >= 0.16.1", "docopt >= 0.6.4", "ncurses", "malebolgia >= 1.3.2"]

mise.toml

@@ -0,0 +1,2 @@
+[tools]
+nim = "1"

private/ncurses_ext.nim

@@ -1,31 +1,31 @@
 import ncurses
 export ncurses
 
-#proc keypad*(win: PWindow, enable: bool): int {.cdecl, discardable, importc: "keypad", dynlib: libncurses.}
-#proc scrollok*(win: PWindow, enable: bool): int {.cdecl, discardable, importc: "scrollok", dynlib: libncurses.}
-#proc nodelay*(win: PWindow, enable: bool): int {.cdecl, discardable, importc: "nodelay", dynlib: libncurses.}
+#proc keypad*(win: ptr window, enable: bool): int {.cdecl, discardable, importc: "keypad", dynlib: libncurses.}
+#proc scrollok*(win: ptr window, enable: bool): int {.cdecl, discardable, importc: "scrollok", dynlib: libncurses.}
+#proc nodelay*(win: ptr window, enable: bool): int {.cdecl, discardable, importc: "nodelay", dynlib: libncurses.}
 #proc nonl*(): int {.cdecl, discardable, importc: "nonl", dynlib: libncurses.}
 
-proc newwin*(num_rows, num_cols, begin_x, begin_y: int): PWindow {.cdecl, discardable, importc: "newwin", dynlib: libncurses.}
-proc delwin*(win: PWindow): int {.cdecl, discardable, importc: "delwin", dynlib: libncurses.}
-#proc newwin(num_rows, num_cols, begin_x, begin_y: int): PWindow {.cdecl, discardable, importc: "newwin", dynlib: libncurses.}
+proc newwin*(num_rows, num_cols, begin_x, begin_y: int): ptr window {.cdecl, discardable, importc: "newwin", dynlib: libncurses.}
+proc delwin*(win: ptr window): int {.cdecl, discardable, importc: "delwin", dynlib: libncurses.}
+#proc newwin(num_rows, num_cols, begin_x, begin_y: int): ptr window {.cdecl, discardable, importc: "newwin", dynlib: libncurses.}
 
-#proc wgetch*(win: PWindow): int {.cdecl, discardable, importc: "wgetch", dynlib: libncurses.}
-#proc wrefresh*(win: PWindow): int {.cdecl, discardable, importc: "wrefresh", dynlib: libncurses.}
-proc wclear*(win: PWindow): int {.cdecl, discardable, importc: "wclear", dynlib: libncurses.}
-proc mvwhline*(win: PWindow, rol, col: int, chType: char, n: int): int {.cdecl, discardable, importc: "whline", dynlib: libncurses.}
-proc wmove*(win: PWindow, rol, col: int): int {.cdecl, discardable, importc: "wmove", dynlib: libncurses.}
-#proc wprintw*(win: PWindow, str: cstring): int {.cdecl, discardable, importc: "wprintw", dynlib: libncurses.}
-#proc mvwprintw*(win: PWindow, row, col: int, str: cstring): int {.cdecl, discardable, importc: "mvwprintw", dynlib: libncurses.}
+#proc wgetch*(win: ptr window): int {.cdecl, discardable, importc: "wgetch", dynlib: libncurses.}
+#proc wrefresh*(win: ptr window): int {.cdecl, discardable, importc: "wrefresh", dynlib: libncurses.}
+proc wclear*(win: ptr window): int {.cdecl, discardable, importc: "wclear", dynlib: libncurses.}
+proc mvwhline*(win: ptr window, rol, col: int, chType: char, n: int): int {.cdecl, discardable, importc: "whline", dynlib: libncurses.}
+proc wmove*(win: ptr window, rol, col: int): int {.cdecl, discardable, importc: "wmove", dynlib: libncurses.}
+#proc wprintw*(win: ptr window, str: cstring): int {.cdecl, discardable, importc: "wprintw", dynlib: libncurses.}
+#proc mvwprintw*(win: ptr window, row, col: int, str: cstring): int {.cdecl, discardable, importc: "mvwprintw", dynlib: libncurses.}
 
-proc box*(win: PWindow, vert_border, horiz_border: char): int {.cdecl, discardable, importc: "box", dynlib: libncurses.}
-proc wborder*(win: PWindow, ls,rs,ts,bs,tl,tr,bl,br: char): int {.cdecl, discardable, importc: "wborder", dynlib: libncurses.}
+proc box*(win: ptr window, vert_border, horiz_border: char): int {.cdecl, discardable, importc: "box", dynlib: libncurses.}
+proc wborder*(win: ptr window, ls,rs,ts,bs,tl,tr,bl,br: char): int {.cdecl, discardable, importc: "wborder", dynlib: libncurses.}
 
 proc init_pair*(n, f, b: int): int {.cdecl, discardable, importc: "init_pair", dynlib: libncurses.}
 proc COLOR_PAIR*(n: int): int {.cdecl, discardable, importc: "COLOR_PAIR", dynlib: libncurses.}
 
-proc wattron*(win: PWindow, attrs: int): int {.cdecl, discardable, importc: "wattron", dynlib: libncurses.}
-proc wattroff*(win: PWindow, attrs: int): int {.cdecl, discardable, importc: "wattron", dynlib: libncurses.}
+proc wattron*(win: ptr window, attrs: int): int {.cdecl, discardable, importc: "wattron", dynlib: libncurses.}
+proc wattroff*(win: ptr window, attrs: int): int {.cdecl, discardable, importc: "wattron", dynlib: libncurses.}
 
 const BLACK* = 0
 const RED* = 1