From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 4341 invoked from network); 4 May 2021 18:53:03 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 4 May 2021 18:53:03 -0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org; s=rsa-20200801; h=List-Archive:List-Owner:List-Post:List-Unsubscribe: List-Subscribe:List-Help:List-Id:Sender:Message-ID:Date:Content-ID: Content-Type:MIME-Version:Subject:To:From:Reply-To:Cc: Content-Transfer-Encoding:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References; bh=7yhRq33RNEHZbq30940gTZc3zmXr609zJsuFQmL+a4c=; b=BAZ3r26NcHVPJFr0OW8DvyM8pf npvr3sAaHd5mtMTiX3e9geBj/x9q9ejqqcxLyNw2EM+TAZAydzyBaE+n2foSPushRSK9sMkmjTMG0 akPJY/0PnidjKRczU+Anklbw1hLCxWHJ3go11lkxYKjjt8tuKRUmgGs2An3PkLuH25fdFjfCACd/z yTP77WiAKzsoiWScFoTcB0mj/jg9qGgME4WbR3O1NriF8I5nxD5Qeu1rztzsAqvvUBHM4mg2KZ1GJ elaLp6mENhhJzOeV26RmAmm86tfSVi82hR7u7JJKaokMNKvJK8eZaRyrB4XOFoux7RiVpAg0vc+q7 2mXaM9PQ==; Received: from authenticated user by zero.zsh.org with local id 1le0AH-0002xR-PK; Tue, 04 May 2021 18:53:01 +0000 Received: from authenticated user by zero.zsh.org with esmtpsa (TLS1.3:TLS_AES_256_GCM_SHA384:256) id 1le0A0-0002dx-1Y; Tue, 04 May 2021 18:52:44 +0000 Received: from [192.168.178.21] (helo=hydra) by mail.kiddle.eu with esmtp(Exim 4.94.2) (envelope-from ) id 1le09z-000EHv-Hm for zsh-workers@zsh.org; Tue, 04 May 2021 20:52:43 +0200 From: Oliver Kiddle To: Zsh workers Subject: PATCH: update ansible completion to 2.10.8 MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <54925.1620154363.1@hydra> Date: Tue, 04 May 2021 20:52:43 +0200 Message-ID: <54926-1620154363.547876@AFIl.0ZTd.hM34> X-Seq: 48783 Archived-At: X-Loop: zsh-workers@zsh.org Errors-To: zsh-workers-owner@zsh.org Precedence: list Precedence: bulk Sender: zsh-workers-request@zsh.org X-no-archive: yes List-Id: List-Help: List-Subscribe: List-Unsubscribe: List-Post: List-Owner: List-Archive: Mostly some changes to the password options and ansible-vault. This post is really to test if the restarted Exim with security patches applied is working fine. Sympa was also upgraded in the process. Oliver diff --git a/Completion/Unix/Command/_ansible b/Completion/Unix/Command/_ansible index c81308586..65cae148e 100644 --- a/Completion/Unix/Command/_ansible +++ b/Completion/Unix/Command/_ansible @@ -46,9 +46,9 @@ case $service in ;| ansible|ansible-console|ansible-inventory|ansible-playbook|ansible-pull) args+=( - '--ask-vault-pass[ask for vault password]' + --ask-vault-pass{,word}'[ask for vault password]' '--vault-id=[specify vault identity to use]:vault identity' - '--vault-password-file=[specify vault password file]:vault password file:_files' + --vault-pass{,word}-file='[specify vault password file]:vault password file:_files' ) ;| ansible|ansible-console|ansible-inventory|ansible-playbook|ansible-pull) @@ -229,11 +229,11 @@ case $state in if zstyle -T ":completion:${curcontext}:plugins" verbose; then (( ${(P)#plugvar} )) || set -A ${plugvar} \ ${${(f)"$(_call_program plugins ansible-doc -t $plug -l)"}/ ##/:} - _describe -t plugins "${plug} plugin" $plugvar && ret=0 + _describe -t plugins "${plug} plugin" $plugvar -M 'r:|.=* r:|=*' && ret=0 else (( ${(P)#plugvar} )) || set -A ${plugvar} \ ${${(f)"$(_call_program plugins ansible-doc -t $plug -F)"}%% *} - _wanted plugins expl "${plug} plugin" compadd -a $plugvar && ret=0 + _wanted plugins expl "${plug} plugin" compadd -M 'r:|.=* r:|=*' -a $plugvar && ret=0 fi ;; tags) @@ -270,12 +270,19 @@ case $state in args+=( '(-c --ignore-certs)'{-c,--ignore-certs}'[ignore SSL certificate validation errors]' '(-s --server)'{-s+,--server=}'[specify API server destination]:server:_hosts' + --{token,api-key}='[specify ansible galaxy API key]:api key' \*{-v,--verbose}'[verbose mode]' ) ;| - collection-*) - args+=( '--api-key=[specify ansible galaxy API key]:api key' ) + role-setup) # order important here, source comes before github args + args+=( ': :_guard "^-*" "source"' '*:secret' ) ;| + role-(delete|import|setup)) + args+=( ': :_guard "^-*" "github username"' ':github repository' ) + ;| + role-(info|init|install|list|remove)) + args+=( '*: :_guard "^-*" "role name"' ) + ;; role-(info|search|list|remove|install)) args+=( '(-p --roles-path)'{-p,--roles-path}'[specify location of roles]:path:_directories' ) ;| @@ -334,23 +341,28 @@ case $state in collection-build) args+=( '--output-path=[specify path in which the collection is built to]:path [.]:_directories' + '*:collection directory to build:_directories' ) ;; collection-init) args+=( '--collection-skeleton=[specify path to a collection skeleton that the new role should be based upon]:path:_files' + ': :_guard "^-*" "collection name"' ) ;; collection-publish) args+=( "--no-wait[don't wait for import validation results]" '--import-timeout=[specify time to wait for import process]:time' + ':collection tarball:_files' ) ;; collection-install) args+=( '(-p --collections-path)'{-p+,--collections-path=}'[specify directory containing collections]:_directories' - '(-r --requirements-file)'{-r+,--requirements-file=}'[specify file containing a list of collections to install]:file:_files' + '(-r --requirements-file *)'{-r+,--requirements-file=}'[specify file containing a list of collections to install]:file:_files' + '--pre[include pre-release versions]' + '*:collecion name:_files' ) ;; esac @@ -362,13 +374,13 @@ case $state in (( $#words > 2 )) && ign='!' args=( "${ign}(-)"{-h,--help}'[display usage information]' - '--ask-vault-pass[ask for vault password]' + --ask-vault-pass{,word}'[ask for vault password]' '--vault-id=[specify vault identity to use]:vault identity' - '--vault-password-file=[specify vault password file]:vault password file:_files' + --vault-pass{,word}-file='[specify vault password file]:vault password file:_files' \*{-v,--verbose}'[verbose mode]' ) case $line[1] in - create|encrypt*|edit|rekey) + create|(de|en)crypt*|edit|rekey) args+=( '--encrypt-vault-id=[specify vault id to use to encrypt (required if more than one vault-id is provided)]:vault id' ) @@ -382,13 +394,13 @@ case $state in ) ;| create|edit|rekey|view) args+=( ':file:_files' ) ;| - (en|de)crypt) args+=( '::file:_files' ) ;; - rekey) + decrypt|rekey) args+=( '--new-vault-id=[specify new vault identity to use]:vault identity' '--new-vault-password-file=[specify new vault password file]:vault password file:_files' ) - ;; + ;| + (en|de)crypt) args+=( '::file:_files' ) ;; esac _arguments -s -S $args && ret=0 ;;