From 63346edb1bb53dd20bf1417a5271034d39a35b3f Mon Sep 17 00:00:00 2001 From: Natrim Date: Wed, 20 Jun 2012 11:14:24 +0200 Subject: [PATCH 1/4] add simple composer plugin with subcommands completion --- plugins/composer/_composer | 21 +++++++++++++++++++++ plugins/composer/composer.plugin.zsh | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 plugins/composer/_composer create mode 100644 plugins/composer/composer.plugin.zsh diff --git a/plugins/composer/_composer b/plugins/composer/_composer new file mode 100644 index 000000000..8301111f1 --- /dev/null +++ b/plugins/composer/_composer @@ -0,0 +1,21 @@ +#simple composer subcommand completion +#compdef composer.phar +#autoload + +local -a _1st_arguments + +if [ -f composer.phar ]; then + _1st_arguments=(`./composer.phar --no-ansi | sed "1,/Available commands/d" | awk '{ printf $1":"; for (i = 2; i <= NF; i++) printf "%s\xc2\xa0",$i; printf "\n" }'`) + else + if which composer.phar &> /dev/null; then + _1st_arguments=(`composer.phar --no-ansi | sed "1,/Available commands/d" | awk '{ printf $1":"; for (i = 2; i <= NF; i++) printf "%s\xc2\xa0",$i; printf "\n" }'`) + fi +fi + +_arguments \ + '*:: :->subcmds' && return 0 + +if (( CURRENT == 1 )); then + _describe -t commands "composer.phar subcommand" _1st_arguments + return +fi \ No newline at end of file diff --git a/plugins/composer/composer.plugin.zsh b/plugins/composer/composer.plugin.zsh new file mode 100644 index 000000000..983a24754 --- /dev/null +++ b/plugins/composer/composer.plugin.zsh @@ -0,0 +1,2 @@ +#alias +alias composer="composer.phar" \ No newline at end of file From 1bef83e62b5b457df0c31c7a783a9152994e3fac Mon Sep 17 00:00:00 2001 From: Natrim Date: Thu, 21 Jun 2012 09:27:46 +0200 Subject: [PATCH 2/4] add arguments --- plugins/composer/_composer | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/plugins/composer/_composer b/plugins/composer/_composer index 8301111f1..d16e88b4a 100644 --- a/plugins/composer/_composer +++ b/plugins/composer/_composer @@ -1,21 +1,21 @@ -#simple composer subcommand completion #compdef composer.phar #autoload local -a _1st_arguments -if [ -f composer.phar ]; then - _1st_arguments=(`./composer.phar --no-ansi | sed "1,/Available commands/d" | awk '{ printf $1":"; for (i = 2; i <= NF; i++) printf "%s\xc2\xa0",$i; printf "\n" }'`) - else - if which composer.phar &> /dev/null; then - _1st_arguments=(`composer.phar --no-ansi | sed "1,/Available commands/d" | awk '{ printf $1":"; for (i = 2; i <= NF; i++) printf "%s\xc2\xa0",$i; printf "\n" }'`) - fi -fi +_1st_arguments=(`composer.phar --no-ansi | sed "1,/Available commands/d" | awk '{ printf $1":"; for (i = 2; i <= NF; i++) printf "%s\xc2\xa0",$i; printf "\n" }'`) _arguments \ + '(--help)--help[Display help message.]' \ + '(--quiet)--quiet[Do not output any message.]' \ + '(--verbose)--verbose[Increase verbosity of messages.]' \ + '(--version)--version[Display this application version.]' \ + '(--ansi)--ansi[Force ANSI output.]' \ + '(--no-ansi)--no-ansi[Disable ANSI output.]' \ + '(--no-interaction)--no-interaction[Do not ask any interactive question.]' \ '*:: :->subcmds' && return 0 if (( CURRENT == 1 )); then _describe -t commands "composer.phar subcommand" _1st_arguments return -fi \ No newline at end of file +fi From a636ada19825722146f1c08733bb6eabf4cbf7c3 Mon Sep 17 00:00:00 2001 From: Natrim Date: Thu, 21 Jun 2012 09:43:28 +0200 Subject: [PATCH 3/4] move the aliases a little --- plugins/composer/_composer | 6 +++--- plugins/composer/_composer.phar | 21 +++++++++++++++++++++ plugins/composer/composer.plugin.zsh | 11 ++++++++++- 3 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 plugins/composer/_composer.phar diff --git a/plugins/composer/_composer b/plugins/composer/_composer index d16e88b4a..ccfcfb906 100644 --- a/plugins/composer/_composer +++ b/plugins/composer/_composer @@ -1,9 +1,9 @@ -#compdef composer.phar +#compdef composer #autoload local -a _1st_arguments -_1st_arguments=(`composer.phar --no-ansi | sed "1,/Available commands/d" | awk '{ printf $1":"; for (i = 2; i <= NF; i++) printf "%s\xc2\xa0",$i; printf "\n" }'`) +_1st_arguments=(`composer --no-ansi | sed "1,/Available commands/d" | awk '{ printf $1":"; for (i = 2; i <= NF; i++) printf "%s\xc2\xa0",$i; printf "\n" }'`) _arguments \ '(--help)--help[Display help message.]' \ @@ -16,6 +16,6 @@ _arguments \ '*:: :->subcmds' && return 0 if (( CURRENT == 1 )); then - _describe -t commands "composer.phar subcommand" _1st_arguments + _describe -t commands "composer subcommand" _1st_arguments return fi diff --git a/plugins/composer/_composer.phar b/plugins/composer/_composer.phar new file mode 100644 index 000000000..d16e88b4a --- /dev/null +++ b/plugins/composer/_composer.phar @@ -0,0 +1,21 @@ +#compdef composer.phar +#autoload + +local -a _1st_arguments + +_1st_arguments=(`composer.phar --no-ansi | sed "1,/Available commands/d" | awk '{ printf $1":"; for (i = 2; i <= NF; i++) printf "%s\xc2\xa0",$i; printf "\n" }'`) + +_arguments \ + '(--help)--help[Display help message.]' \ + '(--quiet)--quiet[Do not output any message.]' \ + '(--verbose)--verbose[Increase verbosity of messages.]' \ + '(--version)--version[Display this application version.]' \ + '(--ansi)--ansi[Force ANSI output.]' \ + '(--no-ansi)--no-ansi[Disable ANSI output.]' \ + '(--no-interaction)--no-interaction[Do not ask any interactive question.]' \ + '*:: :->subcmds' && return 0 + +if (( CURRENT == 1 )); then + _describe -t commands "composer.phar subcommand" _1st_arguments + return +fi diff --git a/plugins/composer/composer.plugin.zsh b/plugins/composer/composer.plugin.zsh index 983a24754..5e655d4b8 100644 --- a/plugins/composer/composer.plugin.zsh +++ b/plugins/composer/composer.plugin.zsh @@ -1,2 +1,11 @@ #alias -alias composer="composer.phar" \ No newline at end of file +if which composer.phar &> /dev/null; then + if which composer &> /dev/null; then + else + alias composer="composer.phar" + fi +else + if which composer &> /dev/null; then + alias composer.phar="composer" + fi +fi From 97e97cb864776aaf8fc6c021568b88d227551e06 Mon Sep 17 00:00:00 2001 From: Natrim Date: Thu, 21 Jun 2012 09:45:19 +0200 Subject: [PATCH 4/4] tabs --- plugins/composer/composer.plugin.zsh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/composer/composer.plugin.zsh b/plugins/composer/composer.plugin.zsh index 5e655d4b8..2b1f2855a 100644 --- a/plugins/composer/composer.plugin.zsh +++ b/plugins/composer/composer.plugin.zsh @@ -1,11 +1,11 @@ #alias if which composer.phar &> /dev/null; then - if which composer &> /dev/null; then - else - alias composer="composer.phar" - fi + if which composer &> /dev/null; then + else + alias composer="composer.phar" + fi else - if which composer &> /dev/null; then - alias composer.phar="composer" - fi + if which composer &> /dev/null; then + alias composer.phar="composer" + fi fi