squibid/dep
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Squibid
2024-12-23 21:42:38 -05:00
parent d6460d53ed 443a091e3e
commit 6d6568ecfd
5 changed files with 105 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

137
lua/dep.lua
View File

@ -11,7 +11,7 @@ local logger = require("dep.log").global
local proc = require("dep.proc")
local initialized, perf, config_path, base_dir
local packages, root
local packages, root, load
local function bench(name, code, ...)
local start = os.clock()
@ -78,6 +78,7 @@ local function register(spec, overrides)
package.url = spec.url or package.url or ("https://github.com/" .. id .. ".git")
package.branch = spec.branch or package.branch
package.dir = base_dir .. package.name
package.commit = spec.commit
package.pin = overrides.pin or spec.pin or package.pin
package.enabled = not overrides.disable and not spec.disable and package.enabled
@ -127,27 +128,6 @@ local function register_recursive(list, overrides)
error(string.format("%s (spec=%s)", err, vim.inspect(list[i])))
end
end
if list.modules then
for i = 1, #list.modules do
local name, module = "<unnamed module>", list.modules[i]
if type(module) == "string" then
if list.modules.prefix then
module = list.modules.prefix .. module
end
name, module = module, require(module)
end
name = module.name or name
local ok, err = pcall(register_recursive, module, overrides)
if not ok then
error(string.format("%s <- %s", err, name))
end
end
end
end
local function sort_dependencies()
@ -417,6 +397,16 @@ local function reload()
end
local function reload_all()
-- recall the load function
if load and type(load) == "function" then
local ok, ret = pcall(load)
if ok and type(ret) == "table" then
register_recursive(ret)
else
logger:log("error", ret)
end
end
for i = 1, #packages do
local package = packages[i]
package.loaded, package.subtree_loaded = false, false
@ -504,33 +494,55 @@ local function sync(package, cb)
log_err(before)
cb(err)
else
proc.git_fetch(package.dir, "origin", package.branch or "HEAD", function(err, message)
if err then
log_err(message)
cb(err)
else
proc.git_rev_parse(package.dir, "FETCH_HEAD", function(err, after)
if err then
log_err(after)
cb(err)
elseif before == after then
logger:log("skip", string.format("skipped %s", package.id))
cb(err)
else
proc.git_reset(package.dir, after, function(err, message)
if err then
log_err(message)
else
mark_reconfigure(package)
logger:log("update", string.format("updated %s; %s -> %s", package.id, before, after))
end
if package.commit then
proc.git_checkout(package.dir, package.branch, package.commit, function(err, message)
if err then
log_err(message)
cb(err)
else
proc.git_rev_parse(package.dir, package.commit, function(err, after)
if err then
log_err(after)
cb(err)
end)
end
end)
end
end)
elseif before == after then
logger:log("skip", string.format("skipped %s", package.id))
cb(err)
else
mark_reconfigure(package)
logger:log("update", string.format("updated %s; %s -> %s", package.id, before, after))
end
end)
end
end)
else
proc.git_fetch(package.dir, "origin", package.branch or "HEAD", function(err, message)
if err then
log_err(message)
cb(err)
else
proc.git_rev_parse(package.dir, "FETCH_HEAD", function(err, after)
if err then
log_err(after)
cb(err)
elseif before == after then
logger:log("skip", string.format("skipped %s", package.id))
cb(err)
else
proc.git_reset(package.dir, after, function(err, message)
if err then
log_err(message)
else
mark_reconfigure(package)
logger:log("update", string.format("updated %s; %s -> %s", package.id, before, after))
end
cb(err)
end)
end
end)
end
end)
end
end
end)
else
@ -538,9 +550,21 @@ local function sync(package, cb)
if err then
logger:log("error", string.format("failed to install %s; reason: %s", package.id, message))
else
package.exists = true
mark_reconfigure(package)
logger:log("install", string.format("installed %s", package.id))
if package.commit then
proc.git_checkout(package.dir, package.branch, package.commit, function(err, message)
if err then
logger:log("error", string.format("failed to checkout %s; reason: %s", package.id, message))
else
package.exists = true
mark_reconfigure(package)
logger:log("install", string.format("installed %s", package.id))
end
end)
else
package.exists = true
mark_reconfigure(package)
logger:log("install", string.format("installed %s", package.id))
end
end
cb(err)
@ -850,7 +874,16 @@ return setmetatable({
packages = {}
bench("load", function()
root = register("chiyadev/dep")
root = register("squibid/dep")
if config["load"] and type(config["load"]) == "function" then
local ok, ret = pcall(config["load"])
if ok and type(ret) == "table" then
load = config["load"]
register_recursive(ret)
else
logger:log("error", ret)
end
end
register_recursive(config)
sort_dependencies()
ensure_acyclic()