Debug flag I did not added "verbose" alias because it's incorrect--the "debug" flag shortens wait time and that's not "verbose" or not. Shortening wait time is not appropriate for "--debug" too, but never it is verbosity. The original version also has "-v" alias in flag handling code, but it won't be handled because "version" flag has "-v" alias and it captures the arg eariler.

Changes

3 changed files (+35/-4)

• src/RunOptions.zig
  • @@ -33,7 +33,7 @@ function_list: c.OnOff = c.ONOFF_OFF,
    function_poll: c.OnOff = c.ONOFF_OFF, function_wait: c.OnOff = c.ONOFF_OFF, utc: c.OnOff = c.ONOFF_OFF, - debug: c.OnOff = c.ONOFF_OFF, + debug: bool = false, report_sunrise: c.OnOff = c.ONOFF_OFF, report_sunset: c.OnOff = c.ONOFF_OFF, list_days: c_uint = c.DEFAULT_LIST,
  • @@ -65,7 +65,7 @@ pub fn toC(self: *const @This()) c.runStruct {
    .functionPoll = self.function_poll, .functionWait = self.function_wait, .utc = self.utc, - .debug = self.debug, + .debug = if (self.debug) c.ONOFF_ON else c.ONOFF_OFF, .reportSunrise = self.report_sunrise, .reportSunset = self.report_sunset, .listDays = self.list_days,
• src/main.zig
  • @@ -46,6 +46,8 @@ fn writeHelp(writer: anytype, bin: []const u8) !void {
    \\[Options] \\-v, --version Prints version to stdout and exits. \\-h, --help Prints this message to stdout and exits. + \\--debug Prints debug log, and shortens "wait" duration + \\ to one minute. \\ \\[Commands] \\poll Prints whether it's DAY or NIGHT.
  • @@ -80,8 +82,7 @@ pub fn main() u8 {
    const allocator = arena.allocator(); - const opts = RunOptions.init(); - var c_opts = opts.toC(); + var opts = RunOptions.init(); var args = std.process.ArgIterator.initWithAllocator(allocator) catch { return ExitCode.out_of_memory.code();
  • @@ -111,8 +112,15 @@ pub fn main() u8 {
    return ExitCode.ok.code(); } + + if (std.mem.eql(u8, "--debug", arg)) { + opts.debug = true; + continue; + } } + var c_opts = opts.toC(); + return switch (c.sunpoll(&c_opts)) { c.EXIT_DAY => ExitCode.day.code(), c.EXIT_NIGHT => ExitCode.night.code(),
• tests/poll.zig
  • @@ -47,3 +47,26 @@ test {
    // try std.testing.expectEqualStrings(legacy.stderr, new.stderr); // try std.testing.expectEqualStrings(legacy.stdout, new.stdout); } + + test { + const regular = try poll(std.testing.allocator, config.new_bin); + defer std.testing.allocator.free(regular.stderr); + defer std.testing.allocator.free(regular.stdout); + + var env = std.process.EnvMap.init(std.testing.allocator); + defer env.deinit(); + + try env.put("TZ", "UTC"); + + const debug = try std.process.Child.run(.{ + .allocator = std.testing.allocator, + .argv = &.{ config.new_bin, "--debug", "poll", "29.977435N", "31.132484E" }, + .env_map = &env, + }); + defer std.testing.allocator.free(debug.stderr); + defer std.testing.allocator.free(debug.stdout); + + // Original sunwait prints debug log to stdout. + // TODO: Print to stderr + try std.testing.expect(debug.stdout.len > regular.stdout.len); + }