X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fpharext%2FCliCommand.php;h=f4f29b6ab10d6d58aace00977c238486f574e98d;hb=e1c1b76f0a87c7573e30468763d47c0b97b11e8e;hp=1299a0e99397bb437fd9f58c308d5ccc8fd3b945;hpb=0813c3a5e5dc60c691f7f658b8fe3b51925c6bc1;p=pharext%2Fpharext

diff --git a/src/pharext/CliCommand.php b/src/pharext/CliCommand.php
index 1299a0e..f4f29b6 100644
--- a/src/pharext/CliCommand.php
+++ b/src/pharext/CliCommand.php
@@ -16,7 +16,7 @@ trait CliCommand
 	 * Output pharext vX.Y.Z header
 	 */
 	function header() {
-		printf("pharext v%s (c) Michael Wallner <mike@php.net>\n", VERSION);
+		printf("pharext v%s (c) Michael Wallner <mike@php.net>\n\n", VERSION);
 	}
 	
 	/**
@@ -24,7 +24,7 @@ trait CliCommand
 	 * @param string $prog
 	 */
 	public function help($prog) {
-		printf("\nUsage:\n\n  \$ %s", $prog);
+		printf("Usage:\n\n  \$ %s", $prog);
 		
 		$flags = [];
 		$required = [];
@@ -51,9 +51,27 @@ trait CliCommand
 			printf(" [-%s <arg>]", implode("|-", array_column($optional, 0)));
 		}
 		printf("\n\n");
-		foreach ($this->args->getSpec() as $spec) {
-			printf("    -%s|--%s %s", $spec[0], $spec[1], ($spec[3] & CliArgs::REQARG) ? "<arg>  " : (($spec[3] & CliArgs::OPTARG) ? "[<arg>]" : "       "));
-			printf("%s%s%s", str_repeat(" ", 16-strlen($spec[1])), $spec[2], ($spec[3] & CliArgs::REQUIRED) ? " (REQUIRED)" : "");
+		$spc = $this->args->getSpec();
+		$max = max(array_map("strlen", array_column($spc, 1)));
+		$max += $max % 8 + 2;
+		foreach ($spc as $spec) {
+			if (isset($spec[0])) {
+				printf("    -%s|", $spec[0]);
+			} else {
+				printf("    ");
+			}
+			printf("--%s ", $spec[1]);
+			if ($spec[3] & CliArgs::REQARG) {
+				printf("<arg>  ");
+			} elseif ($spec[3] & CliArgs::OPTARG) {
+				printf("[<arg>]");
+			} else {
+				printf("       ");
+			}
+			printf("%s%s", str_repeat(" ", $max-strlen($spec[1])+3*!isset($spec[0])), $spec[2]);
+			if ($spec[3] & CliArgs::REQUIRED) {
+				printf(" (REQUIRED)");
+			}
 			if (isset($spec[4])) {
 				printf(" [%s]", $spec[4]);
 			}