sync: rename check to sync, and update to update_tests

src/configlet.nim

@@ -1,5 +1,5 @@
 import std/posix
-import "."/[cli, generate/generate, lint/lint, logger, sync/check, sync/update, uuid/uuid]
+import "."/[cli, generate/generate, lint/lint, logger, sync/sync, uuid/uuid]
 
 proc main =
   onSignal(SIGTERM):
@@ -15,10 +15,7 @@ proc main =
   of actLint:
     lint(conf)
   of actSync:
-    if conf.action.update:
-      update(conf)
-    else:
-      check(conf)
+    sync(conf)
   of actUuid:
     uuid(conf.action.num)
   of actGenerate:

src/sync/check.nim → src/sync/sync.nim

@@ -1,6 +1,6 @@
 import std/[os, sequtils, sets, strformat]
 import ".."/[cli, logger]
-import "."/[exercises, probspecs]
+import "."/[exercises, probspecs, update_tests]
 
 proc contentsAfterFirstHeader(path: string): string =
   result = newStringOfCap(getFileSize(path))
@@ -112,7 +112,7 @@ proc explain(syncKind: SyncKind): string =
   of skMetadata: "have unsynced metadata"
   of skTests: "are missing test cases"
 
-proc check*(conf: Conf) =
+proc sync*(conf: Conf) =
   logNormal("Checking exercises...")
 
   let probSpecsDir = initProbSpecsDir(conf)
@@ -133,7 +133,10 @@ proc check*(conf: Conf) =
       checkMetadata(exercises, seenUnsynced)
 
     if skTests in conf.action.scope:
-      checkTests(exercises, seenUnsynced)
+      if conf.action.update:
+        updateTests(exercises, conf, seenUnsynced)
+      else:
+        checkTests(exercises, seenUnsynced)
   finally:
     if conf.action.probSpecsDir.len == 0:
       removeDir(probSpecsDir)
@@ -143,5 +146,9 @@ proc check*(conf: Conf) =
       logNormal(&"[warn] some exercises {explain(syncKind)}")
     quit(QuitFailure)
   else:
-    logNormal("All exercises are up-to-date!")
+    if conf.action.scope == {SyncKind.low .. SyncKind.high}:
+      logNormal("All exercises are up to date!")
+    else:
+      for syncKind in conf.action.scope:
+        logNormal(&"All {syncKind} are up to date!")
     quit(QuitSuccess)

src/sync/update.nim → src/sync/update_tests.nim

@@ -116,23 +116,18 @@ proc syncIfNeeded(exercise: Exercise, conf: Conf): bool =
     logDetailed(&"[skip] {exercise.slug} does not have canonical data")
     true
 
-proc update*(conf: Conf) =
-  logNormal("Syncing exercises...")
+proc updateTests*(exercises: seq[Exercise], conf: Conf,
+                  seenUnsynced: var set[SyncKind]) =
+  logNormal("Updating tests...")
 
   var everyExerciseIsSynced = true
-  let probSpecsDir = initProbSpecsDir(conf)
-  try:
-    for exercise in findExercises(conf, probSpecsDir):
-      let isExerciseSynced = syncIfNeeded(exercise, conf)
-      if not isExerciseSynced:
-        everyExerciseIsSynced = false
-  finally:
-    if conf.action.probSpecsDir.len == 0:
-      removeDir(probSpecsDir)
+
+  for exercise in exercises:
+    let isExerciseSynced = syncIfNeeded(exercise, conf)
+    if not isExerciseSynced:
+      everyExerciseIsSynced = false
 
   if everyExerciseIsSynced:
-    logNormal("All exercises are synced!")
-    quit(QuitSuccess)
+    seenUnsynced.excl skTests
   else:
-    logNormal("[warn] some exercises are still missing test cases")
-    quit(QuitFailure)
+    seenUnsynced.incl skTests

tests/test_binary.nim

@@ -121,12 +121,13 @@ Checking exercises...
 [warn] some exercises are missing test cases
 """
 
-    test "`sync --update --mode=include` exits with 0 and includes the expected test cases":
+    test "`sync --update --mode=include --tests` exits with 0 and includes the expected test cases":
       execAndCheck(0):
-        execCmdEx(&"{binaryPath} -t {trackDir} sync --update -mi -o -p {psDir}")
+        execCmdEx(&"{binaryPath} -t {trackDir} sync --update -mi -o -p {psDir} --tests")
 
       check outp == """
-Syncing exercises...
+Checking exercises...
+Updating tests...
 [info] anagram: included 1 missing test case
 [info] diffie-hellman: included 1 missing test case
 [info] grade-school: included 1 missing test case
@@ -137,7 +138,7 @@ Syncing exercises...
 [info] luhn: included 1 missing test case
 [info] prime-factors: included 5 missing test cases
 [info] react: included 14 missing test cases
-All exercises are synced!
+All tests are up to date!
 """
 
     const expectedDiffOutput = """
@@ -464,13 +465,14 @@ All exercises are synced!
 
       check outp.conciseDiff() == expectedDiffOutput
 
-    test "after syncing, another `sync --update --mode=include` performs no changes":
+    test "after syncing, another `sync --update --mode=include --tests` performs no changes":
       execAndCheck(0):
-        execCmdEx(&"{binaryPath} -t {trackDir} sync --update -mi -o -p {psDir}")
+        execCmdEx(&"{binaryPath} -t {trackDir} sync --update -mi -o -p {psDir} --tests")
 
       check outp == """
-Syncing exercises...
-All exercises are synced!
+Checking exercises...
+Updating tests...
+All tests are up to date!
 """
 
     test "after syncing, a `sync` without `--update` shows that tests are up to date":