Merge pull request #65 from getkirby/feature/debug-mode

New debug mode

README.md

@@ -139,6 +139,14 @@ kirby remove:command hello
 
 If you have a local and a global command, you can choose which one to delete.
 
+## Debugging
+
+Use the `-d` or `--debug` argument to run the command in debug mode:
+
+```bash
+kirby make:command hello --debug
+```
+
 ## Formatting Output
 
 Sending messages to the terminal is super easy.

src/CLI/CLI.php

@@ -102,7 +102,7 @@ public static function command(...$args): void
 		try {
 			$cli->run(...$args);
 		} catch (Throwable $e) {
-			$cli->error((string)$e);
+			$cli->handleException($e);
 		}
 	}
 
@@ -312,6 +312,19 @@ public function dir(?string $folder = null): string
 		return $folder;
 	}
 
+	/**
+	 * Handles exception with throwing exception or out error message
+	 */
+	protected function handleException(Throwable $e): never
+	{
+		if ($this->isDefined('debug') === true) {
+			throw $e;
+		}
+
+		$this->error($e->getMessage());
+		exit;
+	}
+
 	/**
 	 * Gets path for global commands (respecting 'XDG_CONFIG_HOME' if set)
 	 *
@@ -501,7 +514,17 @@ public function run(?string $name = null, ...$args): void
 			]
 		]);
 
-		// add help as last argument
+		// add debug argument
+		$this->climate->arguments->add([
+			'debug' => [
+				'description' => 'Enables debug mode',
+				'prefix'      => 'd',
+				'longPrefix'  => 'debug',
+				'noValue'     => true
+			]
+		]);
+
+		// add help argument
 		$this->climate->arguments->add([
 			'help' => [
 				'description' => 'Prints a usage statement',
@@ -521,8 +544,7 @@ public function run(?string $name = null, ...$args): void
 		try {
 			$this->climate->arguments->parse($argv);
 		} catch (Throwable $e) {
-			$this->error($e->getMessage());
-			exit;
+			$this->handleException($e);
 		}
 
 		// enable quiet mode
@@ -536,7 +558,11 @@ public function run(?string $name = null, ...$args): void
 			return;
 		}
 
-		$command['command']($this);
+		try {
+			$command['command']($this);
+		} catch (Throwable $e) {
+			$this->handleException($e);
+		}
 	}
 
 	/**