mirror of
https://github.com/status-im/nim-confutils.git
synced 2025-03-03 13:20:36 +00:00
cb858a27f4
* Fix `cli` invocation from nimscript When calling `cli` macro from nimscript, there are compilation issues: - `nim-faststreams` is not available, therefore, `nim-serialization` does not work, due to `equalMem` being gated behind `notJSnotNims`. Dropping support for config files in nimscript contexts fixes that. - `std/strformat` raises `ValueError` for invalid format strings, but does so at runtime rather than checking types at compiletime. As it is only used for simple string concatenation in error cases, changing to simple concatenation avoids verbose error handling. - `getAppFilename()` is unavailable in `nimscript`. This was already fixed by replacing it with `appInvocation()` but two instances of direct `getAppFilename()` calls remained in default arguments. This is fixed by changing those default arguments as well. - The `!= nil` check on the `proc` in `loadImpl` does not work when called from nimscript. This is fixed by changing to `isNil`. - Passing `addr result` around to internal templates correctly creates the config, but the object ultimately being returned is not the same. Passing `var result` directly through the templates ensures that the correct `result` gets modified and is clearer than implicit capture. Applying these fixes fixes running `.nims` files with `cli` macro. * Add debugging output on failure * Update confutils.nimble * Update confutils.nim
75 lines
2.4 KiB
Nim
75 lines
2.4 KiB
Nim
# confutils
|
|
# Copyright (c) 2018-2024 Status Research & Development GmbH
|
|
# Licensed under either of
|
|
# * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
|
|
# * MIT license ([LICENSE-MIT](LICENSE-MIT))
|
|
# at your option.
|
|
# This file may not be copied, modified, or distributed except according to
|
|
# those terms.
|
|
|
|
import os, strutils
|
|
mode = ScriptMode.Verbose
|
|
|
|
packageName = "confutils"
|
|
version = "0.1.0"
|
|
author = "Status Research & Development GmbH"
|
|
description = "Simplified handling of command line options and config files"
|
|
license = "Apache License 2.0"
|
|
skipDirs = @["tests"]
|
|
|
|
requires "nim >= 1.6.0",
|
|
"stew",
|
|
"serialization"
|
|
|
|
let nimc = getEnv("NIMC", "nim") # Which nim compiler to use
|
|
let lang = getEnv("NIMLANG", "c") # Which backend (c/cpp/js)
|
|
let flags = getEnv("NIMFLAGS", "") # Extra flags for the compiler
|
|
let verbose = getEnv("V", "") notin ["", "0"]
|
|
|
|
let cfg =
|
|
" --styleCheck:usages --styleCheck:error" &
|
|
(if verbose: "" else: " --verbosity:0 --hints:off") &
|
|
" --skipParentCfg --skipUserCfg --outdir:build --nimcache:build/nimcache -f"
|
|
|
|
proc build(args, path: string) =
|
|
exec nimc & " " & lang & " " & cfg & " " & flags & " " & args & " " & path
|
|
|
|
proc run(args, path: string) =
|
|
build args & " --mm:refc -r", path
|
|
if (NimMajor, NimMinor) > (1, 6):
|
|
build args & " --mm:orc -r", path
|
|
|
|
task test, "Run all tests":
|
|
for threads in ["--threads:off", "--threads:on"]:
|
|
run threads, "tests/test_all"
|
|
build threads, "tests/test_duplicates"
|
|
|
|
#Also iterate over every test in tests/fail, and verify they fail to compile.
|
|
echo "\r\nTest Fail to Compile:"
|
|
for path in listFiles(thisDir() / "tests" / "fail"):
|
|
if not path.endsWith(".nim"):
|
|
continue
|
|
if gorgeEx(nimc & " " & lang & " " & flags & " " & path).exitCode != 0:
|
|
echo " [OK] ", path.split(DirSep)[^1]
|
|
else:
|
|
echo " [FAILED] ", path.split(DirSep)[^1]
|
|
quit(QuitFailure)
|
|
|
|
echo "\r\nNimscript test:"
|
|
let
|
|
actualOutput = gorgeEx(
|
|
nimc & " --verbosity:0 e " & flags & " " & "./tests/cli_example.nim " &
|
|
"--foo=1 --bar=2 --withBaz 42").output
|
|
expectedOutput = unindent"""
|
|
foo = 1
|
|
bar = 2
|
|
baz = true
|
|
arg ./tests/cli_example.nim
|
|
arg 42"""
|
|
if actualOutput.strip() == expectedOutput:
|
|
echo " [OK] tests/cli_example.nim"
|
|
else:
|
|
echo " [FAILED] tests/cli_example.nim"
|
|
echo actualOutput
|
|
quit(QuitFailure)
|