Fix design issues and add comprehensive test suite
Guard doSetup() against re-initialization, route welcome to onboard wizard, fix import confirmation logic, remove invalid syncthing generate flags, and show full export path. Add shell-based integration test suite (123 tests) at ~/src/test/pal/ covering all commands. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
43
cli/pal.lux
43
cli/pal.lux
@@ -339,7 +339,7 @@ fn showInteractiveWelcome(): Unit with {Console, Process} = {
|
|||||||
"3" => showHelp(),
|
"3" => showHelp(),
|
||||||
_ => {
|
_ => {
|
||||||
print("")
|
print("")
|
||||||
doSetup()
|
doOnboard()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -371,7 +371,28 @@ fn createDirectories(): Unit with {Process} = {
|
|||||||
ensureDir(base + "/server")
|
ensureDir(base + "/server")
|
||||||
}
|
}
|
||||||
|
|
||||||
fn doSetup(): Unit with {Process} = {
|
fn doSetup(): Unit with {Console, Process} = {
|
||||||
|
print("")
|
||||||
|
|
||||||
|
if isInitialized() then {
|
||||||
|
printWarn("pal is already initialized on this device.")
|
||||||
|
print("")
|
||||||
|
let rerun = askConfirm("Re-run setup? This will overwrite your config.", false)
|
||||||
|
if rerun == false then {
|
||||||
|
print("")
|
||||||
|
printHint("No changes made.")
|
||||||
|
print("")
|
||||||
|
()
|
||||||
|
} else {
|
||||||
|
print("")
|
||||||
|
doSetupSteps()
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
doSetupSteps()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn doSetupSteps(): Unit with {Process} = {
|
||||||
print("")
|
print("")
|
||||||
printHeader("Setting up pal")
|
printHeader("Setting up pal")
|
||||||
|
|
||||||
@@ -403,7 +424,7 @@ fn doSetup(): Unit with {Process} = {
|
|||||||
if hasCommand("syncthing") then {
|
if hasCommand("syncthing") then {
|
||||||
let hasConfig = execQuiet("test -f " + palDir() + "/syncthing/config/config.xml && echo yes || echo no")
|
let hasConfig = execQuiet("test -f " + palDir() + "/syncthing/config/config.xml && echo yes || echo no")
|
||||||
if hasConfig |> isNo then {
|
if hasConfig |> isNo then {
|
||||||
let ignore3 = Process.exec("syncthing generate --home=" + palDir() + "/syncthing/config --no-default-folder --gui-listen=127.0.0.1:8385 2>&1")
|
let ignore3 = Process.exec("syncthing generate --home=" + palDir() + "/syncthing/config 2>&1")
|
||||||
printStep("Initializing sync", "done")
|
printStep("Initializing sync", "done")
|
||||||
} else {
|
} else {
|
||||||
printStep("Initializing sync", "ready")
|
printStep("Initializing sync", "ready")
|
||||||
@@ -508,7 +529,7 @@ fn doSyncSetup(): Unit with {Process} = {
|
|||||||
let hasConfig = execQuiet("test -f " + palDir() + "/syncthing/config/config.xml && echo yes || echo no")
|
let hasConfig = execQuiet("test -f " + palDir() + "/syncthing/config/config.xml && echo yes || echo no")
|
||||||
if hasConfig |> isNo then {
|
if hasConfig |> isNo then {
|
||||||
printStepPending("Creating config")
|
printStepPending("Creating config")
|
||||||
let ignore = Process.exec("syncthing generate --home=" + palDir() + "/syncthing/config --no-default-folder --gui-listen=127.0.0.1:8385 2>&1")
|
let ignore = Process.exec("syncthing generate --home=" + palDir() + "/syncthing/config 2>&1")
|
||||||
printStep("Creating config", "done")
|
printStep("Creating config", "done")
|
||||||
} else {
|
} else {
|
||||||
printStep("Creating config", "exists")
|
printStep("Creating config", "exists")
|
||||||
@@ -779,7 +800,7 @@ fn doExport(): Unit with {Console, Process} = {
|
|||||||
let fileSize = execQuiet("du -h " + exportPath + " | cut -f1")
|
let fileSize = execQuiet("du -h " + exportPath + " | cut -f1")
|
||||||
printStep("Creating archive", fileSize)
|
printStep("Creating archive", fileSize)
|
||||||
print("")
|
print("")
|
||||||
printSuccess("Export created: " + exportFile)
|
printSuccess("Export created: " + exportPath)
|
||||||
print("")
|
print("")
|
||||||
printHint("Restore with:")
|
printHint("Restore with:")
|
||||||
printCmd("pal import " + exportFile)
|
printCmd("pal import " + exportFile)
|
||||||
@@ -814,11 +835,7 @@ fn doImport(archivePath: String): Unit with {Console, Process} = {
|
|||||||
print("")
|
print("")
|
||||||
|
|
||||||
let confirmed = askConfirm("Continue?", false)
|
let confirmed = askConfirm("Continue?", false)
|
||||||
if confirmed == false then {
|
if confirmed then {
|
||||||
print("")
|
|
||||||
printHint("Import cancelled.")
|
|
||||||
print("")
|
|
||||||
} else {
|
|
||||||
print("")
|
print("")
|
||||||
printHeader("Importing")
|
printHeader("Importing")
|
||||||
|
|
||||||
@@ -844,6 +861,10 @@ fn doImport(archivePath: String): Unit with {Console, Process} = {
|
|||||||
printErr("Import failed - config not found in archive")
|
printErr("Import failed - config not found in archive")
|
||||||
}
|
}
|
||||||
print("")
|
print("")
|
||||||
|
} else {
|
||||||
|
print("")
|
||||||
|
printHint("Import cancelled.")
|
||||||
|
print("")
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// No existing data, proceed without confirmation
|
// No existing data, proceed without confirmation
|
||||||
@@ -1339,7 +1360,7 @@ fn doOnboardSteps(): Unit with {Console, Process} = {
|
|||||||
let hasConfig = execQuiet("test -f " + palDir() + "/syncthing/config/config.xml && echo yes || echo no")
|
let hasConfig = execQuiet("test -f " + palDir() + "/syncthing/config/config.xml && echo yes || echo no")
|
||||||
if hasConfig |> isNo then {
|
if hasConfig |> isNo then {
|
||||||
printStepPending("Creating sync config")
|
printStepPending("Creating sync config")
|
||||||
let ignore11 = Process.exec("syncthing generate --home=" + palDir() + "/syncthing/config --no-default-folder --gui-listen=127.0.0.1:8385 2>&1")
|
let ignore11 = Process.exec("syncthing generate --home=" + palDir() + "/syncthing/config 2>&1")
|
||||||
printStep("Creating sync config", "done")
|
printStep("Creating sync config", "done")
|
||||||
} else {
|
} else {
|
||||||
printStep("Creating sync config", "exists")
|
printStep("Creating sync config", "exists")
|
||||||
|
|||||||
8
flake.lock
generated
8
flake.lock
generated
@@ -47,13 +47,13 @@
|
|||||||
"rust-overlay": "rust-overlay"
|
"rust-overlay": "rust-overlay"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1771221263,
|
"lastModified": 1771638380,
|
||||||
"narHash": "sha256-Av4s4pelV+ueIMSY61aHuT8KjKZ6ekXtJsnjVc89gtQ=",
|
"narHash": "sha256-RLGfahDSlYi8ec50DtmfOZn9q8JpF2xBTcUb8K2ZQ3Q=",
|
||||||
"path": "/home/blu/src/lux",
|
"path": "/home/blu/src/lux/lang",
|
||||||
"type": "path"
|
"type": "path"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"path": "/home/blu/src/lux",
|
"path": "/home/blu/src/lux/lang",
|
||||||
"type": "path"
|
"type": "path"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user