Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dev #52

Merged
merged 4 commits into from
Jul 7, 2021
Merged

Dev #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7da6fda
`silent! helptags`. Fix #48
savq Jul 7, 2021
f198185
Check for nvim 0.5
savq Jul 7, 2021
d9a46a6
Add PaqSync
savq Jul 7, 2021
efe70aa
Add verbose option
savq Jul 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ Calling the `paq` function per package is deprecated. Users should now pass a li
- `PaqInstall`: Install all packages listed in your configuration.
- `PaqUpdate`: Update all packages already on your system (it won't implicitly install them).
- `PaqClean`: Remove all packages (in Paq's directory) that aren't listed on your configuration.
- `PaqSync`: Execute the three operations listed above.


## Options
Expand Down
41 changes: 35 additions & 6 deletions doc/paq-nvim.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*paq-nvim.txt* Package manager for Neovim v0.4.4 Last change: 2021-06-08
*paq-nvim.txt* Package manager for Neovim v0.4.4 Last change: 2021-07-07
*paq-nvim*
*paq*

Expand Down Expand Up @@ -114,6 +114,13 @@ imported as `paq`, the functions are:
configuration.


|paq.sync| *paq.sync*
*:PaqSync*
Executes |paq.clean|, |paq.update|, and |paq.install|. Note that all
paq operations are performed asynchronously, so messages might be printed
out of order.


|paq.list| *paq.list*
*:PaqList*
Lists installed packages as well as packages that were recently removed.
Expand All @@ -131,13 +138,35 @@ imported as `paq`, the functions are:
Deletes the |paq-log| file.


|paq.setup| *paq.setup*
|paq.setup| *paq:setup*

Method to configure specific global behavior. It can take a table with the
following keys:

`path`
String that determines where Paq should install packages. It overwrites
the default value for |paq-dir|. `path` should still be a valid |packages|
directory, Paq won't modify the 'runtimepath'. This option exists mainly
to allow testing without altering a user's configuration.

Default value: |paq-dir|

`verbose`
Boolean that determines whether paq should print `(up-to-date) pkg` for
packages that were not updated.

Configures specific global behavior. It takes as single input a table,
which can have a key `path` to overwrite the default value for |paq-dir|.
This functionality exists mainly to allow testing without altering a
user's configuration.
Default value: `true`

Note that unlike most Lua plugins, paq.setup is a method, not a function.
This allows chaining it with the list of packages without needing to
bind `"paq"` locally, for example:
>
require("paq"):setup({verbose=false}) {
"savq/paq-nvim";
"neovim/nvim-lspconfig";
"nvim-treesitter/nvim-treesitter"
}
<

|paq.paq|

Expand Down
34 changes: 19 additions & 15 deletions lua/paq.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
local vim = require("paq.compat")
local vim = vim.api.nvim_call_function("has", {"nvim-0.5"}) and vim or require("paq.compat")
local uv = vim.loop
local print_err = vim.api.nvim_err_writeln

local cfg = {
paqdir = vim.fn.stdpath("data") .. "/site/pack/paqs/",
verbose = true,
}
local LOGFILE = vim.fn.stdpath("cache") .. "/paq.log"
local paq_dir = vim.fn.stdpath("data") .. "/site/pack/paqs/"

local packages = {} -- 'name' = {options} pairs
local num_pkgs = 0
local last_ops = {} -- 'name' = 'op' pairs
Expand All @@ -31,21 +33,21 @@ local messages = {

local function Counter(op) counters[op] = {ok=0, err=0, nop=0} end

local function update_count(op, result, total)
local function update_count(op, result, _, total)
local c, t = counters[op]
if not c then return end
c[result] = c[result] + 1
t = c[result]
if c.ok + c.err + c.nop == total then
Counter(op)
vim.cmd("packloadall! | helptags ALL")
vim.cmd("packloadall! | silent! helptags ALL")
end
return t
end

local function report(op, result, name, total)
local total = total or num_pkgs
local cur = update_count(op, result, total)
local cur = update_count(op, result, nil, total)
local count = cur and string.format("%d/%d", cur, total) or ""
local msg = messages[op][result]
local p = result == "err" and print_err or print
Expand Down Expand Up @@ -86,7 +88,7 @@ local function run_hook(pkg)
end

local function install(pkg)
if pkg.exists then return update_count("install", "nop", pkg.name) end
if pkg.exists then return update_count("install", "nop", nil, num_pkgs) end
local args = pkg.branch
and {"clone", pkg.url, "--depth=1", "-b", pkg.branch, pkg.dir}
or {"clone", pkg.url, "--depth=1", pkg.dir}
Expand Down Expand Up @@ -115,7 +117,7 @@ local function get_git_hash(dir)
end

local function update(pkg)
if not pkg.exists or pkg.pin then return update_count("update", "nop", pkg.name) end
if not pkg.exists or pkg.pin then return update_count("update", "nop", nil, num_pkgs) end
local hash = get_git_hash(pkg.dir)
local post_update = function(ok)
if not ok then
Expand All @@ -125,7 +127,7 @@ local function update(pkg)
report("update", "ok", pkg.name)
if pkg.run then run_hook(pkg) end
else
report("update", "nop", pkg.name)
(cfg.verbose and report or update_count)("update", "nop", pkg.name, num_pkgs) -- blursed
end
end
call_proc("git", {"pull"}, pkg.dir, post_update)
Expand Down Expand Up @@ -188,7 +190,7 @@ local function register(args)
return
end

local dir = paq_dir .. (args.opt and "opt/" or "start/") .. name
local dir = cfg.paqdir .. (args.opt and "opt/" or "start/") .. name

packages[name] = {
name = name,
Expand All @@ -204,9 +206,10 @@ end

do
vim.tbl_map(vim.cmd, {
"command! PaqInstall lua require('paq').install()",
"command! PaqUpdate lua require('paq').update()",
"command! PaqClean lua require('paq').clean()",
"command! PaqInstall lua require('paq'):install()",
"command! PaqUpdate lua require('paq'):update()",
"command! PaqClean lua require('paq'):clean()",
"command! PaqSync lua require('paq'):sync()",
"command! PaqList lua require('paq').list()",
"command! PaqLogOpen lua require('paq').log_open()",
"command! PaqLogClean lua require('paq').log_clean()"
Expand All @@ -217,9 +220,10 @@ return setmetatable({
paq = register, -- DEPRECATE 1.0
install = function(self) Counter "install" vim.tbl_map(install, packages) return self end,
update = function(self) Counter "update" vim.tbl_map(update, packages) return self end,
clean = function(self) Counter "remove" remove(paq_dir .. "start/") remove(paq_dir .. "opt/") end,
clean = function(self) Counter "remove" remove(cfg.paqdir .. "start/") remove(cfg.paqdir .. "opt/") return self end,
sync = function(self) self:clean():update():install() return self end,
list = list,
setup = function(self, args) paq_dir = args.path return self end,
setup = function(self, args) for k,v in pairs(args) do cfg[k] = v end return self end,
log_open = function(self) vim.cmd("sp " .. LOGFILE) return self end,
log_clean = function(self) uv.fs_unlink(LOGFILE) print("Paq log file deleted") return self end,
}, {__call = function(self, tbl) packages = {} num_pkgs = 0 vim.tbl_map(register, tbl) return self end}
Expand Down