From 090a4e57e0f600139fdf7aa7971ece3ac00cb4b3 Mon Sep 17 00:00:00 2001
From: Meghan Denny <hello@nektro.net>
Date: Fri, 20 Aug 2021 21:41:06 -0700
Subject: [PATCH] rework lockfile parsing to accept a Dir instead of a path

---
 src/cmd/ci.zig | 3 ++-
 src/common.zig | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/cmd/ci.zig b/src/cmd/ci.zig
index b656eb7b4d903b0faad48500924997db42cefb5c..203f463b68fcde7aa0b6c88624db4ca5d23290c9 100644
--- a/src/cmd/ci.zig
+++ b/src/cmd/ci.zig
@@ -10,12 +10,13 @@ const common = @import("./../common.zig");
 pub fn execute(args: [][]u8) !void {
     _ = args;
 
+    const dir = std.fs.cwd();
     const cachepath = try std.fs.path.join(gpa, &.{ ".zigmod", "deps" });
 
     var options = common.CollectOptions{
         .log = true,
         .update = false,
-        .lock = try common.parse_lockfile("zigmod.lock"),
+        .lock = try common.parse_lockfile(dir),
     };
     const top_module = try common.collect_deps_deep(cachepath, "zig.mod", &options);
 
diff --git a/src/common.zig b/src/common.zig
index b189ea720115b27c75bc2c96f24601536e475871..726f6ced813a4c78a3b04f872135a385322b2719 100644
--- a/src/common.zig
+++ b/src/common.zig
@@ -335,10 +335,10 @@ pub fn add_files_package(pkg_name: []const u8, dirs: []const []const u8, parent_
     return (try get_module_from_dep(&d, destination, parent_name, &options)).?;
 }
 
-pub fn parse_lockfile(path: []const u8) ![]const [4][]const u8 {
+pub fn parse_lockfile(dir: std.fs.Dir) ![]const [4][]const u8 {
     var list = std.ArrayList([4][]const u8).init(gpa);
     const max = std.math.maxInt(usize);
-    const f = try std.fs.cwd().openFile(path, .{});
+    const f = try dir.openFile("zigmod.lock", .{});
     const r = f.reader();
     var i: usize = 0;
     var v: usize = 1;
-- 
2.54.0