Updated to Zig 0.14.1, latest bof-launcher and latest zig-yaml.

Author: michal-z

.gitignore

@@ -29,6 +29,7 @@
 !.gitattributes
 
 # Ignore some special directories
-zig-cache
+BOF-collection.yaml
+.zig-cache
 zig-out
 backup

build.zig

@@ -1,24 +1,10 @@
 const std = @import("std");
 
-fn osTagStr(os_tag: std.Target.Os.Tag) []const u8 {
-    return switch (os_tag) {
-        .windows => "win",
-        .linux => "lin",
-        else => unreachable,
-    };
-}
-
-fn cpuArchStr(arch: std.Target.Cpu.Arch) []const u8 {
-    return switch (arch) {
-        .x86_64 => "x64",
-        .x86 => "x86",
-        .aarch64 => "aarch64",
-        .arm => "arm",
-        else => unreachable,
-    };
-}
+pub const min_zig_version = std.SemanticVersion{ .major = 0, .minor = 14, .patch = 1 };
 
 pub fn build(b: *std.Build) void {
+    ensureZigVersion() catch return;
+
     const supported_targets: []const std.Target.Query = &.{
         .{ .cpu_arch = .x86, .os_tag = .windows, .abi = .gnu },
         .{ .cpu_arch = .x86, .os_tag = .linux, .abi = .gnu },
@@ -53,22 +39,20 @@ pub fn build(b: *std.Build) void {
             .optimize = optimize,
         }).module("yaml");
 
-        const bof_launcher_dep = b.dependency("bof_launcher", .{ .optimize = optimize });
+        const bof_launcher_dep = b.dependency(
+            "bof_launcher",
+            .{ .optimize = optimize },
+        ).builder.dependency(
+            "bof_launcher_lib",
+            .{ .optimize = optimize, .target = target },
+        );
         const bof_launcher_lib = bof_launcher_dep.artifact(
-            std.mem.join(
-                b.allocator,
-                "_",
-                &.{ "bof_launcher", osTagStr(target.result.os.tag), cpuArchStr(target.result.cpu.arch) },
-            ) catch unreachable,
+            b.fmt("bof_launcher_{s}_{s}", .{ osTagStr(target), cpuArchStr(target) }),
         );
         const bof_launcher_api_module = bof_launcher_dep.module("bof_launcher_api");
 
         const exe = b.addExecutable(.{
-            .name = std.mem.join(
-                b.allocator,
-                "_",
-                &.{ "cli4bofs", osTagStr(target.result.os.tag), cpuArchStr(target.result.cpu.arch) },
-            ) catch unreachable,
+            .name = b.fmt("cli4bofs_{s}_{s}", .{ osTagStr(target), cpuArchStr(target) }),
             .root_source_file = b.path("src/main.zig"),
             .target = target,
             .optimize = optimize,
@@ -81,3 +65,43 @@ pub fn build(b: *std.Build) void {
         b.installArtifact(exe);
     }
 }
+
+fn osTagStr(target: std.Build.ResolvedTarget) []const u8 {
+    return switch (target.result.os.tag) {
+        .windows => "win",
+        .linux => "lin",
+        else => unreachable,
+    };
+}
+
+fn cpuArchStr(target: std.Build.ResolvedTarget) []const u8 {
+    return switch (target.result.cpu.arch) {
+        .x86_64 => "x64",
+        .x86 => "x86",
+        .aarch64 => "aarch64",
+        .arm => "arm",
+        else => unreachable,
+    };
+}
+
+fn ensureZigVersion() !void {
+    var installed_ver = @import("builtin").zig_version;
+    installed_ver.build = null;
+
+    if (installed_ver.order(min_zig_version) != .eq) {
+        std.log.err("\n" ++
+            \\---------------------------------------------------------------------------
+            \\
+            \\Installed Zig compiler version is not supported.
+            \\
+            \\Required version is: {any}
+            \\Installed version: {any}
+            \\
+            \\Please install supported version and try again.
+            \\
+            \\---------------------------------------------------------------------------
+            \\
+        , .{ min_zig_version, installed_ver });
+        return error.ZigIsTooOld;
+    }
+}

build.zig.zon

@@ -1,6 +1,7 @@
 .{
-    .name = "cli4bofs",
-    .version = "0.1.0",
+    .name = .cli4bofs,
+    .version = "0.9.1",
+    .fingerprint = 0x24054146b73f1bd0,
     .paths = .{
         "build.zig",
         "build.zig.zon",
@@ -11,12 +12,12 @@
     },
     .dependencies = .{
         .bof_launcher = .{
-            .url = "https://github.com/The-Z-Labs/bof-launcher/archive/4f9e9d50237b7e63079c9708a671a0d18ea1ee8f.tar.gz",
-            .hash = "122067dfd5fdbea0d8522d60aa57003a2a63499ece9e611caca917ae0fd51f931de2",
+            .url = "https://github.com/The-Z-Labs/bof-launcher/archive/943a456a2c9b1d4ddf5c667e2d57588275954cf5.tar.gz",
+            .hash = "bof_launcher-1.0.0-u0w4iMtmCACvVnH0kfCHWinLLQdGUmdVdWjYa_XNo2EK",
         },
         .zig_yaml = .{
-            .url = "https://github.com/kubkon/zig-yaml/archive/325dbdd276604dccf184c32fef9600b0ac48343d.tar.gz",
-            .hash = "1220e8870ca83e47b98807e89b5b636072413f6c09f9b26037e4c98c55e4960ac55a",
+            .url = "https://github.com/kubkon/zig-yaml/archive/2d42183a7b49742e74f4b1eca8a245e73cb34113.tar.gz",
+            .hash = "zig_yaml-0.1.0-C1161uaCAgBeGM34gK6grYHDxDEq92BCDbSleBDEqd-s",
         },
     },
 }

src/main.zig

@@ -2,7 +2,7 @@ const std = @import("std");
 const bofs = @import("bof-launcher");
 const yaml = @import("yaml");
 
-pub const std_options = .{
+pub const std_options = std.Options{
     .log_level = .info,
 };
 
@@ -147,6 +147,10 @@ pub fn main() !u8 {
     defer _ = gpa.deinit();
     const allocator = gpa.allocator();
 
+    var arena = std.heap.ArenaAllocator.init(allocator);
+    defer arena.deinit();
+    const arena_allocator = arena.allocator();
+
     ///////////////////////////////////////////////////////////
     // 1. look for BOF-collection.yaml file in cwd
     // 2. parse it if available and store results in the ArrayList
@@ -160,14 +164,15 @@ pub fn main() !u8 {
         const source = try file.readToEndAlloc(allocator, std.math.maxInt(u32));
         defer allocator.free(source);
 
-        var yaml_file = try yaml.Yaml.load(allocator, source);
-        errdefer yaml_file.deinit();
+        var yaml_file: yaml.Yaml = .{ .source = source };
+        errdefer yaml_file.deinit(allocator);
+        try yaml_file.load(allocator);
 
-        const bofs_collection = try yaml_file.parse([]BofRecord);
+        const bofs_collection = try yaml_file.parse(arena_allocator, []BofRecord);
 
         break :blk .{ bofs_collection, yaml_file };
     };
-    defer if (yaml_file) |yf| @constCast(&yf).*.deinit();
+    defer if (yaml_file) |yf| @constCast(&yf).*.deinit(allocator);
 
     ///////////////////////////////////////////////////////////
     // commands processing:
@@ -196,7 +201,7 @@ pub fn main() !u8 {
 
     var cmd: Cmd = undefined;
     var bof_name: [:0]const u8 = undefined;
-    var bof_path_buffer: [std.fs.MAX_PATH_BYTES:0]u8 = undefined;
+    var bof_path_buffer: [std.fs.max_path_bytes:0]u8 = undefined;
 
     var list_tag: []u8 = undefined;
     var list_by_tag: bool = false;
@@ -304,7 +309,7 @@ pub fn main() !u8 {
             for (cmd_args[3..]) |arg| {
                 // handle case when file:<filepath> argument is provided
                 if (mem.indexOf(u8, arg, "file:") != null) {
-                    var iter = mem.tokenize(u8, arg, ":");
+                    var iter = mem.tokenizeScalar(u8, arg, ':');
 
                     _ = iter.next() orelse return error.BadData;
                     const file_path = iter.next() orelse return error.BadData;
@@ -340,7 +345,6 @@ pub fn main() !u8 {
         .info => {
             for (bofs_collection) |bof| {
                 if (std.mem.eql(u8, bof_name, bof.name)) {
-
                     try stdout.print("Name: {s}\n", .{bof.name});
                     try stdout.print("Description: {s}\n", .{bof.description});
                     try stdout.print("BOF authors(s): {s}\n", .{bof.author});
@@ -399,7 +403,7 @@ pub fn main() !u8 {
                     if (bof.errors) |errors| for (errors) |err| {
                         try stdout.print("{s} ({x}) : {s}\n", .{ err.name, err.code, err.message });
                     };
- 
+
                     try stdout.print("\nEXAMPLES: {s}\n", .{bof.examples});
                 }
             }
@@ -436,7 +440,7 @@ pub fn main() !u8 {
                 try stdout.print("info <BOF>  - Display BOF description and usage examples\n", .{});
             } else if (std.mem.eql(u8, cmd_help, "list")) {
                 try stdout.print("list [TAG]  - List BOFs (all or based on TAG) from BOF-collection.yaml file\n", .{});
-            } else if (std.mem.eql(u8, cmd_help, "help")) { 
+            } else if (std.mem.eql(u8, cmd_help, "help")) {
                 try stdout.print("help <COMMAND>  - Display help about given command\n", .{});
             } else {
                 try stderr.writeAll("Fatal: unrecognized command provided. Aborting.\n");