feat(commands): Enhance ci/matrix commands with argparse integration and structured argument handling where applicable

Author: monyarm

packages/mcl/src/main.d

@@ -34,6 +34,10 @@ template genSubCommandArgs()
             "host_info_args,"~
             "config_args,"~
             "machine_args,"~
+            "ci_matrix_args,"~
+            "ci_args,"~
+            "print_table_args,"~
+            "shard_matrix_args,"~
             "Default!unknown_command_args"~
         ") cmd;";
 }
@@ -74,7 +78,7 @@ mixin CLI!MCLArgs.main!((args)
 
     mixin genSubCommandMatch;
 
-                return 0;
+    return 0;
 });
 
 void setLogLevel(LogLevel l)

packages/mcl/src/src/mcl/commands/ci.d

@@ -8,6 +8,8 @@ import std.array : array, join;
 import std.conv : to;
 import std.process : ProcessPipes;
 
+import argparse;
+
 import mcl.utils.env : optional, parseEnv;
 import mcl.commands.ci_matrix: nixEvalJobs, SupportedSystem, Params, flakeAttr;
 import mcl.commands.shard_matrix: generateShardMatrix;
@@ -18,6 +20,11 @@ import mcl.utils.json : toJSON;
 
 Params params;
 
+@(Command("ci").Description("Run CI"))
+struct ci_args
+{
+}
+
 export void ci(string[] args)
 {
     params = parseEnv!Params;

packages/mcl/src/src/mcl/commands/ci_matrix.d

@@ -16,6 +16,8 @@ import std.exception : enforce;
 import std.format : fmt = format;
 import std.logger : tracef, infof, errorf, warningf;
 
+import argparse;
+
 import mcl.utils.env : optional, MissingEnvVarsException, parseEnv;
 import mcl.utils.string : enumToString, StringRepresentation, MaxWidth, writeRecordAsTable;
 import mcl.utils.json : toJSON;
@@ -143,8 +145,11 @@ version (unittest)
 
 Params params;
 
-
-export void ci_matrix(string[] args)
+@(Command("ci-matrix").Description("Print a table of the cache status of each package"))
+struct ci_matrix_args
+{
+}
+export void ci_matrix(ci_matrix_args args)
 {
     params = parseEnv!Params;
     createResultDirs();
@@ -182,13 +187,20 @@ Package[] checkCacheStatus(Package[] packages)
     return packages;
 }
 
-export void print_table(string[] args)
+@(Command("print-table").Description("Print a table of the cache status of each package"))
+struct print_table_args
+{
+}
+
+export int print_table(print_table_args args)
 {
     createResultDirs();
 
     getPrecalcMatrix()
         .checkCacheStatus()
         .printTableForCacheStatus();
+
+    return 0;
 }
 
 struct Params
@@ -199,6 +211,7 @@ struct Params
     @optional() int maxWorkers;
     @optional() int maxMemory;
     @optional() bool isInitial;
+
     string cachixCache;
     string cachixAuthToken;
 

packages/mcl/src/src/mcl/commands/package.d

@@ -2,9 +2,9 @@ module mcl.commands;
 
 public import mcl.commands.get_fstab : get_fstab, get_fstab_args;
 public import mcl.commands.deploy_spec : deploy_spec, deploy_spec_args;
-public import mcl.commands.ci_matrix : ci_matrix, print_table;
-public import mcl.commands.shard_matrix : shard_matrix;
-public import mcl.commands.ci : ci;
+public import mcl.commands.ci_matrix : ci_matrix,ci_matrix_args, print_table,print_table_args;
+public import mcl.commands.shard_matrix : shard_matrix, shard_matrix_args;
+public import mcl.commands.ci : ci, ci_args;
 public import mcl.commands.host_info : host_info, host_info_args;
 public import mcl.commands.machine : machine, machine_args;
 public import mcl.commands.config : config, config_args;

packages/mcl/src/src/mcl/commands/shard_matrix.d

@@ -13,26 +13,26 @@ import std.regex : matchFirst, regex;
 import std.stdio : writeln;
 import std.string : strip;
 
+import argparse;
+
 import mcl.utils.env : parseEnv, optional;
 import mcl.utils.json : toJSON;
 import mcl.utils.nix : nix;
 import mcl.utils.path : createResultDirs, resultDir, rootDir;
 
-export void shard_matrix(string[] args)
+@(Command("shard-matrix").Description("Generate a shard matrix for a flake"))
+struct shard_matrix_args
 {
-    const params = parseEnv!Params;
-    auto matrix = generateShardMatrix();
-    saveShardMatrix(matrix, params);
-
+    @(NamedArgument(["github-output"]).Placeholder("output").Description("Output to GitHub Actions"))
+    string githubOutput;
 }
 
-struct Params
+export int shard_matrix(shard_matrix_args args)
 {
-    @optional() string githubOutput;
+    auto matrix = generateShardMatrix();
+    saveShardMatrix(matrix, args);
+    return 0;
 
-    void setup()
-    {
-    }
 }
 
 struct Shard
@@ -138,15 +138,15 @@ unittest
 
 }
 
-void saveShardMatrix(ShardMatrix matrix, Params params)
+void saveShardMatrix(ShardMatrix matrix, shard_matrix_args args)
 {
     const matrixJson = matrix.toJSON();
     const matrixString = matrixJson.toString();
     infof("Shard matrix: %s", matrixJson.toPrettyString);
     const envLine = "gen_matrix=" ~ matrixString;
-    if (params.githubOutput != "")
+    if (args.githubOutput != "")
     {
-        params.githubOutput.append(envLine);
+        args.githubOutput.append(envLine);
     }
     else
     {