add repository arg to add and publish subcommands (#159)

src/api.zig

@@ -18,7 +18,7 @@ pub fn getLatest(
     range: ?version.Range,
 ) !version.Semver {
     const url = if (range) |r|
-        try std.fmt.allocPrintZ(allocator, "https://{s}/pkgs/{s}/{s}/latest?v={}", .{
+        try std.fmt.allocPrintZ(allocator, "https://{s}/pkgs/{s}/{s}/latest?v={u}", .{
             repository,
             user,
             package,
@@ -354,6 +354,7 @@ pub fn pollDeviceCode(
 
 pub fn postPublish(
     allocator: Allocator,
+    repository_opt: ?[]const u8,
     access_token: []const u8,
     pkg: *Package,
 ) !void {
@@ -368,7 +369,10 @@ pub fn postPublish(
         std.fs.cwd().deleteFile(filename) catch {};
     }
 
-    const url = "https://" ++ utils.default_repo ++ "/publish";
+    const repository = repository_opt orelse utils.default_repo;
+    const url = try std.fmt.allocPrintZ(allocator, "https://{s}/publish", .{repository});
+    defer allocator.free(url);
+
     const payload = try file.reader().readAllAlloc(allocator, std.math.maxInt(usize));
     defer allocator.free(payload);
 
@@ -404,8 +408,12 @@ pub fn postPublish(
         200 => {},
         401 => return error.Unauthorized,
         else => |code| {
-            std.log.err("http status code: {}", .{code});
-            return error.HttpError;
+            if (fifo.readableSlice(0).len > 0) {
+                return error.Explained;
+            } else {
+                std.log.err("http status code: {}", .{code});
+                return error.HttpError;
+            }
         },
     }
 }

src/commands.zig

@@ -658,14 +658,15 @@ pub fn add(
     build_deps: bool,
     ref: ?[]const u8,
     root_path: ?[]const u8,
+    repository_opt: ?[]const u8,
     target: []const u8,
 ) !void {
     switch (src_tag) {
         .pkg, .github, .local, .git => {},
         else => return error.Todo,
     }
 
-    const repository = utils.default_repo;
+    const repository = repository_opt orelse utils.default_repo;
     var arena = ThreadSafeArenaAllocator.init(allocator);
     defer arena.deinit();
 
@@ -714,7 +715,7 @@ pub fn add(
                             .min = latest,
                             .kind = .caret,
                         },
-                        .repository = utils.default_repo,
+                        .repository = repository,
                     },
                 },
             };
@@ -814,7 +815,7 @@ pub fn rm(
     try project.toFile(file);
 }
 
-pub fn publish(allocator: Allocator, pkg: ?[]const u8) anyerror!void {
+pub fn publish(allocator: Allocator, repository: ?[]const u8, pkg: ?[]const u8) anyerror!void {
     const client_id = "ea14bba19a49f4cba053";
     const scope = "read:user user:email";
 
@@ -933,7 +934,7 @@ pub fn publish(allocator: Allocator, pkg: ?[]const u8) anyerror!void {
         return error.Explained;
     }
 
-    api.postPublish(allocator, access_token.?, project.get(name).?) catch |err| switch (err) {
+    api.postPublish(allocator, repository, access_token.?, project.get(name).?) catch |err| switch (err) {
         error.Unauthorized => {
             if (from_env) {
                 std.log.err("the access token from the env var 'GYRO_ACCESS_TOKEN' is using an outdated format for github. You need to get a new one.", .{});
@@ -946,7 +947,7 @@ pub fn publish(allocator: Allocator, pkg: ?[]const u8) anyerror!void {
             }
 
             std.log.info("getting you a new token...", .{});
-            try publish(allocator, pkg);
+            try publish(allocator, repository, pkg);
         },
         else => return err,
     };

src/main.zig

@@ -7,6 +7,7 @@ const Dependency = @import("Dependency.zig");
 const cmds = @import("commands.zig");
 const loadSystemCerts = @import("certs.zig").loadSystemCerts;
 const Display = @import("Display.zig");
+const utils = @import("utils.zig");
 
 const c = @cImport({
     @cInclude("git2.h");
@@ -190,7 +191,8 @@ pub const commands = struct {
             cmd.addFlag('b', "build-dep", "Add this as a build dependency");
             cmd.addOption('r', "root", "file", completion.Param.File, "Set root path with respect to the project root, default is 'src/main.zig'");
             cmd.addOption('c', "ref", "file", completion.Param.File, "commit, tag, or branch to reference for git or github source types");
-            cmd.addPositional("package", completion.Param.Package, .many, "The package(s) to add");
+            cmd.addOption('p', "repository", "repo", ?completion.Param.Repository, "The package repository you want to add a package from, default is " ++ utils.default_repo);
+            cmd.addPositional("package", completion.Param.Package, .one, "The package to add");
 
             cmd.done();
             break :blk cmd;
@@ -214,7 +216,7 @@ pub const commands = struct {
                 args.flag("--build-dep"),
                 args.option("--ref"),
                 args.option("--root"),
-                // TODO fix
+                args.option("--repository"),
                 args.positionals()[0],
             );
         }
@@ -296,14 +298,19 @@ pub const commands = struct {
 
             cmd.addFlag('h', "help", "Display help");
             cmd.addPositional("package", ?completion.Param.Package, .one, "The package to publish");
+            cmd.addOption('r', "repository", "repo", ?completion.Param.Repository, "The package repository you want to publish to, default is " ++ utils.default_repo);
 
             cmd.done();
             break :blk cmd;
         };
 
         pub const Args = info.ClapComptime();
         pub fn run(allocator: std.mem.Allocator, args: *Args, _: *clap.args.OsIterator) !void {
-            try cmds.publish(allocator, if (args.positionals().len > 0) args.positionals()[0] else null);
+            try cmds.publish(
+                allocator,
+                args.option("--repository"),
+                if (args.positionals().len > 0) args.positionals()[0] else null,
+            );
         }
     };