chore: bump 2023.1001 -> 2023.1002

.forge.cfg

@@ -1,5 +1,3 @@
-nimble
-
 [target]
 x86_64-linux-gnu
 aarch64-linux-gnu

.github/workflows/build.yml

@@ -14,7 +14,7 @@ jobs:
 
       - uses: jiro4989/setup-nim-action@v1
         with:
-          nim-version: ${{ env.NIM_VERSION }}
+          nim-version: 2.0.0
 
       - uses: goto-bus-stop/setup-zig@v2
 

.github/workflows/nightly.yml

@@ -17,7 +17,7 @@ jobs:
   build-artifacts:
     needs: check-commits
     if: ${{ needs.check-commits.outputs.quit != 'true' }}
-    uses: daylinmorgan/actions/.github/workflows/build-nim-forge.yml@main
+    uses: ./.github/workflows/build.yml
 
   generate-release:
     needs: build-artifacts

.gitignore

@@ -1,2 +1,6 @@
 /bin
 /dist
+
+# atlas
+*.workspace
+src/nim.cfg

forge.nimble

@@ -1,4 +1,4 @@
-version       = "2023.1001"
+version       = "2023.1002"
 author        = "Daylin Morgan"
 description   = "build nim binaries for all the platforms"
 license       = "MIT"
@@ -8,7 +8,9 @@ binDir        = "bin"
 
 
 requires "nim >= 2.0.0",
-         "cligen"
+         "cligen",
+         "https://github.com/daylinmorgan/bbansi#head"
+
 
 import strformat
 

nimble.lock

@@ -1,16 +0,0 @@
-{
-  "version": 2,
-  "packages": {
-    "cligen": {
-      "version": "1.6.14",
-      "vcsRevision": "bee21f2d0878d4eba4631fd8b67370e4778424de",
-      "url": "https://github.com/c-blake/cligen.git",
-      "downloadMethod": "git",
-      "dependencies": [],
-      "checksums": {
-        "sha1": "195164d6a417c5393ee8aac1d1c2dfb0d45574b1"
-      }
-    }
-  },
-  "tasks": {}
-}

src/forge.nim

@@ -1,4 +1,4 @@
-import std/[os, osproc, sequtils, strformat, strutils, tables, terminal]
+import std/[os, osproc, sequtils, strformat, strutils, tables]
 
 import forge/[config, utils, term, zig]
 
@@ -21,7 +21,7 @@ proc genFlags(target: string, args: seq[string] = @[]): seq[string] =
 proc targets() =
   ## show available targets
   let targetList = zigTargets()
-  termEcho styleBright, fgGreen, "available targets:"
+  termEcho "[bold green]available targets:".bb
   stderr.writeLine targetList.columns
 
 proc cc(target: string, dryrun: bool = false, nimble: bool = false, args: seq[string]) =
@@ -85,17 +85,16 @@ proc release(
   checkTargets(cfg.targets.keys.toSeq())
 
   if verbose:
-    termEcho $cfg
+    cfg.showConfig
 
   if dryrun:
-    termEcho styleBright, fgBlue, "dry run...see below for commands"
+    termEcho "[bold blue]dry run...see below for commands".bb
 
   let
     baseCmd = if nimble or cfg.nimble: "nimble" else: "nim"
     rest = parseArgs(args)
 
-  termEcho styleBright, fgYellow,
+  termEcho fmt"[bold yellow]compiling {cfg.bins.len} binaries for {cfg.targets.len} targets".bb
-    &"compiling {cfg.bins.len} binaries for {cfg.targets.len} targets"
 
   for t, tArgs in cfg.targets:
     for b, bArgs in cfg.bins:
@@ -118,7 +117,7 @@ proc release(
         stderr.writeLine cmd
       else:
         if verbose:
-          termEcho styleBright, "cmd: ", ansiResetCode, cmd
+          termEcho fmt"[bold]cmd[/]: {cmd}".bb
         let errCode = execCmd cmd
         if errCode != 0:
           termErr "cmd: ", cmd
@@ -129,7 +128,7 @@ when isMainModule:
   zigExists()
 
   const
-    customMulti = "${doc}Usage:\n  $command {SUBCMD} [sub-command options & parameters]\n\nsubcommands:\n$subcmds"
+    customMulti = "Usage:\n  $command {SUBCMD} [sub-command options & parameters]\n\nsubcommands:\n$subcmds"
     vsn = staticExec "git describe --tags --always HEAD"
 
 

src/forge/config.nim

@@ -1,4 +1,5 @@
 import std/[parsecfg, tables, os, strutils, strformat]
+import term
 
 type
   ForgeConfig* = object
@@ -10,36 +11,52 @@ type
     version*: string
     nimble*: bool
 
-proc `$`*(c: ForgeConfig): string =
+proc showConfig*(c: ForgeConfig) =
-  var lines: seq[string] = @[]
+  var lines: string = ""
-  lines.add "config ="
+  template addLine(l: string) = lines.add(l & "\n")
-  lines.add "| nimble  " & $c.nimble
+  proc addNameArgs(name, args: string): string =
-  lines.add "| outdir  " & c.outdir
+    result.add fmt"|  {name}"
-  lines.add "| format  " & c.format
+    if args != "":
-  lines.add "| version " & c.version
+      result.add fmt" | " & $args.bb("faint")
-  lines.add "| targets:"
+
+  addLine $fmt"""
+config =
+| [blue]nimble[/]  {c.nimble}
+| [blue]outdir[/]  {c.outdir}
+| [blue]format[/]  {c.format}
+| [blue]version[/] {c.version}""".bb
+
+  
+  addLine $"| [green]targets[/]:".bb
   for target, args in c.targets:
-    lines.add "|   " & target & (if args != "": "|" & args else: "")
+    addLine addNameArgs(target, args)
-  lines.add "| bins:"
+
+  addLine $"| [green]bins[/]:".bb
   for bin, args in c.bins:
-    lines.add "|   " & bin & (if args != "": "|" & args else: "")
+    addline addNameArgs(bin, args)
 
-  lines.join("\n")
+  termEcho lines
 
-proc loadConfigFile*(f: string, load_targets: bool,
+proc loadConfigFile*(
-    load_bins: bool): ForgeConfig =
+    f: string,
-  let
+    load_targets: bool,
-    dict = loadConfig(f)
+    load_bins: bool
-    base = dict.getOrDefault("")
+  ): ForgeConfig =
 
-  result.targets = newOrderedTable[string, string]()
+  let dict = loadConfig(f)
-  result.bins = newOrderedTable[string, string]()
 
+  # get the top level flags
+  if dict.hasKey(""):
+    let base = dict[""]
     result.nimble = base.hasKey("nimble")
     result.outdir = base.getOrDefault("outdir")
     result.name = base.getOrDefault("name")
     result.version = base.getOrDefault("version")
     result.format = base.getOrDefault("format")
+
+  result.targets = newOrderedTable[string, string]()
+  result.bins = newOrderedTable[string, string]()
+
   if dict.hasKey("target") and load_targets:
     result.targets = dict.getOrDefault("target")
   if dict.hasKey("bin") and load_bins:

src/forge/term.nim

@@ -1,17 +1,17 @@
-import std/terminal
+import std/strutils
 
-# TODO support NO_COLOR for these
+import bbansi
-let prefix = ansiForegroundColorCode(fgMagenta, bright = true) & "forge" &
-    ansiResetCode & ansiForegroundColorCode(fgYellow) & " || " & ansiResetCode
 
-template termEcho*(args: varargs[untyped]) =
+let prefix = "[bold magenta]forge[/] [yellow]||[/] ".bb
-  stderr.styledWriteLine(prefix, args)
 
-template termErr*(args: varargs[untyped]) =
+template termEcho*(args: varargs[string | BbString, `$`]) =
-  stderr.styledWriteLine(prefix, fgRed, "error ", fgDefault, args)
+  stderr.writeLine $prefix, args.join(" ")
 
-template termErrQuit*(args: varargs[untyped]) =
+template termErr*(args: varargs[string | BbString, `$`]) =
-  termErr(args)
+  stderr.writeLine $prefix, $"[red]error ||[/] ".bb, args.join(" ")
+
+template termErrQuit*(args: varargs[string | BbString, `$`]) =
+  termErr args
   quit 1
 
-
+export bbansi

src/forge/zig.nim

@@ -1,5 +1,4 @@
-import std/[json, os, osproc, terminal]
+import std/[json, os, osproc]
-
 import term
 
 proc zigTargets*(): seq[string] =
@@ -26,7 +25,7 @@ template callZig*(zigCmd: string) =
 
 proc zigExists*() =
   if (findExe "zig") == "":
-    termErr "zig not found"
+    termErr "[red]zig not found".bb
     termErr "  forge requires a working installation of zig"
     termErr "  see: https://ziglang.org/download/"
     quit 1