Merge pull request #494 from zdharma-continuum/57-allow-deleting-mult…

…iple-plugins-in-one-command

fix: delete multiple plugins at once

- `delete` subcommand can now take multiple arguments
- improved logic for `--all`, `--clean` flags
- improved log output
- now cleans up broken symlinks

.github/workflows/documentation.yaml

@@ -30,7 +30,7 @@ jobs:
           echo "" >> $GITHUB_STEP_SUMMARY # this is a blank line
           if ! git --no-pager diff --exit-code; then
             echo "::error:: Z-shelldocs are out-of-date." >> $GITHUB_STEP_SUMMARY
-            echo "To regenerate, run `make doc`" >> $GITHUB_STEP_SUMMARY
+            echo 'To regenerate, run `make doc`' >> $GITHUB_STEP_SUMMARY
             exit 1
           else
             echo "::notice:: Z-shelldocs are up-to-date." >> $GITHUB_STEP_SUMMARY

.github/workflows/tests.yaml

@@ -61,6 +61,9 @@ jobs:
       - name: "annexes"
         run: zunit run tests/annexes.zunit
 
+      - name: "commands"
+        run: zunit run tests/commands.zunit
+
       - name: "gh-r"
         run: zunit run --fail-fast --verbose tests/gh-r.zunit
 

_zinit

@@ -210,7 +210,7 @@ _zinit_delete(){
     '--quiet[Turn off messages from the operation]' \
     '--yes[Automatically confirm any yes/no prompts]' \
     + '(operation)' \
-      '1:installed:__zinit_installed' \
+      '*::installed:__zinit_installed' \
       {-a,--all}'[Delete all plugins and snippets]' \
       {-c,--clean}'[Delete only the currently-not loaded plugins and snippets]'
 } # ]]]

doc/zsdoc/zinit-autoload.zsh.adoc

@@ -52,6 +52,7 @@ FUNCTIONS
  .zinit-module
  .zinit-pager
  .zinit-prepare-readlink
+ .zinit-prompt
  .zinit-recall
  .zinit-recently
  .zinit-restore-extendedglob
@@ -398,9 +399,7 @@ Has 17 line(s). Calls functions:
 
 Uses feature(s): _eval_, _read_
 
-Called by:
-
- .zinit-delete
+Not called by script or any function (may be e.g. a hook, a Zle widget, etc.).
 
 .zinit-create
 ~~~~~~~~~~~~~
@@ -431,26 +430,24 @@ Not called by script or any function (may be e.g. a hook, a Zle widget, etc.).
 
 ____
  
- Deletes plugin's or snippet's directory (in Zinit's home directory).
+ Deletes a plugin or snippet and related files and hooks.
  
- User-action entry point.
- 
- $1 - snippet URL or plugin spec (4 formats: user---plugin, user/plugin, user, plugin)
- $2 - plugin (only when $1 - i.e. user - given)
+ $1 - snippet url or plugin
 ____
 
-Has 99 line(s). Calls functions:
+Has 107 line(s). Calls functions:
 
  .zinit-delete
  |-- zinit-side.zsh/.zinit-compute-ice
  |-- zinit.zsh/+zinit-message
- |-- zinit.zsh/+zinit-prehelp-usage-message
  |-- zinit.zsh/.zinit-any-to-user-plugin
- `-- zinit.zsh/.zinit-parse-opts
+ `-- zinit.zsh/zinit
 
-Uses feature(s): _setopt_
+Uses feature(s): _setopt_, _zmodload_, _zparseopts_
 
-Not called by script or any function (may be e.g. a hook, a Zle widget, etc.).
+Called by:
+
+ zinit.zsh/zinit
 
 .zinit-diff-env-compute
 ~~~~~~~~~~~~~~~~~~~~~~~
@@ -886,6 +883,26 @@ Called by:
  .zinit-clear-completions
  .zinit-show-completions
 
+.zinit-prompt
+~~~~~~~~~~~~~
+
+____
+ 
+ Prompt user to confirm
+ 
+ $1 - prompt
+ 
+ $REPLY - 0 or 1
+____
+
+Has 4 line(s). Doesn't call other functions.
+
+Uses feature(s): _read_
+
+Called by:
+
+ .zinit-delete
+
 .zinit-recall
 ~~~~~~~~~~~~~
 
@@ -949,7 +966,9 @@ Has 17 line(s). Calls functions:
 
 Uses feature(s): _eval_
 
-Not called by script or any function (may be e.g. a hook, a Zle widget, etc.).
+Called by:
+
+ .zinit-delete
 
 .zinit-save-set-extendedglob
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~

doc/zsdoc/zinit-install.zsh.adoc

@@ -800,7 +800,7 @@ ____
  `#compdef <names ...>'
 ____
 
-Has 573 line(s). Doesn't call other functions.
+Has 549 line(s). Doesn't call other functions.
 
 Uses feature(s): _autoload_, _bindkey_, _compdef_, _compdump_, _eval_, _read_, _setopt_, _unfunction_, _zle_, _zstyle_
 

doc/zsdoc/zinit.zsh.adoc

@@ -93,7 +93,7 @@ DETAILS
 Script Body
 ~~~~~~~~~~~
 
-Has 252 line(s). Calls functions:
+Has 244 line(s). Calls functions:
 
  Script-Body
  |-- +zinit-message
@@ -115,6 +115,7 @@ Has 252 line(s). Calls functions:
  |   |-- zinit-autoload.zsh/.zinit-clear-completions
  |   |-- zinit-autoload.zsh/.zinit-compile-uncompile-all
  |   |-- zinit-autoload.zsh/.zinit-compiled
+ |   |-- zinit-autoload.zsh/.zinit-delete
  |   |-- zinit-autoload.zsh/.zinit-help
  |   |-- zinit-autoload.zsh/.zinit-list-bindkeys
  |   |-- zinit-autoload.zsh/.zinit-list-compdef-replay
@@ -229,7 +230,6 @@ Has 38 line(s). Calls functions:
 Called by:
 
  zinit
- zinit-autoload.zsh/.zinit-delete
 
 -zinit_scheduler_add_sh
 ~~~~~~~~~~~~~~~~~~~~~~~
@@ -749,7 +749,6 @@ Has 2 line(s). Doesn't call other functions.
 Called by:
 
  zinit
- zinit-autoload.zsh/.zinit-delete
 
 .zinit-prepare-home
 ~~~~~~~~~~~~~~~~~~~
@@ -1104,7 +1103,6 @@ Not called by script or any function (may be e.g. a hook, a Zle widget, etc.).
 
 ____
  
- ]]]
  Registers the z-annex inside Zinit – i.e. an Zinit extension
 ____
 
@@ -1292,7 +1290,7 @@ ____
  and completion.
 ____
 
-Has 564 line(s). Calls functions:
+Has 568 line(s). Calls functions:
 
  zinit
  |-- +zinit-message
@@ -1308,6 +1306,7 @@ Has 564 line(s). Calls functions:
  |-- zinit-autoload.zsh/.zinit-clear-completions
  |-- zinit-autoload.zsh/.zinit-compile-uncompile-all
  |-- zinit-autoload.zsh/.zinit-compiled
+ |-- zinit-autoload.zsh/.zinit-delete
  |-- zinit-autoload.zsh/.zinit-help
  |-- zinit-autoload.zsh/.zinit-list-bindkeys
  |-- zinit-autoload.zsh/.zinit-list-compdef-replay
@@ -1340,6 +1339,7 @@ Called by:
 
  Script-Body
  zplugin
+ zinit-autoload.zsh/.zinit-delete
 
 zpcdclear
 ~~~~~~~~~
@@ -1398,6 +1398,7 @@ Has 1 line(s). Calls functions:
      |-- zinit-autoload.zsh/.zinit-clear-completions
      |-- zinit-autoload.zsh/.zinit-compile-uncompile-all
      |-- zinit-autoload.zsh/.zinit-compiled
+     |-- zinit-autoload.zsh/.zinit-delete
      |-- zinit-autoload.zsh/.zinit-help
      |-- zinit-autoload.zsh/.zinit-list-bindkeys
      |-- zinit-autoload.zsh/.zinit-list-compdef-replay
@@ -1461,7 +1462,7 @@ ____
  Note that some terminals do not support all combinations.
 ____
 
-Has 120 line(s). Doesn't call other functions.
+Has 117 line(s). Doesn't call other functions.
 
 Called by:
 
@@ -1484,7 +1485,7 @@ ____
  `#compdef <names ...>'
 ____
 
-Has 573 line(s). Doesn't call other functions.
+Has 549 line(s). Doesn't call other functions.
 
 Uses feature(s): _autoload_, _bindkey_, _compdef_, _compdump_, _eval_, _read_, _setopt_, _unfunction_, _zle_, _zstyle_
 

tests/commands.zunit

@@ -0,0 +1,38 @@
+#!/usr/bin/env zunit
+#
+# zdharma-continuum/zinit/tests/commands.zunit
+# Copyright (c) 2016-2021 Sebastian Gniazdowski
+# Copyright (c) 2021-2023 zdharma-continuum
+# Homepage: https://github.com/zdharma-continuum/zinit
+# License: MIT License
+#
+
+@setup {
+  ZBIN="${ZPFX}/bin"
+}
+@test 'delete --help' {
+  run zinit delete --help
+  assert $output contains 'zinit delete [options] [plugins...]'
+  assert $state equals 0
+}
+@test 'delete --all' {
+  run zinit as'completion' is-snippet for @'https://github.com/docker/cli/blob/master/contrib/completion/zsh/_docker'
+  assert $state equals 0
+}
+@test 'delete a snippet' {
+  run zinit id-as'git.zsh' is-snippet for @'OMZL::git.zsh'
+  run zinit delete --yes 'git.zsh'
+  assert $state equals 0
+}
+@test 'delete a plugin' {
+    run zinit from'gh-r' as'program' id-as mv'shfmt* -> shfmt' for @'mvdan/sh'
+    run zinit delete --yes sh
+    assert $state equals 0
+}
+@test 'delete a program' {
+    run zinit as'program' cp'wd.sh->wd' mv'_wd.sh->_wd' pick'wd' for @'mfaerevaag/wd'
+    run zinit delete --yes mfaerevaag/wd
+    assert $state equals 0
+}
+
+# vim:ft=zsh:sw=2:sts=2:et:foldmarker={,}:foldmethod=marker